Version bump

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

3 files changed, 158 insertions, 7 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 3c7df1e1aa81..18d474bfb25a 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.177 2013/09/07 19:15:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.178 2013/09/18 12:49:27 tommy Exp $
+
+*freenet-0.7.5_p1456 (18 Sep 2013)
+
+  18 Sep 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +freenet-0.7.5_p1456.ebuild:
+  Version bump
 
   07 Sep 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   freenet-0.7.5_p1455.ebuild:
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index fb6599c0c5e8..e1d2daf8da83 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -14,19 +14,22 @@ AUX run.sh-20090501 16217 SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef5
 DIST freenet-0.7.5_p1452.zip 4668774 SHA256 ed2bd48f94a32cd91d313ee3b3ea0889ca83baeac7116a39e63c9c624c65ad7f SHA512 67bf9b4982f4ab709800c9c969f7fa44cd2a3ef9c22246f2811d87efddc1e23c8454d2666a993b3e73bfa43955328bb68bb41d8ecab45131ea71027d12804cc1 WHIRLPOOL 1e392181ec0b8ac42ec9d63cd6816b382f662efd9712acaf5a8fdb727c6ab1e40ae6926b33b3601693870d89e2cb9bf66a2c2ccce25a699d4c21b7d1d341b2b7
 DIST freenet-0.7.5_p1453.zip 4669180 SHA256 1cc7358d408cdb1aab7899ca0331ccbb5553e4d5822491e364204976b90828a7 SHA512 5052ac1af25ef31a9bfecdd118c0d0f18b8105a560c5b229735cdd094f3b44c89a6eea57a002190d1731ca9827fb968c118d915a9e601ad15b014af82fdc5fd2 WHIRLPOOL e8bba86683b07d3100808200dc53049b4c29254c0de2f3fc1167f370bc307d3b6ef1bf97b5a685fd7a742b118bece148ff9339d0dfaf9365ca5f124de2296849
 DIST freenet-0.7.5_p1455.zip 4691756 SHA256 04d63ede7a49350eff8a6e4573aa000acd0c5034a5175f6b8634eb9308cf0120 SHA512 df25ce08bb2dc6c9c9d83c75ac288d5074b25d0322d8d12febbe8d915e70b48750d5c3b8bd8f76fb707d3308d9772308c09369c3c4a2f3037eef5c41b33a4367 WHIRLPOOL f52ec6cb95caefc00aed06f93f099290b10f8d3953c5b66565a8cbb91c32a2e8f3a528c9ac7940472717ff960fff05aeb521faac377d2c0ccf8037ec0400511e
+DIST freenet-0.7.5_p1456.zip 4707904 SHA256 f37bdfaaa155c3ef30971c3ef3736cd2cdb52febc774fe53dfaedbed7a8bcf20 SHA512 58c70e7800094388ff2cd35c791d91d31c246703743e13cba51ea3d1f27557177ef824186c4b1c56c04f173ad5ce319eda86305ae46527939f52f7aedded6fb5 WHIRLPOOL 3b58ff9bc3bbd5f212c33b1de0f8bdcad3399dd886312514be04ed3ac776274bb8c373d5a35254a446a247b41547d1b5dc9bf2e32f4f01d35cbcfac559702ba0
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
 DIST seednodes-20130218.fref.bz2 9194 SHA256 9ac006dc994456ef34f81b070a3dba6574f209fc2ea3413f57f66f0b5dde77a2 SHA512 42539e0471b44be83bcb2cc473217482099f7800d97fd642401607d6d99da4f0ea25c8dc974025d34665607a7f787a37137e4d839b047bca2f1f4d42b8363fe2 WHIRLPOOL 9a4ebbf703f9da7e427fd95ac6b4afbe6f4dd632b09362fbe7504d8606e8b9be768e39cfae82e211bd656e0748b5006e96ab4f4ceb3b9fcf60782a0f062fb8c2
