Version bump, drop old

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

4 files changed, 28 insertions, 20 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 5e7527b5f8dd..a5cebbfd7674 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
 # 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.129 2011/05/28 13:17:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.130 2011/06/13 13:00:27 tommy Exp $
+
+*freenet-0.7.5_p1377 (13 Jun 2011)
+
+  13 Jun 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1376.ebuild, +freenet-0.7.5_p1377.ebuild,
+  freenet-9999.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1376 (28 May 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index d96c8e53b3c6..bb593a6a6ed1 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,20 +9,19 @@ 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_p1376.zip 4128435 RMD160 ba434baf36bf054fe7fc81b02947a0699877c9fa SHA1 70d38a72e2cc189380f38da52879f34fde98aa46 SHA256 91f5d1ba3682ddfb52c4432465309577e5ec0640abb087609fda3bb113d2117f
+DIST freenet-0.7.5_p1377.zip 4140157 RMD160 a4defb1c2144e83074f52901882d2e502573f943 SHA1 f16bf6f358d7c2788a6b8c47d1c26100a928afff SHA256 402f26ce01573e41a93bcee190b7217f935d11d1f5296f4d6429dc51ca88b09a
 DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
-DIST seednodes-20110506.fref.bz2 10694 RMD160 a2d45b0c1dea16e6092f911b43b7828379cf0470 SHA1 b61123984999f893ef660d1a7aeec70f20473353 SHA256 290bc12ecde89bea75304c8e41dc1af87a857a23346190d7250238ca2d27f89d
-DIST seednodes-20110527.fref.bz2 9311 RMD160 e0be67e09afde9af72cdc36af83e3a5feac217d6 SHA1 e8d09ced3b3ef70b2456c32480d8276aa6df1790 SHA256 a970070f797db8927cf1649b5ff7b208c147b9bd1efe3357c98f0226c51d43ad
-EBUILD freenet-0.7.5_p1376.ebuild 4189 RMD160 8def85bbaa619057262b3a17a1cc4c72ebaa5bc3 SHA1 4c2a249415e4a63678f6fdb8c881f51d5e03f64e SHA256 e22bacac252e1a7b817aade907bf92f975d948c839b7a8d18b137ddf5ecf23c6
-EBUILD freenet-9999.ebuild 3683 RMD160 ee6aaa6efaaa11b3533b06866cfe91a7c2d64e46 SHA1 27020f472b9ebe23f443fdb4fe9c8b3c3cf71273 SHA256 5a3cad78fefaa91ce97894e76119dc223466bde09987794b72ba9cc633e5dc04
-MISC ChangeLog 15772 RMD160 45364560014d83b2ba076b6acb4ce9812ef7e444 SHA1 306303723475d9aa9247445fe12e54809fba41be SHA256 1ecd4ca59575cd7310af95bf9cbe3766ef813c68bb47188c0d183d9883a2727a
+DIST seednodes-20110611.fref.bz2 11808 RMD160 54eaed73c6dee2a8e3493054ed40e79857188426 SHA1 63c5704e8367efd4459eda52a6c09dd24001624f SHA256 8cfee0d7acd3a274e44ad69d1a2abf947d5caf98fc182ed926ca6cad1024960b
+EBUILD freenet-0.7.5_p1377.ebuild 4314 RMD160 e5ffe23391644f26ce0d98e7754823f586d3c692 SHA1 e022f36071ad3c840636689d5ca1b5dc3633dc5b SHA256 5f7e4f0b45def9c21504d7cd638d6aff1a1b30c7000b61a9e65c4b2497ba5f1e
+EBUILD freenet-9999.ebuild 3683 RMD160 1970ab29179e5d9220b454f784bd7c305d0360cc SHA1 cb6ec4694dd8fae27ea4a444494712c45859a5b9 SHA256 0ed207bd2931999dcde3b340b453ed76c0bed4fc66dbc786d1e3b995582d80ed
+MISC ChangeLog 15976 RMD160 6800318465ac467a8c20edd76f1ce95669629a15 SHA1 9e1598fd8790bdc8c8aaa78f04ed37c4d674768e SHA256 1b3fe6b54a0a96b718b385b754c316c91e0c4cc84bfc8477c79f4892d2a50c6d
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk3g9gcACgkQG7kqcTWJkGcdOQP+OiN8p/DteZ+thEm6NQtKk1yv
-MOZADlf5mvy0urAyjEYd86ieqgXMXhCHj0XXWgSHEmqAC/o0xpiQvBIqphUP/AH+
-t5DDSg907O8GIYUynUSIX3y3sZBoOFA2sAQ2wDKXA7oi4h2x7QmP63lj710Op4rG
-2wjJxCFsZI1PnLdRos4=
-=tVTW
+iJwEAQECAAYFAk32CfgACgkQG7kqcTWJkGdu4QP9E6i4qUi14Hu5n05asxSZyqFi
+XHQVVCQ1lLPBdZ7/+TiDlI7w767FRLBJanfp/Y1MqWrmXmy+jO/fCo77222HxGgx
+8CoiiaQx8ugc004o9HAq6QizFi/QXK7tzh8Php6NY262TWOvO0G/ZDPgkj/iOr1J
+EEzMuBbR19s2DXD6fuA=
+=0VdC
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1376.ebuild b/net-p2p/freenet/freenet-0.7.5_p1377.ebuild
index c9e62ac49d78..d4d346672832 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1376.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1377.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_p1376.ebuild,v 1.1 2011/05/28 13:17:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1377.ebuild,v 1.1 2011/06/13 13:00:27 tommy Exp $
 
 EAPI="2"
-DATE=20110527
+DATE=20110611
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib
@@ -29,12 +29,12 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/lzmajio
 	dev-java/mersennetwister"
 DEPEND="app-arch/unzip
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.6
 	${CDEPEND}
 	test? ( dev-java/junit
 		dev-java/ant-junit )
 	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	net-libs/nativebiginteger
 	${CDEPEND}"
 PDEPEND="net-libs/NativeThread
@@ -75,6 +75,8 @@ src_prepare() {
 	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
 	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
 	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+	#build-fix from upstream, should be in 1378
+	sed -i 's:target="1.6":target="1.6" encoding="UTF-8":g' build-clean.xml || die
 	java-pkg-2_src_prepare
 }
 
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index c2be0a3de0b8..54a7f18be129 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.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-9999.ebuild,v 1.15 2011/05/07 13:09:18 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.16 2011/06/13 13:00:27 tommy Exp $
 
 EAPI="2"
-DATE=20110506
+DATE=20110611
 JAVA_PKG_IUSE="doc source"
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
@@ -30,11 +30,11 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	${CDEPEND}
 	test? ( dev-java/junit )
 	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	net-libs/nativebiginteger
 	${CDEPEND}"
 PDEPEND="net-libs/NativeThread