From cab420ab1fc761f7eff98f9b543dd73b8ded9d52 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:07:20 +0000
Subject: dev-java/tomcat-jstl-el: Change SLOT to 0.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild  | 63 ++++++++++++++++++++++
 .../tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild     | 63 ----------------------
 2 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
 delete mode 100644 dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild

(limited to 'dev-java/tomcat-jstl-el')

diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
new file mode 100644
index 00000000000..78d569aa51e
--- /dev/null
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_EL="${MY_PN}-jstlel"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - EL 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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="jstlel/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "${S}"/jstlel/target/${MY_EL}-${PV}.jar ${MY_EL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/jstlel/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/jstlel/src/*
+	fi
+}
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
deleted file mode 100644
index 1ca0ec8d8ea..00000000000
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_EL="${MY_PN}-jstlel"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - EL 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"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-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
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-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"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/jstlel/target/${MY_EL}-${PV}.jar ${MY_EL}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/jstlel/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/jstlel/src/*
-	fi
-}
-- 
cgit v1.2.1