net-p2p/freenet-bin: Remove useless RESTRICT; einfo -> elog; clean up formatting

svn path=/sunrise/; revision=4632

diff --git a/net-p2p/freenet-bin/ChangeLog b/net-p2p/freenet-bin/ChangeLog
index a7e3c24bf234098492aad78b62c4abcba5d6f969..0a6d0df11ed59befb386068f87ecda63ba282e60 100644 (file)
--- a/net-p2p/freenet-bin/ChangeLog
+++ b/net-p2p/freenet-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Sep 2007; Jakub Moc <jakub@gentoo.org> freenet-bin-0.7.1061.ebuild:
+  Remove useless RESTRICT; einfo -> elog; clean up formatting
+
   11 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   freenet-bin-0.7.1061.ebuild:
   remove trailing whitespace and add some quotes around variables

diff --git a/net-p2p/freenet-bin/Manifest b/net-p2p/freenet-bin/Manifest
index f65ff7f3254b2b030397817d534a88a894efbc85..534c0e512155d664384f58cdf45f0f8aa85b8ef7 100644 (file)
--- a/net-p2p/freenet-bin/Manifest
+++ b/net-p2p/freenet-bin/Manifest
@@ -3,6 +3,6 @@ DIST freenet-r15122-snapshot.jar 2131696 RMD160 416483369415688b6dcf090e3e4f2246
 DIST freenet07.tar.gz 383366 RMD160 d6f7baee05c1fe2d713fa345fae10bc25287b61e SHA1 8e9ddde6420f5cc24824467747b7a3bcbc21b15c SHA256 aae56bd0d2ed7d80217b1eccab1cf3a946a517df83fc6c1a9de7b95fd82724aa
 DIST update.sh 3115 RMD160 e65f151e06b5a6425dcb59f03b4874ec1e8b5047 SHA1 e024bcfc443982fcc3d888088ef427943fa62f71 SHA256 df80518672316ae8d330e08ef50f170eabacd9003eeac975a400523d0f61922c
 DIST wrapper.conf 1706 RMD160 413f4fec1f60b6d4651f1ffd945e6d9ec2275e39 SHA1 8ec5648d5677325a867118e687f1e05cfe4a417a SHA256 f56a8e897297107c3ea2c95da5f321556e1ac82e87d81f339610f8bb27ecd88b
-EBUILD freenet-bin-0.7.1061.ebuild 2389 RMD160 e3831a26fbed330c1d4bec9f784f4f469fda3735 SHA1 15b9006897492765ba41f2ebd5300f54ff8f3476 SHA256 bded5b61cc7861813b53bbe2c26a34aa464fc0462e57157e3ca191d0db215f0b
-MISC ChangeLog 1936 RMD160 c7c87f12e5648b3df0369c00f5f991f6ee6042c2 SHA1 fa8902f5e66769da070511229dc259961589ef73 SHA256 746ba88eb0aad19abbb33c172e4e34c0671706c1554730207501939a0a35e542
+EBUILD freenet-bin-0.7.1061.ebuild 2409 RMD160 651216af382ebf3fa43673bf0722d8ff7be815d2 SHA1 d9e69103b5d471f160971a65af78bfc3ed0ced31 SHA256 bea62ad3506ecda63def970e2fc812d39ef367e87719f067f946110b93f4cb4d
+MISC ChangeLog 2072 RMD160 473ade4670bfa73a66ecf67be6a37ba9104533ef SHA1 bd6b2683d884391adddcc5be6aedd70fc7e91422 SHA256 e7b3c55b145df1e1214a3b04511fb14499321b04601b801edf3cca27fe527198
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild b/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild
index 7f12ec2397292dfef82064f2d27839766cfce144..8d078060c80a59e034adc661b2312377d030004c 100644 (file)
--- a/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild
+++ b/net-p2p/freenet-bin/freenet-bin-0.7.1061.ebuild
@@ -27,7 +27,7 @@ RDEPEND="!net-p2p/freenet
 
 S="${WORKDIR}/${PN/-bin/}"
 
-RESTRICT="userpriv mirror"
+RESTRICT="userpriv"
 
 QA_TEXTRELS="opt/freenet/lib/libwrapper-linux-x86-32.so"
 
@@ -40,12 +40,13 @@ src_unpack() {
        unpack "freenet07.tar.gz"
        cd "${S}"
        rm bin/wrapper-macosx* bin/wrapper-linux-ppc-* lib/libwrapper-macosx*.* \
-       lib/libwrapper*ppc-*.so update stun mdns librarian bin/1run.sh bin/*jar \
-       welcome.html INSTALL README
+               lib/libwrapper*ppc-*.so update stun mdns librarian bin/1run.sh bin/*jar \
+               welcome.html INSTALL README
+
        sed -i -e 's:./bin/wrapper:/opt/freenet/bin/wrapper:g' \
-       -e 's:./wrapper.conf:/opt/freenet/wrapper.conf:g' \
-       -e 's:PIDDIR=".":PIDDIR="/opt/freenet/":g' \
-       -e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh
+               -e 's:./wrapper.conf:/opt/freenet/wrapper.conf:g' \
+               -e 's:PIDDIR=".":PIDDIR="/opt/freenet/":g' \
+               -e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh || die "sed failed"
 }
 
 src_compile() {
@@ -66,11 +67,13 @@ src_install() {
 }
 
 pkg_postinst () {
-       einfo "1. Start freenet with /etc/init.d/freenet start"
-       einfo "2. Open localhost:8888 in your browser for the web interface."
-       einfo "3. After uninstalling freenet delete /opt/freenet manually (unless you want to keep it for a later reinstall)"
-       einfo "   as freenet creates some extra stuff not deleted by portage"
-       if (diff /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar >/dev/null 2>&1); then :;
+       elog "1. Start freenet with /etc/init.d/freenet start"
+       elog "2. Open localhost:8888 in your browser for the web interface."
+       elog "3. After uninstalling freenet delete /opt/freenet manually (unless you want to keep it for a later reinstall)"
+       elog "   as freenet creates some extra stuff not deleted by portage"
+
+       if (diff /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar >/dev/null 2>&1) ; then 
+               :;
        else
                cp /opt/freenet/${MY_JAR_FILE} /opt/freenet/freenet-stable-latest.jar
        fi