Keyword x86 2.0.2, version bump 3.0

(Portage version: 2.0.53_rc7)

8 files changed, 15 insertions, 68 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 4e09c643a642..9979fdfa4952 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.22 2005/09/18 15:55:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.23 2005/11/02 14:24:20 axxo Exp $
+
+*commons-httpclient-3.0_rc4 (02 Nov 2005)
+
+  02 Nov 2005; Thomas Matthijs <axxo@gentoo.org>
+  commons-httpclient-2.0.2.ebuild, -commons-httpclient-3.0_rc1.ebuild,
+  -commons-httpclient-3.0_rc3.ebuild, +commons-httpclient-3.0_rc4.ebuild:
+  Keyword x86 2.0.2, version bump 3.0
 
 *commons-httpclient-3.0_rc3 (18 Sep 2005)
 
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index dded68bf4b39..68c75dd873c5 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bcd30b640140aeb80e1107cbd5a88d10 ChangeLog 3254
 MD5 85a7cd05a7569930a02041ec5cda33ee commons-httpclient-2.0.1.ebuild 1692
 MD5 94cb3b6f257ce9c601940d42f3f71aec commons-httpclient-2.0.2.ebuild 1708
-MD5 a1a4765cad5d775260e5cbc9553cfbb7 commons-httpclient-3.0_rc1.ebuild 1421
+MD5 d15921ee86600d8804d282e5d57591c6 commons-httpclient-3.0_rc1.ebuild 1436
 MD5 18ee6015da930d1e15dbcc4a94cbcc19 commons-httpclient-3.0_rc3.ebuild 1418
+MD5 18ee6015da930d1e15dbcc4a94cbcc19 commons-httpclient-3.0_rc4.ebuild 1418
 MD5 22c430c6bf50bc578f8095df5fd64cc4 files/digest-commons-httpclient-2.0.1 81
 MD5 63acee983ed2a9669cd20bc47743b8d3 files/digest-commons-httpclient-2.0.2 81
 MD5 0f992c1cc59ac83b50ecb76e46e4cedd files/digest-commons-httpclient-3.0_rc1 83
 MD5 14cc53f92e92bd2504de2e82758f8532 files/digest-commons-httpclient-3.0_rc3 83
+MD5 d2322c9e0f16e39e0c351e74433faf6f files/digest-commons-httpclient-3.0_rc4 83
 MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
 MD5 20316ee59dc3bf35dd5c04778ae6882f files/jikes.diff 955
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDWQMmQiJ/wx066S4RAoybAJ9w+BbZhzwvC1KVEgaUo638SY9lzgCfY/uP
-Mrr5waNZfgUvghm599Yqgw4=
-=n3n/
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
index 68f7c4ae7227..9ae1801fa84a 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9 2005/10/21 15:01:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild,v 1.10 2005/11/02 14:24:20 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="doc jikes source"
 
 RDEPEND=">=virtual/jre-1.3
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.ebuild
deleted file mode 100644
index df4d6ee361a4..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 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_rc1.ebuild,v 1.4 2005/07/10 13:01:54 axxo Exp $
-
-inherit java-pkg 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/log4j-1.2.5
-		dev-java/commons-logging
-		dev-java/commons-codec"
-
-DEPEND=">=virtual/jdk-1.3
-	sys-apps/sed
-	>=dev-java/ant-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
-	java-pkg_jar-from junit
-}
-
-src_compile() {
-	local antflags="dist"
-	use junit && antflags="${antflags} test"
-	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-3.0_rc3.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0_rc4.ebuild
index d70457e12bd8..6799d9932783 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.0_rc3.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_rc3.ebuild,v 1.1 2005/09/18 15:55:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0_rc4.ebuild,v 1.1 2005/11/02 14:24:20 axxo Exp $
 
 inherit java-pkg eutils
 
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc1
deleted file mode 100644
index 12dd3c42b0d9..000000000000
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95d29587d0eeef2f6ad25d92e43aeead commons-httpclient-3.0-rc1-src.tar.gz 1768130
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc3 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc3
deleted file mode 100644
index 2dc5019209e3..000000000000
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2557057c818096742446634c92ffce6 commons-httpclient-3.0-rc3-src.tar.gz 1781589
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc4 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc4
new file mode 100644
index 000000000000..f6fb44582548
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0_rc4
@@ -0,0 +1 @@
+MD5 961edab7cdf9950f2a6d2243301407e3 commons-httpclient-3.0-rc4-src.tar.gz 1796659