diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-12-24 21:25:53 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-12-24 21:25:53 +0000 |
| commit | 01e9ff3954382f8249e48bbfca3642266f425a6e (patch) | |
| tree | 855fbf813d2c4e68ed2e9de4d88419d48542e3a4 /dev-java | |
| parent | remove the portage dep, it's no longer relevant (diff) | |
| download | gentoo-2-01e9ff3954382f8249e48bbfca3642266f425a6e.tar.gz gentoo-2-01e9ff3954382f8249e48bbfca3642266f425a6e.tar.bz2 gentoo-2-01e9ff3954382f8249e48bbfca3642266f425a6e.zip | |
Remove invalid 1.5 patch
(Portage version: 2.1_pre1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-pool/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-pool/commons-pool-1.2-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/commons-pool/files/commons-pool-1.2-java5.patch | 37 |
3 files changed, 6 insertions, 42 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/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
- }
|