summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-06-08 21:03:56 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-06-08 21:03:56 +0000
commit5ab38ce82ac19bbfafe31642b61646c388f76b9a (patch)
treeff9a74a52e01bd594b84257c36cbb388a92b405b
parentSwap dev-java/tomcat-servlet-api dependency for java-virtuals/servlet-api. (diff)
downloadgentoo-2-5ab38ce82ac19bbfafe31642b61646c388f76b9a.tar.gz
gentoo-2-5ab38ce82ac19bbfafe31642b61646c388f76b9a.tar.bz2
gentoo-2-5ab38ce82ac19bbfafe31642b61646c388f76b9a.zip
Swap dev-java/tomcat-servlet-api dependency for java-virtuals/servlet-api.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
-rw-r--r--dev-java/tomcat-jstl-el/ChangeLog6
-rw-r--r--dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild10
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/tomcat-jstl-el/ChangeLog b/dev-java/tomcat-jstl-el/ChangeLog
index ffb0d0271876..7c69f60f4ced 100644
--- a/dev-java/tomcat-jstl-el/ChangeLog
+++ b/dev-java/tomcat-jstl-el/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/tomcat-jstl-el
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/ChangeLog,v 1.1 2015/06/03 07:56:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/ChangeLog,v 1.2 2015/06/08 21:03:56 monsieurp Exp $
+
+ 08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+ tomcat-jstl-el-1.2.5.ebuild:
+ Swap dev-java/tomcat-servlet-api dependency for java-virtuals/servlet-api.
*tomcat-jstl-el-1.2.5 (03 Jun 2015)
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
index faca5ea909e2..95f20e833f08 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild,v 1.1 2015/06/03 07:56:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild,v 1.2 2015/06/08 21:03:56 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -20,9 +20,9 @@ SLOT="1.2.5"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-CDEPEND="dev-java/tomcat-jstl-impl:1.2.5
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-servlet-api:3.1"
+CDEPEND="java-virtuals/servlet-api:3.0
+ dev-java/tomcat-jstl-impl:1.2.5
+ dev-java/tomcat-jstl-spec:1.2.5"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="jstlel/build.xml"