fix deps, some cleanups

(Portage version: 2.0.51.22-r1)

4 files changed, 26 insertions, 32 deletions

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index d6111261d2b9..c2e6ffb70503 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.23 2005/05/14 16:07:59 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.24 2005/07/09 16:00:26 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  commons-beanutils-1.6.1-r2.ebuild, commons-beanutils-1.7.0-r1.ebuild:
+  fix deps, some cleanups
 
 *commons-beanutils-1.7.0-r1 (14 May 2005)
 *commons-beanutils-1.6.1-r2 (14 May 2005)
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index a3bb8a24883d..851a64b3efdc 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24371946a712a7f5e4c08e943ee22b88 commons-beanutils-1.7.0-r1.ebuild 1437
-MD5 3bf7a2d13a0907fa79c6c73d8bcb1435 commons-beanutils-1.6.1-r2.ebuild 1430
-MD5 ca01e6b71265b734c7ccd02531d2fd17 ChangeLog 3585
+MD5 1ff476c6a429898ef98253808937853c commons-beanutils-1.7.0-r1.ebuild 1441
+MD5 bf9e370d301357d5ac32e8a02c783dac commons-beanutils-1.6.1-r2.ebuild 1444
+MD5 ffca55f6a3bee779e028697383b04522 ChangeLog 3733
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a65fcfbd83466bf025820b316482b38a files/digest-commons-beanutils-1.6.1-r2 79
 MD5 776456ec1cdc342af0507027a94da5d3 files/digest-commons-beanutils-1.7.0-r1 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFChiJy06ebR+OMO78RAt1AAJ4ytrhROfTY6TUCUq9PBOIrmX7BOQCfbjBf
-aq37iNQMB6LlE7d+hI6gIDE=
-=8d+X
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild
index 62d8ccfa3587..82668fd1a44a 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.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-beanutils/commons-beanutils-1.6.1-r2.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild,v 1.2 2005/07/09 16:00:26 axxo Exp $
 
 inherit java-pkg
 
@@ -13,13 +13,14 @@ SLOT="1.6"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
 IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${P}-src
 
@@ -27,9 +28,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	echo "commons-collections.jar=$(java-config -p commons-collections)" \
-		> build.properties
-	echo "commons-logging.jar=$(java-config -p commons-logging)" | sed s/\=.*:/\=/ >> build.properties
+	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
 }
 
 src_compile() {
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild
index e18970abec12..707fe377bc54 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.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-beanutils/commons-beanutils-1.7.0-r1.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild,v 1.2 2005/07/09 16:00:26 axxo Exp $
 
 inherit java-pkg
 
@@ -13,23 +13,23 @@ SLOT="1.7"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
 IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2"
-S=${WORKDIR}/${PN}-${PV}-src
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	echo "commons-collections.jar=$(java-config -p commons-collections)" \
-		> build.properties
-	echo "commons-logging.jar=$(java-config -p commons-logging)" \
-		| sed s/\=.*:/\=/ >> build.properties
+	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
 }
 
 src_compile() {