Version bump, drop old

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

3 files changed, 37 insertions, 17 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 83b297b1bec5..6e9241a27a77 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.123 2011/03/18 17:20:03 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.124 2011/04/02 14:57:37 tommy Exp $
+
+*freenet-0.7.5_p1363 (02 Apr 2011)
+
+  02 Apr 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1356.ebuild, +freenet-0.7.5_p1363.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1358 (18 Mar 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 7a3dd9fcf3d0..cfcca1f9a41b 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,23 +9,23 @@ AUX run.sh-20090501 16217 RMD160 f8b03990d011e1f149ec43aa536fd7540a19f01a SHA1 1
 AUX strip-openjdk-check.patch 4015 RMD160 c512338ac1dc9ca88082f403d8a4bc4dfcb98c07 SHA1 8e2e7c6eb7bb0f738d9afd73b2b32f7f5b2d515b SHA256 74f4d18e590b181d60ee41c1d3aa9ede8525fd643cdfa4e4688d1c8310ec893c
 AUX strip-version-check.patch 349 RMD160 579ddfdf6549263e7ec2b9190eff6d08d6a2d5c4 SHA1 58e7422d180e4f443d415ec424646933eceeceb8 SHA256 35a33e5c52288505eefca96a6fbb98ae725d6fbefb727e73e513a1356b5cbfef
 AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b882dc0d366b946596bdecb1b1d45c1e221e4e0 SHA256 52e5e283ac4c43d78feecf1edf5ccb38e5505c89624769976fcbf4ac2c8a1572
-DIST freenet-0.7.5_p1356.zip 3753145 RMD160 d2afebdf249ad97f88b7d05b78172f54699e0eb1 SHA1 9ac78747fff7b62eb0d40811b3afe7616587bad6 SHA256 4c35b3a095752efe5fc73c8288fef1ff81938a1e433e664161b649d887efedde
 DIST freenet-0.7.5_p1358.zip 3761488 RMD160 ac33e46809427925e3c9ec85248b14fb73490a14 SHA1 7ef85edf694ad1f08a264169e6db41d456213f88 SHA256 9cadfe3b0a8f540345847efcf3ddb19afc61f22e18af920a880fc93b533d3a16
+DIST freenet-0.7.5_p1363.zip 3854885 RMD160 ba484c28d9ecf3c440d3245578e6d3c8ebf74403 SHA1 a63b0d3525078533b64b7e36e2c2d002413534ac SHA256 ee3a88d4ad7fcd05d1b5a0bf8d8c2584800f28bdfcc9ddbdc540ff2e78758e5e
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20110212.fref.bz2 8478 RMD160 c058827cc73bc189e1b284c3fe7c854e062ee7ed SHA1 91abad0f7d95616bfa125e28b52c5adfadb7744e SHA256 7e92208899c440f964df395c05dfc1e4b5ffd18ab8de8216f55f9fc2a3cf641e
-DIST seednodes-20110227.fref.bz2 9329 RMD160 7ea14729112624489fe9e85ae01822ac639cbd82 SHA1 3a2b5917e6ae88e455d1bbefedc2a31a2a0d6b65 SHA256 2c3fdaba5e9074f3ee07d1f73e482a40b53c7e85c448a7e1c16f33da1b09544b
 DIST seednodes-20110318.fref.bz2 11180 RMD160 7452e1143c99cb8e2f24f89e2518128275836721 SHA1 52efbcb42bd554786139fee63d68bf3c04ad2560 SHA256 6403a260540332f24fd31239919dca8e43d951924b53c07978c1b6382e65b75c
-EBUILD freenet-0.7.5_p1356.ebuild 3762 RMD160 db3bd2e98069ec00eb18213cfdb21f78c7cf48ea SHA1 88cd14c91a53d3af6457a3808c8b998196e63d89 SHA256 c6e5f4fa7743b1793c4e7364f2ead8aa9359c95d482ad718ff697ce1386638f1
+DIST seednodes-20110402.fref.bz2 9322 RMD160 7e6217e7c6ccf29815ce9c5cad06a3bbaf370660 SHA1 8dc7dc8ae74b9dee50eed6c678dc8d5a3799f291 SHA256 f5a7797b6abd2d0be960caf02e384934febfcad4b9bc5986ee4f3746fc9a0ae5
 EBUILD freenet-0.7.5_p1358.ebuild 4189 RMD160 c578a25dc50fe6d9acd87a291fda5f55f3de18a1 SHA1 b95049d25182dc1883f1a7dba0f7d00d4f313ce9 SHA256 d34d46fb955600c050953c35474e31e31224c3aa46559d79d355b0ac0604cebf
+EBUILD freenet-0.7.5_p1363.ebuild 4189 RMD160 33b1692e96f2e3371293400a4fe7b13d44a1440a SHA1 d1992c1b77c223a3061242563afc454f7ed4d3d1 SHA256 91cb96a5fa90ba7b2095f28a6356d6aea967adfa84e1a069075a2a3a33c8e3f1
 EBUILD freenet-9999.ebuild 3683 RMD160 31e2285e52d015ed00ca9c30c251418a6f7a16d4 SHA1 3bfff4d567ab25af59cd5496a5121ee72c396add SHA256 efe19a000eaae8263ceb097a6c1c9fa2de63b1bcb60db3517288dca1fa7f252c
-MISC ChangeLog 14642 RMD160 63a6bdd00cad762042416ce365bdacc5cde37449 SHA1 15e9f436ed27ae1e4a9b6b47e0ebb1ee046dd1ff SHA256 751d980a01f0f02c6048d238758d76818e752f7cc8df4f09b00b0aa2a5031b4f
+MISC ChangeLog 14823 RMD160 7f57eb638d2e3e1707f170befc3f052fe841428d SHA1 053beffc20810df8683dd575feff25b20c8cebff SHA256 90e5632d6a6779dd49dd7f49934c059d7075a4459a3b750e35324d9d75589cea
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2DlE4ACgkQG7kqcTWJkGfOYwP+NGZuJdaNA2tVFxv86JM7PcKW
-JGKs8qdqcD3Ke1e95GbMnrju6o0A/mgEka/F4y+CY45eYENm7SAQLXJGahXUGbuS
-gbgOc5Ws9zrEYxAGKKABzL/M+u361raAPo8pwwLceETOFEmO8UYI0IgqlZ0eJfs7
-kybrmyNiM3BZ91+Kyvo=
-=TiZO
+iJwEAQECAAYFAk2XOWwACgkQG7kqcTWJkGfKRAP/Xdd4Z5Z1FD6ZTl6NRYzXShrf
+EXOwfia2Y5EtmIKiOk5npIK1Nvj05mzqAzIeaP4lro8wbx4/6/NmO19UdoPpkFem
+AjTWRsL9yCQfzweHThob4qHEbGe6X8d5PTvUwTHBcwar9mQGzIMtUj6KwgeNDifV
+oB60QiewDsz+NWmkW7c=
+=EpZO
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1356.ebuild b/net-p2p/freenet/freenet-0.7.5_p1363.ebuild
index 75639429865b..fd143ca414c1 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1356.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1363.ebuild
@@ -1,9 +1,9 @@
 # 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_p1356.ebuild,v 1.1 2011/03/11 15:26:49 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1363.ebuild,v 1.1 2011/04/02 14:57:37 tommy Exp $
 
 EAPI="2"
-DATE=20110227
+DATE=20110402
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib
@@ -31,7 +31,8 @@ CDEPEND="dev-db/db-je:3.3
 DEPEND="app-arch/unzip
 	>=virtual/jdk-1.5
 	${CDEPEND}
-	test? ( dev-java/junit )
+	test? ( dev-java/junit
+		dev-java/ant-junit )
 	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.5
 	net-libs/nativebiginteger
@@ -40,11 +41,11 @@ 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"
-use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
-use test && EANT_GENTOO_CLASSPATH+=" junit"
+export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
 
 pkg_setup() {
 	has_version dev-java/icedtea[cacao] && {
@@ -60,11 +61,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${P}.zip seednodes-${DATE}.fref.bz2
+	mv "${WORKDIR}"/freenet-fred-* "${S}"
 }
 
 src_prepare() {
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-	cd "${S}"
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
@@ -78,6 +78,20 @@ src_prepare() {
 	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