fix deps, add source useflag support, cleanup

(Portage version: 2.0.51.22-r1)

6 files changed, 35 insertions, 61 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index c5c4fe276725..3e942ad5ce11 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.19 2005/05/29 15:39:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.20 2005/07/10 13:01:54 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  -commons-httpclient-2.0-r1.ebuild, commons-httpclient-2.0.1.ebuild,
+  commons-httpclient-2.0.2.ebuild, commons-httpclient-3.0_rc1.ebuild:
+  fix deps, add source useflag support, cleanup
 
   29 May 2005; Markus Rothe <corsair@gentoo.org>
   commons-httpclient-2.0.2.ebuild, commons-httpclient-3.0_rc1.ebuild:
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
deleted file mode 100644
index 6fc21d978c01..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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-2.0-r1.ebuild,v 1.8 2005/01/20 18:43:38 luckyduck Exp $
-
-inherit java-pkg 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-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE="doc jikes"
-
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/log4j-1.2.5
-	>=dev-java/ant-1.4
-	dev-java/commons-logging
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo.diff
-	epatch ${FILESDIR}/jikes.diff
-	echo "commons-logging.jar=/usr/share/commons-logging/lib/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/*
-}
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
index 1a0c6cc160df..62160c99d011 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.1.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.1.ebuild,v 1.9 2005/05/04 22:18:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.1.ebuild,v 1.10 2005/07/10 13:01:54 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,15 +11,18 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc amd64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
+
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/log4j-1.2.5
+	dev-java/commons-logging"
 
 DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
 	sys-apps/sed
-	>=dev-java/log4j-1.2.5
 	>=dev-java/ant-1.4
-	dev-java/commons-logging
+	source? ( app-arch/zip )
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +36,7 @@ src_unpack() {
 	fi
 
 	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
-	echo "commons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
 }
 
 src_compile() {
@@ -46,4 +49,5 @@ src_compile() {
 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.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild
index 0cde619b1420..6c4f56d6b8e0 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.7 2005/05/29 15:39:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2.ebuild,v 1.8 2005/07/10 13:01:54 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,15 +11,18 @@ 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 jikes"
+IUSE="doc jikes source"
+
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/log4j-1.2.5
+	dev-java/commons-logging"
 
 DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
 	sys-apps/sed
-	>=dev-java/log4j-1.2.5
 	>=dev-java/ant-1.4
-	dev-java/commons-logging
+	source? ( app-arch/zip )
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +36,7 @@ src_unpack() {
 	fi
 
 	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
-	echo "commons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
 }
 
 src_compile() {
@@ -46,4 +49,5 @@ src_compile() {
 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_rc1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.ebuild
index 35ba9e687325..df4d6ee361a4 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0_rc1.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_rc1.ebuild,v 1.3 2005/05/29 15:39:17 corsair Exp $
+# $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
 
@@ -12,17 +12,19 @@ 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"
+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/log4j-1.2.5
 	>=dev-java/ant-1.4
 	junit? ( dev-java/junit )
+	source? ( app-arch/zip )
 	${RDEPEND}"
-RDEPEND=">=virtual/jdk-1.3
-		dev-java/commons-logging
-		dev-java/commons-codec"
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,4 +47,5 @@ src_compile() {
 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-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0-r1
deleted file mode 100644
index 6ad9c15703a0..000000000000
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bc428538d8299cc76b54186eed6adcd commons-httpclient-2.0-src.tar.gz 1427148