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

[Patrice Clement]

commit:     a1ddf16a66660cd7946def0d9aac93c12f85cdf7
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 11:02:47 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 11:11:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ddf16a

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

Package-Manager: portage-2.2.26

 dev-java/tomcat-jstl-impl/Manifest                 |  2 +-
 .../tomcat-jstl-impl-1.2.5-r1.ebuild               | 38 +++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

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

diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 065b69e..9ab517d 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,24 +13,29 @@ MY_IMPL="${MY_PN}-impl"
 
 DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation 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="dev-java/xalan:0
+CDEPEND="
+	dev-java/xalan:0
 	dev-java/tomcat-jstl-spec:0
 	dev-java/tomcat-servlet-api:3.1"
-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}"
 
@@ -39,18 +44,21 @@ EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
 EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="impl/build.xml"
 
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+JAVA_RM_FILES=(
+	impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+)
 
+PATCHES=(
 	# This patch overrides a couple of methods.
-	epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
+	"${FILESDIR}"/${P}-ImportSupport.patch
 	# This one disables one test case which doesn't work.
-	epatch "${FILESDIR}"/${P}-SetSupport.patch
+	"${FILESDIR}"/${P}-SetSupport.patch
+)
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
 
-	# This test case doesn't pass.
-	rm -v \
-		impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+	epatch "${PATCHES[@]}"
 }
 
 EANT_TEST_TARGET="test"