summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2011-02-27 10:31:31 +0000
committerThomas Sachau <tommy@gentoo.org>2011-02-27 10:31:31 +0000
commitb9bc5dc2b20a96ebe0421b3e740be2ec70046fcf (patch)
tree45d406c11e439f8eaa484120467845d264bcb3a5
parentMarked ~ppc/~ppc64 wrt #353115 (diff)
downloadgentoo-2-b9bc5dc2b20a96ebe0421b3e740be2ec70046fcf.tar.gz
gentoo-2-b9bc5dc2b20a96ebe0421b3e740be2ec70046fcf.tar.bz2
gentoo-2-b9bc5dc2b20a96ebe0421b3e740be2ec70046fcf.zip
Fix bug 356633, thanks to Diego for reporting
(Portage version: 2.2.0_alpha25-r1/cvs/Linux x86_64)
-rw-r--r--net-p2p/freenet/ChangeLog6
-rw-r--r--net-p2p/freenet/freenet-0.7.5_p1355.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 2ebb809d25d3..a81624f50c54 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.120 2011/02/17 18:58:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.121 2011/02/27 10:31:31 tommy Exp $
+
+ 27 Feb 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ freenet-0.7.5_p1355.ebuild:
+ Fix bug 356633, thanks to Diego for reporting
*freenet-0.7.5_p1355 (17 Feb 2011)
diff --git a/net-p2p/freenet/freenet-0.7.5_p1355.ebuild b/net-p2p/freenet/freenet-0.7.5_p1355.ebuild
index 8bff755afdf0..2e61160ff9a3 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1355.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1355.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_p1355.ebuild,v 1.1 2011/02/17 18:58:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1355.ebuild,v 1.2 2011/02/27 10:31:31 tommy Exp $
EAPI="2"
-DATE=20110212
+DATE=20110227
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2 multilib
@@ -41,7 +41,7 @@ PDEPEND="net-libs/NativeThread
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
+EANT_GENTOO_CLASSPATH="db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.junit.present=true"
use test || export EANT_EXTRA_ARGS+=" -Dtest.skip=true"
use test && EANT_GENTOO_CLASSPATH+=" junit"
@@ -74,6 +74,7 @@ src_prepare() {
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}"/freenet-ant-1.7.1.jar lib/ant.jar || die
java-pkg-2_src_prepare
}