fixed #76924 by removing the junit tests. fixing them is not worth the trouble.

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 0b7b92c7bbbabfd89542d5a1f2d5642db99b3366..d519756460d01225c7a65a4ac5af5f49305d050b 100644 (file)
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxen
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.6 2004/12/24 09:58:37 axxo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.7 2005/01/09 08:07:40 luckyduck Exp $
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jaxen-1.1_beta2.ebuild:
+  removed junit tests to fix #76924. the code for unit testing is a mess, tried
+  to fixing it but it is not worth the trouble.
 
   24 Dec 2004; Thomas Matthijs <axxo@gentoo.org> jaxen-1.1_beta2.ebuild:
   fix doc target

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 63918290e9cae20a101a9eaf085cbee6a3d17a0d..0129ed0af70c6c132f07f8cc347134801c80e7cd 100644 (file)
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 364b983f2baf8b7dd39f4bc42bccffa5 jaxen-1.0.ebuild 1292
-MD5 59f104e93a0d5f396f0ba310399f0d97 jaxen-1.1_beta2.ebuild 1576
-MD5 7d23c41280192a0db1642fbcbfc5e2a8 ChangeLog 1009
+MD5 74f5d0e0053c9ebff6a91b0fcffe4f2b jaxen-1.0.ebuild 1293
+MD5 fe034fc548a3a417acc5334dafb33279 jaxen-1.1_beta2.ebuild 1261
+MD5 c960dcd7251425cec48881e678c0b5b3 ChangeLog 1219
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254
 MD5 16edfe03c1dcf95c79b4b815c1b273da files/digest-jaxen-1.0 66
 MD5 316a481f610ecae9085418b487d1fe1b files/build.xml.patch 1018
 MD5 18b53511f075c771c0b69c5bc0b65dba files/MANIFEST.MF 307
-MD5 eafc9c5ca5edce2368074a57fb83ad61 files/digest-jaxen-1.1_beta2 144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBy+hf/rLF9B432nYRArkcAJ94j3HNYmPDgtGMC5k8KKHjy5D9VACfTd0c
-+14xGA9G6er/FN2YkeGatsQ=
-=xByU
------END PGP SIGNATURE-----
+MD5 7155bee4486dae1d29f03ce768a5a36e files/digest-jaxen-1.1_beta2 72

diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta2 b/dev-java/jaxen/files/digest-jaxen-1.1_beta2
index 415f8919156395318b8b2de847fc7f5db1ef35d3..e8375161cfaab6fb96b666977c4f6e629e3ccad0 100644 (file)
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta2
+++ b/dev-java/jaxen/files/digest-jaxen-1.1_beta2
@@ -1,2 +1 @@
 MD5 4895bd92b7ca56f9dfe0ed8e0bea9869 jaxen-1.1-beta-2-src.tar.gz 697184
-MD5 af89b6be590a930b50001770d8071004 jaxen-tests-1.1_beta2.tar.gz 62810

diff --git a/dev-java/jaxen/jaxen-1.0.ebuild b/dev-java/jaxen/jaxen-1.0.ebuild
index 2ec923822b1c40b25ff4a06756b97125492c374c..ecf43e06afa8f72b083d5875e373702a84803a7e 100644 (file)
--- a/dev-java/jaxen/jaxen-1.0.ebuild
+++ b/dev-java/jaxen/jaxen-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.3 2004/10/17 07:28:55 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.4 2005/01/09 08:07:40 luckyduck Exp $
 
 inherit java-pkg eutils
 

diff --git a/dev-java/jaxen/jaxen-1.1_beta2.ebuild b/dev-java/jaxen/jaxen-1.1_beta2.ebuild
index 3bba58c05e4e70f838a1fbb3dbde6fe5180bbd39..13e6598ce36026968afcfb7d5394ec9db94d28b9 100644 (file)
--- a/dev-java/jaxen/jaxen-1.1_beta2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta2.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2.ebuild,v 1.3 2004/12/24 09:58:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2.ebuild,v 1.4 2005/01/09 08:07:40 luckyduck Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="A Java XPath Engine"
 HOMEPAGE="http://jaxen.org/"
-SRC_URI="http://www.ibiblio.org/maven/jaxen/distributions/${PN}-1.1-beta-2-src.tar.gz
-       junit? ( http://dev.gentoo.org/~karltk/projects/java/distfiles/jaxen-tests-1.1_beta2.tar.gz )"
+SRC_URI="http://www.ibiblio.org/maven/jaxen/distributions/${PN}-1.1-beta-2-src.tar.gz"
 LICENSE="jaxen"
 SLOT="1.1"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="doc jikes junit"
+IUSE="doc jikes"
 
 DEPEND=">=virtual/jdk-1.3
        jikes? ( dev-java/jikes )
@@ -28,9 +27,10 @@ S=${WORKDIR}/${PN}-1.1-beta-2
 
 src_unpack() {
        unpack ${A}
-       mv xml ${S}/
+
        cd ${S}
-       epatch ${FILESDIR}/jaxen-1.1_beta2-gentoo.diff
+       epatch ${FILESDIR}/${P}-gentoo.diff
+
        mkdir -p target/lib
        cd target/lib
        rm -f *.jar
@@ -39,15 +39,7 @@ src_unpack() {
        java-pkg_jar-from dom4j-1
 
        cd ${S}
-       # circular deps :(
-       if has_version dev-java/ant-tasks ; then
-               if ! use junit ; then
-                       einfo "disabling junit"
-                       sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-               fi
-       else
-               sed -i 's/depends="compile,test"/depends="compile"/' build.xml
-       fi
+       sed -i 's/depends="compile,test"/depends="compile"/' build.xml
 }
 
 src_compile() {
@@ -58,7 +50,6 @@ src_compile() {
 }
 
 src_install() {
-
        java-pkg_dojar target/jaxen*.jar
 
        use doc && java-pkg_dohtml -r dist/docs/*