net-p2p/freenet: New upstream release, update live ebuild, make ebuilds ready for next releases

svn path=/sunrise/; revision=7279

8 files changed, 66 insertions, 70 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 88759ae1b..dd1578d95 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7_p1166.ebuild, +freenet-0.7_p1167.ebuild,
+  freenet-9999-r1.ebuild, files/ext.patch, files/freenet, files/freenet.old,
+  files/wrapper1.conf:
+  New upstream release, update live ebuild, make ebuilds ready for next releases
+
   27 Oct 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -freenet-0.7_p1165.ebuild, +freenet-0.7_p1166.ebuild,
   freenet-9999-r1.ebuild, files/ext.patch, files/wrapper1.conf:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 8ee340404..296f271b3 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,10 +1,10 @@
-AUX ext.patch 5219 RMD160 2d835d17793ea6f441524feab9c484a536c571f0 SHA1 0cd41ebe37ce257a3602aef3a564398f99c3ed85 SHA256 879e552d5bf8398851489855858cfaa4aaadfc346a5957595f0f12998895b104
-AUX freenet 667 RMD160 3b27107bc1c7ce786621817aedbd51bef8d87281 SHA1 b2e1c5ee6df53e41533a7f24acac4531eb2b0c4b SHA256 3112937e3ea474a9e9624aaf841b9f52007abb2f48b0c3b9b1e886b882318c84
-AUX freenet.old 643 RMD160 be7dc68fed6caf7062f9b3250be6223513d375ff SHA1 50f706994d7fba56e3b38fdbc2998b246147d713 SHA256 8396eea93c2dcb8c7ce7d8659d0da22e06992867c8d57526c634455395334f72
-AUX wrapper1.conf 1903 RMD160 8937491f8fffd2e01f2a5f45adbd9d188ae8fd02 SHA1 02436e8f4717c2047165229fa515a425a4a2fea2 SHA256 fced6c20eca2706203b457ed4425cffdcd000d4dcb1e814e8427666a34165771
-DIST freenet-0.7_p1166.tar.bz2 2243858 RMD160 34169c2ee84683503901bf869ac50b772626dbec SHA1 7c4c5101db36dbc7767a3b46471bf52b5573aec1 SHA256 7a04ce7a951c2f6fc1ddf73bcfc1d33efd9e55e9af167868283a0a25c941f895
+AUX ext.patch 5906 RMD160 8135e829041e767912e1db3b35299fd5c162d790 SHA1 64f998cb8a8041be3f10925fde9cb0fa24b4ab51 SHA256 747b38acd06a838d39cef93511e9ede250fa3f208c628b13f0bc3ea3be7c6c67
+AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
+AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
+AUX wrapper1.conf 2229 RMD160 a6f8caf1f7d6878791edc5f8f230b3dbe9150e4d SHA1 cff2b9dd41d685ec7f48547e65639e8b17d0144c SHA256 c5190c5178121814ef70fb72a13c9e5e27178845a016842450f9b9debf3d0971
+DIST freenet-0.7_p1167.tar.bz2 2243209 RMD160 a767a3fbb721765173f40197a96c4ce007b307cc SHA1 fcedcd526f201e0553b7340b60c24d5b19d47759 SHA256 9776e46020eabf8f0ffdfcd023a42054a17462a4d3292e059fc9fbdc0e0cfdb0
 DIST seednodes-20080928.fref 28703 RMD160 8f92609f1d8beb3164d8f4d5e35c4539a6824dc3 SHA1 9c5a2a2f6188850b8503c1e31ae79e9964c4662a SHA256 ed153fe40f36c6088f97c4d7bed15333722b7e6b27b7c9efd0c506cd7b79f7c3
