6 files changed, 36 insertions, 63 deletions
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index e88446606cd2..088e48eba21b 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-validator
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.6 2003/04/26 05:36:58 strider Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.7 2004/03/17 06:34:49 zx Exp $
+
+*commons-validator-1.0.2-r1 (17 Mar 2004)
+
+  17 Mar 2004; Chris Aniszczyk <zx@gentoo.org>
+  commons-validator-1.0.1-r1.ebuild, commons-validator-1.0.2-r1.ebuild,
+  commons-validator-1.0.2.ebuild:
+  Clean up like crazy. Removed jakarta-commons.eclass stuff because it's broken.
 
 *commons-validator-1.0.2 (22 Apr 2003)
 
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 892a5e901f4b..a6f32cc817dd 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,4 @@
-MD5 6cef903272b1d95d4502400b473dd59b commons-validator-1.0.1-r1.ebuild 1747
-MD5 3cde449fb3aeda9782bc02d8f308cb4f commons-validator-1.0.2.ebuild 1707
-MD5 0effc24a1f110be33fa0aa8773926c36 ChangeLog 1176
+MD5 3aa565bb9df2a003c724314a912e236c commons-validator-1.0.2-r1.ebuild 1921
+MD5 af3a472153b212fd0e12a739758dfded ChangeLog 1448
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 3b4d11c72fe5990ec6689406240d3ef6 files/digest-commons-validator-1.0.2 78
-MD5 9662be5b3dfd04427b8e37c8fcba691a files/digest-commons-validator-1.0.1-r1 147
+MD5 3b4d11c72fe5990ec6689406240d3ef6 files/digest-commons-validator-1.0.2-r1 78
diff --git a/dev-java/commons-validator/commons-validator-1.0.1-r1.ebuild b/dev-java/commons-validator/commons-validator-1.0.1-r1.ebuild
deleted file mode 100644
index f2dbe1f12681..000000000000
--- a/dev-java/commons-validator/commons-validator-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 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.1-r1.ebuild,v 1.3 2003/04/26 05:36:58 strider Exp $
-
-inherit jakarta-commons
-
-S="${WORKDIR}/validator-${PV}-src"
-DESCRIPTION="Jakarta component to validate user input, or data input"
-HOMEPAGE="http://jakarta.apache.org/commons/validator/"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-commons/release/${PN}/v${PV}/validator-${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
-	junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc jikes junit"
-
-src_compile() {
-	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
-	jakarta-commons_src_compile myconf make
-
-	# UGLY HACK
-	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
-	cd ${S}/target/classes
-	zip -r ../${PN}-${PV}.jar org
-
-	jakarta-commons_src_install dojar
-	use doc && jakarta-commons_src_compile makedoc
-	use doc && jakarta-commons_src_install html
-}
diff --git a/dev-java/commons-validator/commons-validator-1.0.2.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
index 30b9053712c8..5b111aea5280 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.3 2003/07/11 21:41:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild,v 1.1 2004/03/17 06:34:49 zx Exp $
 
-inherit jakarta-commons
+inherit java-pkg
 
-S="${WORKDIR}/${P}-src"
 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"
@@ -16,28 +15,42 @@ 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
+	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_compile() {
 	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-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
-	jakarta-commons_src_compile myconf make
 
-	# UGLY HACK
+	local antflags="compile"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test"
+	ant ${antflags}
+}
+
+src_install() {
+	#HACK
 	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
 	cd ${S}/target/classes
-	zip -r ../${PN}-${PV}.jar org
+	zip -qr ../${PN}.jar org
 
-	jakarta-commons_src_install dojar
-	use doc && jakarta-commons_src_compile makedoc
-	use doc && jakarta-commons_src_install html
+	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.1-r1 b/dev-java/commons-validator/files/digest-commons-validator-1.0.1-r1
deleted file mode 100644
index d6e04fae2fba..000000000000
--- a/dev-java/commons-validator/files/digest-commons-validator-1.0.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c51666899dc54bfdf82cb2a03ea04f67 /commons-validator-1.0.1-r1.ebuild 1750
-MD5 461c02332ccd971426cb1c8620ab1bab validator-1.0.1-src.tar.gz 51653
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r1
index f6bd8c581e2d..f6bd8c581e2d 100644
--- a/dev-java/commons-validator/files/digest-commons-validator-1.0.2
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r1