net-p2p/freenet: New upstream release + update ebuilds

svn path=/sunrise/; revision=7089

4 files changed, 21 insertions, 13 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 9b13dadb3..9ce97c848 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1162.ebuild, +freenet-0.7_p1163.ebuild,
+  freenet-9999-r1.ebuild:
+  New upstream release + update ebuilds
+
   07 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   files/wrapper1.conf, -freenet-0.7_p1160.ebuild, +freenet-0.7_p1162.ebuild,
   freenet-9999-r1.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index e8713d454..9088f5d2c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -2,9 +2,9 @@ AUX ext.patch 4954 RMD160 57fb8ecf9be8900a1ad54306d5c4df1eef6acd80 SHA1 3f9eaacd
 AUX freenet 667 RMD160 3b27107bc1c7ce786621817aedbd51bef8d87281 SHA1 b2e1c5ee6df53e41533a7f24acac4531eb2b0c4b SHA256 3112937e3ea474a9e9624aaf841b9f52007abb2f48b0c3b9b1e886b882318c84
 AUX freenet.old 643 RMD160 be7dc68fed6caf7062f9b3250be6223513d375ff SHA1 50f706994d7fba56e3b38fdbc2998b246147d713 SHA256 8396eea93c2dcb8c7ce7d8659d0da22e06992867c8d57526c634455395334f72
 AUX wrapper1.conf 1846 RMD160 b75534061632064f7ebd9153260b021a7f23c076 SHA1 b6df84ded6f31b1a2c0757cdf7c8736e9b744181 SHA256 00b09246fd598c6ce13836d79104e4964de538ac1d9b3af6fa7bf240f142ca00
