diff options
| -rw-r--r-- | dev-java/jakarta-jstl/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/jakarta-jstl/Manifest | 14 | ||||
| -rw-r--r-- | dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild | 33 |
3 files changed, 37 insertions, 18 deletions
diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog index 1262b30bcf95..bdcd1f9d9dc6 100644 --- a/dev-java/jakarta-jstl/ChangeLog +++ b/dev-java/jakarta-jstl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jakarta-jstl -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.18 2007/11/13 11:21:01 opfer Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.19 2008/03/10 11:24:32 betelgeuse Exp $ + + 10 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> + jakarta-jstl-1.1.2-r1.ebuild: + RESTRICT test for the upcoming generic src_test. Needs cactus packaged. 13 Nov 2007; Christian Faulhammer <opfer@gentoo.org> jakarta-jstl-1.1.2-r1.ebuild: diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest index 0ee24e0f6dab..33764f15fab5 100644 --- a/dev-java/jakarta-jstl/Manifest +++ b/dev-java/jakarta-jstl/Manifest @@ -1,5 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build-xml.patch 772 RMD160 c56532bc6cddcf23ba48bcd840d92d8ef449312c SHA1 9baa3d372b1baed7fd56fd95436c324cf6fcfeb2 SHA256 3b3b03c03624ed1d800c2f7e614239d1ff2ce598826835260a785aed6504e6b4 DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 RMD160 00ac3b34c7aab445f757bf5b6aaef273194bbf94 SHA1 1d24c9e5019b57f298a40a77bac3f863ecf8a033 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23 -EBUILD jakarta-jstl-1.1.2-r1.ebuild 1950 RMD160 c106c3c3ac970b6df1f35c4c1ffed83132b02cb9 SHA1 daa1f02ba597c49ded548e85525604510c89421a SHA256 dcbf73140a584ab9e39a8765319f7d4b4bdb1d6e7dfccc899ee96f2f072523fd -MISC ChangeLog 2992 RMD160 a72b1cd4c1b7725a2d24fa39fea69f1921273c25 SHA1 f75ab1ac62811330644079c5ea0a6ce561a6103f SHA256 622d0f65fd1e2e3df9a88f4cd434b8da418b520e173232ef7023e1000abac459 +EBUILD jakarta-jstl-1.1.2-r1.ebuild 2138 RMD160 e2a548795b5ffce8fb89d0880028cc67e196db17 SHA1 9bd64609350c26cdfd0c1687c5bf8d2da7f665c5 SHA256 a21091ad35c2c6867ed335bedc2128c058aef0893f6cfb68bc36e6430c865ab5 +MISC ChangeLog 3157 RMD160 3cb20af9c3a7e2c31e4868cfa21b119a603182d5 SHA1 7934a211d88496ec79d10fd6adfb3fc02b68d158 SHA256 ab41db8f475400dfe12b0ae9a2164c0a12fea0fa1776ab7bfee3df42f27af135 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH1Rp4cxLzpIGCsLQRAsQ+AJ4xTCpwT4bJgfHhPIjOBOGrFYq4YgCdFBMR +P1I2RFvGE+/C2oc/EExi5Og= +=b0/p +-----END PGP SIGNATURE----- diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild index e909425fb23c..fa23e53c935e 100644 --- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild +++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild @@ -1,6 +1,9 @@ -# 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/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.11 2007/11/13 11:21:01 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.12 2008/03/10 11:24:32 betelgeuse Exp $ + +EAPI=1 +JAVA_PKG_IUSE="doc examples source" inherit java-pkg-2 java-ant-2 eutils @@ -13,20 +16,23 @@ SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="doc examples source" +IUSE="" -COMMON_DEP="~dev-java/servletapi-2.4 +COMMON_DEP="dev-java/servletapi:2.4 dev-java/xalan" RDEPEND=">=virtual/jre-1.4.2 ${COMMON_DEP}" +# test? ( dev-java/ant-junit ) # FIXME breaks due to new JDBC API in 1.6 DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) - ${COMMON_DEP} - dev-java/ant-core - source? ( app-arch/zip )" + ${COMMON_DEP}" S="${WORKDIR}/${MY_P}-src/standard" +# Needs cactus packaged +# http://bugs.gentoo.org/show_bug.cgi?id=212890 +RESTRICT="test" + src_unpack() { unpack ${A} cd "${S}" @@ -35,6 +41,7 @@ src_unpack() { # See bug #134206 # TODO file upstream epatch "${FILESDIR}/build-xml.patch" + #java-ant_remove-taskdefs build-tests.xml echo -e "base.dir=..\n" \ "build.dir = \${base.dir}/build\n" \ @@ -44,20 +51,18 @@ src_unpack() { "jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \ "xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \ > build.properties + #use test && echo "junit.jar=$(java-pkg_getjars --build-only junit)" >> build.properties java-pkg_filter-compiler jikes } -src_compile() { - eant build $(use_doc javadoc-dist) -} +EANT_BUILD_TARGET="build" +EANT_DOC_TARGET="javadoc-dist" +EANT_TEST_TARGET="run.junit" src_install() { java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/ - if use examples; then - dodir /usr/share/doc/${PF}/examples - cp -r "${S}"/examples/* "${D}"/usr/share/doc/${PF}/examples - fi + use examples && java-pkg_doexamples examples use source && java-pkg_dosrc "${S}"/src/* } |