Ebuild cleanup to work with JAVA_PKG_STRICT.

Package-Manager: portage-2.1.2-r1

4 files changed, 39 insertions, 30 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 2351989b6cf6..c45c4b9075ba 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-betwixt
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.8 2006/11/30 15:29:05 caster Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.9 2007/01/20 22:03:35 betelgeuse Exp $
+
+  20 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-betwixt-0.7-r1.ebuild:
+  Ebuild cleanup to work with JAVA_PKG_STRICT.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org>
   -commons-betwixt-0.7.ebuild, commons-betwixt-0.7-r1.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 5f42437aaaa1..ab8bf0972583 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-betwixt-0.6-noget.patch 980 RMD160 4949187d6428dfc3798c8638cb709c8be99a15cc SHA1 1d9c0e791998da306470cc2778d397d3830bd313 SHA256 57a9424247b285e281bbf8a9db29899b75f5053c36dd07a73edcdc8df10a86fc
 MD5 3b892742ca91101232da276492fa254c files/commons-betwixt-0.6-noget.patch 980
 RMD160 4949187d6428dfc3798c8638cb709c8be99a15cc files/commons-betwixt-0.6-noget.patch 980
@@ -16,18 +19,18 @@ EBUILD commons-betwixt-0.6-r2.ebuild 1328 RMD160 35bcd3dd86eff49b26a1e28be55f025
 MD5 3401f35169ea73b5b0458dc583ed3877 commons-betwixt-0.6-r2.ebuild 1328
 RMD160 35bcd3dd86eff49b26a1e28be55f025350efe7df commons-betwixt-0.6-r2.ebuild 1328
 SHA256 772caff348e00b0a534b397366a3c89e190aed09d3b01fcbfeafd37dd99407f5 commons-betwixt-0.6-r2.ebuild 1328
-EBUILD commons-betwixt-0.7-r1.ebuild 1667 RMD160 fab6d6a1a3cb6995bf4982989e1e43a06ccd985f SHA1 bd5cdcecfdfe4a826a5d81deca802f8e780a27d0 SHA256 40013fc88e8ba45dcb32a9c89e9b02d2c92bd7d86c55c2af033a0d11fe16ad33
-MD5 d2ac1b24433c8b0760059c334417afa8 commons-betwixt-0.7-r1.ebuild 1667
-RMD160 fab6d6a1a3cb6995bf4982989e1e43a06ccd985f commons-betwixt-0.7-r1.ebuild 1667
-SHA256 40013fc88e8ba45dcb32a9c89e9b02d2c92bd7d86c55c2af033a0d11fe16ad33 commons-betwixt-0.7-r1.ebuild 1667
-MISC ChangeLog 1705 RMD160 caebeac5c92f11cdca17cbaac192603e37d4247c SHA1 2f74ab993ac83c695e88a26c60fd17387b062708 SHA256 4b8ba4067749ea5a4638827d4dfef74339ff74ec587a60ca810bbe88971bd907
-MD5 13aff80705f810cfc3d1fb3e0a2b3081 ChangeLog 1705
-RMD160 caebeac5c92f11cdca17cbaac192603e37d4247c ChangeLog 1705
-SHA256 4b8ba4067749ea5a4638827d4dfef74339ff74ec587a60ca810bbe88971bd907 ChangeLog 1705
-MISC metadata.xml 739 RMD160 edcd9c21a2f7c3e48b4034dd1ea6e7ec5c9cdfe1 SHA1 9f1dcc20b346cb18d0f227369950afd9e09bdd90 SHA256 e3cb2eb0555c443124a02abcdc02dc70d5e83d1c0832c4c74b0c2bc2c146d8fc
-MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
-RMD160 edcd9c21a2f7c3e48b4034dd1ea6e7ec5c9cdfe1 metadata.xml 739
-SHA256 e3cb2eb0555c443124a02abcdc02dc70d5e83d1c0832c4c74b0c2bc2c146d8fc metadata.xml 739
+EBUILD commons-betwixt-0.7-r1.ebuild 1599 RMD160 6f7cac4029c045d7dffc0a4b7cb84531377f0b5e SHA1 c0ca33faea324e91bfb4dbdd2071f5f817fe64eb SHA256 45728a20b936001a2c2bc6d283586b9a499b1327eb20174e20da4a4b9c94776b
+MD5 fd3f409344fe6ec10b12e2d59a3a9019 commons-betwixt-0.7-r1.ebuild 1599
+RMD160 6f7cac4029c045d7dffc0a4b7cb84531377f0b5e commons-betwixt-0.7-r1.ebuild 1599
+SHA256 45728a20b936001a2c2bc6d283586b9a499b1327eb20174e20da4a4b9c94776b commons-betwixt-0.7-r1.ebuild 1599
+MISC ChangeLog 1843 RMD160 fd0772eaf478f3675e18f75bf54bd66a3f3ed766 SHA1 c7ee09154acce9a7f42e8ca1f62ba393d32f612c SHA256 9069b0ff0b2612adc626674514f7d522495b6d8b6c4a7e7144b9946707ab5ffd
+MD5 9e29a8e4bce63b2c26eb91782da5326d ChangeLog 1843
+RMD160 fd0772eaf478f3675e18f75bf54bd66a3f3ed766 ChangeLog 1843
+SHA256 9069b0ff0b2612adc626674514f7d522495b6d8b6c4a7e7144b9946707ab5ffd ChangeLog 1843
+MISC metadata.xml 737 RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 SHA1 7c110757602c2388ed24c18cb469801a93c0143f SHA256 bfa7bd01e5bd7fabad8dbbef4ad43ec8c9afe870ddaa0f1ebc4c325800046d7b
+MD5 82635b4255554228fde6bc7d44e4985d metadata.xml 737
+RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 metadata.xml 737
+SHA256 bfa7bd01e5bd7fabad8dbbef4ad43ec8c9afe870ddaa0f1ebc4c325800046d7b metadata.xml 737
 MD5 93a42860da538facd3680c14c7aea8c1 files/digest-commons-betwixt-0.6-r1 271
 RMD160 ef7439668e2c2f6a2171ed282a83550c160a5ac2 files/digest-commons-betwixt-0.6-r1 271
 SHA256 b60755478baf45b6023875a01cbbcd393978f7adea964c82413a94184b35afc3 files/digest-commons-betwixt-0.6-r1 271
