Version bump

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

3 files changed, 164 insertions, 7 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 4eca430b46d0..a85a0ffa1fdb 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.152 2012/08/02 18:19:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.153 2012/08/25 13:51:17 tommy Exp $
+
+*freenet-0.7.5_p1410 (25 Aug 2012)
+
+  25 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +freenet-0.7.5_p1410.ebuild:
+  Version bump
 
 *freenet-0.7.5_p1409 (02 Aug 2012)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index d1bd131eadcf..ead57910b534 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -12,20 +12,23 @@ AUX run.sh-20090501 16217 SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef5
 DIST freenet-0.7.5_p1406.zip 4207605 SHA256 0258b3123ddf0c7442bab33a640f6b25b1d92e41da18b2b3ef43cfae5d1321bb
 DIST freenet-0.7.5_p1407.zip 4213058 SHA256 a08ab7e01816bcb2d2c4e9e56d4817ca2bc82bbc1e447019222c6476dad5d393 SHA512 b87f55d47636847815cb2a94078473db980260514ac294de47a2e07f55ab78d9cee7fd8de8e771e1b0d63b60df22fe2c6c10c53f459cbb91a382003ffbe83077 WHIRLPOOL 9ce3db24d912424f37d35a936bdc8c12131b70b299328ec604f09373e2757bd593c056449fba603b508f44a35160ee7899183ba31f94aedec0d9d93075923a74
 DIST freenet-0.7.5_p1409.zip 4279017 SHA256 4da39b91ac2604e9fd25b3ef6e2384e16c5233ff39de98842ee025574c5c0e4b SHA512 f4e51861658b5016ccf8ced61b99d65ccf46a6020e55e9d1ef5f2b20b012e4e5238b99cafc2956d23e7391c87e810e214fead4895d42a052b508e61365c90ad8 WHIRLPOOL d4663ed25eba72b9b648a68e7354910ea0fd299ed58f2f102ad9c844cba5e82893590ecf66cd77c0330a0e9278229b2ddf0ccecaba31669061abe3f44596fac5
+DIST freenet-0.7.5_p1410.zip 4318042 SHA256 4598a20d698539170bb1606cc7b4dd3880a17897cccfcb5d5aa24a3fd9dd8953 SHA512 941c11c2face6405a2ddba33c6c0a9a25b86b398dc2cfc4986f01ded90f9a818da0045b1faae821d155de6ea33f403e1adc934dfae1c0cf9d1c7bbafce9c9d85 WHIRLPOOL 552e05e65c8fa42d15c3da439beab443e24a94ca0d1744ceec9c3e27cd3ef79410cc11b17209c10bed230d331c48f73e9a150c00b8b76b102a788f478e8d86c9
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
 DIST seednodes-20120404.fref.bz2 10744 SHA256 c74d50f9f5c5bcfde58e02f1d98d84bca757b41497554a10cdeb0b51f32518f2
 DIST seednodes-20120415.fref.bz2 8988 SHA256 b7dc53dd27fe8fecf523641136b5b37ec6e63b1c9c7c5f5a71552054319ee3e8 SHA512 2641c798174a4ad774534a7c1bbd503d90347fca5a5dec6aee054efd3fb4858ff86d3d42516add3a60d99e2e66f5c2bf6cf56d2e8f580fb59fe3b681a1b4f3ae WHIRLPOOL f8ec937ef36a9dd894c2a547b88466ec20d4a3c281eae6d0e39360e0f7d563c173ecdef074ff8f05a763c5df94a3771856e5569b0b0fbc59339b7b5f109b2112
+DIST seednodes-20120730.fref.bz2 7995 SHA256 3d162430e3e4ae9827c0580988c2520e8ff9077ca4beaae72d07845923607e44 SHA512 9761765eb1f8c8efc7759d12de8928ae28a7d0cd287666c1e3391cddb65b1e41cb66735f416e48d3294a36d2dec0bbbd7195e3b54651a564ac410403eea58bec WHIRLPOOL 2b8b2f1c9250caac84b11b6775862452d03831c1848fe2ba23bfb4d17b3b453227aed421a2de8b7c62265afdb80b35687325b1939e34d9326920214dd8e41164
 EBUILD freenet-0.7.5_p1406.ebuild 4726 SHA256 a3a49145f024901f22346a761436c26808fe2bb7a2147d970f57f6beb4b517a0 SHA512 76e029ad7a9d8634ddcb2bcaee4ec158ae7194b9c77cb0a088b17eb2a21492cdd093b0709ce07cea68373b4294635549d424bf13b61cdb0c4a0e64cd9bc9e813 WHIRLPOOL c6bed69b7e53c99fad4f1dca07cc2ac955ecd000dc9e90b2bcdc81f9080f7fbc946a52346714733a1d14dda876677efb76515e9151f5f54efbcffb61ea84e211
 EBUILD freenet-0.7.5_p1407.ebuild 4526 SHA256 31e74ca4a7483fd709a4695a87bdc45abe6d42c3d96ba6697dc2bdec300d68c9 SHA512 8015869fcad8e44888bfe87c910abaafb33c7e4d24024c1ad6224d3997a51d61a5ed5a0feab1f1a4c2d757d8d1d24cee9e2cfde386b187239968732f77aecc08 WHIRLPOOL 3acaaf99f64219f3eab67e48a6b0463daf797f942fb0eee55da966fedecec4c8a37c20acb52ad7c6f61c72b3b751afe2c6a22de63865f3697c1d2e082d22af0b
 EBUILD freenet-0.7.5_p1409.ebuild 4526 SHA256 e7a0a4386cccc203d5688103b26ae3b64dae9a3f58e4902e0f3337851d74c28b SHA512 4ca46b3e8d4a8c90a4bf9ff22a1428e4d3142cbea0881425e0edd45f412acb27eda7a4a16048e5ea2b856c64664359f39399f6919a557338fdaa195c689a7ec7 WHIRLPOOL 87a0284f79b5c79901ae2b3d2d923ba38cdc560e456fa5bd110561c028b39621365569fed4d8e2ebeff62a3eb5f113e304da521604d25a81e9ba3fd430dc0978
