Version bump to 2.4.5. EAPI 5. Fixes bug #274091, reported by Mike Weissman. Removed old.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 63 insertions, 55 deletions

diff --git a/dev-java/dbunit/ChangeLog b/dev-java/dbunit/ChangeLog
index 97ee129a03ee..5072d0c40f67 100644
--- a/dev-java/dbunit/ChangeLog
+++ b/dev-java/dbunit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/dbunit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.25 2009/07/19 13:42:31 nixnut Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/ChangeLog,v 1.26 2014/03/08 18:12:34 tomwij Exp $
+
+*dbunit-2.4.5 (08 Mar 2014)
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +dbunit-2.4.5.ebuild,
+  -dbunit-2.2.ebuild:
+  Version bump to 2.4.5. EAPI 5. Fixes bug #274091, reported by Mike Weissman.
+  Removed old.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> dbunit-2.4.1.ebuild:
   ppc stable #258723
@@ -69,4 +76,3 @@
   +files/build.xml, +dbunit-2.1.ebuild:
   Initial import. Builds dbunit from source and removes packed jars. Fixes
   #63290.
-
diff --git a/dev-java/dbunit/dbunit-2.2.ebuild b/dev-java/dbunit/dbunit-2.2.ebuild
deleted file mode 100644
index 086b3f47303b..000000000000
--- a/dev-java/dbunit/dbunit-2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 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.8 2008/10/22 11:46:03 fordfrog Exp $
-
-EAPI="1"
-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"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/poi-2.0:0
-	>=dev-java/junit-3.8:0
-	>=dev-java/ant-core-1.6:0
-	dev-java/commons-logging:0
-	>=dev-java/commons-lang-2.1:2.1
-	dev-java/commons-collections:0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/build.xml build.xml
-
-	cd "${S}"/lib || die
-	#rm -v *.jar
-	java-pkg_jar-from poi
-	java-pkg_jar-from junit
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from commons-lang-2.1
-	java-pkg_jar-from commons-collections
-}
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dodoc todo.txt || die
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/dbunit/dbunit-2.4.5.ebuild b/dev-java/dbunit/dbunit-2.4.5.ebuild
new file mode 100644
index 000000000000..1a20d01b76b8
--- /dev/null
+++ b/dev-java/dbunit/dbunit-2.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbunit/dbunit-2.4.5.ebuild,v 1.1 2014/03/08 18:12:34 tomwij Exp $
+
+EAPI="5"
+
+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://dbunit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+COMMON_DEP="dev-java/slf4j-api:0
+			dev-java/poi:3.2
+			dev-java/commons-collections:0
+			dev-java/ant-core:0
+			dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/slf4j-nop:0
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	# Upstream no longer provides a build file.
+	cp -v "${FILESDIR}"/build-2.4.xml build.xml || die
+}
+
+EANT_GENTOO_CLASSPATH="poi-3.2,junit,slf4j-api,commons-collections,ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	# slf4j needed for runtime
+	java-pkg_register-optional-dependency slf4j-nop
+	java-pkg_register-optional-dependency slf4j-log4j12
+
+	java-pkg_dojar "${S}"/dist/"${PN}.jar"
+
+	use doc && java-pkg_dojavadoc build/javadoc
+	use source && java-pkg_dosrc org
+}