Restrict junit dependency, version dump.

(Portage version: 2.1.4_rc14)

4 files changed, 9 insertions, 44 deletions

diff --git a/dev-java/wsdl4j/ChangeLog b/dev-java/wsdl4j/ChangeLog
index 32dfcfdfc8b0..cf20738ac39d 100644
--- a/dev-java/wsdl4j/ChangeLog
+++ b/dev-java/wsdl4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/wsdl4j
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.19 2007/11/24 08:42:46 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.20 2008/01/10 23:17:18 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org> -wsdl4j-1.5.1-r1.ebuild,
+  wsdl4j-1.6.2.ebuild:
+  Restrict junit dependency, version dump.
 
   24 Nov 2007; Samuli Suominen <drac@gentoo.org> wsdl4j-1.6.2.ebuild:
   amd64 stable wrt #199261
diff --git a/dev-java/wsdl4j/files/digest-wsdl4j-1.5.1-r1 b/dev-java/wsdl4j/files/digest-wsdl4j-1.5.1-r1
deleted file mode 100644
index 362c0346e428..000000000000
--- a/dev-java/wsdl4j/files/digest-wsdl4j-1.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f3e40e653d549a2972f044fce36eb225 wsdl4j-1.5.1-gentoo.tar.bz2 355619
-RMD160 eefd9f280e870016176db50e6c0aa2710eab594d wsdl4j-1.5.1-gentoo.tar.bz2 355619
-SHA256 c8d14c919234a06375beddb8d456863105077b16832d9e71129bcd3d1c619a48 wsdl4j-1.5.1-gentoo.tar.bz2 355619
diff --git a/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild b/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild
deleted file mode 100644
index 75d88e49f775..000000000000
--- a/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.5.1-r1.ebuild,v 1.5 2007/06/22 12:05:28 angelos Exp $
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
-HOMEPAGE="http://wsdl4j.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_dojar build/lib/*.jar
-
-	dohtml doc/*.html || die
-	dodoc doc/spec/* || die
-
-	use doc && java-pkg_dojavadoc build/javadocs/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
index c80b5d22dad8..9974fd2c350e 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild,v 1.4 2007/11/24 08:42:46 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild,v 1.5 2008/01/10 23:17:18 caster Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit )
+	test? ( =dev-java/junit-3.8* )
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"