Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and bug 376277

Package-Manager: portage-2.2.0_alpha47-r1/cvs/Linux x86_64

7 files changed, 185 insertions, 37 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index e44944f41fda..21878b5e4fe2 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.133 2011/07/16 10:25:24 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.134 2011/07/31 18:45:48 tommy Exp $
+
+*freenet-0.7.5_p1389 (31 Jul 2011)
+
+  31 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1384.ebuild, +freenet-0.7.5_p1389.ebuild,
+  +files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch,
+  +files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch,
+  +files/freenet-0.7.5_p1389-wrapper.conf, freenet-9999.ebuild:
+  Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and
+  bug 376277
 
 *freenet-0.7.5_p1384 (16 Jul 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index cf8a9bd6fa8e..2e519c84c914 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -4,24 +4,27 @@ Hash: SHA1
 AUX 0.7.5_p1297-ext.patch 1701 RMD160 1c8e9959d26e98f6ad6b92bae6598c1583863f6e SHA1 54f5d8c5e0158d91010d292a8d7358b474a7aef5 SHA256 c407f6f803255b120b613eae55c3e2e8da0bed2040cf7cbd0aae5e9b23a252db
 AUX 0.7.5_p1302-ext.patch 947 RMD160 5931df622dca62591cbffce5176330acce82567d SHA1 94a91e0a3f1598a26c569b14f81ca50f53d983ee SHA256 66eae4637f9248bf2407e8bb5361b86aa3f1d04acdfca4207a3596877430fbdc
 AUX freenet 476 RMD160 fdce44749587d73cb3f5b916e893e3bb95ef3200 SHA1 48eb8bfbd27a17b0bb3b29248ce4c43b59a76bda SHA256 4a8482117a434e9885438b7ca5384851bff49fefa28b13e33494a746c781342f
+AUX freenet-0.7.5_p1384-libraryloader-just-try-loading.patch 833 RMD160 eec3bec210ec4389e2f446d021238024ff854e0f SHA1 96dd2400bdb5e4489816b750898613483f0ae44f SHA256 ea583fd3893240c9e28b0e0ab652902b7b2819686f06beb17995bd591fe1b36e
+AUX freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch 932 RMD160 816bd5e83c8edfef277b70db431cf16247e796fb SHA1 d7758412ebf8cf820cb643a9f7ed71376a17d307 SHA256 1bb91a57f71044ee3dd51bb07eb7523644b60232445757c28a19b48a56a95e0a
+AUX freenet-0.7.5_p1389-wrapper.conf 1680 RMD160 bcb6122d7b9960e75d850765b005e521f521e47a SHA1 cfe240aa8b43f39c0e4a3f38485fd82245f9cd17 SHA256 f9e8e37b4e7eacbd5534fabce20a6597ae8123b4c63267393ed0d593a2c79a82
 AUX freenet.old 452 RMD160 e9e834fedf4270c14f3e8d754c58eb05f3f570c5 SHA1 edb5d0ab062d46f494db88560885d7ee7b026e29 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8fc72f1714fa6
 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a
 AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1384.zip 4156816 RMD160 c5693dd4deb4dbad0ed6c1746e9f7112bbd65ded SHA1 b924b72191be90a92fb48c5587a420e8ae940246 SHA256 3072a397f945ffe5ea24dca47fdbd47e28722e50469d0957902f9f4e67fe59f4
+DIST freenet-0.7.5_p1389.zip 4146977 RMD160 4933f29d5d09c7053cc5c2fe1c82c2073c732a48 SHA1 ffa5e19d03d3dd36b3e5087b345cf962c67bd287 SHA256 7b14d87e1b0fc16ab216d4024b7e20c2358a19aa32ece31d98d73e38a2115b8b
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
-DIST seednodes-20110715.fref.bz2 9007 RMD160 bda708be6cd20acbf3eaa1be01e39e619f479102 SHA1 957cb2f0d47af2b34527174728c0b23853b5a1db SHA256 da60f0aa08cf7d9b4c685574ed4a290166acbc9c8325ae30e5f7ad89d71487c5
-EBUILD freenet-0.7.5_p1384.ebuild 4189 RMD160 c9ec13d9841f7612589ada88d9403703b62c861f SHA1 26e4d1843bce8c42324664b245f43b8d3cc9a6bd SHA256 222444823f8d528dba0e43e8f9fe417ce396167d5ebdf25af3a77597fe009b5d
-EBUILD freenet-9999.ebuild 3683 RMD160 172e7ca18900e1248df3df6c975371e6b340c145 SHA1 085f736b909769d0c0456c2685b70d047e24bece SHA256 a553f937b57297852cdad124c2dcd73636e027a785f1fd4d18cc519e6ac1428c
-MISC ChangeLog 16555 RMD160 7e82e8d867899cea8df569b3e591985df822ad8c SHA1 af8c8886aeb3df5e464ca7a448d96a66cb72dfcf SHA256 c1055bb1ee8a1db353b29a443e9c7b2dfd80a75b955218254cf4bf3db6931eb7
+DIST seednodes-20110731.fref.bz2 10758 RMD160 29e7e9d596f533a4a432bd6ca4d5f0d1daf1f427 SHA1 b9eacff490600c9b08a9a4efda70271b4d26315b SHA256 f1cb91d5d693361347df475fa013198981bd2866dc448a6e423bd109c97f2c02
+EBUILD freenet-0.7.5_p1389.ebuild 4766 RMD160 d1e24c6daeccae9a7bf8882bb44d586f1531629c SHA1 fb8b41988d7796e0aa9e768f02d1c3e3da141004 SHA256 6ba27b5e78c91526f15fa7848fd72b8195ad4986246e4cc291bb783b000c19d3
+EBUILD freenet-9999.ebuild 4330 RMD160 2a84b8224b9f7b31f59fef7b42bd744e51212804 SHA1 3e79b193e697dbe226c2438a43e5368409f17e0b SHA256 f929c3a886f066abd5898a9ef4af3f25c151d79fd154c6e20769269e2150312f
+MISC ChangeLog 17008 RMD160 78c5821ae6d863af88d180f8270d5896cc4edbdd SHA1 583d8c611d7bda0558bce9192d6c8f9c6317e458 SHA256 5130e69692b39449a46c2ffec85f3df0f586b8867c4d3d41245e2d420d4a96ad
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4hZyIACgkQG7kqcTWJkGcmbgP/erL+JQ/7NqCOYfroT4heM2KQ
-bIaLr3wg+Vp+whn2/VYerVI0qS2Yyn9TaZI27aXVvWDFe+8lGw3l9K1xhMwKYoOW
-JHQwdvZGprN6Gr21sqs3PhzoWCxJvAzTMuHFql+EzYbhhdfUdx/FBqbAIQTRYWMK
-jSbYoMlvqqYqQFbEPas=
-=SPoU
+iJwEAQECAAYFAk41ougACgkQG7kqcTWJkGeNOQQAkMuXKVpfUKOwZlWtRTxcmYUD
+GoP5KKSsjuaPY0j5uOqzxw2Hw3rRops5zlpL+5lPqQwM6BhWZ2eHgZlCQmeQ/J8m
+cEfZzHdMugShw65EqMmYrmsc/5pfMLZx45cUnwykmk0ZDzZwEbMbpxNSBGnui4Af
+5dRRTSeyHgOkrcNUwBA=
+=Nbxx
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
new file mode 100644
index 000000000000..ffe9354dc846
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
@@ -0,0 +1,17 @@
+--- freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java.orig	2011-07-29 17:32:37.000000000 +0200
++++ freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java	2011-07-29 17:35:02.000000000 +0200
+@@ -48,12 +48,11 @@
+ 		final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;
+ 		String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;
+ 
+-		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
+-		if (nativeLib.exists()) {
++		try {
+ 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
+ 			System.loadLibrary(libraryName);
+ 			success = true;
+-		} else {
++		} catch(UnsatisfiedLinkError ule) {
+ 			try {
+ 				// Get the resource
+ 				URL resource = LibraryLoader.class.getResource(resourceName);
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
new file mode 100644
index 000000000000..5300fb196235
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
@@ -0,0 +1,28 @@
+--- freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 16:48:36.000000000 +0200
++++ freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java	2011-07-29 16:50:20.000000000 +0200
+@@ -193,12 +193,6 @@
+ 	 */
+ 	public native static byte[] nativeModPow(byte base[], byte exponent[], byte modulus[]);
+ 
+-	/**
+-	 * Converts a BigInteger byte-array to a 'double'
+-	 * @param ba Big endian twos complement representation of the BigInteger to convert to a double
+-	 * @return The plain double-value represented by 'ba'
+-	 */
+-	public native static double nativeDoubleValue(byte ba[]);
+ 	private byte[] cachedBa = null;
+ 
+         /**
+@@ -286,11 +280,7 @@
+ 
+ 	@Override
+ 	public double doubleValue() {
+-		// TODO Recent tests show that Java version is quicker. Maybe drop?
+-		if(_nativeOk)
+-			return nativeDoubleValue(toByteArray());
+-		else
+-			return super.doubleValue();
++		return super.doubleValue();
+ 	}
+ 
+ 	/**
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
new file mode 100644
index 000000000000..066f62474293
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
@@ -0,0 +1,49 @@
+wrapper.java.command=java
+wrapper.working.dir=/var/freenet/
+wrapper.java.mainclass=freenet.node.NodeStarter
+wrapper.java.library.path.1=/usr/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
+wrapper.logfile=wrapper.log
+wrapper.logfile.format=LPTM
+wrapper.logfile.loglevel=INFO
+wrapper.logfile.maxsize=2M
+wrapper.logfile.maxfiles=3
+wrapper.syslog.loglevel=NONE
+wrapper.console.title=Freenet 0.7
+wrapper.jvm_exit.timeout=120
+wrapper.restart.reload_configuration=TRUE
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+wrapper.filter.action.1=RESTART
+
+# Name of the service
+wrapper.ntservice.name=freenet-darknet
+
+# Display name of the service
+wrapper.ntservice.displayname=Freenet 0.7 darknet
+
+# Description of the service
+wrapper.ntservice.description=The Free Network Project daemon
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
+wrapper.ntservice.process_priority=BELOW_NORMAL
+
+# Start services with a different user than SYSTEM
+# SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !
diff --git a/net-p2p/freenet/freenet-0.7.5_p1384.ebuild b/net-p2p/freenet/freenet-0.7.5_p1389.ebuild
index 983636ce6b99..7dfb0feee5f2 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1384.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1389.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1384.ebuild,v 1.1 2011/07/16 10:25:24 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1389.ebuild,v 1.1 2011/07/31 18:45:48 tommy Exp $
 
 EAPI="2"
-DATE=20110715
+DATE=20110731
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib
@@ -19,12 +19,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="freemail test"
 
-CDEPEND="dev-db/db-je:3.3
+CDEPEND="freemail? ( dev-java/bcprov )
+	dev-java/commons-compress
+	dev-db/db-je:3.3
 	dev-java/fec
 	dev-java/java-service-wrapper
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
+	dev-java/jbitcollider-core
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
@@ -37,13 +40,12 @@ DEPEND="app-arch/unzip
 RDEPEND=">=virtual/jre-1.6
 	net-libs/nativebiginteger
 	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
+PDEPEND="net-libs/NativeThread"
 
 EANT_BUILD_TARGET="package"
 EANT_TEST_TARGET="unit"
 EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
+EANT_GENTOO_CLASSPATH="commons-compress db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper jbitcollider-core lzma lzmajio mersennetwister"
 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
 export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
 
@@ -65,22 +67,40 @@ src_unpack() {
 }
 
 src_prepare() {
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
-	epatch "${FILESDIR}"/strip-openjdk-check.patch
+	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
+		"${FILESDIR}"/strip-openjdk-check.patch \
+		"${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
+		"${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
+
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		-e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar:g" \
 		freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
+
+	local i=2 pkg jars jar
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
+		done
+	done
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
+
+	if use freemail ; then
+		jars="$(java-pkg_getjars bcprov)"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
+		done
+	fi
+
 	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
 	java-pkg-2_src_prepare
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
 }
 
 src_test() {
-#	java-pkg_jar-from --into lib junit
-#	java-pkg_jar-from --into lib ant-junit
 	java-pkg_jar-from --into lib fec
 	java-pkg_jar-from --into lib java-service-wrapper
 	java-pkg_jar-from --into lib mersennetwister
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index 4bbc94564021..b3abd4beecc5 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.18 2011/07/16 10:25:24 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.19 2011/07/31 18:45:48 tommy Exp $
 
 EAPI="2"
-DATE=20110715
+DATE=20110731
 JAVA_PKG_IUSE="doc source"
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
 EGIT_PROJECT="freenet/fred-official"
 
-inherit eutils git java-pkg-2 java-ant-2 multilib
+inherit eutils git-2 java-pkg-2 java-ant-2 multilib
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
@@ -21,12 +21,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE="freemail test"
 
-CDEPEND="dev-db/db-je:3.3
+CDEPEND="freemail? ( dev-java/bcprov )
+	dev-java/commons-compress
+	dev-db/db-je:3.3
 	dev-java/fec
 	dev-java/java-service-wrapper
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
+	dev-java/jbitcollider-core
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
@@ -37,13 +40,12 @@ DEPEND=">=virtual/jdk-1.6
 RDEPEND=">=virtual/jre-1.6
 	net-libs/nativebiginteger
 	${CDEPEND}"
-PDEPEND="net-libs/NativeThread
-	freemail? ( dev-java/bcprov )"
+PDEPEND="net-libs/NativeThread"
 S=${WORKDIR}/${PN}
 
 EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
+EANT_GENTOO_CLASSPATH="commons-compres db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper jbitcollider-core lzma lzmajio mersennetwister"
 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
 use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
 use test && EANT_GENTOO_CLASSPATH+=" junit"
@@ -66,14 +68,33 @@ src_unpack() {
 }
 
 src_prepare() {
-	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
-	epatch "${FILESDIR}"/strip-openjdk-check.patch
+	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
+		"${FILESDIR}"/strip-openjdk-check.patch \
+		"${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
+		"${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		-e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar:g" \
 		freenet-wrapper.conf || die "sed failed"
-	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
+
+	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
+
+	local i=2 pkg jars jar
+	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
+		jars="$(java-pkg_getjars ${pkg})"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
+		done
+	done
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
+
+	if use freemail ; then
+		jars="$(java-pkg_getjars bcprov)"
+		for jar in ${jars} ; do
+			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
+		done
+	fi
+
 	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
 	java-pkg-2_src_prepare
 }