Version bump, drop old

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

3 files changed, 32 insertions, 15 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 910d9dfe7c12..950fab020690 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.116 2011/02/06 01:30:35 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.117 2011/02/09 21:14:42 tommy Exp $
+
+*freenet-0.7.5_p1345 (09 Feb 2011)
+
+  09 Feb 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -freenet-0.7.5_p1339.ebuild, +freenet-0.7.5_p1345.ebuild:
+  Version bump, drop old
 
 *freenet-0.7.5_p1344 (06 Feb 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 4bcaeaf91e94..0d314a548df2 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,21 +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_p1339.zip 3739923 RMD160 063291e6b4bf9c6d946d0510ff0e08c6154d8090 SHA1 c5ec94ee6cacd589883c53d22dd82f0b69036392 SHA256 b1e43f5f6ed7bcdec66fd1d4bf57bda617dc5ac89fd2d3f280d0d696e8b26129
 DIST freenet-0.7.5_p1344.zip 3745545 RMD160 7669879c892b36f9fbddddc109d5adb472007f93 SHA1 15d3be2e027b5feb3ef39c6bfbc61cfaa5230e1e SHA256 51137a02c4754356e3a68f7a4dc4def5c821c844519cb6a6b23ef01ea4b4cb5f
+DIST freenet-0.7.5_p1345.zip 3745606 RMD160 e117af9348ee09fc02d595e9219d7d6bf8cf7acb SHA1 30aab271dc228b468f1ad134ed0d09405553d236 SHA256 9edf4f2ec4c5b81b5a794920fda8bacc3d6d352184eb29eaaf3f49dc7091a4f6
+DIST freenet-ant-1.7.1.jar 1327167 RMD160 2ff5fa9c7041aa475bc1374763897fd8f19ca1f4 SHA1 ab21c797797d9e216ff1e05dfaac969a74191cd1 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1
 DIST seednodes-20110102.fref 14223 RMD160 c3a151e2b6be279f01ce5c573f8cdcf3c38032e0 SHA1 9a6ec550a3738e783dce2dd406db49c017ec3440 SHA256 7bfe657b3729ae0a8c8302fbd2bdc428383447f21c0ba5c0439a65524c719908
 DIST seednodes-20110106.fref 17386 RMD160 0191a0570550c48762a1b0c916f58e33da5b8106 SHA1 fbb0c117a2db97b0fd0e5f8519a67be3cb691a64 SHA256 cc50dfbe6a2c3e3775ac293af3ff27cc742fc69d291b344306795096c48d6570
-EBUILD freenet-0.7.5_p1339.ebuild 3475 RMD160 192372b86e33883c15becd56fdc7fa77306df6a2 SHA1 d583d2e47740b326e20079a6d18ec2c1378b9bfc SHA256 7f8a62d3358ebed39ee44762edb048ca0539e9a60eaeb4c08c7cbd5247ddb5d7
+DIST seednodes-20110124.fref.bz2 6966 RMD160 b08d6a511101b396b6e0a7870fd09f771294b8cf SHA1 cb0ef20df894bbf2bac4dd6cdaebea330343f46c SHA256 b00aa3e9c8b98ae0c6ad9b9e65525649fe9826acfe4a4a0307b25677759ff6a5
 EBUILD freenet-0.7.5_p1344.ebuild 3475 RMD160 e0a461cc209301478f39cb3c4336350c195e2609 SHA1 f9675572efb5d8e438bd62d08b7b811925d0dc6a SHA256 4ce82b69a40a022fcc669b64a7066c2e2c9b2c8ae26f47e6472b61377c9e2dda
+EBUILD freenet-0.7.5_p1345.ebuild 3739 RMD160 8fd0bc59777445216f36128497898f445da80a60 SHA1 8c70519847a681ce3f1aa9794240bc9e1e55d8c2 SHA256 87101fef5c92c4f6a0dd34e4b5b10e3975ee4953289ebf0280149fe802c0c079
 EBUILD freenet-9999.ebuild 3095 RMD160 7567b1fbd6102fc620fc1d4f57f1e202b7ce0321 SHA1 a35daf5e8eb99f011584388363d6114ec7a903f7 SHA256 4e18e4f16caddbb5abb7f322dfb615f04ab50b5c1eabd7f4bbab666908d1aeb5
-MISC ChangeLog 13389 RMD160 d4d47565f51ddd350122ca6b5a84f2249580f395 SHA1 7eac89c649ec2658a3e1b4fcd6dc44a259fafd8a SHA256 4ac665d99d8dca9f59c21f27836d2042c71612c9e3846e8ec3bc1fd8cfaf5c6b
+MISC ChangeLog 13570 RMD160 f3b0daf0a9fb4690eeb4a05606d70c0c20350f09 SHA1 0b7d7c3b68a73651c85e0549bc0d92c252f92371 SHA256 6bbf9389801a217cd437427b6e9a3633182ddf1079cf07f4b7f81c4feaf70c4c
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk1N+dEACgkQG7kqcTWJkGf5XAP/Szb0u0TXzsHNPdADWFx3ZXLf
-qzvB44Zf7lRa2cAc4XN2YAWTZ42VrI8W+cS75b3ACVYnqlGiEdL5m1VQ0sNZAV39
-+i4ps7A9ee9JjkGHK3kC7e9LAuE5wQ1zDBpIodgUv0w4WZboCErS75hVkU6ZJoOR
-nIRcSLq0qA/Ygixe/hc=
-=gY0g
+iJwEAQECAAYFAk1TA9QACgkQG7kqcTWJkGcAsQP/VG3am6GWop/JVEv+KINEE8Rd
+h7CEJbiyPgvDxtsi5m78irhQve6sQmcir9lto6Y0/xzqeuhhZaf11B9qAvO9f78N
+DxesrleJU3KFuRssDDpoWNtwKdzPn21UYNuSmOX+cBRuDNj+Tk2PuzI2naa+9gfk
+0kGMoh6Vm6Yp7Yl71cQ=
+=d1Zp
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1339.ebuild b/net-p2p/freenet/freenet-0.7.5_p1345.ebuild
index 7cca10298a44..6153ac635292 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1339.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1345.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_p1339.ebuild,v 1.1 2011/01/29 18:38:49 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1345.ebuild,v 1.1 2011/02/09 21:14:42 tommy Exp $
 
 EAPI="2"
-DATE=20110106
+DATE=20110124
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib
@@ -11,7 +11,8 @@ inherit eutils java-pkg-2 java-ant-2 multilib
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
 SRC_URI="http://github.com/${PN}/fred-official/zipball/build0${PV#*p} -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref"
+	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	mirror://gentoo/freenet-ant-1.7.1.jar"
 
 LICENSE="as-is GPL-2"
 SLOT="0"
@@ -31,7 +32,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-core"
 RDEPEND=">=virtual/jre-1.5
 	net-libs/nativebiginteger
 	${CDEPEND}"
@@ -57,6 +59,10 @@ pkg_setup() {
 	enewuser freenet -1 -1 /var/freenet freenet
 }
 
+src_unpack() {
+	unpack ${P}.zip seednodes-${DATE}.fref.bz2
+}
+
 src_prepare() {
 	mv "${WORKDIR}"/freenet-fred-* "${S}"
 	cd "${S}"
@@ -64,7 +70,9 @@ src_prepare() {
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
 	epatch "${FILESDIR}"/strip-openjdk-check.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
+	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
+		-e "s:/usr/share/ant-core/lib/ant.jar:/usr/share/freenet/lib/ant.jar:g" \
+		freenet-wrapper.conf || die "sed failed"
 	use freemail && echo "wrapper.java.classpath.12=/usr/share/bcprov/lib/bcprov.jar" >> freenet-wrapper.conf
 	java-ant_rewrite-classpath "${EANT_BUILD_XML}"
 	java-pkg-2_src_prepare
@@ -72,6 +80,7 @@ src_prepare() {
 
 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
@@ -82,7 +91,7 @@ src_install() {
 	doins freenet-wrapper.conf || die
 	insinto /var/freenet
 	doins run.sh || die
-	newins "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || 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