Version bump + ebuild improvements

(Portage version: 2.1.2-r1)

4 files changed, 88 insertions, 2 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 21529c65c373..11152285f51c 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jxpath
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.10 2006/07/22 22:58:20 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.11 2007/01/21 01:01:45 fordfrog Exp $
+
+*commons-jxpath-1.2 (21 Jan 2007)
+
+  21 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/commons-jxpath-1.2-gentoo.patch, +commons-jxpath-1.2.ebuild:
+  Version bump + ebuild improvements
 
 *commons-jxpath-1.1-r2 (22 Jul 2006)
 
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild
new file mode 100644
index 000000000000..66467290deed
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild,v 1.1 2007/01/21 01:01:45 fordfrog Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
+HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
+SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source test"
+
+COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
+	=dev-java/servletapi-2.3*
+	>=dev-java/jdom-1.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+# Limited to jdk-1.4 because javadoc fails with other jdks
+DEPEND="=virtual/jdk-1.4*
+	!test? ( dev-java/ant-core )
+	test? (
+		dev-java/ant
+		dev-java/commons-collections
+		dev-java/commons-logging
+		=dev-java/junit-3.8*
+	)
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	mkdir -p ${S}/target/lib
+	cd ${S}/target/lib
+	java-pkg_jar-from commons-beanutils-1.6
+	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from jdom-1.0
+	if use test ; then
+		java-pkg_jar-from commons-collections
+		java-pkg_jar-from commons-logging
+		java-pkg_jar-from junit
+	fi
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch b/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch
new file mode 100644
index 000000000000..1f87d01f9342
--- /dev/null
+++ b/dev-java/commons-jxpath/files/commons-jxpath-1.2-gentoo.patch
@@ -0,0 +1,18 @@
+--- build.xml.orig	2006-10-13 00:54:56.000000000 +0200
++++ build.xml	2006-10-13 00:55:08.000000000 +0200
+@@ -52,7 +52,7 @@
+       </fileset>

+     </copy>

+   </target>

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++  <target name="jar" description="o Create the jar" depends="compile">

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">

+     </jar>

+   </target>

+@@ -182,4 +182,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">

+     </unjar>

+   </target>

+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>

diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2
new file mode 100644
index 000000000000..da372825b8a2
--- /dev/null
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2
@@ -0,0 +1,3 @@
+MD5 e3a6201ca1d967717a196940ec6362fc commons-jxpath-1.2-src.tar.gz 184231
+RMD160 77d39147a9c17cc044bb0ad080c183d36ce8038e commons-jxpath-1.2-src.tar.gz 184231
+SHA256 85b6cb3d5cfb92dbf4ace9ddd8d6880ccf86ba521039ff0e75483e3a86783b40 commons-jxpath-1.2-src.tar.gz 184231