From 5658860ac01528d8a9dc7f67b1882562da3895d4 Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Sun, 31 Jul 2011 18:45:48 +0000 Subject: Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and bug 376277 (Portage version: 2.2.0_alpha47-r1/cvs/Linux x86_64) --- net-p2p/freenet/ChangeLog | 12 +- ....7.5_p1384-libraryloader-just-try-loading.patch | 17 +++ ...384-nativebiginteger-no-nativedoublevalue.patch | 28 ++++ .../freenet/files/freenet-0.7.5_p1389-wrapper.conf | 49 +++++++ net-p2p/freenet/freenet-0.7.5_p1384.ebuild | 131 ------------------ net-p2p/freenet/freenet-0.7.5_p1389.ebuild | 151 +++++++++++++++++++++ net-p2p/freenet/freenet-9999.ebuild | 45 ++++-- 7 files changed, 289 insertions(+), 144 deletions(-) create mode 100644 net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch create mode 100644 net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch create mode 100644 net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf delete mode 100644 net-p2p/freenet/freenet-0.7.5_p1384.ebuild create mode 100644 net-p2p/freenet/freenet-0.7.5_p1389.ebuild (limited to 'net-p2p') 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]) + -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/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_p1384.ebuild deleted file mode 100644 index 983636ce6b99..000000000000 --- a/net-p2p/freenet/freenet-0.7.5_p1384.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# 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 $ - -EAPI="2" -DATE=20110715 -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 multilib - -DESCRIPTION="An encrypted network without censorship" -HOMEPAGE="http://www.freenetproject.org/" -SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip - mirror://gentoo/seednodes-${DATE}.fref.bz2 - mirror://gentoo/freenet-ant-1.7.1.jar" - -LICENSE="as-is GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="freemail test" - -CDEPEND="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/lzma - dev-java/lzmajio - dev-java/mersennetwister" -DEPEND="app-arch/unzip - >=virtual/jdk-1.6 - ${CDEPEND} - test? ( dev-java/junit - dev-java/ant-junit ) - dev-java/ant-core" -RDEPEND=">=virtual/jre-1.6 - net-libs/nativebiginteger - ${CDEPEND}" -PDEPEND="net-libs/NativeThread - freemail? ( dev-java/bcprov )" - -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_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true" -export EANT_EXTRA_ARGS+=" -Dtest.skip=true" - -pkg_setup() { - has_version dev-java/icedtea[cacao] && { - ewarn "dev-java/icedtea was built with cacao USE flag." - ewarn "freenet may compile with it, but it will refuse to run." - ewarn "Please remerge dev-java/icedtea without cacao USE flag," - ewarn "if you plan to use it for running freenet." - } - java-pkg-2_pkg_setup - enewgroup freenet - enewuser freenet -1 -1 /var/freenet freenet -} - -src_unpack() { - unpack ${P}.zip seednodes-${DATE}.fref.bz2 - mv "${WORKDIR}"/freenet-fred-* "${S}" -} - -src_prepare() { - cp "${FILESDIR}"/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 - 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 - java-ant_rewrite-classpath "${EANT_BUILD_XML}" - cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die - java-pkg-2_src_prepare -} - -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 - java-pkg_jar-from --into lib lzma - java-pkg_jar-from --into lib db4o-jdk5 - java-pkg_jar-from --into lib db4o-jdk12 - java-pkg_jar-from --into lib db4o-jdk11 - export EANT_EXTRA_ARGS+=" -Dtest.skip=false" - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar dist/freenet.jar - java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar - if has_version =sys-apps/baselayout-2*; then - doinitd "${FILESDIR}"/freenet - else - newinitd "${FILESDIR}"/freenet.old freenet - fi - dodoc AUTHORS README || die - insinto /etc - doins freenet-wrapper.conf || die - insinto /var/freenet - doins run.sh || die - newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die - fperms +x /var/freenet/run.sh - dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so - use doc && java-pkg_dojavadoc javadoc - use source && java-pkg_dosrc src -} - -pkg_postinst() { - elog " " - elog "1. Start freenet with /etc/init.d/freenet start." - elog "2. Open localhost:8888 in your browser for the web interface." - #workaround for previously existing freenet user - [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ - freenet:freenet /var/freenet -} - -pkg_postrm() { - if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then - elog " " - elog "If you dont want to use freenet any more" - elog "and dont want to keep your identity/other stuff" - elog "remember to do 'rm -rf /var/freenet' to remove everything" - fi -} diff --git a/net-p2p/freenet/freenet-0.7.5_p1389.ebuild b/net-p2p/freenet/freenet-0.7.5_p1389.ebuild new file mode 100644 index 000000000000..7dfb0feee5f2 --- /dev/null +++ b/net-p2p/freenet/freenet-0.7.5_p1389.ebuild @@ -0,0 +1,151 @@ +# 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_p1389.ebuild,v 1.1 2011/07/31 18:45:48 tommy Exp $ + +EAPI="2" +DATE=20110731 +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 multilib + +DESCRIPTION="An encrypted network without censorship" +HOMEPAGE="http://www.freenetproject.org/" +SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip + mirror://gentoo/seednodes-${DATE}.fref.bz2 + mirror://gentoo/freenet-ant-1.7.1.jar" + +LICENSE="as-is GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="freemail test" + +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" +DEPEND="app-arch/unzip + >=virtual/jdk-1.6 + ${CDEPEND} + test? ( dev-java/junit + dev-java/ant-junit ) + dev-java/ant-core" +RDEPEND=">=virtual/jre-1.6 + net-libs/nativebiginteger + ${CDEPEND}" +PDEPEND="net-libs/NativeThread" + +EANT_BUILD_TARGET="package" +EANT_TEST_TARGET="unit" +EANT_BUILD_XML="build-clean.xml" +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" + +pkg_setup() { + has_version dev-java/icedtea[cacao] && { + ewarn "dev-java/icedtea was built with cacao USE flag." + ewarn "freenet may compile with it, but it will refuse to run." + ewarn "Please remerge dev-java/icedtea without cacao USE flag," + ewarn "if you plan to use it for running freenet." + } + java-pkg-2_pkg_setup + enewgroup freenet + enewuser freenet -1 -1 /var/freenet freenet +} + +src_unpack() { + unpack ${P}.zip seednodes-${DATE}.fref.bz2 + mv "${WORKDIR}"/freenet-fred-* "${S}" +} + +src_prepare() { + 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 \ + "${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" \ + freenet-wrapper.conf || die "sed failed" + + 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 + cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die +} + +src_test() { + java-pkg_jar-from --into lib fec + java-pkg_jar-from --into lib java-service-wrapper + java-pkg_jar-from --into lib mersennetwister + java-pkg_jar-from --into lib lzma + java-pkg_jar-from --into lib db4o-jdk5 + java-pkg_jar-from --into lib db4o-jdk12 + java-pkg_jar-from --into lib db4o-jdk11 + export EANT_EXTRA_ARGS+=" -Dtest.skip=false" + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar dist/freenet.jar + java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar + if has_version =sys-apps/baselayout-2*; then + doinitd "${FILESDIR}"/freenet + else + newinitd "${FILESDIR}"/freenet.old freenet + fi + dodoc AUTHORS README || die + insinto /etc + doins freenet-wrapper.conf || die + insinto /var/freenet + doins run.sh || die + newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die + fperms +x /var/freenet/run.sh + dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so + use doc && java-pkg_dojavadoc javadoc + use source && java-pkg_dosrc src +} + +pkg_postinst() { + elog " " + elog "1. Start freenet with /etc/init.d/freenet start." + elog "2. Open localhost:8888 in your browser for the web interface." + #workaround for previously existing freenet user + [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ + freenet:freenet /var/freenet +} + +pkg_postrm() { + if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then + elog " " + elog "If you dont want to use freenet any more" + elog "and dont want to keep your identity/other stuff" + elog "remember to do 'rm -rf /var/freenet' to remove everything" + fi +} 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 } -- cgit v1.2.3-65-gdbad