From 27f19705279c20fa791f379584318f3a31d2a5fc Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Thu, 1 Mar 2007 13:39:53 +0000 Subject: Revision bump because java-utils-2.eclass was not handling java-pkg_jar-from calls with commas in the correctly. (Portage version: 2.1.2-r12) --- dev-java/commons-jelly/ChangeLog | 9 ++- dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild | 70 ---------------------- dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild | 70 ++++++++++++++++++++++ .../files/digest-commons-jelly-1.0-r1 | 3 - .../files/digest-commons-jelly-1.0-r2 | 3 + 5 files changed, 81 insertions(+), 74 deletions(-) delete mode 100644 dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild create mode 100644 dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild delete mode 100644 dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1 create mode 100644 dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2 (limited to 'dev-java') diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog index 73200052a68b..e7be748d9f8b 100644 --- a/dev-java/commons-jelly/ChangeLog +++ b/dev-java/commons-jelly/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/commons-jelly # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.6 2007/02/10 14:28:42 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.7 2007/03/01 13:39:53 betelgeuse Exp $ + +*commons-jelly-1.0-r2 (01 Mar 2007) + + 01 Mar 2007; Petteri Räty + -commons-jelly-1.0-r1.ebuild, +commons-jelly-1.0-r2.ebuild: + Revision bump because java-utils-2.eclass was not handling java-pkg_jar-from + calls with commas in the correctly. 10 Feb 2007; Petteri Räty commons-jelly-1.0-r1.ebuild: diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild deleted file mode 100644 index 4a883b4db870..000000000000 --- a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.4 2007/02/10 14:28:42 betelgeuse Exp $ - -inherit java-pkg-2 java-ant-2 eutils - -MY_P="${P}-src" -DESCRIPTION="A Java and XML based scripting and processing engine" -HOMEPAGE="http://jakarta.apache.org/commons/jelly/" -SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~x86" -IUSE="doc test source" - -RDEPEND=">=virtual/jre-1.4 - ~dev-java/servletapi-2.3 - =dev-java/commons-cli-1* - dev-java/commons-lang - dev-java/commons-discovery - dev-java/forehead - dev-java/jakarta-jstl - dev-java/commons-jexl - =dev-java/commons-beanutils-1.6* - dev-java/commons-collections - =dev-java/dom4j-1* - =dev-java/jaxen-1.1* - >=dev-java/xerces-2.7 - dev-java/junit - dev-java/commons-logging" - -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - test? ( dev-java/ant-junit ) - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - # disables dependency fetching, and remove tests as a dependency of jar - epatch ${FILESDIR}/${P}-gentoo.patch - - mkdir -p ${S}/lib - cd ${S}/lib - java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang - java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0 - java-pkg_jar-from commons-beanutils-1.6,commons-collections - java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2 - java-pkg_jar-from commons-logging,junit -} - -src_compile() { - eant -Dlibdir=lib jar $(use_doc) -} - -src_test() { - ANT_TASKS="ant-junit" eant test -Dlibdir=lib -} - -src_install() { - java-pkg_newjar target/${P}.jar ${PN}.jar - - dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild new file mode 100644 index 000000000000..8349733db88f --- /dev/null +++ b/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild,v 1.1 2007/03/01 13:39:53 betelgeuse Exp $ + +inherit java-pkg-2 java-ant-2 eutils + +MY_P="${P}-src" +DESCRIPTION="A Java and XML based scripting and processing engine" +HOMEPAGE="http://jakarta.apache.org/commons/jelly/" +SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~x86" +IUSE="doc test source" + +RDEPEND=">=virtual/jre-1.4 + ~dev-java/servletapi-2.3 + =dev-java/commons-cli-1* + dev-java/commons-lang + dev-java/commons-discovery + dev-java/forehead + dev-java/jakarta-jstl + dev-java/commons-jexl + =dev-java/commons-beanutils-1.6* + dev-java/commons-collections + =dev-java/dom4j-1* + =dev-java/jaxen-1.1* + >=dev-java/xerces-2.7 + dev-java/junit + dev-java/commons-logging" + +DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core + test? ( dev-java/ant-junit ) + ${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + # disables dependency fetching, and remove tests as a dependency of jar + epatch "${FILESDIR}/${P}-gentoo.patch" + + mkdir -p "${S}/lib" + cd "${S}/lib" + java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang + java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0 + java-pkg_jar-from commons-beanutils-1.6,commons-collections + java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2 + java-pkg_jar-from commons-logging,junit +} + +src_compile() { + eant -Dlibdir=lib jar $(use_doc) +} + +src_test() { + ANT_TASKS="ant-junit" eant test -Dlibdir=lib +} + +src_install() { + java-pkg_newjar target/${P}.jar ${PN}.jar + + dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die + + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1 deleted file mode 100644 index c5964f16afb6..000000000000 --- a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d8c62cf844ca7ad8b6f34366eb2233c1 commons-jelly-1.0-src.tar.gz 174769 -RMD160 c273e80fb10327a833d192e89500a08302d68c58 commons-jelly-1.0-src.tar.gz 174769 -SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 commons-jelly-1.0-src.tar.gz 174769 diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2 new file mode 100644 index 000000000000..c5964f16afb6 --- /dev/null +++ b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2 @@ -0,0 +1,3 @@ +MD5 d8c62cf844ca7ad8b6f34366eb2233c1 commons-jelly-1.0-src.tar.gz 174769 +RMD160 c273e80fb10327a833d192e89500a08302d68c58 commons-jelly-1.0-src.tar.gz 174769 +SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 commons-jelly-1.0-src.tar.gz 174769 -- cgit v1.2.3-65-gdbad