Fix doins arguments and eerror message

svn path=/sunrise/; revision=4723

3 files changed, 18 insertions, 16 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index e3c4d077b..d6c0fd02e 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,23 +2,26 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  26 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  27 Sep 2007; Dawid Węgliński <cla@gentoo.org> freenet-0.7.1065.ebuild:
+  Fix doins arguments and eerror message
+
+  26 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1064.ebuild, +freenet-0.7.1065.ebuild:
   New upstream release
 
-  25 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  25 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1062.ebuild, +freenet-0.7.1064.ebuild:
   New upstream release
 
-  14 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  14 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1061-r2.ebuild, +freenet-0.7.1062.ebuild:
   New upstream release
 
-  14 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  14 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1061-r1.ebuild, +freenet-0.7.1061-r2.ebuild:
   Added wrapper init script, so login shell not longer needed
 
-  14 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  14 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   freenet-0.7.1061-r1.ebuild:
   Use eerror instead of error and delete useless groupdel
 
@@ -36,24 +39,23 @@
   freenet-0.7.1061.ebuild:
   remove trailing whitespace
 
-  11 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  11 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1060-r1.ebuild, +freenet-0.7.1061.ebuild:
   New Upstream release
 
-  10 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  10 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1060.ebuild, +freenet-0.7.1060-r1.ebuild:
   Reformatted
 
-  10 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  10 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   -freenet-0.7.1058.ebuild, +freenet-0.7.1060.ebuild:
   New upstream release
 
-  07 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  07 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   +freenet-0.7.1058.ebuild:
   New upstream release
 
-  02 Sep 2007; Thomas Sachau (Tommy[D]) thomas.sachau@gmx.de
+  02 Sep 2007; Thomas Sachau (Tommy[D]) <thomas.sachau@gmx.de>
   +files/freenet.pem, +files/servers, +metadata.xml,
   +freenet-0.7.1056.ebuild:
   New source ebuild for bug 128783
-
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 0f9a39dec..f509cdd01 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -3,6 +3,6 @@ DIST freenet-sources-v1065.tar.bz2 19077057 RMD160 e0e750e40dc879cc8446f6dfdf3d8
 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-0.7.1065.ebuild 2644 RMD160 d766b8b211400e3b005f8caf864bb9e8d67b7681 SHA1 85f4f14db84a31ae114773e037b38d1855384953 SHA256 9be9fa315b9f97f7f824598bd8e918bcd67b789ff092356f30d0b9f5c35bcacc
-MISC ChangeLog 2086 RMD160 a016c9a96065fecd429a3df6c4254610ddfc9840 SHA1 59cf61f11e09b063f8dd3d874743a417178dbbad SHA256 df5151c313a75a1e781ea71bd74773059116dd04559618a80c93df2f3bcffdce
+EBUILD freenet-0.7.1065.ebuild 2639 RMD160 7c95ec34c2117754716d9de985142f2d08d0ddb8 SHA1 6e2c10d38751d4d12013c06c59bc9ef2ee1f66f8 SHA256 ecc4d08aa3ce8cc3f5e34d9d111fb3eb1fa1ffc4a57f203a4630bbc49f354baa
+MISC ChangeLog 2105 RMD160 909b671dfb66491ab54baca25f78627777252353 SHA1 b291884d201cca01ae9a3f3355b3368d135b90bc SHA256 444c12dc8f944099e53b3e28709f1f2bac10f33ac80b5f2b02cc83a0a19048d8
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet/freenet-0.7.1065.ebuild b/net-p2p/freenet/freenet-0.7.1065.ebuild
index 65d34f597..ea1faf2b2 100644
--- a/net-p2p/freenet/freenet-0.7.1065.ebuild
+++ b/net-p2p/freenet/freenet-0.7.1065.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-0.7.1061-r2" ; then
 		eerror "Previous versions created user account with a passwordless login shell."
 		eerror "You must unmerge the old version first and delete that user account."
-		eerror "emerge -C \\<${CATEGORY}/${PN}-0.7.1061-r2; userdel freenet"
+		eerror "emerge -C \\<${CATEGORY}/${PN}-0.7.1061-r2 && userdel freenet"
 		die "Insecure version installed!"
 	fi
 
@@ -72,7 +72,7 @@ src_install() {
 	dodoc license/README license/LICENSE.Mantissa license/LICENSE.Freenet
 	dobin bin/wrapper-linux-x86-{32,64}
 	dolib.so lib/libwrapper-linux-x86-{32,64}.so
-	doins run.sh ${DISTDIR}/update.sh ${DISTDIR}/wrapper.conf freenet/lib/freenet-{cvs-snapshot,ext}.jar
+	doins run.sh "${S}"/update.sh "${S}"/wrapper.conf freenet/lib/freenet-{cvs-snapshot,ext}.jar
 
 	dosym freenet-stable-latest.jar /opt/freenet/freenet.jar
 	fperms 755 /opt/freenet/{update,run}.sh
@@ -80,7 +80,7 @@ src_install() {
 }
 
 pkg_postinst () {
-	elog "1. Start freenet with /etc/init.d/freenet start"
+	elog "1. Start freenet with /etc/init.d/freenet start."
 	elog "2. Open localhost:8888 in your browser for the web interface."
 	cp /opt/freenet/freenet-cvs-snapshot.jar /opt/freenet/freenet-stable-latest.jar && chown freenet:freenet /opt/freenet/*
 }