jikes fix #66520

4 files changed, 37 insertions, 9 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/Manifest b/dev-java/commons-httpclient/Manifest
index b74faa599d48..488e0cc9859a 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,9 +1,20 @@
-MD5 c7f399d648b0af20eed56e149e9814ce commons-httpclient-2.0-r1.ebuild 1282
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 bcfc32c14af82dda33f83ef45d1a33e8 commons-httpclient-2.0.1.ebuild 1577
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5322b2cf9c5a1c2e1692c9c9a061350c commons-httpclient-2.0-r1.ebuild 1288
 MD5 553af19721ec40d5c3b9c87f65346eae commons-httpclient-2.0.2.ebuild 1566
-MD5 61b4a182aca6188882fa28226cec80bf ChangeLog 1834
-MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0-r1 79
-MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
+MD5 bcfc32c14af82dda33f83ef45d1a33e8 commons-httpclient-2.0.1.ebuild 1577
+MD5 eb59635eb8facad86b3884aa5aced6e7 ChangeLog 1954
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 22c430c6bf50bc578f8095df5fd64cc4 files/digest-commons-httpclient-2.0.1 81
 MD5 63acee983ed2a9669cd20bc47743b8d3 files/digest-commons-httpclient-2.0.2 81
+MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
+MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0-r1 79
+MD5 20316ee59dc3bf35dd5c04778ae6882f files/jikes.diff 955
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBzJ47/rLF9B432nYRAhGqAJ9GtPVIl8q7BIcrVvRN3i2Zcl7DyACgjzgR
+JONLKvDyeOfsTo3p5SuYf9Q=
+=KT39
+-----END PGP SIGNATURE-----
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;