QA fixes

(Portage version: 2.2_rc62-r4/cvs/Linux x86_64)

4 files changed, 13 insertions, 7 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index f8235379fa91..45dec95c76e9 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.73 2010/02/05 20:36:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.74 2010/02/16 17:52:11 tommy Exp $
+
+  16 Feb 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  freenet-0.7.5_p1239.ebuild, freenet-0.7.5_p1240.ebuild:
+  QA fixes
 
 *freenet-0.7.5_p1240 (05 Feb 2010)
 
diff --git a/net-p2p/freenet/freenet-0.7.5_p1239.ebuild b/net-p2p/freenet/freenet-0.7.5_p1239.ebuild
index 0b8c702499cd..7e784f2e50bd 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1239.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1239.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p1239.ebuild,v 1.1 2009/11/06 20:41:12 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1239.ebuild,v 1.2 2010/02/16 17:52:11 tommy Exp $
 
 EAPI="2"
 DATE=20091027
@@ -57,6 +57,7 @@ src_prepare() {
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):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
+	java-pkg-2_src_prepare
 }
 
 src_install() {
diff --git a/net-p2p/freenet/freenet-0.7.5_p1240.ebuild b/net-p2p/freenet/freenet-0.7.5_p1240.ebuild
index 8c78a9614823..b6f246df48a3 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1240.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1240.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p1240.ebuild,v 1.1 2010/02/05 20:36:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1240.ebuild,v 1.2 2010/02/16 17:52:11 tommy Exp $
 
 EAPI="2"
 DATE=20100204
@@ -41,7 +41,7 @@ EANT_BUILD_TARGET="dist"
 EANT_GENTOO_CLASSPATH="ant-core db4o-jdk5 db4o-jdk12 db4o-jdk11 db-je-3.3 fec java-service-wrapper lzma lzmajio mersennetwister"
 
 pkg_setup() {
-	has_version dev-java/icedtea && built_with_use dev-java/icedtea cacao && {
+	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,"
@@ -62,6 +62,7 @@ src_prepare() {
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):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
+	java-pkg-2_src_prepare
 }
 
 src_install() {
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index efe110e30fc3..93ba4591dd6a 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/11/06 20:41:12 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.8 2010/02/16 17:52:11 tommy Exp $
 
 EAPI="1"
 DATE=20091027