Remove old version and switch PATCHES to array.

Package-Manager: portage-2.2_rc65/cvs/Linux i686

4 files changed, 15 insertions, 46 deletions

diff --git a/dev-java/commons-dbutils/ChangeLog b/dev-java/commons-dbutils/ChangeLog
index 7b27383860bf..ae365567fe5b 100644
--- a/dev-java/commons-dbutils/ChangeLog
+++ b/dev-java/commons-dbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-dbutils
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbutils/ChangeLog,v 1.5 2008/08/23 18:25:04 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbutils/ChangeLog,v 1.6 2010/03/20 13:36:24 betelgeuse Exp $
+
+  20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
+  -commons-dbutils-1.0.ebuild, commons-dbutils-1.1.ebuild:
+  Remove old version and switch PATCHES to array.
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> commons-dbutils-1.1.ebuild:
   add ~amd64, bug #234375
diff --git a/dev-java/commons-dbutils/Manifest b/dev-java/commons-dbutils/Manifest
index f88d1cc63970..545b40052589 100644
--- a/dev-java/commons-dbutils/Manifest
+++ b/dev-java/commons-dbutils/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX 1.1-tests.patch 569 RMD160 12c988bf7696782563a2173cde994e09ded46a10 SHA1 ad714563bbd619255e67e15d6404205f729b353b SHA256 03d14411fc7cff898fede44add98c6733235d2d0087fd45009274fdd626cba2d
-DIST commons-dbutils-1.0-src.tar.gz 28707 RMD160 c3a4e7d864f29ab0cbfb73271f432177bb3052fa SHA1 2e735f1b7fcde5cc23f80673a1275a95814ef8c7 SHA256 6bf5376457ca201d9086cd42d16a026ba0d2254912517bbbfeea64e806dd41a2
 DIST commons-dbutils-1.1-src.tar.gz 60062 RMD160 10d153a9035a764a16b65b3cfb4a129fbd506ecd SHA1 640ed25831496ef9b85b50d3baf667223d8e5690 SHA256 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59
-EBUILD commons-dbutils-1.0.ebuild 939 RMD160 c00022ac22f3f1f0fa29d60c953d896818aa2b79 SHA1 b3b7c11e45068a89f64053c5c803517faabb195c SHA256 fd69890b814283e4ee6baac6def6db61ef2c8badb056e4620b95a61d93b9c71d
-EBUILD commons-dbutils-1.1.ebuild 876 RMD160 ed620aacae6a84381f1aed0d573a14d24dcda2b3 SHA1 46c6e1b41b765a760503c1ac15d66a95a94facf5 SHA256 28f3a8bca4d8b3f4e70cfad4f778b8528baa569d9633306f254928f98e256df3
-MISC ChangeLog 870 RMD160 9a42c76303e903db0c717cfab358984036bb688c SHA1 1f0bd6673e127b3001e012b8a1d4d992375acc12 SHA256 67aeabd4391cb5ca2dab619a1361cd63991c461fad0444fde66efd6103d94943
+EBUILD commons-dbutils-1.1.ebuild 884 RMD160 d7dfc9a2a97713768094609ec703fc3fd82f6540 SHA1 5c5eee48569c8efa392891625b3464b8fdc20e5c SHA256 c594971a3089f84b4934f418057aab5126c09639edeb795f9dc9f84674abda5b
+MISC ChangeLog 1037 RMD160 65b8d0dbd13dee99b9e5540ec07e79ff0b23d441 SHA1 da6abe7dec5344c4b040793503cfe1bbf380e028 SHA256 3194c624386e608c304767c776908d4de034dfd184c029f204703543465c0300
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkiwVlIACgkQkKaRLQcq0GLSKQCff4SWxGXKysLi07V67R7pPZWP
-RnMAnAoyG3jKOtrBW2HOF6RTivdBeAZh
-=s8+9
+iEYEARECAAYFAkukz18ACgkQcxLzpIGCsLQqxgCfRUTGD5+NBsX5J0pNUtrWppAw
+KN4AnjXBk5yKKkU3tiRrOWxQVpjyJRJH
+=tq7c
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.0.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.0.ebuild
deleted file mode 100644
index 66b3e13ee745..000000000000
--- a/dev-java/commons-dbutils/commons-dbutils-1.0.ebuild
+++ /dev/null
@@ -1,33 +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/commons-dbutils/commons-dbutils-1.0.ebuild,v 1.2 2008/01/10 23:09:29 caster Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jakarta components: small set of classes designed to make working with JDBC easier"
-HOMEPAGE="http://jakarta.apache.org/commons/dbutils/"
-SRC_URI="mirror://apache/jakarta/commons/dbutils/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.6
-	=dev-java/junit-3.8*"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc source"
-
-src_compile() {
-
-	use doc && antflags="${antflags} javadoc"
-	eant -Dnoget=only jar ${antflags} || die "compilation failed"
-
-}
-
-src_install() {
-
-	java-pkg_newjar target/${PN}-1.1-dev.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/
-	use source && java-pkg_dosrc src/java/*
-
-}
diff --git a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
index 856573c42d5e..e279814bc185 100644
--- a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
+++ b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild,v 1.3 2008/08/23 18:25:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild,v 1.4 2010/03/20 13:36:24 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${P}-src"
 
-PATCHES="${FILESDIR}/1.1-tests.patch"
+PATCHES=( "${FILESDIR}/1.1-tests.patch" )
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
 src_install() {