Remove generation 1 ebuild and relax commons-lang dependency for upcoming version bump to 2.3

Package-Manager: portage-2.1.3.7

4 files changed, 12 insertions, 62 deletions

diff --git a/dev-java/dbunit/ChangeLog b/dev-java/dbunit/ChangeLog
index 5f2c429449c2..b15ade1895f1 100644
--- a/dev-java/dbunit/ChangeLog
+++ b/dev-java/dbunit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/dbunit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.14 2007/03/15 05:27:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.15 2007/08/26 14:14:43 betelgeuse Exp $
+
+  26 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> -dbunit-2.1.ebuild,
+  dbunit-2.2.ebuild:
+  Remove generation 1 ebuild and relax commons-lang dependency for upcoming
+  version bump to 2.3
 
   15 Mar 2007; Joshua Nichols <nichoj@gentoo.org> dbunit-2.2.ebuild:
   Stable on amd64 for bug #166744.
diff --git a/dev-java/dbunit/dbunit-2.1.ebuild b/dev-java/dbunit/dbunit-2.1.ebuild
deleted file mode 100644
index 5242db122fd9..000000000000
--- a/dev-java/dbunit/dbunit-2.1.ebuild
+++ /dev/null
@@ -1,53 +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/dbunit/dbunit-2.1.ebuild,v 1.6 2007/01/12 11:14:57 betelgeuse Exp $
-
-inherit java-pkg
-
-DESCRIPTION="DBUnit is a JUnit extension targeted for database-driven projects."
-HOMEPAGE="http://www.dbunit.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-IUSE="doc jikes source"
-
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/crimson-1*
-	>=dev-db/hsqldb-1.7.2.4
-	=dev-java/mockmaker-1.12.0*
-	>=dev-java/mockobjects-0.09
-	>=dev-java/poi-2.0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-core-1.6
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/build.xml build.xml
-
-	mkdir lib && cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from crimson-1
-	java-pkg_jar-from hsqldb
-	java-pkg_jar-from mockmaker-1.12
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from poi
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} docs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	use doc && java-pkg_dohtml -r docs/*
-}
diff --git a/dev-java/dbunit/dbunit-2.2.ebuild b/dev-java/dbunit/dbunit-2.2.ebuild
index 7181399c13d4..7ffd709ead03 100644
--- a/dev-java/dbunit/dbunit-2.2.ebuild
+++ b/dev-java/dbunit/dbunit-2.2.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/dbunit-2.2.ebuild,v 1.5 2007/03/15 05:27:03 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/dbunit-2.2.ebuild,v 1.6 2007/08/26 14:14:43 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="DBUnit is a JUnit extension targeted for database-driven projects."
 HOMEPAGE="http://www.dbunit.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+IUSE=""
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/poi-2.0
 	dev-java/junit
 	>=dev-java/ant-core-1.6
 	dev-java/commons-logging
-	=dev-java/commons-lang-2.1*
+	>=dev-java/commons-lang-2.1
 	dev-java/commons-collections"
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	source? ( app-arch/zip )"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-java/dbunit/files/digest-dbunit-2.1 b/dev-java/dbunit/files/digest-dbunit-2.1
deleted file mode 100644
index fb31dc36bc72..000000000000
--- a/dev-java/dbunit/files/digest-dbunit-2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9726d6508fdb3e576047d47791c5efec dbunit-2.1-src.tar.gz 192326
-RMD160 159a976d2b832d7bde2458ae793284fe40229af6 dbunit-2.1-src.tar.gz 192326
-SHA256 34cd89a08b41228278579cb9df38e2343265f405b5303449b4a047ee9e083635 dbunit-2.1-src.tar.gz 192326