Version bump. Fixes bug #152269.

Package-Manager: portage-2.1.4.4

5 files changed, 135 insertions, 7 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/Manifest b/dev-java/commons-validator/Manifest
index 60236fd61982..6c87c2a1962b 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX validator-1.3.build.xml.patch 1399 RMD160 141bd427e1c468de040e639f6ceebfa0dbbd5e92 SHA1 5aa161c899acd7978ad5d466edf0c336833ed976 SHA256 93abf25e854cac7f0893d68c10fa6856cec5b4a6b0e8b1c9544b8a3d9447a844
 DIST commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161 RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c SHA1 c50c5e0c6c864e9c21a75e3553449a513098014a SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc
 DIST commons-validator-1.1.4-src.tar.gz 181446 RMD160 d9067980087e963083f96506319fb5f1a53549dd SHA1 1f8230619d30afe7c03e9fbd19eb0e9f2dfe1003 SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844
-EBUILD commons-validator-1.1.4-r1.ebuild 2065 RMD160 b0c076dbfc23c28c5b5297ea680c988850ef43df SHA1 19a7c0abfc8db675f750a25f34f17b9e9320d258 SHA256 782c5c9356282dbee9661a2371490cdc44ab3d8b10d36e6af9a52cf142c14364
-MISC ChangeLog 6655 RMD160 2354bc2c63af03dfa3b4985ff123a948b86a5ee9 SHA1 feb471f32220bca7dd987f4baa5ca85536d3015d SHA256 dd6823a673553b23f22f9bfe3aaa218e1fe8eb34437b3f2c30dd3ecf248e3f03
+DIST commons-validator-1.3.1-src.tar.gz 170690 RMD160 136c71ea7a9e356674aa4266e1f8d7079f253b10 SHA1 5df7942e659422569f837765db8149297a33ec06 SHA256 2a1e586b4e29de7835a6b3694950624248f277b40cac899008e99003eb060300
+EBUILD commons-validator-1.1.4-r1.ebuild 2065 RMD160 9687ad66882ed1bc6dd4ac152ac50a4ca6724222 SHA1 54135a675bfd91cbe475a96f751801a95812428e SHA256 e844b738a0aeaf0415a06a61da320623433fbe2ab21020faa8a0cd85572e9dd8
+EBUILD commons-validator-1.3.1.ebuild 2242 RMD160 57acd5d9141f2fa9b31f0c23ddf5a82a7e9643d4 SHA1 4c3df4efefd395dacb471a2efaa0e780cf907200 SHA256 96861d88bcf73cb38978b71624b8b999bf16c0b88bef371366ac3711805627b7
+MISC ChangeLog 6895 RMD160 d4e72bfd3fe3171228fbe0b86f41cd33d9685f54 SHA1 8af181d904d7c8fa060e1ff60bdb5e3c00000092 SHA256 b9fe5ff9411eb7379327797686f385214af8df2d9f69a8b28df1952a71da2f14
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH9s5gcxLzpIGCsLQRAq8AAJ9/+To1TmGy1Y4RvLiolSKVHLQWOgCdHvVt
+lkluJ+BX5bt7bFA/ZTtBjXM=
+=+j40
+-----END PGP SIGNATURE-----
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"