Really stable on amd64 and remove old gen-1 version.

(Portage version: 2.1.2.7)

4 files changed, 8 insertions, 52 deletions

diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index c35cdca7dfcf..2d76c59f4289 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-pool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.41 2007/03/15 04:43:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.42 2007/05/17 20:18:30 caster Exp $
+
+  17 May 2007; Vlastimil Babka <caster@gentoo.org> -commons-pool-1.2.ebuild,
+  commons-pool-1.3.ebuild:
+  Really stable on amd64 and remove old gen-1 version.
 
   15 Mar 2007; Joshua Nichols <nichoj@gentoo.org> ChangeLog:
   Stable on amd64 for bug #166736.
diff --git a/dev-java/commons-pool/commons-pool-1.2.ebuild b/dev-java/commons-pool/commons-pool-1.2.ebuild
deleted file mode 100644
index 5d09d0f2394a..000000000000
--- a/dev-java/commons-pool/commons-pool-1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.2.ebuild,v 1.15 2006/10/05 15:32:41 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Jakarta-Commons component providing general purpose object pooling API"
-HOMEPAGE="http://jakarta.apache.org/commons/pool/"
-SRC_URI="mirror://apache/jakarta/commons/pool/source/${P}-src.tar.gz"
-RDEPEND=">=virtual/jre-1.3
-	>=dev-java/commons-collections-2.0"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.4
-	${RDEPEND}
-	junit? ( >=dev-java/junit-3.7 )
-	jikes? ( dev-java/jikes )"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="jikes junit doc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
-	use junit && echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
-}
-
-src_compile() {
-	local antflags="dist"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use junit && antflags="${antflags} test"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "Compilation Failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	dodoc README.txt
-	dohtml STATUS.html PROPOSAL.html
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-}
diff --git a/dev-java/commons-pool/commons-pool-1.3.ebuild b/dev-java/commons-pool/commons-pool-1.3.ebuild
index 33f891cbf8a1..667964e80ced 100644
--- a/dev-java/commons-pool/commons-pool-1.3.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.3.ebuild,v 1.5 2007/03/12 07:49:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.3.ebuild,v 1.6 2007/05/17 20:18:30 caster Exp $
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -12,11 +12,11 @@ SRC_URI="mirror://apache/jakarta/commons/pool/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
-	test? ( >=dev-java/junit-3.7 )"
+	test? ( =dev-java/junit-3* )"
 
 S="${WORKDIR}/${P}-src"
 
diff --git a/dev-java/commons-pool/files/digest-commons-pool-1.2 b/dev-java/commons-pool/files/digest-commons-pool-1.2
deleted file mode 100644
index 2234d8c03aa3..000000000000
--- a/dev-java/commons-pool/files/digest-commons-pool-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7dc9f479c6a4260f84f6751b434295a commons-pool-1.2-src.tar.gz 269500
-RMD160 281e734b82027ba7b7fb481105c7dd1a5a1defb3 commons-pool-1.2-src.tar.gz 269500
-SHA256 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e commons-pool-1.2-src.tar.gz 269500