stable x86 for 3.x, bug 186189; filter jikes for all

Package-Manager: portage-2.1.2.9

4 files changed, 32 insertions, 16 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 89e45d677d12..450a02239a3a 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.50 2007/07/23 17:50:47 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.51 2007/07/24 07:51:16 opfer Exp $
+
+  24 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
+  commons-httpclient-2.0.2-r1.ebuild, commons-httpclient-3.0.1-r1.ebuild:
+  stable x86 for 3.x, bug 186189; filter jikes for all
 
   23 Jul 2007; nixnut <nixnut@gentoo.org>
   commons-httpclient-3.0.1-r1.ebuild:
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index a71962e428d2..9a58082a053a 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-httpclient-3.0.1-gentoo.patch 2069 RMD160 dc213e6bed0673216f49052a4d6b80c3b3f558cc SHA1 229253b993ec1f305133b7e384f56688e59938a2 SHA256 78896bc33dbba5757f4130751d999356a329e3e669213fc047674dd510e1a043
 MD5 99e1a7deea4b3481f71c29c8564bdf99 files/commons-httpclient-3.0.1-gentoo.patch 2069
 RMD160 dc213e6bed0673216f49052a4d6b80c3b3f558cc files/commons-httpclient-3.0.1-gentoo.patch 2069
@@ -8,18 +11,18 @@ RMD160 dc9f394e40e927641b0a5969608910c2a330faee files/gentoo.diff 444
 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a10e86bbd89ad files/gentoo.diff 444
 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.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-r1.ebuild 1524 RMD160 c5b9d168c7319d47897dbb687458965dec3cb61f SHA1 a20641b83f952c74e8cc73f4cafcb36f0930d0a3 SHA256 2bb57ce5a1149c390d699bbc2001a65eebfa56cf768122df5e18f83a56a53595
-MD5 8c1f753b3708added490b62e6a36aff0 commons-httpclient-3.0.1-r1.ebuild 1524
-RMD160 c5b9d168c7319d47897dbb687458965dec3cb61f commons-httpclient-3.0.1-r1.ebuild 1524
-SHA256 2bb57ce5a1149c390d699bbc2001a65eebfa56cf768122df5e18f83a56a53595 commons-httpclient-3.0.1-r1.ebuild 1524
-MISC ChangeLog 7785 RMD160 cfb8e5ca4503ff013dfd7567e5bf7e0f8ebf2013 SHA1 bdf0b0f1d678d6ef673d6a2bb46e20b8cb75052d SHA256 81402b79bb31de3213ba66ebf1f299ceb91bb229d8c5141a2da663bd90ffb573
-MD5 2636c471e5c0105ba4a02e0ded98fe67 ChangeLog 7785
-RMD160 cfb8e5ca4503ff013dfd7567e5bf7e0f8ebf2013 ChangeLog 7785
-SHA256 81402b79bb31de3213ba66ebf1f299ceb91bb229d8c5141a2da663bd90ffb573 ChangeLog 7785
+EBUILD commons-httpclient-2.0.2-r1.ebuild 1332 RMD160 49c8f07d93261d720a766d2774fd8188c1cc3a8e SHA1 cda71d7270d23dc65c0991c44a08835ed3ec8c31 SHA256 0d961150417bf2e9e2952902c10687ae1e51d5632e0e643ccbf0d98a4eae35cf
+MD5 6375d267a2499454f01567180e5f6331 commons-httpclient-2.0.2-r1.ebuild 1332
+RMD160 49c8f07d93261d720a766d2774fd8188c1cc3a8e commons-httpclient-2.0.2-r1.ebuild 1332
+SHA256 0d961150417bf2e9e2952902c10687ae1e51d5632e0e643ccbf0d98a4eae35cf commons-httpclient-2.0.2-r1.ebuild 1332
+EBUILD commons-httpclient-3.0.1-r1.ebuild 1554 RMD160 f4b217863e098fdcb59783dec6b90d239fc73d9b SHA1 2b4998f1e3c161675e6dc5161b89a15200a51576 SHA256 20d5a5d8daed1e92f27ce020767d00658069ead6f2080992e9f3028137fb6310
+MD5 57e815b600603717b308a6968bc8bdf1 commons-httpclient-3.0.1-r1.ebuild 1554
+RMD160 f4b217863e098fdcb59783dec6b90d239fc73d9b commons-httpclient-3.0.1-r1.ebuild 1554
+SHA256 20d5a5d8daed1e92f27ce020767d00658069ead6f2080992e9f3028137fb6310 commons-httpclient-3.0.1-r1.ebuild 1554
+MISC ChangeLog 7969 RMD160 55f99b2f6bb0b7a1dc6457563472c6583668ba42 SHA1 85fa865790190ab14286bdb23bb9efb7b5e8e944 SHA256 234dbccaa8a8131f49efd4f8f510ece8b2432709c44f7f2f1253224560385e05
+MD5 7ee175d325ffd70379b08435d65e8d4e ChangeLog 7969
+RMD160 55f99b2f6bb0b7a1dc6457563472c6583668ba42 ChangeLog 7969
+SHA256 234dbccaa8a8131f49efd4f8f510ece8b2432709c44f7f2f1253224560385e05 ChangeLog 7969
 MISC metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 SHA1 1cede0993ae8a754ec684d30c12dacc90f778661 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab
 MD5 ca83d42c8a8001ceb75efeeee805267a metadata.xml 378
 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 metadata.xml 378
@@ -30,3 +33,10 @@ SHA256 ce998d858d0bfffcdddb1319983b0f69f6954f032f7a5a09ce8fc5eaacb25b9e files/di
 MD5 0cbffba28b281e05d0126b80fd3c9d10 files/digest-commons-httpclient-3.0.1-r1 289
 RMD160 8b95b84606fc07a9051356fa76117135cfa08fce files/digest-commons-httpclient-3.0.1-r1 289
 SHA256 746bba8a177792a98471ab35b5849e68de637f254999828eeca4f6add03a1b06 files/digest-commons-httpclient-3.0.1-r1 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGpa97NQqtfCuFneMRAh3ZAJ9CoezqupxpTlgi+BDNmk4GdOERuACeI/+O
+VnYsKTqSzFozjT16SIDy+kI=
+=1egw
+-----END PGP SIGNATURE-----
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 15753fc05ec3..d778c0f5f988 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.9 2007/05/06 17:17:19 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild,v 1.10 2007/07/24 07:51:16 opfer Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -34,6 +34,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/gentoo.diff"
 	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	java-pkg_filter-compiler jikes
 }
 
 EANT_BUILD_TARGET="dist"
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0.1-r1.ebuild
index 359de36ef3c5..f772fcb160e4 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.0.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0.1-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-3.0.1-r1.ebuild,v 1.5 2007/07/23 17:50:47 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1-r1.ebuild,v 1.6 2007/07/24 07:51:16 opfer Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 inherit java-pkg-2 java-ant-2
@@ -11,7 +11,7 @@ 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 ~x86-fbsd"
+KEYWORDS="~amd64 ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 # doesn't work on IBM JDK, bug #176133
 RESTRICT="test"
@@ -39,6 +39,7 @@ src_unpack() {
 	mkdir lib && cd lib
 	java-pkg_jar-from commons-logging
 	java-pkg_jar-from commons-codec
+	java-pkg_filter-compiler jikes
 }
 
 EANT_BUILD_TARGET="dist"