Fix handling of tests and junit observed with JAVA_PKG_STRICT enabled.

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 37 insertions, 28 deletions

diff --git a/dev-java/jvyaml/ChangeLog b/dev-java/jvyaml/ChangeLog
index a556e8750da3..f38cf4b97ce6 100644
--- a/dev-java/jvyaml/ChangeLog
+++ b/dev-java/jvyaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jvyaml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.2 2007/01/05 02:45:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.3 2007/01/05 20:41:06 caster Exp $
+
+  05 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  files/jvyaml-0.2-tests.patch, jvyaml-0.2.ebuild:
+  Fix handling of tests and junit observed with JAVA_PKG_STRICT enabled.
 
 *jvyaml-0.2 (05 Jan 2007)
 
diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
index 1025b60a27bf..ec37cfd56cee 100644
--- a/dev-java/jvyaml/Manifest
+++ b/dev-java/jvyaml/Manifest
@@ -1,21 +1,21 @@
-AUX jvyaml-0.2-tests.patch 725 RMD160 bb4c5009d06fb589fdaa5fb04c1fe81d88059366 SHA1 3e53b8797cc567eb809446975a96376df332461c SHA256 2f38f8fd543a2562eeb01382b9b691c877a217d721924dc5f8b2a345f42584ea
-MD5 419ce136c6d7bbf522961ab37d8bd635 files/jvyaml-0.2-tests.patch 725
-RMD160 bb4c5009d06fb589fdaa5fb04c1fe81d88059366 files/jvyaml-0.2-tests.patch 725
-SHA256 2f38f8fd543a2562eeb01382b9b691c877a217d721924dc5f8b2a345f42584ea files/jvyaml-0.2-tests.patch 725
+AUX jvyaml-0.2-tests.patch 747 RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 SHA1 8cc4120b4a4dd7b299de9bdb1bb5f642d261285a SHA256 62be871c80556271cfee3fa2e28cd39c0d0143a8fc99b97360c6af320ac91095
+MD5 db647417d6ed80598130573ac245a32c files/jvyaml-0.2-tests.patch 747
+RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 files/jvyaml-0.2-tests.patch 747
+SHA256 62be871c80556271cfee3fa2e28cd39c0d0143a8fc99b97360c6af320ac91095 files/jvyaml-0.2-tests.patch 747
 DIST jvyaml-src-0.1.tar.gz 135569 RMD160 dbb4b1f7415d6be7a83e7c6c0fc7ab211f30d646 SHA1 da98bf0ebd0ce88ffa4a9d741cfe8b3318b2d61f SHA256 d7f107f43d356286cd532e31b11e4496f19a8e458a0cb8fa703b03ca6c9973db
 DIST jvyaml-src-0.2.tar.gz 202186 RMD160 e286d316be0b2e9fe12f88cd48a6bd93ec0049e6 SHA1 e37b5c8c35ce96f3093ac127a4e3e631a956a194 SHA256 90955c01d7c2ebe041513a3dd2ac01c0e1dbe33ba26cb182bb34513d0c587654
 EBUILD jvyaml-0.1.ebuild 732 RMD160 8f24c0042896efae919fec0a00d31781ba655425 SHA1 ad8c0aefeedeebf9100025aa8de74d386b1b1286 SHA256 3e39499c6fa05c1c2e6ecf8a308c01a59f91d016e9d0b1d65d64e47c3d2e0638
 MD5 0caf235e00039e6aa58358d64d3e0a5c jvyaml-0.1.ebuild 732
 RMD160 8f24c0042896efae919fec0a00d31781ba655425 jvyaml-0.1.ebuild 732
 SHA256 3e39499c6fa05c1c2e6ecf8a308c01a59f91d016e9d0b1d65d64e47c3d2e0638 jvyaml-0.1.ebuild 732
