From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-spec/
Date: Sat, 20 Feb 2016 11:13:29 +0000 (UTC) [thread overview]
Message-ID: <1455966673.2bc2951b8b17f136d9bee970bf77f1435fb50a46.monsieurp@gentoo> (raw)
commit: 2bc2951b8b17f136d9bee970bf77f1435fb50a46
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 11:09:24 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 11:11:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc2951b
dev-java/tomcat-jstl-spec: Housekeeping. Add missing die.
Package-Manager: portage-2.2.26
dev-java/tomcat-jstl-spec/Manifest | 2 +-
.../tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest
index 3d40f62..4a70207 100644
--- a/dev-java/tomcat-jstl-spec/Manifest
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-spec-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 9479bfb..5db72ed 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-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,7 +14,7 @@ MY_SPEC="${MY_PN}-spec"
DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification 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"
@@ -21,14 +22,18 @@ KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="java-virtuals/servlet-api:3.0"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+
+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}"
@@ -38,7 +43,7 @@ EANT_BUILD_TARGET="package"
EANT_BUILD_XML="spec/build.xml"
java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml
+ cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml || die
}
EANT_TEST_TARGET="test"
next reply other threads:[~2016-02-20 11:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-20 11:13 Patrice Clement [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-13 19:09 [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-spec/ Patrice Clement
2015-10-13 19:09 Patrice Clement
2015-10-13 19:09 Patrice Clement
2015-09-05 14:59 Agostino Sarubbo
2015-09-05 14:58 Agostino Sarubbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455966673.2bc2951b8b17f136d9bee970bf77f1435fb50a46.monsieurp@gentoo \
--to=monsieurp@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox