Fix handling of tests and junit observed with JAVA_PKG_STRICT enabled.

(Portage version: 2.1.2_rc4-r6)

3 files changed, 25 insertions, 16 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/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
 }