Version bump, drop old

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

4 files changed, 189 insertions, 7 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 6a6674fefcb0..53326c1b9aad 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.147 2012/04/04 12:39:50 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.148 2012/04/15 22:09:34 tommy Exp $
+
+*freenet-0.7.5_p1407 (15 Apr 2012)
+
+  15 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +freenet-0.7.5_p1407.ebuild,
+  +files/libraryloader-revert-using-of-absolute-path.patch:
+  Version bump, drop old
 
 *freenet-0.7.5_p1406 (04 Apr 2012)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 402fc54c0992..c7d588fe264d 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -7,22 +7,26 @@ AUX freenet-0.7.5_p1384-libraryloader-just-try-loading.patch 833 RMD160 eec3bec2
 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 libraryloader-revert-using-of-absolute-path.patch 854 RMD160 6219c6019adca2f2d31b98d80b51bbbd96fb3f78 SHA1 f5e6928f0d3f820d00f388e815449e2926017b36 SHA256 b8bc840cc0c35a32bf000c23bdb5a7c7cb30508f6f39e3a3d29bb149996e6209
 AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 123fb5cf1c9b50357156fa300c5015a7e0ca65ad SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a
 DIST freenet-0.7.5_p1405.zip 4189365 RMD160 a84e7ef4fc02beb5d5898752f9872d40c268edcf SHA1 8fd7a18a8c880bc67afb4fbad620f05797324df3 SHA256 c972e020ca74ebeecab8c0e86bb012917fbd073095b4fb054adbec69d69f1cd4
 DIST freenet-0.7.5_p1406.zip 4207605 RMD160 ca9631f34a9c17f551d57e7f40f39b5b9234f39f SHA1 bd11da9b65961fd00e4673a23694b10e83f5576a SHA256 0258b3123ddf0c7442bab33a640f6b25b1d92e41da18b2b3ef43cfae5d1321bb
+DIST freenet-0.7.5_p1407.zip 4213058 RMD160 5d621f6954a8d92026e3eddd10da4589fa52ad71 SHA1 e9b9784dbaa8b67091e4760c0bb742282256d01e SHA256 a08ab7e01816bcb2d2c4e9e56d4817ca2bc82bbc1e447019222c6476dad5d393
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20111119.fref.bz2 12102 RMD160 b9c16399e5686b92e485ecd275a5528184b85f07 SHA1 524a36faa3f7f6930c4ffd743f05e708c0a6efc2 SHA256 12b5403cf0b8de809ae7b88f855caff79f0613f7cdd70b90eaa85fe8bd5c9d54
 DIST seednodes-20120404.fref.bz2 10744 RMD160 d4002fe18a609b5c0b1d3afbed040db776db3943 SHA1 d8b8119c7d05118205f4e9e3b2699c7ccfffe1c1 SHA256 c74d50f9f5c5bcfde58e02f1d98d84bca757b41497554a10cdeb0b51f32518f2
+DIST seednodes-20120415.fref.bz2 8988 RMD160 37c3e34652140fe6012a960142cb51c673f5d0be SHA1 24b54010e5a9901c4fab5e7cda355da685efc6b4 SHA256 b7dc53dd27fe8fecf523641136b5b37ec6e63b1c9c7c5f5a71552054319ee3e8
 EBUILD freenet-0.7.5_p1405.ebuild 4729 RMD160 678b0c7a4f6774bf6b4415da9355fad2ef3177b9 SHA1 987a17efddea220574fb195bfafb20019c0454df SHA256 83a9cc815d9e368dd228f8fa3c4c0cc693169b5fb55937ab5901060656a0bfcf
 EBUILD freenet-0.7.5_p1406.ebuild 4729 RMD160 7b0ede2b4a54924a4ccac5704817dd38cffc5f0c SHA1 4df492966568804bef9daee8c234c2d2d95466f5 SHA256 63a95b3bbfa1b6ced397849e0d0c6a32d654b523dc6053049fdcdb0757ef623c