-MISC ChangeLog 20165 SHA256 d4f32f3b7f6b1d052393b5714a29c0d3ec0267fefa7395a1e8f1dfb85b080f59 SHA512 afc4181b715a19ff640f3cd992b4db561a8829a42c0c903ceac034fc4ea5b38ccd6a20f397725435d39ffd50731bc33cbde6e2c0ea7cc3266f2169dad4a143ee WHIRLPOOL e95d033504033e48ac7feb79e5f43cf6723bd7d2f3b7c3248391bd87a93beed5443de1408e8de52f6c36fc9ea5950e5a7d5b9509c8a407c9a4e1a8e17e1c9658
+EBUILD freenet-0.7.5_p1410.ebuild 4526 SHA256 cf802f575c9a1c75287daa7701772821ad99ce778644ffb1e01efd2d683909cd SHA512 05ee0cb928c82d0419e9dba9b0a26ff554a362de1fbbfc648d317a5114869fcf4eb0bee4bc8c8ed8a664288c64c6672695f80f66154c7c559e4fdc60845bcefd WHIRLPOOL d669a1e3fec9f1e62105fc60c9493147e1cab681ebff414789df2b5da9c3913fda2d0034fd2dac74dbee22972cdb6efe448f2c505213a948450f38188983f859
+MISC ChangeLog 20307 SHA256 ed7e773ec840e7f67e7faa3d904dad9a92d8f3dc5fd23bb132d3e8f1b1952928 SHA512 575295522ae2888250ac237a04bb8494ff1c0c9114012a484269ef251ffdeab89ce1396a88f196eeb6da35697504ab663b72bd761af454f85088d98c3598fac9 WHIRLPOOL 17843051be1d7c82f12259eea537ab65445b60ad8777d0c546946041b91de752c0fe66946cc713bc9bb329734a1cd454c283089e94d44a28685eacb20e5c3c48
 MISC metadata.xml 310 SHA256 e614c0ca7fa5d32c3e94ccd6d822fd0aa482ce31439e0206f26b0f7a76113950 SHA512 51675c6c4240c3ca73e9526462da9617e4fa9a86ec43e21a2c85ef824015b3843948504ecb6643f4fdb65c3911712f2e0ab87ad37b56063445db42a315be6de4 WHIRLPOOL c0b49fedbcb65ed5b30254fc90688436070b66de3cc3699d0621d495dfad139bc6a6388b3f25be3be1824ce1eaf2cf688100abbf621116629e61ecfb52e338e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAlAaxR4ACgkQG7kqcTWJkGd6BgP6AxbfQSZVaj5E6/SlhhZdzCi6
-ImFVCMUiK1W3+qMhrRNvcbDpC2UZVWAdmE8aveQryx1YcuDIV4K/xzPUl/zKfzz/
-v6oE4l7NFrhkpfC+joA81bWQFG3TG3xLHTSo4z8cZadPU4cAaql1DhXmVt1fDYaZ
-7/Uhk26KpBEdQQvnIbg=
-=+EGP
+iJwEAQECAAYFAlA42F8ACgkQG7kqcTWJkGeqwAP+MvCJu0mrs3Y3Adl6GM9ZYPLc
+d04nUSuNHZb673+fcnzgbrvpeOYV5SfwpnkWfN5aeHt8/qz2erb9cG9SGV5UTTG7
+6Qb3CreX5xFmzUGYIoCziFXULQxnVBNvuRHaEC8hOFRt+l7OHfOFtJdkq6B5pT5A
+P4IrcfQhM1SPYjcaFCw=
+=8gE+
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1410.ebuild b/net-p2p/freenet/freenet-0.7.5_p1410.ebuild
new file mode 100644
index 000000000000..3cf71a259733
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1410.ebuild
@@ -0,0 +1,148 @@
+# 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_p1410.ebuild,v 1.1 2012/08/25 13:51:17 tommy Exp $
+
+EAPI="2"
+DATE=20120730
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 multilib user
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://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:0 )
+	dev-java/commons-compress:0
+	dev-db/db-je:3.3
+	dev-java/fec:0
+	dev-java/java-service-wrapper:0
+	dev-java/db4o-jdk11:0
+	dev-java/db4o-jdk12:0
+	dev-java/db4o-jdk5:0
+	dev-java/jbitcollider-core:0
+	dev-java/lzma:0
+	dev-java/lzmajio:0
+	dev-java/mersennetwister:0"
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.6
+	${CDEPEND}
+	test? ( dev-java/junit:0
+		dev-java/ant-junit:0 )
+	dev-java/ant-core:0"
+RDEPEND=">=virtual/jre-1.6
+	net-libs/nativebiginteger:0
+	${CDEPEND}"
+PDEPEND="net-libs/NativeThread:0"
+
+JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+JAVA_ANT_ENCODING="utf8"
+
+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 -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}"
+}
+
+java_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
+
+	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+}
+
+EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
+
+src_test() {
+	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
+}