moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337. introduced support for the examples and the source useflag.

(Portage version: 2.0.51.19)

4 files changed, 90 insertions, 10 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index fc6d3ca89bcb..9f7c103d922b 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.20 2005/02/23 21:48:51 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.21 2005/03/29 16:48:58 luckyduck Exp $
+
+*commons-validator-1.0.2-r4 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +commons-validator-1.0.2-r4.ebuild, commons-validator-1.1.3.ebuild:
+  moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.
+  introduced support for the examples and the source useflag.
 
   23 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
   commons-validator-1.0.2-r3.ebuild, commons-validator-1.1.3.ebuild:
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..14d4e2ea5d7b
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild
@@ -0,0 +1,64 @@
+# 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-r4.ebuild,v 1.1 2005/03/29 16:48:58 luckyduck 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
+	app-arch/zip
+	jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/jakarta-oro-2.0*
+	>=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.6.2-r1"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="doc examples jikes source"
+
+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`" >> build.properties
+	echo "xerces.jar=`java-config -p xerces-2`" >> build.properties
+}
+
+src_compile() {
+	local antflags="compile"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	ant ${antflags} || die "build failed"
+}
+
+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
+	if use doc; then
+		java-pkg_dohtml -r dist/docs/
+		java-pkg_dohtml PROPOSAL.html STATUS.html
+		dodoc RELEASE-NOTES.txt
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/example/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/share/*
+}
diff --git a/dev-java/commons-validator/commons-validator-1.1.3.ebuild b/dev-java/commons-validator/commons-validator-1.1.3.ebuild
index 1f3abedf5b86..9adafa440182 100644
--- a/dev-java/commons-validator/commons-validator-1.1.3.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.3.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-validator/commons-validator-1.1.3.ebuild,v 1.8 2005/02/23 21:48:51 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.3.ebuild,v 1.9 2005/03/29 16:48:58 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,9 +9,10 @@ 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 )"
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
-	>=dev-java/oro-2.0.8
+	=dev-java/jakarta-oro-2.0*
 	>=dev-java/commons-digester-1.5
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.3
@@ -20,7 +21,7 @@ RDEPEND=">=virtual/jre-1.3
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="doc jikes"
+IUSE="doc examples jikes source"
 
 src_unpack() {
 	unpack ${A}
@@ -28,7 +29,7 @@ src_unpack() {
 	#dirty hack
 	sed -e 's:target name="compile" depends="static":target name="compile" depends="prepare":' -i build.xml
 
-	echo "oro.jar=`java-config --classpath=oro`" >> build.properties
+	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
@@ -45,9 +46,16 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}
 	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r dist/docs/
-	dohtml PROPOSAL.html STATUS.html
-	dodoc LICENSE.txt
+
+	if use doc; then
+		java-pkg_dohtml -r dist/docs/
+		java-pkg_dohtml PROPOSAL.html STATUS.html
+		dodoc LICENSE.txt
+	fi
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/example/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/share/*
 }
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r4 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r4
new file mode 100644
index 000000000000..f6bd8c581e2d
--- /dev/null
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r4
@@ -0,0 +1 @@
+MD5 917cf3d82847e497e11f9e86488d4b56 commons-validator-1.0.2-src.tar.gz 53692