diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-12-24 22:54:40 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-12-24 22:54:40 +0000 |
| commit | 27c37f23c8a654ac0975f9a3716231c74f2cb62c (patch) | |
| tree | 47b45c21180ccfcaf35e09c2171975931a571234 /dev-java | |
| parent | Version bump, resolves bug #75503. (Manifest recommit) (diff) | |
| download | gentoo-2-27c37f23c8a654ac0975f9a3716231c74f2cb62c.tar.gz gentoo-2-27c37f23c8a654ac0975f9a3716231c74f2cb62c.tar.bz2 gentoo-2-27c37f23c8a654ac0975f9a3716231c74f2cb62c.zip | |
jikes fix #66520
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-httpclient/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/commons-httpclient/files/jikes.diff | 12 |
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog index 96d928104960..579a2a78a092 100644 --- a/dev-java/commons-httpclient/ChangeLog +++ b/dev-java/commons-httpclient/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-httpclient # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.12 2004/10/17 07:25:42 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.13 2004/12/24 22:54:40 axxo Exp $ + + 24 Dec 2004; Thomas Matthijs <axxo@gentoo.org> +files/jikes.diff, + commons-httpclient-2.0-r1.ebuild: + jikes fix #66520 17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> commons-httpclient-2.0.1.ebuild: diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild index 3a5199f74a69..47c3483d1e0c 100644 --- a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild +++ b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild,v 1.5 2004/10/16 17:06:51 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild,v 1.6 2004/12/24 22:54:40 axxo Exp $ inherit java-pkg eutils @@ -22,7 +22,8 @@ RDEPEND=">=virtual/jdk-1.3" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/gentoo.diff || die "patching failed" + epatch ${FILESDIR}/gentoo.diff + epatch ${FILESDIR}/jikes.diff echo "commons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar" >> build.properties } diff --git a/dev-java/commons-httpclient/files/jikes.diff b/dev-java/commons-httpclient/files/jikes.diff new file mode 100644 index 000000000000..35d9e2d5a888 --- /dev/null +++ b/dev-java/commons-httpclient/files/jikes.diff @@ -0,0 +1,12 @@ +diff -uprN commons-httpclient-2.0.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java commons-httpclient-2.0/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java +--- commons-httpclient-2.0.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java 2004-12-24 23:22:12.974827736 +0100 ++++ commons-httpclient-2.0/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java 2004-12-24 23:23:04.863939392 +0100 +@@ -725,7 +725,7 @@ public class MultiThreadedHttpConnection + private static class ConnectionSource { + + /** The connection pool that created the connection */ +- public ConnectionPool connectionPool; ++ public org.apache.commons.httpclient.MultiThreadedHttpConnectionManager.ConnectionPool connectionPool; + + /** The connection's host configuration */ + public HostConfiguration hostConfiguration; |