@@ -37,3 +40,10 @@ SHA256 b60755478baf45b6023875a01cbbcd393978f7adea964c82413a94184b35afc3 files/di
 MD5 6a72c000879b0ae6767c6f2bdbd0d0fc files/digest-commons-betwixt-0.7-r1 271
 RMD160 622a3f55fef0e4cf5ff209c03cd4ee327d644f63 files/digest-commons-betwixt-0.7-r1 271
 SHA256 1b94a3f2d5b3c9267c125c5bd1d2845d61ff6144c6ee537695e20b2f29b9c6a6 files/digest-commons-betwixt-0.7-r1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFspHEcxLzpIGCsLQRAup9AJ9G6PpaFRqtIZIAabNT381pMEikIQCeO9Lq
+Zxqzxq6eZUQ1NReiH6yX968=
+=nMqZ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
index 9488a0283860..5ce4ed5961ce 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.3 2006/11/30 15:29:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.4 2007/01/20 22:03:35 betelgeuse Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -24,6 +24,7 @@ DEPEND=">=virtual/jdk-1.3
 	!test? ( dev-java/ant-core )
 	test? (
 		dev-java/ant
+		dev-java/junit
 		>=dev-java/xerces-2.7
 	)
 	source? ( app-arch/zip )"
@@ -35,17 +36,17 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-notests.patch
 
-	cd ${S}
+	cd "${S}"
+	java-ant_ignore-system-classes
 	mkdir -p ${S}/target/lib && cd ${S}/target/lib
 	java-pkg_jar-from commons-beanutils-1.7
 	java-pkg_jar-from commons-digester
 	java-pkg_jar-from commons-logging
-	use test && java-pkg_jar-from xerces-2
+	use test && java-pkg_jar-from --build-only xerces-2
+	use test && java-pkg_jar-from --build-only junit
 }
 
-src_compile() {
-	eant init jar $(use_doc) -Dnoget=true -Dnotest=true
-}
+EANT_BUILD_TARGET="init jar"
 
 src_install() {
 	java-pkg_newjar target/${PN}*.jar ${PN}.jar
@@ -59,11 +60,5 @@ src_install() {
 }
 
 src_test() {
-	if ! use test; then
-		ewarn "You must USE=test in order to get the dependencies needed"
-		ewarn "to run tests"
-		ewarn "Skipping the tests"
-	else
-		eant test -Dnoget=true
-	fi
+	eant test -DJunit.present=true
 }
diff --git a/dev-java/commons-betwixt/metadata.xml b/dev-java/commons-betwixt/metadata.xml
index f1521d07c71f..392662d241d0 100644
--- a/dev-java/commons-betwixt/metadata.xml
+++ b/dev-java/commons-betwixt/metadata.xml
@@ -8,9 +8,9 @@
 	beans to XML in a flexible way. It is implemented using an XMLIntrospector
 	and XMLBeanInfo classes which are similar to the standard Introspector and
 	BeanInfo from the Java Beans specification.
-	
+
 	Betwixt provides a way of turning beans into XML as well as automatically
-	generating digester rules in a way that can be customized on a per type 
+	generating digester rules in a way that can be customized on a per type
 	manner in the same way that the BeanInfo mechanism can be used to customize
 	the default introspection on a java object.
 </longdescription>