Stable on amd64, bug #176230

(Portage version: 2.1.2.4)

6 files changed, 8 insertions, 113 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 9bea36a79536..204e6bac5157 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-httpclient
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.43 2007/05/06 07:53:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.44 2007/05/06 17:17:19 wltjr Exp $
+
+  06 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -commons-httpclient-2.0.1.ebuild, -commons-httpclient-2.0.2.ebuild,
+  commons-httpclient-2.0.2-r1.ebuild:
+  Stable on amd64, bug #176230
 
   06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   commons-httpclient-2.0.2-r1.ebuild:
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
deleted file mode 100644
index fc0f3bbeb9b4..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.1.ebuild,v 1.14 2006/12/26 18:55:26 betelgeuse Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="The Jakarta Commons HttpClient library"
-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="x86 ppc amd64"
-IUSE="doc jikes source"
-
-RDEPEND=">=virtual/jre-1.3
-	dev-java/commons-logging"
-
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	sys-apps/sed
-	>=dev-java/ant-1.4
-	source? ( app-arch/zip )
-	jikes? ( dev-java/jikes )"
-
-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 jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${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-2.0.2-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
index 4bc9599987b3..15753fc05ec3 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.8 2007/05/06 07:53:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild,v 1.9 2007/05/06 17:17:19 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.3
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
deleted file mode 100644
index f7aca2438d2c..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.ebuild,v 1.14 2006/12/26 18:55:26 betelgeuse Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="The Jakarta Commons HttpClient library"
-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 x86"
-IUSE="doc jikes 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 )
-	jikes? ( dev-java/jikes )"
-
-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 jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${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.1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1
deleted file mode 100644
index 3b74cbe6880a..000000000000
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b74f527e2eee22f1212cf2689b7a3761 commons-httpclient-2.0.1-src.tar.gz 1399272
-RMD160 f9387f9e5bba9a2161cd6d66a2594e70a7a20584 commons-httpclient-2.0.1-src.tar.gz 1399272
-SHA256 66381f811cd015359d806da9488a627bbf9803d3e0ef15e9a48f831eee39bdcb commons-httpclient-2.0.1-src.tar.gz 1399272
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
deleted file mode 100644
index 545cd53a1c27..000000000000
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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