-MISC ChangeLog 19334 RMD160 d5962a59e211444ca123f9446784a8e45b18e1f6 SHA1 93a9be4c4fd8de78e6206fb2cc10a45e6060f314 SHA256 e6bf0e9fe679769c155de26a8038d85e0ab375682c48ad9883cb9b03f2507d92
+EBUILD freenet-0.7.5_p1407.ebuild 4747 RMD160 ad8e296a964a30a9346752c89f287078ea30d3b5 SHA1 002f83462a02be43f54162452f76c9e6e6e930a2 SHA256 319e77221b018680249fe6882305270459daeb2ed4c625e996fdef2964439eb0
+MISC ChangeLog 19546 RMD160 e6393a5e8655bcf93f15380fa78b05829ea1a270 SHA1 391862fce03465083981aae7cdf82e059a9ac586 SHA256 0100d5d020e59115a0200a4b2e039fd3a8d46fb33c7ce0434a8d184b1c2bf296
 MISC metadata.xml 310 RMD160 94e7e4cefcf1deb4bbff792a0cbf30ef63e7b264 SHA1 8f8368b809a3e803ab488945087827a41f1b40f5 SHA256 e614c0ca7fa5d32c3e94ccd6d822fd0aa482ce31439e0206f26b0f7a76113950
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAk98QSIACgkQG7kqcTWJkGdz7QP/UeVXJObqeWPkNQP3FV3iA/2p
-JavGafArKP08Zgx0krL67X6ML39ZHKeC0dBGFREjAnOhpoHAcJWfXuWChd5BrhXm
-b+8/WBp4tzu/zcjmL1IlVnTbE501O2b8h7uDPDYefQde5GWtwo32KvSJQOJXPEc9
-x6LlOmS1jl8Z7xOzY/8=
-=1dgy
+iJwEAQECAAYFAk+LRuMACgkQG7kqcTWJkGc+YwP+NXoiEfP1qm9hqNaogkyO+lCs
+gWyd2xuUJEZF527FJMhJVAQqb2KQkxejdled2GjqHMWtbv2DtvTmggn+Fb5sGC6S
+lgpDDxc1OmSWYBnnGLG+yqSByVzj8X6K4dxVeqk+EqcDOKdN+J/KuzQtCox22IB8
++0+WHtgzVHpMn7JL+GY=
+=KUGW
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch b/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
new file mode 100644
index 000000000000..e252aed003d5
--- /dev/null
+++ b/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
@@ -0,0 +1,19 @@
+commit bad37bf86798d30292769581aca7e71471c34485
+Author: Matthew Toseland <toad@amphibian.dyndns.org>
+Date:   Fri Nov 5 23:30:43 2010 +0000
+
+    Use the specific, absolute path, rather than loading from path, for NativeBigInteger library.
+
+diff --git a/src/freenet/support/LibraryLoader.java b/src/freenet/support/LibraryLoader.java
+index d4a22a0..2470d40 100644
+--- a/src/freenet/support/LibraryLoader.java
++++ b/src/freenet/support/LibraryLoader.java
+@@ -45,7 +45,7 @@ public class LibraryLoader {
+ 		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
+ 		if (nativeLib.exists()) {
+ 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
+-			System.loadLibrary(libraryName);
++			System.loadLibrary(nativeLib.getAbsolutePath());
+ 			success = true;
+ 		} else {
+ 			try {
diff --git a/net-p2p/freenet/freenet-0.7.5_p1407.ebuild b/net-p2p/freenet/freenet-0.7.5_p1407.ebuild
new file mode 100644
index 000000000000..6e2ab363123f
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1407.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 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_p1407.ebuild,v 1.1 2012/04/15 22:09:34 tommy Exp $
+
+EAPI="2"
+DATE=20120415
+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-1.45 )
+	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}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
+
+	EPATCH_OPTS+=" -R"
+	epatch "${FILESDIR}"/libraryloader-revert-using-of-absolute-path.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
+}