Stable on amd64, bug #176230

Package-Manager: portage-2.1.2.4

7 files changed, 16 insertions, 136 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/Manifest b/dev-java/commons-httpclient/Manifest
index 4d2166c7d54e..3382712441ee 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -6,39 +6,24 @@ AUX gentoo.diff 444 RMD160 dc9f394e40e927641b0a5969608910c2a330faee SHA1 f6df83d
 MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
 RMD160 dc9f394e40e927641b0a5969608910c2a330faee files/gentoo.diff 444
 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a10e86bbd89ad files/gentoo.diff 444
-DIST commons-httpclient-2.0.1-src.tar.gz 1399272 RMD160 f9387f9e5bba9a2161cd6d66a2594e70a7a20584 SHA1 8cbf691ed8802e0fbb2069d00828be5444b00260 SHA256 66381f811cd015359d806da9488a627bbf9803d3e0ef15e9a48f831eee39bdcb
 DIST commons-httpclient-2.0.2-src.tar.gz 1447937 RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed SHA1 c6813d3ed0d2fa61389bf84fb5393af482b5f150 SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102
 DIST commons-httpclient-3.0.1-src.tar.gz 1698379 RMD160 5b02f6731718a590dbace90e6e494a9568a7abdb SHA1 6deb04b60ec3093f0c8ee56b7bbc6980435b319c SHA256 6a26b4dfb9bfacf9849793d6edf997079b2230e5523f7aa9274a7d1d2fb1f2a8
-EBUILD commons-httpclient-2.0.1.ebuild 1528 RMD160 5f21af4644d226df50bd9def475c378b691ee4c6 SHA1 f0023b3938ac1753b549e71c4f33098817aaf8f7 SHA256 0db0a146bb3955a0ea6ebd6087b07b9a5c3d9603b865c39176efe9ed45a609c5
-MD5 e1fa3fe999deeb6ca057a0ef0f91727e commons-httpclient-2.0.1.ebuild 1528
-RMD160 5f21af4644d226df50bd9def475c378b691ee4c6 commons-httpclient-2.0.1.ebuild 1528
-SHA256 0db0a146bb3955a0ea6ebd6087b07b9a5c3d9603b865c39176efe9ed45a609c5 commons-httpclient-2.0.1.ebuild 1528
-EBUILD commons-httpclient-2.0.2-r1.ebuild 1305 RMD160 2d503c683814e38b4c521506754e1704db786171 SHA1 a0eabf6df7031fd8286b47bc34f5f0e43205d50e SHA256 05885de9bb001f246d52e93c32f7432fe0d56001a60c005dd433a4a2c5431f52
-MD5 fe0850ccd8e3a4f00aeaa4d4d2295240 commons-httpclient-2.0.2-r1.ebuild 1305
-RMD160 2d503c683814e38b4c521506754e1704db786171 commons-httpclient-2.0.2-r1.ebuild 1305
-SHA256 05885de9bb001f246d52e93c32f7432fe0d56001a60c005dd433a4a2c5431f52 commons-httpclient-2.0.2-r1.ebuild 1305
-EBUILD commons-httpclient-2.0.2.ebuild 1540 RMD160 cd9236f07468f27a143328b2ab5bb20bd29515dd SHA1 f0f0d4741a55e873f4e9f5075f813bd157ebdcdd SHA256 2d147afdb01a620aa988d9db7e2bddd0859bc9e69803a3805e356deadf15d055
-MD5 a3e8e318158ff2871705525c5c31bfd2 commons-httpclient-2.0.2.ebuild 1540
-RMD160 cd9236f07468f27a143328b2ab5bb20bd29515dd commons-httpclient-2.0.2.ebuild 1540
-SHA256 2d147afdb01a620aa988d9db7e2bddd0859bc9e69803a3805e356deadf15d055 commons-httpclient-2.0.2.ebuild 1540
+EBUILD commons-httpclient-2.0.2-r1.ebuild 1299 RMD160 4eaeb4ae0afdd2ea1b3921073dc64a8a5a2e37b0 SHA1 9ac98f3bcc8a96ea85805e3ca3dff0521c88a3d5 SHA256 45d202e23302abc12fe94984eb02dec38a583fadd3c68c0d18131c04e5af64c7
+MD5 951fe18e9823f9cddbc4a5d269e81a3d commons-httpclient-2.0.2-r1.ebuild 1299
+RMD160 4eaeb4ae0afdd2ea1b3921073dc64a8a5a2e37b0 commons-httpclient-2.0.2-r1.ebuild 1299
+SHA256 45d202e23302abc12fe94984eb02dec38a583fadd3c68c0d18131c04e5af64c7 commons-httpclient-2.0.2-r1.ebuild 1299
 EBUILD commons-httpclient-3.0.1.ebuild 1486 RMD160 89e0775c97f4aee800ec23869f4a03a4310ba60a SHA1 61b1011ab209dc5727a6efd8ea8ce84a6b8a7689 SHA256 218c0fa1457e939ba05a894f07a6dd469f34592031d540ca588c3043d3c00e4b
 MD5 4945cb9e3ad6c39f4d148ba64e4e5d7f commons-httpclient-3.0.1.ebuild 1486
 RMD160 89e0775c97f4aee800ec23869f4a03a4310ba60a commons-httpclient-3.0.1.ebuild 1486
 SHA256 218c0fa1457e939ba05a894f07a6dd469f34592031d540ca588c3043d3c00e4b commons-httpclient-3.0.1.ebuild 1486
