diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-06-08 21:00:35 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-06-08 21:00:35 +0000 |
| commit | 667ba32c2aa12fa3b8fef87031897ff02d88fd6d (patch) | |
| tree | e6f7ca2bfe2a148f8b521c5953b8e1aac21a9110 /dev-java/tomcat-jstl-compat | |
| parent | Drop keywords (diff) | |
| download | gentoo-2-667ba32c2aa12fa3b8fef87031897ff02d88fd6d.tar.gz gentoo-2-667ba32c2aa12fa3b8fef87031897ff02d88fd6d.tar.bz2 gentoo-2-667ba32c2aa12fa3b8fef87031897ff02d88fd6d.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)
Diffstat (limited to 'dev-java/tomcat-jstl-compat')
| -rw-r--r-- | dev-java/tomcat-jstl-compat/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/tomcat-jstl-compat/ChangeLog b/dev-java/tomcat-jstl-compat/ChangeLog index 48a8259f8cc9..8303f661115f 100644 --- a/dev-java/tomcat-jstl-compat/ChangeLog +++ b/dev-java/tomcat-jstl-compat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/tomcat-jstl-compat # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-compat/ChangeLog,v 1.1 2015/06/03 07:53:38 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-compat/ChangeLog,v 1.2 2015/06/08 21:00:35 monsieurp Exp $ + + 08 Jun 2015; Patrice Clement <monsieurp@gentoo.org> + tomcat-jstl-compat-1.2.5.ebuild: + Swap dev-java/tomcat-servlet-api dependency for java-virtuals/servlet-api. *tomcat-jstl-compat-1.2.5 (03 Jun 2015) diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild index a23a3a293781..48c51d071aa5 100644 --- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild +++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-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-compat/tomcat-jstl-compat-1.2.5.ebuild,v 1.1 2015/06/03 07:53:38 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild,v 1.2 2015/06/08 21:00:35 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 +CDEPEND="java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 - dev-java/tomcat-servlet-api:3.1" + dev-java/tomcat-jstl-impl: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="compat/build.xml" |