Use EANT_GENTOO_CLASSPATH so that emerge doesn't fail when commons-collections has more than one jar.

Package-Manager: portage-2.1.2.7

3 files changed, 30 insertions, 15 deletions

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index c6e0dd41a344..d82648a225ee 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.36 2007/02/11 12:23:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.37 2007/05/17 20:16:39 betelgeuse Exp $
+
+  17 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-beanutils-1.6.1-r3.ebuild:
+  Use EANT_GENTOO_CLASSPATH so that emerge doesn't fail when
+  commons-collections has more than one jar.
 
   11 Feb 2007; Vlastimil Babka <caster@gentoo.org>
   -commons-beanutils-1.6.1-r2.ebuild, -commons-beanutils-1.7.0-r1.ebuild:
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 9ca758d22a27..1a9dbb49b902 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-beanutils-1.6.1-src.tar.gz 148249 RMD160 ef18dd9abc81cdbe790318bfdaac6026d9a2570d SHA1 0545881bee6ee60248a3bbd2e2fdb87b88674751 SHA256 e35572613bd7141bcb64725e9f7c3f527ba5f11d4d12d5daff808f886e472bdd
 DIST commons-beanutils-1.7.0-src.tar.gz 258835 RMD160 1a9058a79cf6dfc8e5d384af2a5cdec3dcf3184b SHA1 3c1eceae87320fe7e0eec8573fd19b8ff283d1c5 SHA256 ffe3ff9208c3eb8a9c393ee244445fc1e70bb42213bee97dc86e71704fa40076
-EBUILD commons-beanutils-1.6.1-r3.ebuild 1277 RMD160 b0ef1d0a0eccecae7c482b537abf6433ad4c1d8f SHA1 08790200b4e35b3839661f20e9d96123f1c9d824 SHA256 eb40bdb9f2db013cc3233faa0001dc9599b514a34d4b0611266f170e30abf1fc
-MD5 a27c7dae358e6d2ec93fd30ad56a0b5e commons-beanutils-1.6.1-r3.ebuild 1277
-RMD160 b0ef1d0a0eccecae7c482b537abf6433ad4c1d8f commons-beanutils-1.6.1-r3.ebuild 1277
-SHA256 eb40bdb9f2db013cc3233faa0001dc9599b514a34d4b0611266f170e30abf1fc commons-beanutils-1.6.1-r3.ebuild 1277
+EBUILD commons-beanutils-1.6.1-r3.ebuild 1157 RMD160 7184d43b63910f81f248474fd2b19469f7f9db52 SHA1 489bf187ece1bb54c9c16a0c35f02205aceaef2e SHA256 7d53ad92d304b4798d7d0bfefb1ce2d61f7f8f37ed11219c249c329f36cb4070
+MD5 d2ede02bc3bf0d30f058400fa6fed6c3 commons-beanutils-1.6.1-r3.ebuild 1157
+RMD160 7184d43b63910f81f248474fd2b19469f7f9db52 commons-beanutils-1.6.1-r3.ebuild 1157
+SHA256 7d53ad92d304b4798d7d0bfefb1ce2d61f7f8f37ed11219c249c329f36cb4070 commons-beanutils-1.6.1-r3.ebuild 1157
 EBUILD commons-beanutils-1.7.0-r2.ebuild 1279 RMD160 c210888fd09cff514ef8585e2ec2c57e038ceb1c SHA1 5920d52be848995c25a1f61fb34d3a4b63c73acb SHA256 5f49c373e3f81e9be916d341aac5ff6f0ab079dfa017444d74988668da23a4ae
 MD5 ac916560ffd183296233ab9ff8f67907 commons-beanutils-1.7.0-r2.ebuild 1279
 RMD160 c210888fd09cff514ef8585e2ec2c57e038ceb1c commons-beanutils-1.7.0-r2.ebuild 1279
 SHA256 5f49c373e3f81e9be916d341aac5ff6f0ab079dfa017444d74988668da23a4ae commons-beanutils-1.7.0-r2.ebuild 1279
-MISC ChangeLog 5606 RMD160 edc4da2507e2a4ff024d261edd88b6a1bce6d2bb SHA1 ff3eb5d9988f63395117913e0161d7b2178c201d SHA256 faabecd0d9f6f6fcf14047ad1dafc0c6e097206bc3e71b1cd6949f11ed7b1c26
-MD5 17fdbb0d0e8511bdc6213972c6d70f7a ChangeLog 5606
-RMD160 edc4da2507e2a4ff024d261edd88b6a1bce6d2bb ChangeLog 5606
-SHA256 faabecd0d9f6f6fcf14047ad1dafc0c6e097206bc3e71b1cd6949f11ed7b1c26 ChangeLog 5606
+MISC ChangeLog 5807 RMD160 4881a7e7a810928c883c9cec0571f04cdcb08174 SHA1 17c1374952751ab198ab776f7622c1c7cb1bf56f SHA256 3e80432344b8c29740a9163eddfa7c7e12562fa4ef596e376a9c753655177a30
+MD5 8c3d490aa5e0a2f23193c9398e1ee868 ChangeLog 5807
+RMD160 4881a7e7a810928c883c9cec0571f04cdcb08174 ChangeLog 5807
+SHA256 3e80432344b8c29740a9163eddfa7c7e12562fa4ef596e376a9c753655177a30 ChangeLog 5807
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,3 +25,10 @@ SHA256 dc5e1bb45062f80031a8ed9386b2f96ed78cf396d6c370acc9511032a42a99cc files/di
 MD5 ed5c6ffa606a1a356f05ac30cdbae14f files/digest-commons-beanutils-1.7.0-r2 283
 RMD160 4b8d6880facc296ef1918717cbdf97d24610dd9b files/digest-commons-beanutils-1.7.0-r2 283
 SHA256 0dde4b4160450df0de3c3fe1f07a7fe1407dc7ef9a4a820564e223f380c5f743 files/digest-commons-beanutils-1.7.0-r2 283
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGTLgncxLzpIGCsLQRAnbMAKCJs4BpMGnSFdtLNKUb1uQsSrBb9gCffOle
+Q8fiQjigDOAaT+1p8uBnWIg=
+=ZKcO
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
index d134bf82e358..56ea013b3ab9 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.10 2007/02/10 18:59:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.11 2007/05/17 20:16:39 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -19,8 +21,6 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.3
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${P}-src"
@@ -28,11 +28,11 @@ S="${WORKDIR}/${P}-src"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" 	> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	java-ant_rewrite-classpath
 }
 
+EANT_GENTOO_CLASSPATH="commons-collections,commons-logging"
+
 src_install() {
 	java-pkg_dojar dist/${PN}*.jar