QA fixes

Package-Manager: portage-2.2_rc62-r4/cvs/Linux x86_64

5 files changed, 22 insertions, 16 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/Manifest b/net-p2p/freenet/Manifest
index 2fbcef25dcbd..f1cf2498753c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -13,17 +13,17 @@ DIST freenet-0.7.5_p1239.tgz 2169738 RMD160 656cd917a59f5f716884c2fa9f0b878686ca
 DIST freenet-0.7.5_p1240.zip 3001067 RMD160 12415fdb9eb1d29a9f6b4dfa8daa7319843b80a7 SHA1 c94a6733ea3dbcde6a3483b3b429e0309207248a SHA256 7b34a3d3f2e0f7ae141ace2b51fa54c862ddd5b0fabd7ac1aca7871b29a085bd
 DIST seednodes-20091027.fref 22241 RMD160 5a21874cb0c8dd27cc46329253a10182ac1280bd SHA1 55a060aee01afa8e9bc94be04e2356b7e2f6c4b0 SHA256 42a00a8166deb01ad660600315a9624961c4403ebcf1509971f483ddb4b63e94
 DIST seednodes-20100204.fref 30225 RMD160 b9b6c837bb08927aa8061213ef2548e8d5aeebfc SHA1 87a480522f3b7ea068b27e86b9a25809fcd53d72 SHA256 a09d5c3d977cb42efe05dc7fac8f799db3b566ef2e01da242f1bf6c9b0de9f19
-EBUILD freenet-0.7.5_p1239.ebuild 3145 RMD160 438aa9489ad36b90c2b7e17894ed322a873209fc SHA1 65c8e2db50278fb72a65114bb26e8d52dfa48399 SHA256 4e6e7efb3018b107c449fe3759b7a650023a35568a6b4c939f71685172405356
-EBUILD freenet-0.7.5_p1240.ebuild 3179 RMD160 60d13b66a3f11fef343549580008059deee9f3e9 SHA1 2366b5cc0273c5502f9e3c53c3231fb83c3bf277 SHA256 05b530f5e632ab95b89261cf93d554c4e8875548a5d8e4139e33930fbf1d5ae9
-EBUILD freenet-9999.ebuild 2579 RMD160 34bbd02d3f6b36b30625e037dbb3f7353206a512 SHA1 01912428dfe1cf6349e75f76e7bc9839d46cf21e SHA256 5228610e74892342e2ada10ccafb338b5e23ca3e0b8d41d4acc53ffe298a9462
-MISC ChangeLog 5345 RMD160 36d7a601942a8861d512cbbd76b80993bc801fbb SHA1 313c73137c6a52a9d18612fef7bbaf4eb8919949 SHA256 d697d19bd6356417a8bcba122121bed5baadd014f77ec3d58f869cb6391e35ff
+EBUILD freenet-0.7.5_p1239.ebuild 3169 RMD160 da8c796f6f1b31a0c6decaac65af906d5d8f8687 SHA1 3e1a80ab2283c29d13a922d8004a17ec951b6bfa SHA256 abea17b2d55207306c340e635a366232ad4fb2b6956ffe85a83e68a1333084e0
+EBUILD freenet-0.7.5_p1240.ebuild 3169 RMD160 eea7b4b5146e28f97c0363bf26320a9a9b7c95c8 SHA1 34294fcb4534ca86bff9d49e61dd7f2061f2cec6 SHA256 a6c5eaea85ee42c354a87a3c53d550be97023378cf42c73bf44ed2b8d803352a
+EBUILD freenet-9999.ebuild 2579 RMD160 af27c89827ed87434431e2151a844d4e456b07b4 SHA1 bebe0bf774eb6a58a2f94b145021ee57bee4fc4f SHA256 c4f241bcea153172ebb8ef420e75101d987f70b8f3b190ffbde3ce9a42623ee1
+MISC ChangeLog 5474 RMD160 89dea860e0348effb05554d1e098e83ffa1214dc SHA1 b03a8bfcb3f7c4082668c762a7468c8441b989db SHA256 4513a990275af38982617cf4e7e1d479e11395952aeadbd43570799ba69f509d
 MISC metadata.xml 332 RMD160 5e5c8b88681af85d63236c47f3a9a92881515679 SHA1 38a87952bb9389758e8700b4468b122ccf5199ea SHA256 3ca39205a9351767ed2901a4c8c8dd563ed1d83f6684f3bb6c2ab9e92ba4c10f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iJwEAQECAAYFAktsgUUACgkQG7kqcTWJkGeZQgQAvgjNS9vbWEgmWgqPg5c+MTmP
-llh2vcGz1r5p76H4ym2r/Rw4JwSsMA0ve8kzvrBlBFKJCprz2LX7P5SgxZ/6M4Yo
-xo+yAlLa3LCZXUp8OBiIcWvzorPiPv0n5fMQvElmiR7FpfkVBgXHiIeQA5vxoGY8
-+1/U2fyggFYHHP5Rm5Q=
-=eiyh
+iJwEAQECAAYFAkt621kACgkQG7kqcTWJkGcKhwP/avtX9XACjm7sD/ocOkuSINuJ
+z7UJmaSSwH633k7vw+gVaJKa78z8rhsCTOmK1XoXpCWChvI7RZgFEos+1OQizK5l
+U5IElIX6KGBpquemu0AGwQLC4P9135ymTgOnIemLAfhfTtsxIiMbqIs+FQixxn3f
+wsOeQezou7ogsJUVaKk=
+=8GGx
 -----END PGP SIGNATURE-----
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