Remove ant-core-1.7'*' dependency, update live ebuild

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

5 files changed, 46 insertions, 27 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 126b51aa9693..99a61f4d2859 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # 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.118 2011/02/13 11:02:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.119 2011/02/15 21:19:42 tommy Exp $
+
+  15 Feb 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-0.7.5_p1345.ebuild, freenet-0.7.5_p1352.ebuild, freenet-9999.ebuild:
+  Remove ant-core-1.7'*' dependency, update live ebuild
 
 *freenet-0.7.5_p1352 (13 Feb 2011)
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 10dadee78bce..0b1c4cd4a67f 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -12,20 +12,19 @@ AUX wrapper1.conf 2396 RMD160 e029cb5feaf98a03234a061362c0989207fdfd23 SHA1 9b88
 DIST freenet-0.7.5_p1345.zip 3745606 RMD160 e117af9348ee09fc02d595e9219d7d6bf8cf7acb SHA1 30aab271dc228b468f1ad134ed0d09405553d236 SHA256 9edf4f2ec4c5b81b5a794920fda8bacc3d6d352184eb29eaaf3f49dc7091a4f6
 DIST freenet-0.7.5_p1352.zip 3747674 RMD160 a0cd53546dbca68621c57ef990a4121ed186db08 SHA1 c506c43084763bf87e50d797210f0e7c1f775fb9 SHA256 ee6b02c93fbf3218b854d708a4e6049a7cd89b6bc71c4885cc4555dfe20d1681
 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-20110124.fref.bz2 6966 RMD160 b08d6a511101b396b6e0a7870fd09f771294b8cf SHA1 cb0ef20df894bbf2bac4dd6cdaebea330343f46c SHA256 b00aa3e9c8b98ae0c6ad9b9e65525649fe9826acfe4a4a0307b25677759ff6a5
 DIST seednodes-20110212.fref.bz2 8478 RMD160 c058827cc73bc189e1b284c3fe7c854e062ee7ed SHA1 91abad0f7d95616bfa125e28b52c5adfadb7744e SHA256 7e92208899c440f964df395c05dfc1e4b5ffd18ab8de8216f55f9fc2a3cf641e
-EBUILD freenet-0.7.5_p1345.ebuild 3739 RMD160 8fd0bc59777445216f36128497898f445da80a60 SHA1 8c70519847a681ce3f1aa9794240bc9e1e55d8c2 SHA256 87101fef5c92c4f6a0dd34e4b5b10e3975ee4953289ebf0280149fe802c0c079
-EBUILD freenet-0.7.5_p1352.ebuild 3739 RMD160 f564eb7775390865895373e6674d4c6bd9596c57 SHA1 e041851edbf75f57df01fa89c469f7e5ed68cdbc SHA256 763931260f3e1315e4964fc227a4ce5e33b3901884d0a565b4d96a39f377d0dd
-EBUILD freenet-9999.ebuild 3095 RMD160 7567b1fbd6102fc620fc1d4f57f1e202b7ce0321 SHA1 a35daf5e8eb99f011584388363d6114ec7a903f7 SHA256 4e18e4f16caddbb5abb7f322dfb615f04ab50b5c1eabd7f4bbab666908d1aeb5
-MISC ChangeLog 13751 RMD160 764ede6f616fc65a5cc95ca74fdef74c045b0ce5 SHA1 cd479893fc16cb2bd067b2ea0b9821c442fff44c SHA256 887c56e8ae945fa9bfbcd2d44b22803ab3da00299b645660ec6c69f51338d6e7
+EBUILD freenet-0.7.5_p1345.ebuild 3713 RMD160 10cc199df61f6c80e1a73d36feb97f79ad6ea69b SHA1 8d65e0e70808db352c3e6c56ab56e89b2b105231 SHA256 4c693184f7400528a214bf0e7f6b7b714e31ac10c416686fb129859aecfffaac
+EBUILD freenet-0.7.5_p1352.ebuild 3713 RMD160 f3fdff233b528cc56e56013f488542a195924648 SHA1 ac01753fb9fca112b78d53b2a9b9bd6e6d99c7bd SHA256 e83352f624e4f3e2c0133f571f0957f5c1dfad3e970fab4257435135f3c7f68c
+EBUILD freenet-9999.ebuild 3683 RMD160 31e2285e52d015ed00ca9c30c251418a6f7a16d4 SHA1 3bfff4d567ab25af59cd5496a5121ee72c396add SHA256 efe19a000eaae8263ceb097a6c1c9fa2de63b1bcb60db3517288dca1fa7f252c
+MISC ChangeLog 13946 RMD160 8f6d71601350a43cb18cd39694370de919f7bac8 SHA1 cd76c0422389547de98c59993c2420ac07dfa047 SHA256 cd9074a6c0167241ade0bfdb966194ef44b541c5dfc27feefb06cf47c21c6680
 MISC metadata.xml 332 RMD160 692365bdee16dc9218a18a306e5b15a4b2684206 SHA1 6f1d02202549206e3c5856c9a5a99b334015f7c9 SHA256 869705ebd157480153ca5ddbf7c48426b4374a8cba10164a1f1582fde5afa3a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk1Xuj4ACgkQG7kqcTWJkGc64wP/aTupR6pu5TM2hRb2JD4SpWq3
