diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-02-20 11:02:23 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-02-20 11:11:05 +0000 |
| commit | 5c906fe9f55b7870b874bdbb7281caa1473d6848 (patch) | |
| tree | 597ecd2c6ca03fa84a34175bf1e497c69a2eebda | |
| parent | dev-java/tomcat-jstl-compat: Housekeeping. Add missing die. (diff) | |
| download | gentoo-5c906fe9f55b7870b874bdbb7281caa1473d6848.tar.gz gentoo-5c906fe9f55b7870b874bdbb7281caa1473d6848.tar.bz2 gentoo-5c906fe9f55b7870b874bdbb7281caa1473d6848.zip | |
dev-java/tomcat-jstl-el: Housekeeping. Add missing die.
Package-Manager: portage-2.2.26
| -rw-r--r-- | dev-java/tomcat-jstl-el/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/dev-java/tomcat-jstl-el/Manifest b/dev-java/tomcat-jstl-el/Manifest index 3d40f6296597..1ca781d9d514 100644 --- a/dev-java/tomcat-jstl-el/Manifest +++ b/dev-java/tomcat-jstl-el/Manifest @@ -1 +1 @@ -DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff +DIST tomcat-jstl-el-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild index e8d693972af7..fd00193f8f9c 100644 --- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild +++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -13,24 +14,29 @@ MY_EL="${MY_PN}-jstlel" DESCRIPTION="JSP Standard Tag Library (JSTL) - EL jar" HOMEPAGE="https://tomcat.apache.org/taglibs/standard/" -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip" +SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" -CDEPEND="java-virtuals/servlet-api:3.0 +CDEPEND=" dev-java/tomcat-jstl-impl:0 - dev-java/tomcat-jstl-spec:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 + dev-java/tomcat-jstl-spec:0 + java-virtuals/servlet-api:3.0" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) - ${CDEPEND}" + >=virtual/jdk-1.6" S="${WORKDIR}/${MY_P}" @@ -40,7 +46,7 @@ EANT_BUILD_TARGET="package" EANT_BUILD_XML="jstlel/build.xml" java_prepare() { - cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml + cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml || die } EANT_TEST_TARGET="test" |