-EBUILD freenet-0.7_p1166.ebuild 3529 RMD160 e6248afd05b05a29e8766b6ab863d4fd52e1bbaa SHA1 fe41de61f9d956e6a728b1b9862a79bde99709a3 SHA256 ad1adf77fbe33a57ba398a9c695912b880771ca172e2a190da6c7e068ee71571
-EBUILD freenet-9999-r1.ebuild 4214 RMD160 3ebc65efe6f8626971e90cec3bcbad443bfab84c SHA1 81aaf4b4f31998eb59e3c17bbc0dd67980e830e0 SHA256 112cae519f1f025a218b2f16d0d01b5d161a8ccf9acefee79ea8395cbd3c3fc8
-MISC ChangeLog 14238 RMD160 8222f367b6cbd574de9c3636d0c9f108ce7fdef2 SHA1 dd1599a844caf0025fb6aec85bdfc8b3ea852028 SHA256 f697cd29952db0e2a6c46504e3139632776ebafd4964b741282725e10b9d3beb
+EBUILD freenet-0.7_p1167.ebuild 3167 RMD160 635ecf588c62fb6a775884950b10edc425e2a893 SHA1 acab00497e252ec826343cb6204b3e43b70d7a1d SHA256 1eb54009b9a0364395b4939a4a398cbd8ecab3b0beec5cbb96dd1c4d90678f76
+EBUILD freenet-9999-r1.ebuild 3860 RMD160 cb12ca956f6e14c539082e8361e0e5017fab18c6 SHA1 506bd7216f19e947de676795d28cff8f3c6fac25 SHA256 5240ecf19b02602616d13ea58e750f1dd0a49e917d0ebcf1260302374c7ed245
+MISC ChangeLog 14535 RMD160 0da36fb55fb5152d648df297e7eeaa46fd7b473c SHA1 a6dc329e062be625a0758f45151cb46983d9dbbc SHA256 63c9894042fa4898f45f6c16058d9b51324b3d3dc3f1fee5a53b3676d2330341
 MISC metadata.xml 238 RMD160 61d35251af6d2d13fa32d5c455dbf179174ca375 SHA1 b2ff81a006f10b2a9d37722a77eb70be65abb9e8 SHA256 9425b3716c550570a17382ba0b1a9fbf3243483ea6117ae94453ee7047362f8a
diff --git a/net-p2p/freenet/files/ext.patch b/net-p2p/freenet/files/ext.patch
index 0c08c0512..aa7794f3c 100644
--- a/net-p2p/freenet/files/ext.patch
+++ b/net-p2p/freenet/files/ext.patch
@@ -1,7 +1,7 @@
 diff -ur freenet-old/build.xml freenet/build.xml
---- freenet-old/build.xml	2008-10-27 18:32:49.000000000 +0100
-+++ freenet/build.xml	2008-10-27 18:36:47.000000000 +0100
-@@ -16,7 +16,10 @@
+--- freenet-old/build.xml	2008-10-28 21:40:50.000000000 +0100
++++ freenet/build.xml	2008-10-28 21:40:42.000000000 +0100
+@@ -16,7 +16,13 @@
  	<property name="build" location="build"/>
  	<property name="build-test" location="build-test"/>
  	<property name="lib"	location="lib"/>
@@ -10,10 +10,13 @@ diff -ur freenet-old/build.xml freenet/build.xml
 +	<property name="je.location" location="${lib}/je.jar"/>
 +	<property name="fec.location" location="${lib}/fec.jar"/>
 +	<property name="ant.location" location="${lib}/ant.jar"/>
++	<property name="sevenzip.location" location="${lib}/sevenzip.jar"/>
++	<property name="lzmajio.location" location="${lib}/lzmajio.jar"/>
++	<property name="mersennetwister.location" location="${lib}/mersennetwister.jar"/>
  	<property name="javadoc" location="javadoc"/>
  	<property name="svn.revision" value="@custom@"/>
  	<property name="CSSTokenizerFilter.relative.jflex" value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/>
-@@ -37,7 +40,6 @@
+@@ -37,7 +43,6 @@
  	</target>
  
  	<target name="env" depends="mkdir"   description="Learn about the environment">
@@ -21,7 +24,7 @@ diff -ur freenet-old/build.xml freenet/build.xml
  		<available file="${CSSTokenizerFilter.java}" property="CSSTokenizerFilter.present"/>
  		<available file="${junit.location}" property="junit.present"/>
  	</target>
