Version bump + ebuild improvements

Package-Manager: portage-2.1.2-r1

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 21529c65c373a07f82a5b7e6f0a0050ad417ddb4..11152285f51cead2b4e5f1a50b809718e50cf8bd 100644 (file)
--- 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/Manifest b/dev-java/commons-jxpath/Manifest
index a7df0042b489997ff81bff3ac731fa81f77e24e4..956298b4cab71a47f59f6a2883c892fc01b41e45 100644 (file)
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,7 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX commons-jxpath-1.2-gentoo.patch 657 RMD160 602218617d7108a85a41022b601b58e8840217b0 SHA1 2fbf6692f601544b10fd19288e870bda887f6767 SHA256 8af00bb31da88eae4d6ba8f5617ad728416e64951f9722c6c681c793aeafb39b
+MD5 d1b5492badaeab329958c059b54cc5be files/commons-jxpath-1.2-gentoo.patch 657
+RMD160 602218617d7108a85a41022b601b58e8840217b0 files/commons-jxpath-1.2-gentoo.patch 657
+SHA256 8af00bb31da88eae4d6ba8f5617ad728416e64951f9722c6c681c793aeafb39b files/commons-jxpath-1.2-gentoo.patch 657
 DIST commons-jxpath-1.1-src.tar.gz 181809 RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 SHA1 48c371595af43a8d09295077145e81716e2a8e0d SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46
+DIST commons-jxpath-1.2-src.tar.gz 184231 RMD160 77d39147a9c17cc044bb0ad080c183d36ce8038e SHA1 56e0d69c2797371ff96743eea4f03deb73ecb509 SHA256 85b6cb3d5cfb92dbf4ace9ddd8d6880ccf86ba521039ff0e75483e3a86783b40
 EBUILD commons-jxpath-1.1-r1.ebuild 1275 RMD160 8d5b5c8cacc8fd947762c985fb5245d0a7c58d2c SHA1 a701ad828b5b8aa15929496cfd16f1bbfb6386a5 SHA256 2c234c5b915f44a567526d3d4c4da6576b000d80c7d2363fbc71c68e6879cf40
 MD5 53b0dd95594e1315f466ae4d02012267 commons-jxpath-1.1-r1.ebuild 1275
 RMD160 8d5b5c8cacc8fd947762c985fb5245d0a7c58d2c commons-jxpath-1.1-r1.ebuild 1275
@@ -10,10 +12,14 @@ EBUILD commons-jxpath-1.1-r2.ebuild 1295 RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d
 MD5 f650ffcc29ab7bd7a9296c52233c4a8e commons-jxpath-1.1-r2.ebuild 1295
 RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d10668eb5 commons-jxpath-1.1-r2.ebuild 1295
 SHA256 2d1ee566b95f14eefe3c6477d0ad82e8daaf478f3f1bf454ffddbbb0c8a42c03 commons-jxpath-1.1-r2.ebuild 1295
-MISC ChangeLog 1406 RMD160 b2e9000575691ddb6f7bf25ca8b0bd86038a5923 SHA1 223c40bfdf1d7331274cf1d9c62057d8e84d4e79 SHA256 4a0dad780ae5d51d5a16de2d905807aecb95c61857e5e685f5eb59b30a3a345c
-MD5 7a8cf532c1318778bddc8015d0df08cd ChangeLog 1406
-RMD160 b2e9000575691ddb6f7bf25ca8b0bd86038a5923 ChangeLog 1406
-SHA256 4a0dad780ae5d51d5a16de2d905807aecb95c61857e5e685f5eb59b30a3a345c ChangeLog 1406
+EBUILD commons-jxpath-1.2.ebuild 1479 RMD160 d9d1cd73f024d8757bbb986f7f833fa2df79cc84 SHA1 f10a836fe06a065e39296593afe16ee8fcc78a56 SHA256 da05cd447bac8db75d4a835c15e1f42c7a6f71221352567abe511dcca5968959
+MD5 b02d1ad25502e90ffc0ae5a565eea565 commons-jxpath-1.2.ebuild 1479
+RMD160 d9d1cd73f024d8757bbb986f7f833fa2df79cc84 commons-jxpath-1.2.ebuild 1479
+SHA256 da05cd447bac8db75d4a835c15e1f42c7a6f71221352567abe511dcca5968959 commons-jxpath-1.2.ebuild 1479
+MISC ChangeLog 1601 RMD160 4be490b92689bea238c4d2297446885ef45ce9a6 SHA1 dab833ef3c28e4de53779b5a889ea8355d3091fd SHA256 350f003f882572d830421622fe1ad9d6de0e123e3a9b4521e35a84e54c8fb295
+MD5 8f2db778774f64f5fba80b266a132a67 ChangeLog 1601
+RMD160 4be490b92689bea238c4d2297446885ef45ce9a6 ChangeLog 1601
+SHA256 350f003f882572d830421622fe1ad9d6de0e123e3a9b4521e35a84e54c8fb295 ChangeLog 1601
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -24,10 +30,6 @@ SHA256 3cd112afffbbf19f76868699496cfc663070349311bdd584abbf78eb6962560d files/di
 MD5 2e27bbc9d7e8de76fc433c51e4d0107a files/digest-commons-jxpath-1.1-r2 268
 RMD160 150d458da6849617be3216737470881feb3255e4 files/digest-commons-jxpath-1.1-r2 268
 SHA256 3cd112afffbbf19f76868699496cfc663070349311bdd584abbf78eb6962560d files/digest-commons-jxpath-1.1-r2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwq2Wgo/w9rxVVVERAvxvAKCVnOsBs5xbXSlVwLlKsRovt6JSawCcDGKl
-jirEiCqRogi7StInNW9S94s=
-=62T6
------END PGP SIGNATURE-----
+MD5 1c0580380dd9face127c630de498eba8 files/digest-commons-jxpath-1.2 268
+RMD160 934f49297e2eac197117efb3af08fab59813d744 files/digest-commons-jxpath-1.2 268
+SHA256 d02b085df57c226745148456c00f2203455a5cecf31f51aeb422dfc3915b5e72 files/digest-commons-jxpath-1.2 268

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 (file)
index 0000000..6646729
--- /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 (file)
index 0000000..1f87d01
--- /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>\r
+     </copy>\r
+   </target>\r
+-  <target name="jar" description="o Create the jar" depends="compile,test">\r
++  <target name="jar" description="o Create the jar" depends="compile">\r
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">\r
+     </jar>\r
+   </target>\r
+@@ -182,4 +182,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">\r
+     </unjar>\r
+   </target>\r
+-</project>
+\ Chybí znak konce řádku na konci souboru
++</project>\r

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 (file)
index 0000000..da37282
--- /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