Migrate src_test to splitted ant.

Package-Manager: portage-2.1.3_rc9

3 files changed, 31 insertions, 19 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index e918ac869b8f..e5a00019e4c1 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.12 2007/02/04 00:22:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.13 2007/08/03 15:57:40 betelgeuse Exp $
+
+  03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-betwixt-0.7-r1.ebuild:
+  Migrate src_test to splitted ant.
 
   04 Feb 2007; Vlastimil Babka <caster@gentoo.org>
   -commons-betwixt-0.6-r1.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 687dd97cbcfc..07409e435172 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
@@ -12,14 +15,14 @@ EBUILD commons-betwixt-0.6-r2.ebuild 1325 RMD160 3c2c03cc2554dbaf8de1f23a3b2b125
 MD5 c367cae7535f2031b1d218c3ecec341f commons-betwixt-0.6-r2.ebuild 1325
 RMD160 3c2c03cc2554dbaf8de1f23a3b2b125e2da5a10b commons-betwixt-0.6-r2.ebuild 1325
 SHA256 8f20d102f3fd9ed1c6b1529c6bf79e6d61960540a9857774ddeaf70b062923a6 commons-betwixt-0.6-r2.ebuild 1325
-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 2160 RMD160 8e741d6c4caed707ca9057b60fbde5eabb7e55dc SHA1 5aafe7baf5719c5e8ae55f148386a4ae9b2c2d86 SHA256 a5ecc55f2bf78951d88bc8ca437e0d4f825b4421e2e17eca8687994878cf6489
-MD5 87b5b11f4811ca8856c4518bd2e47745 ChangeLog 2160
-RMD160 8e741d6c4caed707ca9057b60fbde5eabb7e55dc ChangeLog 2160
-SHA256 a5ecc55f2bf78951d88bc8ca437e0d4f825b4421e2e17eca8687994878cf6489 ChangeLog 2160
+EBUILD commons-betwixt-0.7-r1.ebuild 1521 RMD160 ce3c653428ca54765bcbdc32f6db5ebb7fcd93d1 SHA1 52a344914855ff0eecd38372763675ba0b87cf9c SHA256 73eba0d6bdfee385382e03a722136efba6d79c62b64f87f3a667870d3863b78a
+MD5 f682ea144cbf58a4c1775b876712c421 commons-betwixt-0.7-r1.ebuild 1521
+RMD160 ce3c653428ca54765bcbdc32f6db5ebb7fcd93d1 commons-betwixt-0.7-r1.ebuild 1521
+SHA256 73eba0d6bdfee385382e03a722136efba6d79c62b64f87f3a667870d3863b78a commons-betwixt-0.7-r1.ebuild 1521
+MISC ChangeLog 2287 RMD160 3e9fcf8850a4efaf10ac3a165660238a7f756aac SHA1 3be6c6749b1345c67ae351539d12675057c3dbe9 SHA256 2f644994bd9106c1c633a8af82f05555608553430e49095695b1c8392b5be7a9
+MD5 d40a7eae4d07e208efd2b5b9f3897808 ChangeLog 2287
+RMD160 3e9fcf8850a4efaf10ac3a165660238a7f756aac ChangeLog 2287
+SHA256 2f644994bd9106c1c633a8af82f05555608553430e49095695b1c8392b5be7a9 ChangeLog 2287
 MISC metadata.xml 737 RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 SHA1 7c110757602c2388ed24c18cb469801a93c0143f SHA256 bfa7bd01e5bd7fabad8dbbef4ad43ec8c9afe870ddaa0f1ebc4c325800046d7b
 MD5 82635b4255554228fde6bc7d44e4985d metadata.xml 737
 RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 metadata.xml 737
@@ -30,3 +33,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.4 (GNU/Linux)
+
+iD8DBQFGs1B4cxLzpIGCsLQRArQTAJ0WA2LpVkm6ZSppLt2LzacLWpUa5QCfSnGQ
+hmrV5g2erR5H+vpBDAhozXE=
+=O5hQ
+-----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 5ce4ed5961ce..40a308d8b8e6 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,8 @@
 # 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.4 2007/01/20 22:03:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.5 2007/08/03 15:57:40 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc test source"
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -11,7 +13,7 @@ SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0.7"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="doc test source"
+IUSE=""
 
 COMMON_DEP="
 	>=dev-java/commons-logging-1.0.2
@@ -21,13 +23,10 @@ RDEPEND=">=virtual/jre-1.3
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.3
 	${COMMON_DEP}
-	!test? ( dev-java/ant-core )
 	test? (
-		dev-java/ant
-		dev-java/junit
+		dev-java/ant-junit
 		>=dev-java/xerces-2.7
-	)
-	source? ( app-arch/zip )"
+	)"
 
 S="${WORKDIR}/${P}-src/"
 
@@ -42,8 +41,6 @@ src_unpack() {
 	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 --build-only xerces-2
-	use test && java-pkg_jar-from --build-only junit
 }
 
 EANT_BUILD_TARGET="init jar"
@@ -60,5 +57,6 @@ src_install() {
 }
 
 src_test() {
-	eant test -DJunit.present=true
+	java-pkg_jar-from --into target/lib xerces-2,junit
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
 }