Version bump. Fixes bug #152269.

(Portage version: 2.1.4.4)

4 files changed, 120 insertions, 5 deletions

diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 8fe27a505dbf..26f3d645a88e 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.41 2007/05/23 17:03:38 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.42 2008/04/05 00:57:02 betelgeuse Exp $
+
+*commons-validator-1.3.1 (05 Apr 2008)
+
+  05 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/validator-1.3.build.xml.patch, commons-validator-1.1.4-r1.ebuild,
+  +commons-validator-1.3.1.ebuild:
+  Version bump. Fixes bug #152269.
 
   23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
index fdf61577b69a..0c60e198fa57 100644
--- a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4-r1.ebuild,v 1.8 2007/05/17 20:25:30 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild,v 1.9 2008/04/05 00:57:02 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
-DESCRIPTION="Jakarta component to validate user input, or data input"
+DESCRIPTION="Commons component to validate user input, or data input"
 HOMEPAGE="http://jakarta.apache.org/commons/validator/"
 SRC_URI="mirror://apache/jakarta/commons/validator/source/${MY_P}.tar.gz
 		 mirror://gentoo/${P}-gentoo-missingfiles.tar.bz2"
diff --git a/dev-java/commons-validator/commons-validator-1.3.1.ebuild b/dev-java/commons-validator/commons-validator-1.3.1.ebuild
new file mode 100644
index 000000000000..855c541c6da2
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 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.3.1.ebuild,v 1.1 2008/04/05 00:57:02 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P}-src
+DESCRIPTION="Commons component to validate user input, or data input"
+HOMEPAGE="http://commons.apache.org/validator/"
+SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/jakarta-oro:2.0
+	>=dev-java/commons-digester-1.6
+	>=dev-java/commons-collections-3.1
+	>=dev-java/commons-logging-1.0.4
+	dev-java/commons-beanutils:1.7"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit:0 )
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/validator-1.3.build.xml.patch"
+	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
+
+	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-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
+	local logjar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+	echo "commons-logging.jar=${logjar}" >> build.properties
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
+}
+
+EANT_EXTRA_ARGS="-Dskip.download=true"
+EANT_BUILD_TARGET="compile"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	jar -cf ${PN}.jar -C target/classes/ . || die "could not create jar"
+}
+
+src_test() {
+	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+	local deps="jakarta-oro-2.0,commons-digester,commons-beanutils-1.6"
+	local deps="${deps},commons-logging,commons-collections,junit"
+	eant test -Dskip.download=true \
+		-Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${deps})"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc NOTICE.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/apidocs
+	use examples && java-pkg_doexamples src/example
+	use source && java-pkg_dosrc src/share/*
+}
diff --git a/dev-java/commons-validator/files/validator-1.3.build.xml.patch b/dev-java/commons-validator/files/validator-1.3.build.xml.patch
new file mode 100644
index 000000000000..98d048e0b6ce
--- /dev/null
+++ b/dev-java/commons-validator/files/validator-1.3.build.xml.patch
@@ -0,0 +1,38 @@
+--- build.xml.o	2006-10-21 18:12:49.000000000 +0200
++++ build.xml	2006-10-21 18:29:18.000000000 +0200
+@@ -122,11 +122,12 @@
+ 

+   <!-- Construct compile classpath -->

+   <path id="compile.classpath">

+-    <pathelement location="${build.home}/classes"/>

+-    <pathelement location="${commons-beanutils.jar}"/>

+-    <pathelement location="${commons-digester.jar}"/>

+-    <pathelement location="${commons-logging.jar}"/>

+-    <pathelement location="${oro.jar}"/>

++    <pathelement path="${build.home}/classes"/>

++    <pathelement path="${commons-beanutils.jar}"/>

++    <pathelement path="${commons-digester.jar}"/>

++    <pathelement path="${commons-logging.jar}"/>

++    <pathelement path="${commons-collections.jar}"/>

++    <pathelement path="${oro.jar}"/>

+     <path refid="downloaded.lib.classpath"/>

+   </path>

+ 

+@@ -204,7 +205,7 @@
+   </target>

+ 

+ 

+-  <target name="compile" depends="static"

++  <target name="compile" depends="prepare"

+    description="Compile shareable components">

+     <javac  srcdir="${source.home}"

+            destdir="${build.home}/classes"

+@@ -278,7 +279,7 @@
+     </exec>

+   </target>

+ 

+-  <target name="javadoc" depends="compile, javadoc.js"

++  <target name="javadoc" depends="compile"

+    description="Create component Javadoc documentation">

+     <javadoc sourcepath="${source.home}"

+                 destdir="${dist.home}/docs/apidocs"