Remove invalid 1.5 patch

Package-Manager: portage-2.1_pre1

4 files changed, 8 insertions, 55 deletions

diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index 4a178c18bee5..5d2bd721aaac 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.30 2005/12/08 05:31:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.31 2005/12/24 21:25:53 axxo Exp $
+
+  24 Dec 2005; Thomas Matthijs <axxo@gentoo.org>
+  -files/commons-pool-1.2-java5.patch, commons-pool-1.2-r1.ebuild:
+  Remove invalid 1.5 patch
 
 *commons-pool-1.2-r1 (08 Dec 2005)
 
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 3bf0d2a58506..a8c1ec5bd627 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 988b3a838890ba86d459be0db3733b9a ChangeLog 4443
+MD5 e2516afe4bd724f94a19359c808e2d7c ChangeLog 4585
 MD5 1a64ce858fe2714ecb1ae468e432cf30 commons-pool-1.1.ebuild 1312
-MD5 0cd50c405796ecf8da82bff455f7f738 commons-pool-1.2-r1.ebuild 1436
+MD5 4376384a956878bed8ff5fd1f1d4ed72 commons-pool-1.2-r1.ebuild 1372
 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)
-
-iD8DBQFDl8YBndWRXhKOboURAk9EAKCamC1p6pH42dWCAVjvu+btQ+SjdwCeNJwS
-3dOM94JH0w3hnlga+dsLrKI=
-=LeJ8
------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
index c4a2d70cef32..4177b269f872 100644
--- a/dev-java/commons-pool/commons-pool-1.2-r1.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.2-r1.ebuild,v 1.2 2005/12/24 21:25:53 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -23,9 +23,6 @@ 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
 }
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
deleted file mode 100644
index 2b537326029b..000000000000
--- a/dev-java/commons-pool/files/commons-pool-1.2-java5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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

-                 }