Migrate to split-ant, fix compiling with java-strict.

Package-Manager: portage-2.1.2.7

4 files changed, 46 insertions, 33 deletions

diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 9cec73681f7f..d6b77a1b7a52 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -4,14 +4,18 @@ EBUILD avalon-logkit-1.2-r2.ebuild 1314 RMD160 4010783e2ab6a7195071001d0ec499026
 MD5 bfc6475fbc7b43ea83abcbba7d12d524 avalon-logkit-1.2-r2.ebuild 1314
 RMD160 4010783e2ab6a7195071001d0ec49902653d7a6f avalon-logkit-1.2-r2.ebuild 1314
 SHA256 2916232c326f2c6c67b5b438254494a4ee0df693cebcd609ad16c71264602901 avalon-logkit-1.2-r2.ebuild 1314
+EBUILD avalon-logkit-2.1-r1.ebuild 1417 RMD160 2358e23edc6bfacd7cd7ffb6a1276a5a9a0eb3e1 SHA1 241297c25d9c875a34f6b92b98ffffb805952baa SHA256 c4002448468622d58a0f84a14aa2e13073ba150cced3fdda8ca1707dd2e40bd9
+MD5 4c92e7e1dfb49e478a911f9bd37ef149 avalon-logkit-2.1-r1.ebuild 1417
+RMD160 2358e23edc6bfacd7cd7ffb6a1276a5a9a0eb3e1 avalon-logkit-2.1-r1.ebuild 1417
+SHA256 c4002448468622d58a0f84a14aa2e13073ba150cced3fdda8ca1707dd2e40bd9 avalon-logkit-2.1-r1.ebuild 1417
 EBUILD avalon-logkit-2.1.ebuild 1471 RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 SHA1 0a5c74bfbec7ba04f311dc0d281f0a0bec047420 SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d
 MD5 b95905fc0f67a2cba256c696a9af67d8 avalon-logkit-2.1.ebuild 1471
 RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 avalon-logkit-2.1.ebuild 1471
 SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d avalon-logkit-2.1.ebuild 1471
-MISC ChangeLog 5911 RMD160 9a81ba54b0662fba9158534dda4d2adb76978c84 SHA1 524f85bc71a06b3df2d207b27167722ae2bb8011 SHA256 a20d93d3f42e8d2e9e9ba33395724f46487ad2556cf5b5fa92a0cc1fa4f565e2
-MD5 6cce0999e42978c420d39d051be72083 ChangeLog 5911
-RMD160 9a81ba54b0662fba9158534dda4d2adb76978c84 ChangeLog 5911
-SHA256 a20d93d3f42e8d2e9e9ba33395724f46487ad2556cf5b5fa92a0cc1fa4f565e2 ChangeLog 5911
+MISC ChangeLog 6080 RMD160 54aaed86820d110981859671ca3aa2c6454c0ee2 SHA1 355b9c90fc9184a91cfd9ff901606df7d3131bf7 SHA256 3972f25fc4edebf0e817fb7cd6a277ca34dd62fafad7a2f3bd910540048b14ae
+MD5 31a825f417a592df8af9ba538e788edd ChangeLog 6080
+RMD160 54aaed86820d110981859671ca3aa2c6454c0ee2 ChangeLog 6080
+SHA256 3972f25fc4edebf0e817fb7cd6a277ca34dd62fafad7a2f3bd910540048b14ae ChangeLog 6080
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,3 +26,6 @@ SHA256 37328c380c7e2d18c1a9125d84a4c3b0471276cb6d56f8484f081b5f3c72d7e0 files/di
 MD5 aca53784896d9411474d17b63601c55a files/digest-avalon-logkit-2.1 262
 RMD160 0d222afb4ee150800d8189c0f0f64f2958370b1f files/digest-avalon-logkit-2.1 262
 SHA256 4ffa59089d71ef1974924cb003620be3cb0127c5a6583badae4ae8e3f0263ef7 files/digest-avalon-logkit-2.1 262
+MD5 aca53784896d9411474d17b63601c55a files/digest-avalon-logkit-2.1-r1 262
+RMD160 0d222afb4ee150800d8189c0f0f64f2958370b1f files/digest-avalon-logkit-2.1-r1 262
+SHA256 4ffa59089d71ef1974924cb003620be3cb0127c5a6583badae4ae8e3f0263ef7 files/digest-avalon-logkit-2.1-r1 262
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog
index 39bfb885c57b..9e4d4d125266 100644
--- a/dev-java/xmlunit/ChangeLog
+++ b/dev-java/xmlunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmlunit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.9 2007/04/25 23:04:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.10 2007/05/07 16:56:01 caster Exp $
+
+  07 May 2007; Vlastimil Babka <caster@gentoo.org> xmlunit-1.0-r2.ebuild:
+  Migrate to split-ant, fix compiling with java-strict.
 
   25 Apr 2007; Vlastimil Babka <caster@gentoo.org> -xmlunit-1.0.ebuild:
   Remove unused version.
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index 4733450102dd..ddf77bd6fae5 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -11,14 +11,14 @@ EBUILD xmlunit-1.0-r1.ebuild 1250 RMD160 bed7d053046f411be74339d38f52289f7707f67
 MD5 24a71de70d3801b3df21fe0af5a80856 xmlunit-1.0-r1.ebuild 1250
 RMD160 bed7d053046f411be74339d38f52289f7707f672 xmlunit-1.0-r1.ebuild 1250
 SHA256 db1c831b3c26f4d537f42f2c6e089e7930333a69b68c581d8aff762fb9236ca2 xmlunit-1.0-r1.ebuild 1250
