dep fixes, cleanup

(Portage version: 2.0.51.22-r1)

3 files changed, 37 insertions, 33 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 5e2aeaccacaa..757d1662f94e 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.26 2005/05/29 15:52:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.27 2005/07/10 15:02:29 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  commons-validator-1.0.2-r5.ebuild, commons-validator-1.1.3-r1.ebuild:
+  dep fixes, cleanup
 
   29 May 2005; Markus Rothe <corsair@gentoo.org>
   commons-validator-1.1.3-r1.ebuild:
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild
index 9e0c55fdfda9..d709ee731f42 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild
@@ -1,21 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild,v 1.1 2005/05/14 16:10:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild,v 1.2 2005/07/10 15:02:29 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Jakarta component to validate user input, or data input"
 HOMEPAGE="http://jakarta.apache.org/commons/validator/"
-SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
+SRC_URI="mirror://apache/jakarta/commons/validator/source/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc amd64"
 IUSE="doc examples jikes source"
-
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	app-arch/zip
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/jakarta-oro-2.0*
 	>=dev-java/commons-digester-1.0
@@ -23,18 +18,23 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-logging-1.0
 	=dev-java/commons-beanutils-1.6*
 	>=dev-java/xerces-2.6.2-r1"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	>=dev-java/ant-1.6
+	app-arch/zip
+	jikes? ( dev-java/jikes )"
 
 S="${WORKDIR}/${P}-src"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	echo "oro.jar=`java-config -p jakarta-oro-2.0`" >> build.properties
-	echo "commons-digester.jar=`java-config -p commons-digester`" >> build.properties
-	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-beanutils.jar=`java-config -p commons-beanutils-1.6`" >> build.properties
-	echo "xerces.jar=`java-config -p xerces-2`" >> build.properties
+	echo "oro.jar=$(java-pkg_getjars jakarta-oro-2.0)" >> build.properties
+	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> 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
+	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.6)" >> build.properties
+	echo "xerces.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> build.properties
 }
 
 src_compile() {
diff --git a/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild b/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild
index e7e50ba066ac..dd2bdc30b583 100644
--- a/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild,v 1.2 2005/05/29 15:52:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild,v 1.3 2005/07/10 15:02:29 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Jakarta component to validate user input, or data input"
 HOMEPAGE="http://jakarta.apache.org/commons/validator/"
-SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz mirror://gentoo/commons-validator-1.1.3-gentoo-missingfiles.tar.bz2"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
+SRC_URI="mirror://apache/jakarta/commons/validator/source/${P}-src.tar.gz mirror://gentoo/commons-validator-1.1.3-gentoo-missingfiles.tar.bz2"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+IUSE="doc examples jikes source"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/jakarta-oro-2.0*
 	>=dev-java/commons-digester-1.5
@@ -18,23 +18,23 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-logging-1.0.3
 	=dev-java/commons-beanutils-1.6*
 	>=dev-java/xerces-2.6.2-r1"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
-IUSE="doc examples jikes source"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	>=dev-java/ant-1.4
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	#dirty hack
-	sed -e 's:target name="compile" depends="static":target name="compile" depends="prepare":' -i build.xml
-
-	echo "oro.jar=`java-config --classpath=jakarta-oro-2.0`" >> build.properties
-	echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
-	echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
-	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils-1.6 | sed s/.*://`" >> build.properties
-	echo "xerces.jar=`java-config --classpath=xerces-2`" >> build.properties
+	sed -e 's:target name="compile" depends="static":target name="compile" depends="prepare":' -i build.xml || die "sed failed"
+	echo "oro.jar=$(java-pkg_getjars jakarta-oro-2.0)" >> build.properties
+	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> 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
+	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.6)" >> build.properties
+	echo "xerces.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> build.properties
 }
 
 src_compile() {
@@ -42,7 +42,7 @@ src_compile() {
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
 	ant ${antflags} || die "build failed"
-	jar -cvf ${PN}.jar -C target/classes/ . || die "could not create jar"
+	jar -cf ${PN}.jar -C target/classes/ . || die "could not create jar"
 }
 
 src_install() {