-@@ -51,19 +53,9 @@
+@@ -51,19 +56,9 @@
  		</exec>
  	</target>
  
@@ -42,7 +45,7 @@ diff -ur freenet-old/build.xml freenet/build.xml
  		<!-- Create the time stamp -->
  		<tstamp/>
  
-@@ -77,7 +69,10 @@
+@@ -77,7 +72,13 @@
  
  		<javac srcdir="${src}" destdir="${build}" debug="on" optimize="on" source="1.5">
  			<classpath>
@@ -51,10 +54,13 @@ diff -ur freenet-old/build.xml freenet/build.xml
 +				<pathelement location="${je.location}"/>
 +				<pathelement location="${fec.location}"/>
 +				<pathelement location="${ant.location}"/>
++				<pathelement location="${sevenzip.location}"/>
++				<pathelement location="${lzmajio.location}"/>
++				<pathelement location="${mersennetwister.location}"/>
  				<pathelement location="gnu-crypto.jar"/>
  				<pathelement location="javax-security.jar"/>
  				<pathelement location="javax-crypto.jar"/>
-@@ -135,7 +130,10 @@
+@@ -135,7 +136,13 @@
  		<javac srcdir="${test}" destdir="${build-test}" debug="on" optimize="on" source="1.5">
  			<classpath>
  				<pathelement path="${build}"/>
@@ -63,10 +69,13 @@ diff -ur freenet-old/build.xml freenet/build.xml
 +				<pathelement location="${je.location}"/>
 +				<pathelement location="${fec.location}"/>
 +				<pathelement location="${ant.location}"/>
++				<pathelement location="${sevenzip.location}"/>
++				<pathelement location="${lzmajio.location}"/>
++				<pathelement location="${mersennetwister.location}"/>
  				<pathelement location="${junit.location}"/>
  			</classpath>
  			<compilerarg value="-Xlint"/>
-@@ -149,7 +147,10 @@
+@@ -149,7 +156,13 @@
  			<classpath>
  				<pathelement path="${build}"/>
  				<pathelement path="${build-test}"/>
@@ -75,13 +84,15 @@ diff -ur freenet-old/build.xml freenet/build.xml
 +				<pathelement location="${je.location}"/>
 +				<pathelement location="${fec.location}"/>
 +				<pathelement location="${ant.location}"/>
++				<pathelement location="${sevenzip.location}"/>
++				<pathelement location="${lzmajio.location}"/>
++				<pathelement location="${mersennetwister.location}"/>
  				<pathelement location="${junit.location}"/>
  			</classpath>
  
-Nur in freenet: lib.
 diff -ur freenet-old/src/freenet/node/NodeStarter.java freenet/src/freenet/node/NodeStarter.java
---- freenet-old/src/freenet/node/NodeStarter.java	2008-10-27 18:32:49.000000000 +0100
-+++ freenet/src/freenet/node/NodeStarter.java	2008-10-27 18:34:12.000000000 +0100
+--- freenet-old/src/freenet/node/NodeStarter.java	2008-10-28 21:40:50.000000000 +0100
++++ freenet/src/freenet/node/NodeStarter.java	2008-10-28 21:39:14.000000000 +0100
 @@ -162,37 +162,8 @@
  	}
  