-EBUILD jvyaml-0.2.ebuild 998 RMD160 eb2500776f8abc2dbec3fe35c255e3e6440eb24a SHA1 6ed6a72c0e53d05914afe2a692c373b66fc89f8b SHA256 e18a4285f494be120b2d5c2bfd4170b1ea89fcbc4621be33e247ce9d281d46e8
-MD5 ff57b7ed3dec993f63aa1797e7758b46 jvyaml-0.2.ebuild 998
-RMD160 eb2500776f8abc2dbec3fe35c255e3e6440eb24a jvyaml-0.2.ebuild 998
-SHA256 e18a4285f494be120b2d5c2bfd4170b1ea89fcbc4621be33e247ce9d281d46e8 jvyaml-0.2.ebuild 998
-MISC ChangeLog 604 RMD160 5f00e52a8417d5fdecd93edd2421d4a8c1c77f4f SHA1 701059aeb5e68cb06c32f084dbac3755e76554b9 SHA256 a6100f71271f29cf6a4422378b592dee42b15c8091da61e31ab2e407f2b36995
-MD5 f0861a4a87502b0ea9db991116c4fe6f ChangeLog 604
-RMD160 5f00e52a8417d5fdecd93edd2421d4a8c1c77f4f ChangeLog 604
-SHA256 a6100f71271f29cf6a4422378b592dee42b15c8091da61e31ab2e407f2b36995 ChangeLog 604
+EBUILD jvyaml-0.2.ebuild 1029 RMD160 456ac1c29cfd81e15aabd69b0024fbc5862abe26 SHA1 a58b8f69629457c599cb663178db6670508fdbf4 SHA256 ce4e756c5f57702bb9a6304c49179da3c27ae4d6302fd4e052560a54f4328fb9
+MD5 bbff4c1da5adccd6c11613a5e6fba9b6 jvyaml-0.2.ebuild 1029
+RMD160 456ac1c29cfd81e15aabd69b0024fbc5862abe26 jvyaml-0.2.ebuild 1029
+SHA256 ce4e756c5f57702bb9a6304c49179da3c27ae4d6302fd4e052560a54f4328fb9 jvyaml-0.2.ebuild 1029
+MISC ChangeLog 780 RMD160 eea99e6d35ac836210b085fd1890ce4a5f3804c9 SHA1 86a92359fea4d480d25c7ba50032700e4d6111ab SHA256 db437d32b3c4993146dcfc62e510f1f1b122a95f1a65fe8ecc3e4121172c4345
+MD5 64cc33e19a5e12245b03cc82df86a871 ChangeLog 780
+RMD160 eea99e6d35ac836210b085fd1890ce4a5f3804c9 ChangeLog 780
+SHA256 db437d32b3c4993146dcfc62e510f1f1b122a95f1a65fe8ecc3e4121172c4345 ChangeLog 780
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
diff --git a/dev-java/jvyaml/files/jvyaml-0.2-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
index 8e7862aad86c..0f6997ebbc40 100644
--- a/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
+++ b/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
@@ -1,17 +1,20 @@
-Only in jvyaml-0.2-patched/: .build.xml.swp
-Only in jvyaml-0.2-patched/: build
-diff -ru jvyaml-0.2/build.xml jvyaml-0.2-patched/build.xml
---- jvyaml-0.2/build.xml	2006-09-24 08:46:31.000000000 -0400
-+++ jvyaml-0.2-patched/build.xml	2007-01-04 21:03:44.000000000 -0500
-@@ -46,8 +46,8 @@
-     </javac>
+--- build.xml	2007-01-05 21:30:59.000000000 +0100
++++ build.xml	2007-01-05 21:31:46.000000000 +0100
+@@ -47,7 +47,7 @@
    </target>
  
--  <target name="test" depends="compile-tests" description="Runs all tests">
+   <target name="test" depends="compile-tests" description="Runs all tests">
 -    <junit haltonfailure="false">
-+  <target name="test" depends="compile-tests" unless="test.skip" description="Runs all tests">
 +    <junit haltonfailure="true">
        <classpath>
        	<pathelement location="${build.dir}/classes/jvyaml"/>
        	<pathelement location="${build.dir}/test"/>
-Only in jvyaml-0.2/lib: jvyaml.jar
+@@ -61,7 +61,7 @@
+     </junit>
+   </target>
+ 
+-  <target name="jar" depends="test" description="Create the jvyaml.jar file">
++  <target name="jar" depends="compile" description="Create the jvyaml.jar file">
+     <jar destfile="${lib.dir}/jvyaml.jar">
+       <fileset dir="${jvyaml.classes.dir}">
+         <include name="**/*.class"/>
diff --git a/dev-java/jvyaml/jvyaml-0.2.ebuild b/dev-java/jvyaml/jvyaml-0.2.ebuild
index 80346dbe1535..6d7dc2ba6d39 100644
--- a/dev-java/jvyaml/jvyaml-0.2.ebuild
+++ b/dev-java/jvyaml/jvyaml-0.2.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/jvyaml/jvyaml-0.2.ebuild,v 1.1 2007/01/05 02:45:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/jvyaml-0.2.ebuild,v 1.2 2007/01/05 20:41:06 caster Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -22,12 +22,14 @@ DEPEND=">=virtual/jdk-1.4
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4"
 
-EANT_BUILD_TARGET="jar -Dtest.skip=true"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-tests.patch
+
+	cd lib
+	rm -v *.jar
+	use test && java-pkg_jar-from junit
 }
 
 src_install() {
@@ -37,8 +39,8 @@ src_install() {
 	use source && java-pkg_dosrc src/*
 }
 
-# Tests are known to fail. See
-#	https://jvyaml.dev.java.net/issues/show_bug.cgi?id=5
 src_test() {
+	ewarn "Tests are known to fail. See"
+	ewarn "https://jvyaml.dev.java.net/issues/show_bug.cgi?id=5"
 	eant test
 }