gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Package-Manager: portage-2.2.26
This commit is contained in:
Patrice Clement
2016-02-20 11:02:47 +00:00
parent 5c906fe9f5
commit a1ddf16a66
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-java/tomcat-jstl-impl/Manifest
View File

@@ -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

38
dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
View File

@@ -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
)
# This test case doesn't pass.
rm -v \
impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
java_prepare() {
cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
epatch "${PATCHES[@]}"
}
EANT_TEST_TARGET="test"