Version bump

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

3 files changed, 156 insertions, 8 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index c32ffcffdbe9..890a6f2fb283 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.160 2012/12/20 14:59:50 tommy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.161 2013/01/12 19:46:52 tommy Exp $
+
+*freenet-0.7.5_p1424 (12 Jan 2013)
+
+  12 Jan 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +freenet-0.7.5_p1424.ebuild:
+  Version bump
 
 *freenet-0.7.5_p1423 (20 Dec 2012)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index f9dd95b316f5..1ee786a023f8 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -12,17 +12,19 @@ AUX freenet.old 452 SHA256 b3047b40128bbd7843dc370ab0aa150a9836ed789f48181bd6d8f
 AUX libraryloader-revert-using-of-absolute-path.patch 854 SHA256 b8bc840cc0c35a32bf000c23bdb5a7c7cb30508f6f39e3a3d29bb149996e6209 SHA512 24627e9f30a1b4456bf386ebc0a789e6c1d8670d4c1371b2d658cf04f9a04c09dc91ac803af0b8f883578cf9b3b351da69c7f882f7bdf3277f183134219b4889 WHIRLPOOL 6a328c040c81548bc77452639e2a0752304ef639480258b34d6d4ae15b0009d766a18df90f5685d4f2891a71188c19788675a65d8912560afb9a9fdfa0e9261e
 AUX run.sh-20090501 16217 SHA256 470aa99d083a16d2f620282502a59546611f1903e21aef50b93b10d9fada7d7a SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67 WHIRLPOOL 201c2541da742ae0c211d6b736914340dd06d4907326de5a0073b39e8aa0a60933ed7d4eef3aa86465f9d0c2e0bf5bd78ed85d3c83c08ba9b50aabc25853864e
 DIST freenet-0.7.5_p1423.zip 4348396 SHA256 ba8a0aca1679ee836f3df07090042ae56097037e8b86346d1b2244bf0db68f00 SHA512 f5eba97dbc517e67af038703da7e16ad1983a6200251d0b3c8578a487ee7d55d23184b29f946a0e2cf8b0b830114e206efd4b91b19a5224f2ebfb00e7708be5f WHIRLPOOL f0248113051e6609970f2253b3c99bf8b2840339383fb3eaaffef9109b7c55d3b3aee59c4ff87f97dd4042d5a05f8ef01be69dcc29e7e3aa885f4e0ee3b54c0f
+DIST freenet-0.7.5_p1424.zip 4357554 SHA256 fb098d02e56fabce5ed40bf3ea51a5a658e36174684284c33372a58f31ac865b SHA512 3a6cfdef5653adc598b12fc3e2fa93b81472ca370017ba0ac8a30416f3feb864fea5427f5cd106dfe4d6b4fb45a8d1c6deba12f611d4a2c7eb0c95c2f4abcf38 WHIRLPOOL 6b4199877c93272986cf8048eee06e4371f627c423df2387761dc74b2c388a0f2fa2ebcd7249125aea779e4b0bfa4ffeab6101bd067098f1f8c3fb75d3912639
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
 DIST seednodes-20121030.fref.bz2 9181 SHA256 c71fc9addf7f81208822e59baf2d9ae7f3399c8881360511a7b8926012050b57 SHA512 e079ba7a7752774332862b6332ccff4cd221e53a42b14a795e4c12caca9f7448df67250e8bc456251dafff60048af10a06a83fdc1a04f71b3bb722500d064f2d WHIRLPOOL 4b7b6112680134f6c26ee4bfad0cfe1b2cc2063ef91215c93c562247c7089934df5c78b7fc5e570c4f9a89b3b5574e643917c6961a6b8476a5c98e2689cd2712
 EBUILD freenet-0.7.5_p1423.ebuild 4275 SHA256 a0dc36d9dfec878a4f1618aa79f0600508411fe1bf574423af04489b2c6dc36c SHA512 9af359d623be0575c7e620ac265a03189617241c41f63e7d11f449bf5c7263d4427735928245b490ec4979385c37a30ab34c5f78f3deb989aa638b8c790ecd5c WHIRLPOOL e701ceec35b62173ca0a188cc672c607aeddf009fb569be02a78a693559c13c3340d7fcfa2df4f1e7c8583a6304929a9640f2e9a0c648ff0a4b295a8f6cc2ed0
-MISC ChangeLog 21823 SHA256 6511d92f5f1eae6bfa33c9de221732bd1c10a0cd79a95e9da2337e317bf95378 SHA512 9cff381ab8420a546cab18932f85b9e40089b167200dcaad286eddf9076f875ed809ef7785b87e319c49bdd6ed0c922a4a8086b3ebfc56b2ec01c06a590e0b9c WHIRLPOOL 64b0a8ae41216d06968aff4684690dc9b0f8b488fb5a56c92fecd66cfe50d7864abe374ebbf727b20e98af8275f0a155e81357996b1030f5a2171da31bc637ed
+EBUILD freenet-0.7.5_p1424.ebuild 4275 SHA256 16c24fa9e3608ac45f9e0cc38c91936300d4dd42963e7460127b127beee15125 SHA512 e4e9efee104787fe126ee2ba17dc7fa3507be41ef6337236747032fecd35f0b3db0b42b6ed0a976a8ec1abac14aac431165b5464131728ebb216fcb04ef75e56 WHIRLPOOL 082fe53ab9c6d11d4526ff01f49c00fc528d06bb5735c65ff7e37d2c84571ab5104d6d7dc7daa619cded8ec3e88587966edc480956ef3c2c65f729faa2b5ebfe
+MISC ChangeLog 21965 SHA256 53f154ee12ea72ce841fbc45216c234e8439e6c878380f86802e171d5f59e076 SHA512 11896dcb1be6d15a7aa98420ac0e18f35b85c98d7a764669c32a906305daa271de2e1d2da4522fb228fc2e0b90c6ea9de86237025be5b23c093060a401106ea3 WHIRLPOOL 83bfe62994b3b041acf1ced82ce9b6c738c4f684117c037aa9232bf68a0f39baa9871b765f9656cd19d7837f53827f5cfc410b5dd745e4b884b49cfd84be5b0d
 MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDTJ+0ACgkQG7kqcTWJkGcw1QP/StrezVZ86y6RVB2BQjSlTCWe
-LgB8l5kd+2SZsmf5qzg92hoKLZMRLGFz/3vzX3GWi6pMrqwwafXdgz4gtta1VyCz
-o6GOc+T7pknxhPwFE/GLjd8hPPO8eOF+Dn4arbEu/BMPjuUdXPfhAhfnZHi0YwjD
-WyhT5iNK/b8koQWY3pc=
-=OND7
+iJwEAQEIAAYFAlDxvbsACgkQG7kqcTWJkGdRFgP+LbUd9k5VTk183pcGet2NdARG
+frAjwjMo4PaX0OlZqcRpOOzHjLzTumkPopeABs5P6pzBbpoQsPZkuAXEKNPFckQH
+a/8VOSvfKs+oprr0upHErkAnY+t+r7Nw+79ceG8SV9OsXmb6jK2sCT2yOo1SzE4p
+kLI64CUN0hh5roEcRXM=
+=bytX
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1424.ebuild b/net-p2p/freenet/freenet-0.7.5_p1424.ebuild
new file mode 100644
index 000000000000..f17c4c0617f7
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1424.ebuild
@@ -0,0 +1,140 @@
+# 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_p1424.ebuild,v 1.1 2013/01/12 19:46:52 tommy Exp $
+
+EAPI="2"
+DATE=20121030
+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="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"
+
+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
+}