From: Joshua Nichols Date: Sun, 21 Jan 2007 03:38:04 +0000 (+0000) Subject: Changed build dependency to Java 1.4 or 1.5 from just Java 1.4. Fixed location where... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a0b0e0712e5e633682320379dd6a9213ac768e0;p=gentoo.git Changed build dependency to Java 1.4 or 1.5 from just Java 1.4. Fixed location where javadocs are installed to. Package-Manager: portage-2.1.2-r1 --- diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog index 11152285f51c..a798fb053164 100644 --- a/dev-java/commons-jxpath/ChangeLog +++ b/dev-java/commons-jxpath/ChangeLog @@ -1,10 +1,17 @@ # ChangeLog for dev-java/commons-jxpath # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.12 2007/01/21 03:38:04 nichoj Exp $ + +*commons-jxpath-1.2-r1 (21 Jan 2007) + + 21 Jan 2007; Joshua Nichols commons-jxpath-1.2.ebuild, + +commons-jxpath-1.2-r1.ebuild: + Changed build dependency to Java 1.4 or 1.5 from just Java 1.4. + Fixed location where javadocs are installed to. *commons-jxpath-1.2 (21 Jan 2007) - 21 Jan 2007; Miroslav Šulc + 21 Jan 2007; Miroslav Å ulc +files/commons-jxpath-1.2-gentoo.patch, +commons-jxpath-1.2.ebuild: Version bump + ebuild improvements diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest index 956298b4cab7..f1f22c38de88 100644 --- a/dev-java/commons-jxpath/Manifest +++ b/dev-java/commons-jxpath/Manifest @@ -12,14 +12,18 @@ 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 -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 +EBUILD commons-jxpath-1.2-r1.ebuild 1490 RMD160 849f797ddc4693d50979737d5436e7d1969c7568 SHA1 572410509c18264b93faabe53f91627202f631cf SHA256 9566c6995eddb36228278a25de0deb7c6eab0c5acad5b432d1876bad5c33fa69 +MD5 ea30c8150b8981beadf15b572e5bfbeb commons-jxpath-1.2-r1.ebuild 1490 +RMD160 849f797ddc4693d50979737d5436e7d1969c7568 commons-jxpath-1.2-r1.ebuild 1490 +SHA256 9566c6995eddb36228278a25de0deb7c6eab0c5acad5b432d1876bad5c33fa69 commons-jxpath-1.2-r1.ebuild 1490 +EBUILD commons-jxpath-1.2.ebuild 1487 RMD160 a2beb2fb107cd87c2fdc02951508c41cef91315b SHA1 4d71cdf72262bad5d790ca8d2f40e70746856d4a SHA256 86b28ca636ac1f20d66319b1fbcf63baecb94a78d57b434d00a767c5de69cb7c +MD5 8a2ab0bd22cc5ee22d03b9ba5b91955b commons-jxpath-1.2.ebuild 1487 +RMD160 a2beb2fb107cd87c2fdc02951508c41cef91315b commons-jxpath-1.2.ebuild 1487 +SHA256 86b28ca636ac1f20d66319b1fbcf63baecb94a78d57b434d00a767c5de69cb7c commons-jxpath-1.2.ebuild 1487 +MISC ChangeLog 1867 RMD160 7999c05bf1df8e1564abd096855420d05d0afd4a SHA1 b31114478bea9ce9cbc15dac9585e5a3d97ff4fc SHA256 e5981fb04330f9d8feb53b47df5620d3f3f571eb02897a4622d6f63b84207bde +MD5 edc2ac19b8dfdc18c141c8062b94b2a3 ChangeLog 1867 +RMD160 7999c05bf1df8e1564abd096855420d05d0afd4a ChangeLog 1867 +SHA256 e5981fb04330f9d8feb53b47df5620d3f3f571eb02897a4622d6f63b84207bde ChangeLog 1867 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -33,3 +37,6 @@ SHA256 3cd112afffbbf19f76868699496cfc663070349311bdd584abbf78eb6962560d files/di 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 +MD5 1c0580380dd9face127c630de498eba8 files/digest-commons-jxpath-1.2-r1 268 +RMD160 934f49297e2eac197117efb3af08fab59813d744 files/digest-commons-jxpath-1.2-r1 268 +SHA256 d02b085df57c226745148456c00f2203455a5cecf31f51aeb422dfc3915b5e72 files/digest-commons-jxpath-1.2-r1 268 diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r1.ebuild new file mode 100644 index 000000000000..f6754f951212 --- /dev/null +++ b/dev-java/commons-jxpath/commons-jxpath-1.2-r1.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-r1.ebuild,v 1.1 2007/01/21 03:38:04 nichoj 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}" +# Java 1.6's javadoc doesn't like enums +DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) + !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/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild index 66467290deed..c77d6ee9719c 100644 --- a/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild +++ b/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild,v 1.2 2007/01/21 03:38:04 nichoj Exp $ inherit java-pkg-2 java-ant-2 @@ -18,8 +18,8 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6* >=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* +# Java 1.6's javadoc doesn't like enums +DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) !test? ( dev-java/ant-core ) test? ( dev-java/ant @@ -54,6 +54,6 @@ src_test() { src_install() { java-pkg_dojar target/${PN}.jar - use doc && java-pkg_dojavadoc dist/docs + use doc && java-pkg_dojavadoc dist/docs/api use source && java-pkg_dosrc src/java/* } diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1 new file mode 100644 index 000000000000..da372825b8a2 --- /dev/null +++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1 @@ -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