1 |
commit: 2bc2951b8b17f136d9bee970bf77f1435fb50a46 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 20 11:09:24 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 20 11:11:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc2951b |
7 |
|
8 |
dev-java/tomcat-jstl-spec: Housekeeping. Add missing die. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
dev-java/tomcat-jstl-spec/Manifest | 2 +- |
13 |
.../tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild | 19 ++++++++++++------- |
14 |
2 files changed, 13 insertions(+), 8 deletions(-) |
15 |
|
16 |
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest |
17 |
index 3d40f62..4a70207 100644 |
18 |
--- a/dev-java/tomcat-jstl-spec/Manifest |
19 |
+++ b/dev-java/tomcat-jstl-spec/Manifest |
20 |
@@ -1 +1 @@ |
21 |
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff |
22 |
+DIST tomcat-jstl-spec-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff |
23 |
|
24 |
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 |
25 |
index 9479bfb..5db72ed 100644 |
26 |
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild |
27 |
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild |
28 |
@@ -1,8 +1,9 @@ |
29 |
-# Copyright 1999-2015 Gentoo Foundation |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
# $Id$ |
33 |
|
34 |
EAPI=5 |
35 |
+ |
36 |
JAVA_PKG_IUSE="doc source" |
37 |
|
38 |
inherit java-pkg-2 java-ant-2 |
39 |
@@ -13,7 +14,7 @@ MY_SPEC="${MY_PN}-spec" |
40 |
|
41 |
DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification jar" |
42 |
HOMEPAGE="https://tomcat.apache.org/taglibs/standard/" |
43 |
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip" |
44 |
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip" |
45 |
|
46 |
LICENSE="Apache-2.0" |
47 |
SLOT="0" |
48 |
@@ -21,14 +22,18 @@ KEYWORDS="amd64 x86" |
49 |
IUSE="test" |
50 |
|
51 |
CDEPEND="java-virtuals/servlet-api:3.0" |
52 |
-RDEPEND=">=virtual/jre-1.6 |
53 |
- ${CDEPEND}" |
54 |
-DEPEND=">=virtual/jdk-1.6 |
55 |
+ |
56 |
+RDEPEND=" |
57 |
+ ${CDEPEND} |
58 |
+ >=virtual/jre-1.6" |
59 |
+ |
60 |
+DEPEND=" |
61 |
+ ${CDEPEND} |
62 |
test? ( |
63 |
dev-java/ant-junit:0 |
64 |
dev-java/easymock:3.2 |
65 |
) |
66 |
- ${CDEPEND}" |
67 |
+ >=virtual/jdk-1.6" |
68 |
|
69 |
S="${WORKDIR}/${MY_P}" |
70 |
|
71 |
@@ -38,7 +43,7 @@ EANT_BUILD_TARGET="package" |
72 |
EANT_BUILD_XML="spec/build.xml" |
73 |
|
74 |
java_prepare() { |
75 |
- cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml |
76 |
+ cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/build.xml || die |
77 |
} |
78 |
|
79 |
EANT_TEST_TARGET="test" |