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

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

[Patrice Clement]

commit:     cab420ab1fc761f7eff98f9b543dd73b8ded9d52
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:07:20 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:07:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab420ab

dev-java/tomcat-jstl-el: Change SLOT to 0.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 ...cat-jstl-el-1.2.5.ebuild => tomcat-jstl-el-1.2.5-r1.ebuild} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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-r1.ebuild
similarity index 85%
rename from dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
rename to dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index 1ca0ec8..78d569a 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-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
 
 MY_PN="taglibs-standard"
 MY_P="${MY_PN}-${PV}"
@@ -16,13 +16,13 @@ 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"
+SLOT="0"
 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"
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0"
 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="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
 EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="jstlel/build.xml"
 

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

[Patrice Clement]

commit:     55b1f07fef70a78248a791b2409f998e58c3d067
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:26:39 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:26:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b1f07f

dev-java/tomcat-jstl-el: Stable for amd64. Stable for x86 using the ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 78d569a..e8d6939 100644
--- 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
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="java-virtuals/servlet-api:3.0

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

[Patrice Clement]

commit:     5c906fe9f55b7870b874bdbb7281caa1473d6848
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 11:02:23 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 11:11:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c906fe9

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

Package-Manager: portage-2.2.26

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

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

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
index e8d6939..fd00193 100644
--- 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
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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
@@ -13,24 +14,29 @@ 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"
+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="java-virtuals/servlet-api:3.0
+CDEPEND="
 	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+
+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}"
 
@@ -40,7 +46,7 @@ EANT_BUILD_TARGET="package"
 EANT_BUILD_XML="jstlel/build.xml"
 
 java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/jstlel/build.xml || die
 }
 
 EANT_TEST_TARGET="test"