-MISC ChangeLog 6724 RMD160 0bcccc9b57ad2301e9981c0c8fcf2f0af4934eda SHA1 9a3844078ecc55cf216d7f10c4e24eec0a34fb2c SHA256 387f9217e983752b1936c348766fc01def4c97fb22128c783945e349cfa83583
-MD5 2551b7dffe061805acee05b0be9a9766 ChangeLog 6724
-RMD160 0bcccc9b57ad2301e9981c0c8fcf2f0af4934eda ChangeLog 6724
-SHA256 387f9217e983752b1936c348766fc01def4c97fb22128c783945e349cfa83583 ChangeLog 6724
+MISC ChangeLog 6916 RMD160 acf7e5d26410d7e27f027db85d63c1aee4dcd3b4 SHA1 d61e8014d5b43631748d3f72a445d590db01a313 SHA256 6486611e8e98ad8980f23b50cc7e8ece54e90ef7ddf17adec12eac0f2956db20
+MD5 030ebe1047e623292aef83dec9bfb905 ChangeLog 6916
+RMD160 acf7e5d26410d7e27f027db85d63c1aee4dcd3b4 ChangeLog 6916
+SHA256 6486611e8e98ad8980f23b50cc7e8ece54e90ef7ddf17adec12eac0f2956db20 ChangeLog 6916
 MISC metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 SHA1 1cede0993ae8a754ec684d30c12dacc90f778661 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab
 MD5 ca83d42c8a8001ceb75efeeee805267a metadata.xml 378
 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 metadata.xml 378
 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab metadata.xml 378
-MD5 5a9a0cd5fbef45e7fc64e78e2231b32b files/digest-commons-httpclient-2.0.1 289
-RMD160 04df6973b9828d79ea127fe83beb86934868523b files/digest-commons-httpclient-2.0.1 289
-SHA256 7f5f7bb2f2112e24d8ff655d55561102feae9c5391431605ad8fbda423332840 files/digest-commons-httpclient-2.0.1 289
-MD5 25d25d6d826624b872bcf76690c31ebd files/digest-commons-httpclient-2.0.2 289
-RMD160 0b37e48d9e1a21b03325d4656bce29f35d1bb41b files/digest-commons-httpclient-2.0.2 289
-SHA256 ce998d858d0bfffcdddb1319983b0f69f6954f032f7a5a09ce8fc5eaacb25b9e files/digest-commons-httpclient-2.0.2 289
 MD5 25d25d6d826624b872bcf76690c31ebd files/digest-commons-httpclient-2.0.2-r1 289
 RMD160 0b37e48d9e1a21b03325d4656bce29f35d1bb41b files/digest-commons-httpclient-2.0.2-r1 289
 SHA256 ce998d858d0bfffcdddb1319983b0f69f6954f032f7a5a09ce8fc5eaacb25b9e files/digest-commons-httpclient-2.0.2-r1 289
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