-EBUILD xmlunit-1.0-r2.ebuild 1491 RMD160 503c0fce484ad96c8a9ad545b54e5955ec7a2c4b SHA1 0da7602c9a75ede013ac1457cd61d99d52e6662c SHA256 f6fbf1663283dcc4986dd0fd12fe62eabab45dd04f56b9b5ea56c6225244674e
-MD5 c37ed8ddc9216df31b19572796bb68c2 xmlunit-1.0-r2.ebuild 1491
-RMD160 503c0fce484ad96c8a9ad545b54e5955ec7a2c4b xmlunit-1.0-r2.ebuild 1491
-SHA256 f6fbf1663283dcc4986dd0fd12fe62eabab45dd04f56b9b5ea56c6225244674e xmlunit-1.0-r2.ebuild 1491
-MISC ChangeLog 1437 RMD160 05191d9b3a04ed7c2934f21f85f5b91b30041685 SHA1 115b5acd9ba57cfb3a1fe2dc07f61222f932b31f SHA256 0e2668279f06ea5faa872dc01feafcc8eca2e2386a0a28de39fbeba3f5ac9f66
-MD5 aa7725032f99d0b5a8174bd5056ff577 ChangeLog 1437
-RMD160 05191d9b3a04ed7c2934f21f85f5b91b30041685 ChangeLog 1437
-SHA256 0e2668279f06ea5faa872dc01feafcc8eca2e2386a0a28de39fbeba3f5ac9f66 ChangeLog 1437
+EBUILD xmlunit-1.0-r2.ebuild 1524 RMD160 debb9017a8e2c3321c19e78bb4df5ce67065a4fc SHA1 597e7abdbfbfc0de8d0f82b8873c798aa82fffac SHA256 68cfc4005abb51e9f8b340c3e9e7dc910bc73fe7744be5868f0802a19df59324
+MD5 4504dcdfc538de0de2ae1ddbe3a8a9f2 xmlunit-1.0-r2.ebuild 1524
+RMD160 debb9017a8e2c3321c19e78bb4df5ce67065a4fc xmlunit-1.0-r2.ebuild 1524
+SHA256 68cfc4005abb51e9f8b340c3e9e7dc910bc73fe7744be5868f0802a19df59324 xmlunit-1.0-r2.ebuild 1524
+MISC ChangeLog 1569 RMD160 96ad9e71e3f8cc459c5b87cbc1db287bbc050cbf SHA1 7049127e327e13b772c778927839e09648e4ba94 SHA256 4b6b7a9a9eab659934c171d6f83946d126cc73f7943a85939934229dac49aaa4
+MD5 07132dcdcf6a7ef01bc1b45a3c9d1cd1 ChangeLog 1569
+RMD160 96ad9e71e3f8cc459c5b87cbc1db287bbc050cbf ChangeLog 1569
+SHA256 4b6b7a9a9eab659934c171d6f83946d126cc73f7943a85939934229dac49aaa4 ChangeLog 1569
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
index 1830457b84b6..0f301ce780b7 100644
--- a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
@@ -1,9 +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/xmlunit/xmlunit-1.0-r2.ebuild,v 1.1 2007/02/09 23:27:50 fordfrog Exp $
-
-JAVA_PKG_IUSE="doc source"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.2 2007/05/07 16:56:01 caster Exp $
 
+JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML."
@@ -12,42 +11,46 @@ HOMEPAGE="http://xmlunit.sourceforge.net/"
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
+IUSE=""
 # We depend on jdk-1.4 as tests fail with jdk > 1.4
 # see http://sourceforge.net/tracker/index.php?func=detail&aid=1614984&group_id=23187&atid=377768
 # Also docs cannot be built with jdk > 1.5
+CDEPEND="=dev-java/junit-3*"
 DEPEND="=virtual/jdk-1.4*
-	>=app-arch/unzip-5.50-r1
+	app-arch/unzip
 	test? (
-		>=dev-java/ant-1.6
-		=dev-java/junit-3.8*
-		dev-java/xalan
+		dev-java/ant-junit
+		dev-java/ant-trax
 	)
-	!test? ( >=dev-java/ant-core-1.6 )
-	source? ( app-arch/zip )"
-RDEPEND="=virtual/jre-1.4*"
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="docs"
+	${CDEPEND}"
+RDEPEND="=virtual/jre-1.4*
+	${CDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-${PVR}-build.xml.patch
-	rm -f ${S}/lib/*.jar
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-${PVR}-build.xml.patch"
+	rm -v ${S}/lib/*.jar || die
+	
+	java-ant_rewrite-classpath
 }
 
+EANT_DOC_TARGET="docs"
+EANT_GENTOO_CLASSPATH="junit"
+
 src_test() {
-	eant test
+	ANT_TASKS="ant-junit ant-trax" eant test
 }
 
 src_install() {
-	java-pkg_newjar lib/${PN}${PV}.jar ${PN}.jar
+	java-pkg_newjar lib/${PN}${PV}.jar
 
 	dodoc README.txt
 	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/java/*
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {