Version bump, drop old

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

2 files changed, 22 insertions, 7 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/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