finally fixed the junit dependency nightmare. fixes #77097.

diff --git a/dev-java/xml-xmlbeans/ChangeLog b/dev-java/xml-xmlbeans/ChangeLog
index 0827c5cfc5bce2b5825d53eec8b027e73c1fa578..808c765180ce07f5979ef586f06d45c35c2ff4c1 100644 (file)
--- a/dev-java/xml-xmlbeans/ChangeLog
+++ b/dev-java/xml-xmlbeans/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xml-xmlbeans
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.5 2005/01/08 02:48:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.6 2005/01/10 20:02:58 luckyduck Exp $
+
+  10 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  xml-xmlbeans-20041217.ebuild:
+  finally fixed the junit dependency nightmare. fixes #77097.
 
   08 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
   xml-xmlbeans-20041217.ebuild:

diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index 9e3d8b0387bad43a16361416a822b4644c529182..8e74829b5079e100e63180550a7d06e581539011 100644 (file)
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -1,5 +1,5 @@
-MD5 f942acb827665a6822ae02ba7a960dbd xml-xmlbeans-20041217.ebuild 1573
-MD5 efa94d45b2eb9d18109f38787cadc135 ChangeLog 884
+MD5 6818b74f187f19e709014ed356352249 xml-xmlbeans-20041217.ebuild 1669
+MD5 5f5b914d8e379982da06cec64a0bd42f ChangeLog 1031
 MD5 2f7eb11c0417ec3403532aa25b5a6c6e metadata.xml 1122
 MD5 d17fbe1ca053cfb927b65bec2afd966f files/digest-xml-xmlbeans-20041217 75
 MD5 27c134bfb7f6284ad713592a1bba9919 files/xml-xmlbeans-gentoo.patch 7484

diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild
index 4c9d93b5bb4778a6a1fa83f434846077dbfaba28..6fd7a9f664a58b169e4198c3e97532da4e9bb8dd 100644 (file)
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild,v 1.4 2005/01/08 02:48:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-20041217.ebuild,v 1.5 2005/01/10 20:02:58 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -34,8 +34,10 @@ src_unpack() {
        rm -f jaxen-1.1-beta-2.jar junit.jar
 
        java-pkg_jar-from jaxen-1.1 jaxen-1.1-beta-2-dev.jar jaxen-1.1-beta-2.jar
-       if use junit; then
-               java-pkg_jar-from junit
+       if has_version dev-java/ant-tasks; then
+               if use junit; then
+                       java-pkg_jar-from junit
+               fi
        fi
 }
 
@@ -44,8 +46,10 @@ src_compile() {
        if use doc; then
                antflags="${antflags} docs"
        fi
-       if use junit; then
-               antflags="${antflags} random.jar drt.jar drt"
+       if has_version dev-java/ant-tasks; then
+               if use junit; then
+                       antflags="${antflags} random.jar drt.jar drt"
+               fi
        fi
        if use source; then
                antflags="${antflags} sources"