[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-compat/

[Patrice Clement]

commit:     1a748b805a4952936513fdb7bd02f448ad4d9329
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 10:53:03 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 11:11:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a748b80

dev-java/tomcat-jstl-compat: Housekeeping. Add missing die.

Package-Manager: portage-2.2.26

 dev-java/tomcat-jstl-compat/Manifest               |  2 +-
 .../tomcat-jstl-compat-1.2.5-r1.ebuild             | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-java/tomcat-jstl-compat/Manifest 
b/dev-java/tomcat-jstl-compat/Manifest
index 3d40f62..8f09839 100644
--- a/dev-java/tomcat-jstl-compat/Manifest
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 
09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 
ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
 WHIRLPOOL 
2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-compat-1.2.5.zip 615779 SHA256 
09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 
ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
 WHIRLPOOL 
2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff

diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild 
b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 7e94860..527fd4b 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,24 +14,29 @@ MY_COMPAT="${MY_PN}-compat"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat 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-spec:0
-       dev-java/tomcat-jstl-impl:0"
-RDEPEND=">=virtual/jre-1.6
-       ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+       dev-java/tomcat-jstl-impl: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="compat/build.xml"
 
 java_prepare() {
-       cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml
+       cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml || die
 }
 
 EANT_TEST_TARGET="test"