-MrJpPkEeHqdt6QfOjQbPzcWYW+bKzC/BAyxQcqnO1856DMFHei0zfKO+4/sHbI0O
-dbAhhgQMrPFegA88uXTOh43LtHMjRp87t9Y9/CrF/nL8X25yx0xut98LEnnLuORc
-uNSWOz3luOpgXJHkj6U=
-=ANrg
+iJwEAQECAAYFAk1a7gQACgkQG7kqcTWJkGeffgP/f1VDwr4LTTYWBUvraodqsR9u
+a+SBkUfy54Z6loUIR9q76pOM9ni7rn8thuEuVO6ecKQSVDVYUIMsQe827yOXPxzG
+JR576vUaP215G6OKA5/OPT3ltpVK0AYThTQekDX2VScaBxtdc100JYPhzeaa0QBc
+5zC5U2j57ZN5B/B2ARw=
+=Umyc
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/freenet/freenet-0.7.5_p1345.ebuild b/net-p2p/freenet/freenet-0.7.5_p1345.ebuild
index 6153ac635292..56907ee7c80c 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1345.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1345.ebuild
@@ -1,6 +1,6 @@
 # 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_p1345.ebuild,v 1.1 2011/02/09 21:14:42 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1345.ebuild,v 1.2 2011/02/15 21:19:42 tommy Exp $
 
 EAPI="2"
 DATE=20110124
@@ -25,7 +25,6 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
-	=dev-java/ant-core-1.7*
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
@@ -98,7 +97,7 @@ src_install() {
 	use source && java-pkg_dosrc src
 }
 
-pkg_postinst () {
+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."
diff --git a/net-p2p/freenet/freenet-0.7.5_p1352.ebuild b/net-p2p/freenet/freenet-0.7.5_p1352.ebuild
index 749f3925fbff..3a67f795ae4f 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1352.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1352.ebuild
@@ -1,6 +1,6 @@
 # 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_p1352.ebuild,v 1.1 2011/02/13 11:02:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1352.ebuild,v 1.2 2011/02/15 21:19:42 tommy Exp $
 
 EAPI="2"
 DATE=20110212
@@ -25,7 +25,6 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
-	=dev-java/ant-core-1.7*
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
@@ -98,7 +97,7 @@ src_install() {
 	use source && java-pkg_dosrc src
 }
 
-pkg_postinst () {
+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."
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index 05fa51478b92..498987a6f8c4 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.13 2011/01/04 17:02:05 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.14 2011/02/15 21:19:42 tommy Exp $
 
 EAPI="2"
-DATE=20110102
+DATE=20110212
 JAVA_PKG_IUSE="doc source"
 
 EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
@@ -13,7 +13,8 @@ inherit eutils git java-pkg-2 java-ant-2 multilib
 
 DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="http://www.freenetproject.org/"
-SRC_URI="mirror://gentoo/seednodes-${DATE}.fref"
+SRC_URI="mirror://gentoo/seednodes-${DATE}.fref.bz2
+	mirror://gentoo/freenet-ant-1.7.1.jar"
 
 LICENSE="as-is GPL-2"
 SLOT="0"
@@ -26,13 +27,13 @@ CDEPEND="dev-db/db-je:3.3
 	dev-java/db4o-jdk11
 	dev-java/db4o-jdk12
 	dev-java/db4o-jdk5
-	=dev-java/ant-core-1.7*
 	dev-java/lzma
 	dev-java/lzmajio
 	dev-java/mersennetwister"
 DEPEND=">=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}"
@@ -48,23 +49,38 @@ use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
 use test && EANT_GENTOO_CLASSPATH+=" junit"
 
 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 seednodes-${DATE}.fref.bz2
+	git_src_unpack
+}
+
 src_prepare() {
 	cp "${FILESDIR}"/wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/{0.7.5_p1302-ext,strip-openjdk-check}.patch
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" freenet-wrapper.conf || die "sed failed"
+	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch
+	epatch "${FILESDIR}"/strip-openjdk-check.patch
+	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}"
-	cp "${DISTDIR}"/seednodes-${DATE}.fref seednodes.fref || die
+	java-pkg-2_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
@@ -74,7 +90,8 @@ src_install() {
 	insinto /etc
 	doins freenet-wrapper.conf || die
 	insinto /var/freenet
-	doins seednodes.fref run.sh || die
+	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
@@ -82,7 +99,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
+	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
@@ -92,6 +109,7 @@ pkg_postinst() {
 
 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"