Added Java 1.5 patch. Also fixed the build so that javadocs aren't always generated.

(Portage version: 2.0.53_rc7)

5 files changed, 98 insertions, 11 deletions

diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index 3c2faeca2ad7..4a178c18bee5 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-pool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.29 2005/11/05 11:07:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.30 2005/12/08 05:31:32 nichoj Exp $
+
+*commons-pool-1.2-r1 (08 Dec 2005)
+
+  08 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/commons-pool-1.2-java5.patch, +commons-pool-1.2-r1.ebuild:
+  Added Java 1.5 patch. Also fixed the build so that javadocs aren't always
+  generated.
 
   05 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
   commons-pool-1.1.ebuild, commons-pool-1.2.ebuild:
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 79d4c4949317..89c76b7401b3 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 98c30f8aab1b332b3314477ebe67521f ChangeLog 4203
 MD5 1a64ce858fe2714ecb1ae468e432cf30 commons-pool-1.1.ebuild 1312
+MD5 97841753f37f51c636cd4585dd82a10d commons-pool-1.2-r1.ebuild 1438
 MD5 8148cb7825fdf831a6ca639e6968c4cb commons-pool-1.2.ebuild 1323
+MD5 4b09619ea24faa46c7d9bdee765748ec files/commons-pool-1.2-java5.patch 2315
 MD5 b8d9ac4e67767842878c535474df7961 files/digest-commons-pool-1.1 71
 MD5 d41c8c7c7d3b3490c197807fbe38f8a6 files/digest-commons-pool-1.2 72
+MD5 d41c8c7c7d3b3490c197807fbe38f8a6 files/digest-commons-pool-1.2-r1 72
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbJKKQiJ/wx066S4RAuoaAJ45eR6+vBmRl2BGtEX3rfQaFf5PTgCcDeet
-X48jsC0a9kiJDxhWUCxeA0w=
-=LDQ8
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-pool/commons-pool-1.2-r1.ebuild b/dev-java/commons-pool/commons-pool-1.2-r1.ebuild
new file mode 100644
index 000000000000..c4a2d70cef32
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/12/08 05:31:32 nichoj Exp $
+
+inherit java-pkg eutils
+
+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 ~sparc ~x86"
+IUSE="jikes junit doc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# TODO file upstream
+	epatch "${FILESDIR}/${P}-java5.patch"
+
+	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="build-jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	# TODO move unit tests to src_test
+	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/files/commons-pool-1.2-java5.patch b/dev-java/commons-pool/files/commons-pool-1.2-java5.patch
new file mode 100644
index 000000000000..2b537326029b
--- /dev/null
+++ b/dev-java/commons-pool/files/commons-pool-1.2-java5.patch
@@ -0,0 +1,37 @@
+Only in commons-pool-1.2-patched: build
+Only in commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl: .StackKeyedObjectPool.java.swp
+Only in commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl: .StackObjectPool.java.swp
+diff -ur commons-pool-1.2/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
+--- commons-pool-1.2/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java	2004-06-07 13:40:52.000000000 -0400
++++ commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java	2005-12-08 00:13:44.000000000 -0500
+@@ -235,10 +235,10 @@
+             return;

+         } else {

+             if(null != _factory) {

+-                Enumeration enum = stack.elements();

+-                while(enum.hasMoreElements()) {

++                Enumeration my_enum = stack.elements();

++                while(my_enum.hasMoreElements()) {

+                     try {

+-                        _factory.destroyObject(key,enum.nextElement());

++                        _factory.destroyObject(key,my_enum.nextElement());

+                     } catch(Exception e) {

+                         // ignore error, keep destroying the rest

+                     }

+diff -ur commons-pool-1.2/src/java/org/apache/commons/pool/impl/StackObjectPool.java commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl/StackObjectPool.java
+--- commons-pool-1.2/src/java/org/apache/commons/pool/impl/StackObjectPool.java	2004-06-07 13:40:52.000000000 -0400
++++ commons-pool-1.2-patched/src/java/org/apache/commons/pool/impl/StackObjectPool.java	2005-12-08 00:14:08.000000000 -0500
+@@ -196,10 +196,10 @@
+     public synchronized void clear() {

+         assertOpen();

+         if(null != _factory) {

+-            Enumeration enum = _pool.elements();

+-            while(enum.hasMoreElements()) {

++            Enumeration my_enum = _pool.elements();

++            while(my_enum.hasMoreElements()) {

+                 try {

+-                    _factory.destroyObject(enum.nextElement());

++                    _factory.destroyObject(my_enum.nextElement());

+                 } catch(Exception e) {

+                     // ignore error, keep destroying the rest

+                 }

diff --git a/dev-java/commons-pool/files/digest-commons-pool-1.2-r1 b/dev-java/commons-pool/files/digest-commons-pool-1.2-r1
new file mode 100644
index 000000000000..6c74ccf46989
--- /dev/null
+++ b/dev-java/commons-pool/files/digest-commons-pool-1.2-r1
@@ -0,0 +1 @@
+MD5 e7dc9f479c6a4260f84f6751b434295a commons-pool-1.2-src.tar.gz 269500