Closes #43709

5 files changed, 66 insertions, 4 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index f00ea0be2ec7..cd596de6ca4c 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.4 2004/03/02 08:54:26 aliz Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.5 2004/03/09 05:51:53 zx Exp $
+
+*commons-httpclient-2.0-r1 (09 Mar 2004)
+
+  09 Mar 2004; Chris Aniszczyk <zx@gentoo.org>
+  commons-httpclient-2.0-r1.ebuild, files/gentoo.diff:
+  Weaning off the broken jakarta-commons eclass. Closes #43709
 
 *commons-httpclient-2.0 (24 Feb 2004)
 
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 98cd9409bc3a..0c0ce8512685 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,7 @@
-MD5 c8bef0d521e2f3eb41fe773770733b62 commons-httpclient-2.0.ebuild 982
-MD5 b628d68ff9069003a1a29994c5c68e2c ChangeLog 695
+MD5 37d76617bbe2fb66a5eaaf5c0ef8faab commons-httpclient-2.0-r1.ebuild 1261
+MD5 81679baea28d92fd5fbca71c2dfb6986 commons-httpclient-2.0.ebuild 981
+MD5 ae027e181eff85ecd742f10d483cd562 ChangeLog 900
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0 79
+MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
+MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0-r1 79
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
new file mode 100644
index 000000000000..8907da40eacf
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/03/09 05:51:53 zx Exp $
+
+inherit java-pkg
+
+DESCRIPTION="The Jakarta Commons HttpClient provides an efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations."
+HOMEPAGE="http://jakarta.apache.org/commons/httpclient/index.html"
+SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/log4j-1.2.5
+	>=dev-java/ant-1.4
+	dev-java/commons-logging"
+RDEPEND=">=virtual/jdk-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
+IUSE="doc jikes"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
+	echo "commons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar" >> build.properties
+}
+
+src_compile() {
+	local antflags="dist"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	ant ${antflags}
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && dohtml -r dist/docs/*
+}
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0-r1
new file mode 100644
index 000000000000..6ad9c15703a0
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0-r1
@@ -0,0 +1 @@
+MD5 6bc428538d8299cc76b54186eed6adcd commons-httpclient-2.0-src.tar.gz 1427148
diff --git a/dev-java/commons-httpclient/files/gentoo.diff b/dev-java/commons-httpclient/files/gentoo.diff
new file mode 100644
index 000000000000..4b22b61f3176
--- /dev/null
+++ b/dev-java/commons-httpclient/files/gentoo.diff
@@ -0,0 +1,13 @@
+--- build.xml	2004-02-17 22:40:24.000000000 -0500
++++ build.xml.patched	2004-03-09 00:39:30.079755224 -0500
+@@ -200,10 +200,6 @@
+     <copy todir="${dist.home}/src" filtering="on">
+       <fileset dir="${source.home}"/>
+     </copy>
+-    <mkdir dir="${dist.home}/lib"/>
+-    <copy todir="${dist.home}/lib">
+-      <fileset dir="lib"/>
+-    </copy>
+   </target>
+ 
+ <!-- ========== Targets: "External" Targets: Clean-up ===================== -->