Migrate to splitted ant and make the src_test actually run the tests instead of just...

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/xpp3/ChangeLog b/dev-java/xpp3/ChangeLog
index 9a0d6e4d6caffb5b902cc8a71572836928527e48..263cca9a83e879b7db77604b2316ca7a1ec9843c 100644 (file)
--- a/dev-java/xpp3/ChangeLog
+++ b/dev-java/xpp3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xpp3
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.8 2007/02/09 20:00:34 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.9 2007/04/13 09:01:32 betelgeuse Exp $
+
+  13 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> xpp3-1.1.4c.ebuild:
+  Migrate to splitted ant and make the src_test actually run the tests instead
+  of just building them.
 
 *xpp3-1.1.4c (09 Feb 2007)
 

diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index e3db3613a1d203172414725faf8ba693e5cc3253..4f96443afc37ae1cfb8e756696f664f826986695 100644 (file)
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xpp3-1.1.4c-build.xml.patch 950 RMD160 db82a90defcc48b3f8c9a9186c4f3432d00bc181 SHA1 fd4fbac182c256423dd1162daf72bb50318c6c8e SHA256 dd850813b2eaca04669ea7967fd95ec110f71e677bbedfd2ef01176af344a6c5
 MD5 6aa4cb626a0e6af36894aa39d225be0d files/xpp3-1.1.4c-build.xml.patch 950
 RMD160 db82a90defcc48b3f8c9a9186c4f3432d00bc181 files/xpp3-1.1.4c-build.xml.patch 950
@@ -8,14 +11,14 @@ EBUILD xpp3-1.1.3.4m.ebuild 1134 RMD160 f14b82db4138cc5538d2164f5d0fd357c233f35b
 MD5 a7ff61dbedecacba4673b71092226b2e xpp3-1.1.3.4m.ebuild 1134
 RMD160 f14b82db4138cc5538d2164f5d0fd357c233f35b xpp3-1.1.3.4m.ebuild 1134
 SHA256 14d6c5d9ba1cd8d5ea2477fce8829a6cf944aa9e63a2ec93d626a3db72b34b88 xpp3-1.1.3.4m.ebuild 1134
-EBUILD xpp3-1.1.4c.ebuild 1163 RMD160 2607118d7810ac06eac456005ef2ff8629a53220 SHA1 96fb2ae79c10a76c641bad1746d516be900d804e SHA256 68da88926b3d1593b3dc04a0a08c65f4a99cb70853a5cd8601cd9800b2fff5cc
-MD5 a20acf87e81e267aa454dcdd20a324c8 xpp3-1.1.4c.ebuild 1163
-RMD160 2607118d7810ac06eac456005ef2ff8629a53220 xpp3-1.1.4c.ebuild 1163
-SHA256 68da88926b3d1593b3dc04a0a08c65f4a99cb70853a5cd8601cd9800b2fff5cc xpp3-1.1.4c.ebuild 1163
-MISC ChangeLog 1333 RMD160 0920a199f7c51374d4ed9562a1b65d1e270e58e7 SHA1 48235963e5de929e9a7d4308a89b7a12768f992a SHA256 5c511154df67e4723a46e69c2b679cf39058ba540f83d098730accd25f500ac7
-MD5 dfb3d4855bfd5f9044a7f9b0afc97292 ChangeLog 1333
-RMD160 0920a199f7c51374d4ed9562a1b65d1e270e58e7 ChangeLog 1333
-SHA256 5c511154df67e4723a46e69c2b679cf39058ba540f83d098730accd25f500ac7 ChangeLog 1333
+EBUILD xpp3-1.1.4c.ebuild 1149 RMD160 582ba9d9b1fd6f84580990ab9fb97b178959dc93 SHA1 bce4bce9ef3715439ded0c8d315e53ba8c005ab9 SHA256 e355cc924a8ef7d34e0c425f64bf2d5c7b60603b98433e6da8e0f93f3e801eab
+MD5 82c19ce7fd040e3f1eefbc0cd575d6c0 xpp3-1.1.4c.ebuild 1149
+RMD160 582ba9d9b1fd6f84580990ab9fb97b178959dc93 xpp3-1.1.4c.ebuild 1149
+SHA256 e355cc924a8ef7d34e0c425f64bf2d5c7b60603b98433e6da8e0f93f3e801eab xpp3-1.1.4c.ebuild 1149
+MISC ChangeLog 1513 RMD160 54b4d8c1a3b335d07d08a90ff5d63969009095d1 SHA1 f18b446ec8a897a1be2d4155a2dbf53be46353cc SHA256 2459b43603002160670e1e1cbc28546a2844d6c5c7e416c9b2dfe94a41cad308
+MD5 c9fdbb6da2ccc56572b05397c318b72b ChangeLog 1513
+RMD160 54b4d8c1a3b335d07d08a90ff5d63969009095d1 ChangeLog 1513
+SHA256 2459b43603002160670e1e1cbc28546a2844d6c5c7e416c9b2dfe94a41cad308 ChangeLog 1513
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -26,3 +29,10 @@ SHA256 9952b638371f093220c2bef5051a7f8ad99a65377d5e2b8270d6a199c6c48540 files/di
 MD5 60c5ab2f8931963d72abc2e96b2f6ddc files/digest-xpp3-1.1.4c 238
 RMD160 24ab7e6aeeeab6108b4ffc9cdc6cf9950fc33579 files/digest-xpp3-1.1.4c 238
 SHA256 f9dba3b4d1803164dbedb25885af9aae08d51a11382a386b9ffc5d322a5fd690 files/digest-xpp3-1.1.4c 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGH0bxcxLzpIGCsLQRAsv/AJ9gClPFFbmBb7wqhVCqoPdBBf3A4QCfdFlF
+ngM4M9mjWKGsl/QYvctOGzo=
+=u6nn
+-----END PGP SIGNATURE-----

diff --git a/dev-java/xpp3/xpp3-1.1.4c.ebuild b/dev-java/xpp3/xpp3-1.1.4c.ebuild
index cc8228184560426cab00be6793fd82f9ebd656ab..4aaef80bbd76824871e0359df0a5470dd222aeda 100644 (file)
--- a/dev-java/xpp3/xpp3-1.1.4c.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.1 2007/02/09 20:00:34 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.2 2007/04/13 09:01:32 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -21,26 +21,23 @@ IUSE="test"
 DEPEND=">=virtual/jdk-1.4
        app-arch/unzip
        test? (
-               dev-java/ant
                =dev-java/junit-3.8*
-       )
-       !test? ( dev-java/ant-core )"
+               || ( dev-java/ant-junit dev-java/ant-tasks )
+       )"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${MY_P}
 
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="javadoc"
-
 src_unpack() {
        unpack "${A}"
        cd "${S}"
-       rm -f *.jar
+       rm -v *.jar || die
        epatch "${FILESDIR}/${P}-build.xml.patch"
 }
 
 src_test() {
-       eant -Dgentoo.classpath=$(java-pkg_getjars junit) tests_main
+       ANT_TASKS="ant-junit" \
+               eant -Dgentoo.classpath=$(java-pkg_getjars junit) junit_main
 }
 
 src_install() {