diff --git a/net-p2p/freenet/files/freenet b/net-p2p/freenet/files/freenet
index d8b0a7b06..f276ee4ea 100644
--- a/net-p2p/freenet/files/freenet
+++ b/net-p2p/freenet/files/freenet
@@ -3,14 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 start() {
-	if ! [[ -e /opt/freenet/freenet.ini ]]; then
-		start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh start 2>/dev/null
-		eend 0
-	else
-		echo "Please move freenet to the new location with the following command:"
-		echo "         mv /opt/freenet /var/freenet"
-		eend 1
-	fi
+	start-stop-daemon --start --chuid freenet --exec /bin/sh /var/freenet/run.sh start 2>/dev/null
+	eend 0
 }
 
 status() {
diff --git a/net-p2p/freenet/files/freenet.old b/net-p2p/freenet/files/freenet.old
index 6a01ab58c..d0df97e47 100644
--- a/net-p2p/freenet/files/freenet.old
+++ b/net-p2p/freenet/files/freenet.old
@@ -3,14 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 start() {
-	if ! [[ -e /opt/freenet/freenet.ini ]]; then
-		start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh start 2>/dev/null
-		eend 0
-	else
-		echo "Please move freenet to the new location with the following command:"
-		echo "         mv /opt/freenet /var/freenet"
-		eend 1
-	fi
+	start-stop-daemon --start --chuid freenet --exec /var/freenet/run.sh start 2>/dev/null
+	eend 0
 }
 
 status() {
diff --git a/net-p2p/freenet/files/wrapper1.conf b/net-p2p/freenet/files/wrapper1.conf
index 3914a3f89..a8d6d95ec 100644
--- a/net-p2p/freenet/files/wrapper1.conf
+++ b/net-p2p/freenet/files/wrapper1.conf
@@ -7,12 +7,19 @@ wrapper.java.classpath.3=/usr/share/db-je-3.3/lib/je.jar
 wrapper.java.classpath.4=/usr/share/fec/lib/fec.jar
 wrapper.java.classpath.5=/usr/share/db4o/lib/db4o.jar
 wrapper.java.classpath.6=/usr/share/ant-core/lib/ant.jar
+wrapper.java.classpath.7=/usr/share/sevenzip/lib/sevenzip.jar
+wrapper.java.classpath.8=/usr/share/lzmajio/lib/lzmajio.jar
+wrapper.java.classpath.9=/usr/share/mersennetwister/lib/mersennetwister.jar
 wrapper.java.library.path.1=lib
 wrapper.java.initmemory=60
 wrapper.java.maxmemory=128
 wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
 wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
 wrapper.java.additional.3=-enableassertions:freenet
+
+# You might want to set the following line if you have changed java.maxmemory
+#wrapper.java.additional.4=-XX:MaxPermSize=256M
+
 wrapper.app.parameter.1=freenet.ini
 wrapper.console.format=PM
 wrapper.console.loglevel=INFO
diff --git a/net-p2p/freenet/freenet-0.7_p1166.ebuild b/net-p2p/freenet/freenet-0.7_p1167.ebuild
index 9c05170a1..b47135eac 100644
--- a/net-p2p/freenet/freenet-0.7_p1166.ebuild
+++ b/net-p2p/freenet/freenet-0.7_p1167.ebuild
@@ -19,7 +19,10 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
 	dev-java/java-service-wrapper
 	dev-java/db4o
-	dev-java/ant-core"
+	dev-java/ant-core
+	dev-java/sevenzip
+	dev-java/lzmajio
+	dev-java/mersennetwister"
 DEPEND=">=virtual/jdk-1.5
 	${CDEPEND}"
 RDEPEND=">=virtual/jre-1.5
@@ -36,15 +39,7 @@ EANT_BUILD_TARGET="dist"
 pkg_setup() {
 	java-pkg-2_pkg_setup
 	enewgroup freenet
-	grep /opt/freenet /etc/passwd >/dev/null
-	if [ $? == "0" ]; then
-		ewarn " "
-		ewarn "Changing freenet homedir from /opt/freenet to /var/freenet"
-		ewarn " "
-		usermod -d /var/freenet freenet || die "Was not able to change freenet homedir from /opt/freenet to /var/freenet"
-	else
-		enewuser freenet -1 -1 /var/freenet freenet
-	fi
+	enewuser freenet -1 -1 /var/freenet freenet
 }
 
 src_unpack() {
@@ -53,7 +48,7 @@ src_unpack() {
 	cp "${FILESDIR}"/wrapper1.conf wrapper.conf
 	epatch "${FILESDIR}"/ext.patch
 	sed -i -e "s/=lib/=$(get_libdir)/g" wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.7=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
+	use freemail && echo "wrapper.java.classpath.10=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
 	mkdir -p lib
 	cd lib
 	java-pkg_jar-from db-je-3.3
@@ -61,6 +56,9 @@ src_unpack() {
 	java-pkg_jar-from fec
 	java-pkg_jar-from db4o
 	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from sevenzip
+	java-pkg_jar-from lzmajio
+	java-pkg_jar-from mersennetwister
 }
 
 src_install() {
@@ -97,12 +95,6 @@ pkg_postinst () {
 	ewarn "You can now edit it without the next update overwriting it."
 	elog " "
 	chown freenet:freenet /var/freenet
-	if [[ -e /opt/freenet/freenet.ini ]] && ! [[ -e /var/freenet/freenet.ini ]]; then
-		ewarn " "
-		ewarn "Please move freenet to the new location with the following command:"
-		ewarn "		mv /opt/freenet /var/freenet"
-		ewarn " "
-	fi
 }
 
 pkg_postrm() {
diff --git a/net-p2p/freenet/freenet-9999-r1.ebuild b/net-p2p/freenet/freenet-9999-r1.ebuild
index 59bce1333..bd88fd44b 100644
--- a/net-p2p/freenet/freenet-9999-r1.ebuild
+++ b/net-p2p/freenet/freenet-9999-r1.ebuild
@@ -22,7 +22,10 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/fec
 	dev-java/java-service-wrapper
 	dev-java/db4o
-	dev-java/ant-core"
+	dev-java/ant-core
+	dev-java/sevenzip
+	dev-java/lzmajio
+	dev-java/mersennetwister"
 DEPEND=">=virtual/jdk-1.5
 	${CDEPEND}"
 RDEPEND=">=virtual/jre-1.5
@@ -35,24 +38,17 @@ PDEPEND="net-libs/NativeThread
 S="${WORKDIR}/${PN}"
 
 EANT_BUILD_TARGET="dist"
-MY_FREENET_LATEST="-trunk"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
 	enewgroup freenet
 	grep /opt/freenet /etc/passwd >/dev/null
-	if [ $? == "0" ]; then
-		ewarn " "
-		ewarn "Changing freenet homedir from /opt/freenet to /var/freenet"
-		ewarn " "
-		usermod -d /var/freenet freenet || die "Was not able to change freenet homedir from /opt/freenet to /var/freenet"
-	else
-		enewuser freenet -1 -1 /var/freenet freenet
-	fi
+	enewuser freenet -1 -1 /var/freenet freenet
 }
 
 src_unpack() {
 	subversion_src_unpack
+	subversion_wc_info
 	ESVN_REPO_URI="http://freenet.googlecode.com/svn/trunk/apps/new_installer/res/unix/"
 	ESVN_OPTIONS="-N"
 	subversion_src_unpack
@@ -66,11 +62,10 @@ src_unpack() {
 	head -n 133 run.sh >run1.sh
 	tail -n 444 run.sh >>run1.sh
 	mv run1.sh run.sh
-	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"
-	use freemail && echo "wrapper.java.classpath.7=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
+	use freemail && echo "wrapper.java.classpath.10=/usr/share/bcprov/lib/bcprov.jar" >> wrapper.conf
 	mkdir -p lib
 	cd lib
 	java-pkg_jar-from db-je-3.3
@@ -78,6 +73,9 @@ src_unpack() {
 	java-pkg_jar-from fec
 	java-pkg_jar-from db4o
 	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from sevenzip
+	java-pkg_jar-from lzmajio
+	java-pkg_jar-from mersennetwister
 }
 
 src_install() {
@@ -112,12 +110,6 @@ pkg_postinst () {
 	ewarn "You can now edit it without the next update overwriting it."
 	elog " "
 	chown freenet:freenet /var/freenet
-	if [[ -e /opt/freenet/freenet.ini ]] && ! [[ -e /var/freenet/freenet.ini ]]; then
-		ewarn " "
-		ewarn "Please move freenet to the new location with the following command:"
-		ewarn "         mv /opt/freenet /var/freenet"
-		ewarn " "
-	fi
 }
 
 pkg_postrm() {