+DIST seednodes-20130915.fref.bz2 10046 SHA256 2008510e1c8730aa02674b1dd22f64bd0de86507b27052adcfa66d176f1351ef SHA512 e829ceab4851eaf912e840ec87bcd4458ba9cf7eb0e25d4f4ed059734054136b6c2889671e624999697a97d7b833c2e1a65b47f6e0116f8cb2f11b2e43df921d WHIRLPOOL fab300deed68030030bb99c5716a691b33ed6b89929c3eb506fd02928ad8914044370552c94c5178639ca2adb92cf6f58e3b4b62f6e1f565f65481ddcbb3802d
 EBUILD freenet-0.7.5_p1452.ebuild 4323 SHA256 27c90831484497e7c64b07139a4af344b5592b412d58536de83514d30a984b3e SHA512 29ecada124cffbb0c3dcbff61ddb59ae4c5830f469a055ac88f8f72a36097e6cbf39276264af1b68deea4dfb1fa03cbc8c43b95471e3a1d1f4e7dd4758f18251 WHIRLPOOL 8887876c804152bb94ec99172d5d59aef9750522ceea07ba53455eeb3d0e8076a9689c29f07b9c8adde561667db7af12e6e7faf3c306e80f8c56eab2a35143ac
 EBUILD freenet-0.7.5_p1453.ebuild 4323 SHA256 69fd0225aae9a72980b9f51c67866a7fac7b1700be077f48351d4bce34eb7d01 SHA512 2959a9ba3601862fc96d9732206f280cd7f2344f5258c0087e6b794c7dfa8b75604522985006e8f1eefe96883d832ffa07c963b8fb9c9948c824050cfd464be2 WHIRLPOOL 825208122f0d2f49e0fe903cf2e081db55fe149db91606038ebdceff52f8f52fc7f0672d7bcfe1236f39ab518d16ed9522f84c03c5af34dee817e3c474113f7f
 EBUILD freenet-0.7.5_p1455.ebuild 4284 SHA256 bf58e79d53dd5df1ced02ce4550208bb3fcfe3582c7a5ed59b4c0b58f710e94c SHA512 c905d3789e0b98e54928791e08071d818db87833988ea6ab97247b44bc1ab70833b741c16e5206a5ad5106d58e1d4fbda23aebd54a571990d3027e2618ecc993 WHIRLPOOL 3c9886fde57daed8ce668a879380d1153fe5ace5a4a8bc5bd923442ced50e9acc0720bc00f076df83ab7635aaf95259336a63a7dd5b2207118787b6d6a48d666
-MISC ChangeLog 24680 SHA256 4e0d69b2c69069f0449ccfdcd1b3b4145e63759c2c9fb2ff189ee48ece0cfbf5 SHA512 398c627b4e7a710b76f1c34fe4c4d5f615fc26dca656cdbf9ef2d465a50fa162e223a78bcc90329a38f212c8e8f06076b6cf4e5c7ce1061831500508e8536cd0 WHIRLPOOL b500e13497439032393a603d67a2648e17bf4c7db3956f53c2488f480bd1214f184078c2137bac9286b6dc41b595d58c449a3dda17026395716382a30e856976
+EBUILD freenet-0.7.5_p1456.ebuild 4323 SHA256 749a98537aec87d2bfb762d8676c0ffff64d92dfdd68cce4974e59c180404c83 SHA512 c553eb4644a3e1a3a189d9f8eb1050d8ec43eec7670ef0034f9c2cffcc8062c59062c9c1010b2b6d4d697e7e2951e228369ddc1b8258ba467f3b62c4bc78c9f6 WHIRLPOOL 5fdc588ec12d70775271e69c04990ccb9c7809d2fff32e477af38c7a8a0a9d73cde9769d9a6c125fde6991567c331dd173bbf7d59aa049ffa794eee1b7431cc9
+MISC ChangeLog 24822 SHA256 e244bb1b3b20dd3332a4b1643b18bbb2cf072764b5dd67a6a9e0d49010e080f5 SHA512 6f26eef57888d5caea18684eaf2e38e0d53afc915f83968dcb40bc762e3b6cfdfa9f8d330948af2f02ac12a4c62c6f2f05bab040f95b3c2213cfdb6d531d8cb7 WHIRLPOOL bbe7013059610390c2ad504db7f64187e5dcd3fe21292da028bad9ed846be3f86b0a7d7550e5a326484fb01c3c5c27473e379e22e17c7043efca4d461c21d20c
 MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iJwEAQEIAAYFAlIre2cACgkQG7kqcTWJkGeX6AP+Kef4989anOkpwA6FJ8jBhfA7
-AXGl+7yebBtKSFJvUbUKo5dElXvkJuEUwU7TbX0XvYV748eK1DlgeNwmm0VX5avk
-tW/sdifdPzi+aV58PGTdq6SnrbQWS+tbWtlJ26zEbLaqVm6YdwM2fpNKhRUkQUAb
-2rB4qz5npeU5NF+Dhcg=
-=S0Mx
+iJwEAQEIAAYFAlI5oV4ACgkQG7kqcTWJkGeXhAP+JyPsFfaNdmMfDU60insiAEw5
+C0efe/Powj+6eQgDNtmy7trAzqIIdxj1DIglynX9t9SWnMZwvIHqUsDC1Z4JINkf
+InY5E9lVTFFJNq7I2qFuKWYYuusB526u3RxDiH8JXSo7lbskpCzo2xLZXkFyBVaj
+95xr0nKWHDFhRKbCalE=
+=i+gq
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1456.ebuild b/net-p2p/freenet/freenet-0.7.5_p1456.ebuild
new file mode 100644
index 000000000000..4186da27417f
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1456.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2013 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_p1456.ebuild,v 1.1 2013/09/18 12:49:27 tommy Exp $
+
+EAPI="2"
+DATE=20130915
+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="https://github.com/${PN}/fred-official/archive/build0${PV#*p}.zip -> ${P}.zip
+	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	mirror://gentoo/freenet-ant-1.7.1.jar"
+
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=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="bcprov,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.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
+
+S=${WORKDIR}/fred-official-build0${PV#*p}
+
+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_p1422-wrapper.conf freenet-wrapper.conf || die
+	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+	epatch "${FILESDIR}"/0.7.5_p1321-ext.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
+	local ifs_original=${IFS}
+	IFS=","
+	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
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
+
+	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
+}