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

(Portage version: 2.2.0_alpha23-r1/cvs/Linux x86_64)

4 files changed, 37 insertions, 17 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/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"