summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p/freenet')
-rw-r--r--net-p2p/freenet/ChangeLog9
-rw-r--r--net-p2p/freenet/freenet-0.7.5_p1377.ebuild (renamed from net-p2p/freenet/freenet-0.7.5_p1376.ebuild)10
-rw-r--r--net-p2p/freenet/freenet-9999.ebuild8
3 files changed, 18 insertions, 9 deletions
diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 5e7527b5f8dd..a5cebbfd7674 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,13 @@
# 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.129 2011/05/28 13:17:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.130 2011/06/13 13:00:27 tommy Exp $
+
+*freenet-0.7.5_p1377 (13 Jun 2011)
+
+ 13 Jun 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -freenet-0.7.5_p1376.ebuild, +freenet-0.7.5_p1377.ebuild,
+ freenet-9999.ebuild:
+ Version bump, drop old
*freenet-0.7.5_p1376 (28 May 2011)
diff --git a/net-p2p/freenet/freenet-0.7.5_p1376.ebuild b/net-p2p/freenet/freenet-0.7.5_p1377.ebuild
index c9e62ac49d78..d4d346672832 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1376.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1377.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_p1376.ebuild,v 1.1 2011/05/28 13:17:46 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1377.ebuild,v 1.1 2011/06/13 13:00:27 tommy Exp $
EAPI="2"
-DATE=20110527
+DATE=20110611
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2 multilib
@@ -29,12 +29,12 @@ CDEPEND="dev-db/db-je:3.3
dev-java/lzmajio
dev-java/mersennetwister"
DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
+ >=virtual/jdk-1.6
${CDEPEND}
test? ( dev-java/junit
dev-java/ant-junit )
dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
net-libs/nativebiginteger
${CDEPEND}"
PDEPEND="net-libs/NativeThread
@@ -75,6 +75,8 @@ src_prepare() {
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
+ #build-fix from upstream, should be in 1378
+ sed -i 's:target="1.6":target="1.6" encoding="UTF-8":g' build-clean.xml || die
java-pkg-2_src_prepare
}
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index c2be0a3de0b8..54a7f18be129 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.15 2011/05/07 13:09:18 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.16 2011/06/13 13:00:27 tommy Exp $
EAPI="2"
-DATE=20110506
+DATE=20110611
JAVA_PKG_IUSE="doc source"
EGIT_REPO_URI="git://github.com/freenet/fred-official.git"
@@ -30,11 +30,11 @@ CDEPEND="dev-db/db-je:3.3
dev-java/lzma
dev-java/lzmajio
dev-java/mersennetwister"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
${CDEPEND}
test? ( dev-java/junit )
dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
net-libs/nativebiginteger
${CDEPEND}"
PDEPEND="net-libs/NativeThread