Migrate to splitted ant.

Package-Manager: portage-2.1.2.3

3 files changed, 24 insertions, 18 deletions

diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index f1e5b712737a..2130502c84c0 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/saxpath
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.19 2007/04/07 12:23:10 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.20 2007/04/07 13:02:52 betelgeuse Exp $
+
+  07 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> saxpath-1.0-r2.ebuild:
+  Migrate to splitted ant.
 
   07 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> saxpath-1.0-r2.ebuild:
   Add api to apidocs symlink.
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 9e023d44e6c6..a5853e837bfd 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -6,18 +6,18 @@ MD5 cb58720b66697c1ef1f47de80c839e00 files/MANIFEST.MF 276
 RMD160 52c5c2f61f0c0e7f7f5278562ecc814419edc5f1 files/MANIFEST.MF 276
 SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1 files/MANIFEST.MF 276
 DIST saxpath-1.0.tar.gz 2166023 RMD160 59520216dc54bad5b01e351fd6ae89750b84a876 SHA1 7104f1252fc4296200d5282c8b2863b94ee70cff SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1
-EBUILD saxpath-1.0-r2.ebuild 1315 RMD160 449f382bd008ea85261d21820328a33cdbd5197e SHA1 644815458c2f594bbf2250cae96ed125b49b2c9e SHA256 ecfc30a9e7a5e563efadecffec9aeccb6a5d2551c71945c92c159419041b7a62
-MD5 c0881f0c34b064b9d32695f9ce571720 saxpath-1.0-r2.ebuild 1315
-RMD160 449f382bd008ea85261d21820328a33cdbd5197e saxpath-1.0-r2.ebuild 1315
-SHA256 ecfc30a9e7a5e563efadecffec9aeccb6a5d2551c71945c92c159419041b7a62 saxpath-1.0-r2.ebuild 1315
+EBUILD saxpath-1.0-r2.ebuild 1432 RMD160 927b902a0f580ebbb4e0804307a763c7fd0f8d96 SHA1 9865ad582a9453a85dc27fa265144f6b0a3bd01c SHA256 48f842a49b6609ae86b8b46a9c47477b0eeaf4250adf15ca24aefaf0b218512d
+MD5 03e70ec6b1d514584680352753c2a091 saxpath-1.0-r2.ebuild 1432
+RMD160 927b902a0f580ebbb4e0804307a763c7fd0f8d96 saxpath-1.0-r2.ebuild 1432
+SHA256 48f842a49b6609ae86b8b46a9c47477b0eeaf4250adf15ca24aefaf0b218512d saxpath-1.0-r2.ebuild 1432
 EBUILD saxpath-1.0.ebuild 1187 RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d SHA1 59b85d1d0e615c9f110740db1f90720192e7202e SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959
 MD5 3f2174873aa94dee48e34e8fa748beef saxpath-1.0.ebuild 1187
 RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d saxpath-1.0.ebuild 1187
 SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959 saxpath-1.0.ebuild 1187
-MISC ChangeLog 2552 RMD160 9e00623ec371b9a41bc43deb357551f2f89f40dd SHA1 ae5cdffbe3942455f9e95b32d795ad480f42d04d SHA256 21faf26a9e5d30b894c42ddcfa949e5d9501a857ad13e8be1e9b6373b29fd007
-MD5 6fcc631ff304c7da499cb6a00a1ba084 ChangeLog 2552
-RMD160 9e00623ec371b9a41bc43deb357551f2f89f40dd ChangeLog 2552
-SHA256 21faf26a9e5d30b894c42ddcfa949e5d9501a857ad13e8be1e9b6373b29fd007 ChangeLog 2552
+MISC ChangeLog 2656 RMD160 83fb8af7939af09fb8763994b5d83775b5b8e734 SHA1 75d282b439a8340a73e555e9324e089f7c9072e1 SHA256 c93520471b400027131194ae7e35fa1b9447b3fe40474b25b28930e512012d86
+MD5 e08c54ef39b6d29e09238c729ba088fa ChangeLog 2656
+RMD160 83fb8af7939af09fb8763994b5d83775b5b8e734 ChangeLog 2656
+SHA256 c93520471b400027131194ae7e35fa1b9447b3fe40474b25b28930e512012d86 ChangeLog 2656
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -31,7 +31,7 @@ SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGF40zcxLzpIGCsLQRAiFaAJ4q9SImqjs+EctQ0xXifmhQSa8JNQCfXaFL
-RoW57jOIhO/N8SL9JbSu6Qc=
-=1K02
+iD8DBQFGF5aCcxLzpIGCsLQRApLKAJ9YndtlL1RMZhfd14nGomSfxX2csgCdHhPA
++Y//f5BRR/wgQMFPW5ffdgg=
+=Gu/q
 -----END PGP SIGNATURE-----
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
index 1bc53666c1e5..580ceb3317d7 100644
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r2.ebuild,v 1.5 2007/04/07 12:23:10 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r2.ebuild,v 1.6 2007/04/07 13:02:52 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source test"
+
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A Simple API for XPath."
@@ -16,10 +17,10 @@ RDEPEND=">=virtual/jre-1.4"
 # doc needs ant-trax
 # test needs ant-junit
 DEPEND=">=virtual/jdk-1.4
-	doc? ( dev-java/ant-tasks )
+	doc? ( || ( dev-java/ant-trax dev-java/ant-tasks ) )
 	test? (
 		dev-java/junit
-		dev-java/ant-tasks
+		|| ( dev-java/ant-junit dev-java/ant-tasks )
 	)"
 
 S=${WORKDIR}/${P}-FCS
@@ -28,19 +29,21 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	rm -f *.jar lib/*.jar
+	rm -v *.jar lib/*.jar || die
 
 	mkdir src/conf
-	cp ${FILESDIR}/MANIFEST.MF src/conf
+	cp "${FILESDIR}/MANIFEST.MF" src/conf
 
 	use test && java-ant_rewrite-classpath
+
+	use doc && ANT_TASKS="ant-trax"
 }
 
 EANT_BUILD_TARGET="package"
 EANT_DOC_TARGET="doc javadoc"
 
 src_test() {
-	eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \
+	ANT_TASKS="ant-junit" eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \
 		test
 }