dep fixes, add source useflag, cleanup

Package-Manager: portage-2.0.51.22-r1

3 files changed, 26 insertions, 12 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index 061ea63d85e9..9a60ede3aedc 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.20 2005/05/18 11:27:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.21 2005/07/10 13:47:16 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> commons-dbcp-1.2.1.ebuild:
+  dep fixes, add source useflag, cleanup
 
   18 May 2005; Markus Rothe <corsair@gentoo.org> commons-dbcp-1.2.1.ebuild:
   Stable on ppc64
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 75fda5b684b3..d92c2fe8a239 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,4 +1,14 @@
-MD5 6ccf6f67450f34b11a09951eb40fc25d ChangeLog 3047
-MD5 c26d0240297b7297bdefae4a13ddcd98 commons-dbcp-1.2.1.ebuild 1316
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a6de27fe71cdee9ca3dcd60bdab7cdb3 commons-dbcp-1.2.1.ebuild 1322
+MD5 bb3a7ee0a69840fb19cac95bf438bc4c ChangeLog 3162
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 51ec667c831b7a9628a4a9b5054597ae files/digest-commons-dbcp-1.2.1 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Sb6/rLF9B432nYRAhxJAJ9QDmLAVlF5p7pk8ruiYrcwhNUr8QCeKOCD
+yYqJ7GPjqf973qP1UQRP1xU=
+=SOPA
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild
index 9160add8497a..f72ebba5947a 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild,v 1.7 2005/05/18 11:27:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1.ebuild,v 1.8 2005/07/10 13:47:16 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Jakarta component providing database connection pooling API"
 HOMEPAGE="http://jakarta.apache.org/commons/dbcp/"
 SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.4
-		>=dev-java/commons-collections-2.0
-		>=dev-java/commons-pool-1.1
-		jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3
 		>=dev-java/commons-collections-2.0
 		>=dev-java/commons-pool-1.1"
+DEPEND=">=virtual/jdk-1.3
+		>=dev-java/ant-1.4
+		${RDEPEND}
+		source? ( app-arch/zip )
+		jikes? ( dev-java/jikes )"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-IUSE="jikes doc"
+IUSE="jikes doc source"
 
 src_compile() {
 	local antflags="build-jar"
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
-	echo "commons-pool.jar=`java-config --classpath=commons-pool`" >> build.properties
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
+	echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "Compilation failed"
@@ -34,4 +34,5 @@ src_install () {
 	dodoc README.txt
 	dohtml PROPOSAL.html STATUS.html
 	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
 }