fix deps, cleanup

(Portage version: 2.0.51.22-r1)

2 files changed, 18 insertions, 12 deletions

diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 3a4a66867b2d..0dedc85865e8 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.26 2005/06/04 20:59:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.27 2005/07/10 12:49:16 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  commons-digester-1.6-r1.ebuild:
+  fix deps, cleanup
 
   04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
   commons-digester-1.6-r1.ebuild:
diff --git a/dev-java/commons-digester/commons-digester-1.6-r1.ebuild b/dev-java/commons-digester/commons-digester-1.6-r1.ebuild
index 7553dcd29fb7..479550262afc 100644
--- a/dev-java/commons-digester/commons-digester-1.6-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.6-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-digester/commons-digester-1.6-r1.ebuild,v 1.3 2005/06/04 20:59:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.6-r1.ebuild,v 1.4 2005/07/10 12:49:16 axxo Exp $
 
 inherit java-pkg
 
@@ -13,16 +13,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="doc jikes junit source"
 
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/commons-beanutils-1.6*
+	>=dev-java/commons-collections-2.1
+	>=dev-java/commons-logging-1.0.2"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
 	junit? ( >=dev-java/junit-3.7 )
 	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3
-	=dev-java/commons-beanutils-1.6*
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-logging-1.0.2"
-S=${WORKDIR}/${PN}-${PV}-src
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src
 
 src_compile() {
 	local antflags="dist"
@@ -30,10 +32,10 @@ src_compile() {
 	use junit && antflags="${antflags} test"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	use junit && antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-config -p commons-beanutils-1.6 | sed s/:.*//)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
-	antflags="${antflags} -Dcommons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar"
+	use junit && antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	ant ${antflags} || die "compilation failed"
 }