-DIST freenet-0.7_p1162.tar.bz2 2246529 RMD160 3dad79df76f3671d778121eadac9a8b51bf9a362 SHA1 a2829a13bae1547918f44969f11eb4517335fe6f SHA256 48c2bee61d74d5125c6616acd5ba510176229fa2b7df4c13c1f86c08b0dfed5c
-DIST seednodes-20080907.fref 40223 RMD160 73953e859d82aaaa1d38de1d6526c40b5adec81d SHA1 c32af5a752f368790c560d99888dba3ae7f99572 SHA256 9c6ecebbdf68ead6d3b70ca54fd0da1d004a67b2d0db32907c835d9c01af6065
-EBUILD freenet-0.7_p1162.ebuild 3151 RMD160 e4c5611f7237ccc52f3a2172dd354999598d4f62 SHA1 d57f210c8a817056e99e895bc92ac4e8bbb5265a SHA256 882331970c06a376cbd0b2be4a79880d579bce7c20c11b04b180c1d6016cb657
-EBUILD freenet-9999-r1.ebuild 3767 RMD160 3c3b7010c02afa9ad14ab30884534ba19ea21efb SHA1 e6f750ee1b43be76f0fa46599a1bbac3806660ea SHA256 00a1d58c73ab1ddc24fd9fd77cc88ceccdc8b7a993d138e69f5ca6cdab8e7a1a
-MISC ChangeLog 12898 RMD160 5adb6326fbf02b75136cc0d6d3ddd0c0fd2984cc SHA1 3315b2de1328950f776342d7ef29295402b97754 SHA256 789cd853478d5841d23d2f833161784c86bba63bca8a902964fc4862a2e178ab
+DIST freenet-0.7_p1163.tar.bz2 2263374 RMD160 7dab1b3d34d9bd1dce7394e4afcf517994458438 SHA1 b5860802f1f02c81e984eefc596c62a2c9f6afc7 SHA256 5a20c69aefbb16381b85161f2479cb360fc77d713c4502442c46681374983964
+DIST seednodes-20080914.fref 22382 RMD160 acbf450884ea767e9593d9f7053595d66c9bc0a4 SHA1 347b2ed8d6c792525fd4668fa500a05a2526091f SHA256 7f252080f70182692c7b32a13d5cd480c7d5ed0918ec671bea1d7b3b649cd73a
+EBUILD freenet-0.7_p1163.ebuild 3145 RMD160 54f4ba26d0f47e906b6f277cdc144742d3d21625 SHA1 dec5d4cecf060a071d8cebe7533e5c4dea41d238 SHA256 fa9129fc6ff9772c3855b2f1bbc7f96f2003cd01caf9cab4949024ee08cbba87
+EBUILD freenet-9999-r1.ebuild 3772 RMD160 c91b4c69f6f2fc2d509ec9c5ca5335da66a98a2f SHA1 a2d5322638b78315404f9c0492f36d3e6a583bd5 SHA256 74a83395477d8b5e1a749a35bda2f37c29a57f96560bd65c5dea2ff238719541
+MISC ChangeLog 13080 RMD160 f4e1ddb71ede33b498352dedd184d7762338a295 SHA1 19e22996aa4121d22886acc9106d6d1d2b7ffecc SHA256 16b90e8b8f62df4bc218dcd431072e7af4bc8d03288ced2cca01361255355673
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-p2p/freenet/freenet-0.7_p1162.ebuild b/net-p2p/freenet/freenet-0.7_p1163.ebuild
index cf814c26b..a47d395e4 100644
--- a/net-p2p/freenet/freenet-0.7_p1162.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1163.ebuild
@@ -68,10 +68,11 @@ src_install() {
 	fi
 	dodoc license/README license/LICENSE.Mantissa \
 		AUTHORS README
+	insinto /etc
+	newins wrapper.conf freenet-wrapper.conf
 	insinto /var/freenet
-	doins seednodes.fref wrapper.conf run.sh
+	doins seednodes.fref run.sh
 	dodir /var/freenet/bin
-	dosym /usr/bin/wrapper /var/freenet/bin/wrapper
 	dodir /var/freenet/$(get_libdir)
 	dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /var/freenet/$(get_libdir)/libwrapper.so
 	dosym ../../../usr/$(get_libdir)/libNativeThread.so /var/freenet/$(get_libdir)/libNativeThread.so
diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index ab6d7a370..19a706c8d 100644
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=1
-DATE=20080907
+DATE=20080914
 ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/freenet"
 ESVN_OPTIONS="--ignore-externals"
 inherit eutils java-pkg-2 java-ant-2 multilib subversion
@@ -57,11 +57,12 @@ src_unpack() {
 	cd "${S}"
 	cp "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref
 	cp "${FILESDIR}"/wrapper1.conf wrapper.conf
-	sed -i -e 's:./bin/wrapper:/var/freenet/bin/wrapper:g' \
-	-e 's:./wrapper.conf:/var/freenet/wrapper.conf:g' \
+	sed -i -e 's:./bin/wrapper:/usr/bin/wrapper:g' \
+	-e 's:./wrapper.conf:/etc/freenet-wrapper.conf:g' \
 	-e 's:PIDDIR=".":PIDDIR="/var/freenet/":g' \
 	-e 's:#RUN_AS_USER=:RUN_AS_USER=freenet:g' run.sh || die "sed failed"
-	sed -ie "s:@custom@:${MY_FREENET_LATEST}:g" src/freenet/node/Version.java
+	subversion_wc_info
+	sed -ie "s:@custom@:${ESVN_WC_REVISION}:g" src/freenet/node/Version.java
 	epatch "${FILESDIR}"/ext.patch
 	sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
 	mkdir -p lib
@@ -80,10 +81,11 @@ src_install() {
 	else
 		newinitd "${FILESDIR}"/freenet.old freenet
 	fi
+	insinto /etc
+	newins wrapper.conf freenet-wrapper.conf
 	insinto /var/freenet
-	doins wrapper.conf run.sh seednodes.fref
+	doins run.sh seednodes.fref
 	dodir /var/freenet/bin
-	dosym /usr/bin/wrapper /var/freenet/bin/wrapper
 	dodir /var/freenet/$(get_libdir)
 	dosym ../../../usr/$(get_libdir)/java-service-wrapper/libwrapper.so /var/freenet/$(get_libdir)/libwrapper.so
 	dosym ../../../usr/$(get_libdir)/libNativeThread.so /var/freenet/$(get_libdir)/libNativeThread.so