Migrated to Generation 2.

(Portage version: 2.1.1_pre3-r3)

7 files changed, 119 insertions, 2 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index f435bb987066..920db840e045 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.28 2005/12/21 02:24:37 nichoj Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.29 2006/07/22 22:51:23 nelchael Exp $
+
+*commons-httpclient-3.0-r1 (22 Jul 2006)
+*commons-httpclient-2.0.2-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-httpclient-2.0.2-r1.ebuild, +commons-httpclient-3.0-r1.ebuild:
+  Migrated to Generation 2.
 
 *commons-httpclient-3.0 (21 Dec 2005)
 
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..d254eeb05f2b
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 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.2-r1.ebuild,v 1.1 2006/07/22 22:51:23 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	sys-apps/sed
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#make jikes happy
+	#if use jikes; then
+	#	sed '837 s/ConnectionPool/org.apache.commons.httpclient.MultiThreadedHttpConnectionManager.ConnectionPool/' \
+	#		-i src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java \
+	#		|| die "failed to sed"
+	#fi
+
+	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+}
+
+src_compile() {
+	local antflags="dist"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild
new file mode 100644
index 000000000000..d39ad79cde44
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild,v 1.1 2006/07/22 22:51:23 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${P/_/-}
+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/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc junit source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/commons-logging
+	dev-java/commons-codec"
+
+DEPEND=">=virtual/jdk-1.3
+	sys-apps/sed
+	>=dev-java/ant-core-1.4
+	junit? ( dev-java/junit )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir lib && cd lib
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-codec
+	use junit && java-pkg_jar-from junit
+}
+
+src_compile() {
+	local antflags="dist"
+	use junit && antflags="${antflags} test"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
index 3c685d62670c..545cd53a1c27 100644
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
@@ -1 +1,3 @@
 MD5 f3ae7736fbfb559cb228291427f22c2d commons-httpclient-2.0.2-src.tar.gz 1447937
+RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed commons-httpclient-2.0.2-src.tar.gz 1447937
+SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 commons-httpclient-2.0.2-src.tar.gz 1447937
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1
new file mode 100644
index 000000000000..545cd53a1c27
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1
@@ -0,0 +1,3 @@
+MD5 f3ae7736fbfb559cb228291427f22c2d commons-httpclient-2.0.2-src.tar.gz 1447937
+RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed commons-httpclient-2.0.2-src.tar.gz 1447937
+SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 commons-httpclient-2.0.2-src.tar.gz 1447937
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
index ff770c7c29c9..885e7ae97b81 100644
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
@@ -1 +1,3 @@
 MD5 e440ab39e3103f7e47adfaed17e365e3 commons-httpclient-3.0-src.tar.gz 1903528
+RMD160 3ade2b18683bc9899b240101898ebd34d9e1dbf7 commons-httpclient-3.0-src.tar.gz 1903528
+SHA256 84bae36abcc01d3f706d17fefefd4b81ceebfaccd2ff08511b4805ba3b5d88d3 commons-httpclient-3.0-src.tar.gz 1903528
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1
new file mode 100644
index 000000000000..885e7ae97b81
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1
@@ -0,0 +1,3 @@
+MD5 e440ab39e3103f7e47adfaed17e365e3 commons-httpclient-3.0-src.tar.gz 1903528
+RMD160 3ade2b18683bc9899b240101898ebd34d9e1dbf7 commons-httpclient-3.0-src.tar.gz 1903528
+SHA256 84bae36abcc01d3f706d17fefefd4b81ceebfaccd2ff08511b4805ba3b5d88d3 commons-httpclient-3.0-src.tar.gz 1903528