Fixes #53620.

4 files changed, 70 insertions, 3 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index eb8d91d8e7e2..20fbbf9a6f79 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.8 2004/04/05 04:59:48 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.9 2004/06/19 23:39:46 karltk Exp $
+
+*commons-validator-1.0.2-r2 (20 Jun 2004)
+
+  20 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  commons-validator-1.0.2-r2.ebuild: Added proper dep for zip, using
+  patch by  Thomas Matthijs <axxo@keanu.be>, fixes #53620.
 
   04 Apr 2004; Chris Aniszczyk <zx@gentoo.org>
   commons-validator-1.0.2-r1.ebuild:
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
index aa6a849baa4e..a48d1d0aa5eb 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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-r1.ebuild,v 1.2 2004/04/05 04:59:48 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild,v 1.3 2004/06/19 23:39:46 karltk Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.3
 	>=dev-java/commons-logging-1.0
 	>=dev-java/commons-beanutils-1.0
 	>=dev-java/xerces-2.0.1
-	app-arch/unzip
+	app-arch/zip
 	jikes? ( dev-java/jikes )
 	junit? ( >=junit-3.7 )"
 RDEPEND=">=virtual/jre-1.3"
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..f5d632b9ffdb
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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-r2.ebuild,v 1.1 2004/06/19 23:39:46 karltk 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"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-1.4
+	>=dev-java/oro-2.0.6
+	>=dev-java/commons-digester-1.0
+	>=dev-java/commons-collections-2.0
+	>=dev-java/commons-logging-1.0
+	>=dev-java/commons-beanutils-1.0
+	>=dev-java/xerces-2.0.1
+	app-arch/zip
+	jikes? ( dev-java/jikes )
+	junit? ( >=junit-3.7 )"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+RESTRICT="nomirror"
+KEYWORDS="x86 ~ppc ~sparc"
+IUSE="doc jikes junit"
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	echo "oro.jar=`java-config --classpath=oro`" >> 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`" >> build.properties
+	echo "xerces.jar=`java-config --classpath=xerces`" >> build.properties
+}
+
+src_compile() {
+	local antflags="compile"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test"
+	ant ${antflags}
+}
+
+src_install() {
+	# Dirty hack
+	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
+	cd ${S}/target/classes
+	zip -qr ../${PN}.jar org
+
+	cd ${S}
+	java-pkg_dojar target/${PN}.jar
+	use doc && dohtml -r dist/docs/
+	dohtml PROPOSAL.html STATUS.html
+	dodoc RELEASE-NOTES.txt
+}
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2
new file mode 100644
index 000000000000..f6bd8c581e2d
--- /dev/null
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r2
@@ -0,0 +1 @@
+MD5 917cf3d82847e497e11f9e86488d4b56 commons-validator-1.0.2-src.tar.gz 53692