From 4dad8b9edad37e8dde954eda89802e7dd9129855 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 13:58:15 +0000
Subject: dev-java/tomcat-jstl-spec: Change SLOT to 0.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../tomcat-jstl-spec-1.2.5-r1.ebuild               | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild

diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..70c1350b23a5
--- /dev/null
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -0,0 +1,61 @@
+# 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_SPEC="${MY_PN}-spec"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification 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"
+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"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="spec/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/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}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/spec/src/*
+	fi
+}
-- 
cgit v1.2.3-65-gdbad


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

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../tomcat-jstl-impl-1.2.5-r1.ebuild               | 73 ++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild

diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..9da9e6dc8673
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -0,0 +1,73 @@
+# 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_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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+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
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+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
+
+	# This patch overrides a couple of methods.
+	epatch "${FILESDIR}"/${P}-ImportSupport.patch
+
+	# This one disables one test case which doesn't work.
+	epatch "${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
+}
+
+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}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/impl/src/*
+	fi
+}
-- 
cgit v1.2.3-65-gdbad


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

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 000000000000..78d569aa51e0
--- /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 1ca0ec8d8ea3..000000000000
--- 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.3-65-gdbad


From cb2c9cdcbd244bc58e2ea30a64e72df795fc0db8 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:23:52 +0000
Subject: dev-java/tomcat-jstl-spec: Stable for amd64. Stable for x86 using the
 ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 70c1350b23a5..9479bfb453de 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-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"
-- 
cgit v1.2.3-65-gdbad


From 3a63fe1fb033bbbcc39921bc94bc486f55aa731a Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:24:45 +0000
Subject: dev-java/tomcat-jstl-impl: Stable for amd64. Stable for x86 using the
 ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 9da9e6dc8673..065b69e46f27 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-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="dev-java/xalan:0
-- 
cgit v1.2.3-65-gdbad


From b1967e9244b3ded3930d520b0b4c5506e45e7bac Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:26:04 +0000
Subject: dev-java/tomcat-jstl-impl: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild | 73 ----------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild

diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
deleted file mode 100644
index 695b680775fb..000000000000
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ /dev/null
@@ -1,73 +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_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"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/xalan:0
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/tomcat-servlet-api:3.1"
-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="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,xalan"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="impl/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
-
-	# This patch overrides a couple of methods.
-	epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
-	# This one disables one test case which doesn't work.
-	epatch "${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
-}
-
-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}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/impl/src/*
-	fi
-}
-- 
cgit v1.2.3-65-gdbad


From 55b1f07fef70a78248a791b2409f998e58c3d067 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:26:39 +0000
Subject: 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@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 78d569aa51e0..e8d693972af7 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
-- 
cgit v1.2.3-65-gdbad


From f1c1ce61bf58764cac5ccbda2628cbdf6466908c Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:26:58 +0000
Subject: dev-java/tomcat-jstl-spec: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 .../tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild | 61 ----------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild

diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
deleted file mode 100644
index 62f34c4140c0..000000000000
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ /dev/null
@@ -1,61 +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_SPEC="${MY_PN}-spec"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Specification 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"
-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"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="spec/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/spec/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}"/spec/target/${MY_SPEC}-${PV}.jar ${MY_SPEC}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/spec/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/spec/src/*
-	fi
-}
-- 
cgit v1.2.3-65-gdbad


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

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

diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..e5e4549797a9
--- /dev/null
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-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 eutils
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_COMPAT="${MY_PN}-compat"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat 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-spec:0
+	dev-java/tomcat-jstl-impl: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="compat/build.xml"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/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}"/compat/target/${MY_COMPAT}-${PV}.jar ${MY_COMPAT}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r "${S}"/compat/target/site/apidocs/
+	fi
+
+	if use source; then
+		java-pkg_dosrc "${S}"/compat/src/*
+	fi
+}
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
deleted file mode 100644
index 25cecf5a33fe..000000000000
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-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_COMPAT="${MY_PN}-compat"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat 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-spec:1.2.5
-	dev-java/tomcat-jstl-impl: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="compat/build.xml"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/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}"/compat/target/${MY_COMPAT}-${PV}.jar ${MY_COMPAT}.jar
-
-	if use doc; then
-		java-pkg_dohtml -r "${S}"/compat/target/site/apidocs/
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}"/compat/src/*
-	fi
-}
-- 
cgit v1.2.3-65-gdbad


From f66687954a3525f2f14a3e7ca0f9cfc0fc7455c8 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:28:14 +0000
Subject: dev-java/tomcat-jstl-compat: Stable for amd64. Stable for x86 using
 the ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index e5e4549797a9..7e94860a0441 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-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
-- 
cgit v1.2.3-65-gdbad


From 2a8fc55e81d77bb373f0e526169ad6af684cdbb9 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 14:29:34 +0000
Subject: dev-java/commons-jelly: tomcat-jstl dependency SLOT bump.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild | 64 ----------------------
 dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild | 64 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
 create mode 100644 dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
deleted file mode 100644
index 1442a6288470..000000000000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
+++ /dev/null
@@ -1,64 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/"
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/dom4j:1
-	dev-java/junit:0
-	dev-java/jaxen:1.1
-	dev-java/commons-cli:1
-	dev-java/commons-lang:0
-	dev-java/commons-jexl:1.0
-	dev-java/commons-logging:0
-	dev-java/commons-discovery:0
-	dev-java/commons-collections:0
-	dev-java/commons-beanutils:1.7
-	dev-java/tomcat-jstl-spec:1.2.5
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	# disables dependency fetching, and remove tests as a dependency of jar
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
-	jaxen-1.1,junit,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
new file mode 100644
index 000000000000..b55dbf897f99
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/dom4j:1
+	dev-java/junit:0
+	dev-java/jaxen:1.1
+	dev-java/commons-cli:1
+	dev-java/commons-lang:0
+	dev-java/commons-jexl:1.0
+	dev-java/commons-logging:0
+	dev-java/commons-discovery:0
+	dev-java/commons-collections:0
+	dev-java/commons-beanutils:1.7
+	dev-java/tomcat-jstl-spec:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+	commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
+	jaxen-1.1,junit,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
-- 
cgit v1.2.3-65-gdbad


From e1cb1a13f3e98cf9ab19967b1590dc4b9fb933f4 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 15:36:19 +0000
Subject: dev-java/mojarra: tomcat-jstl dependency SLOT bump.

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

diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..001f613ea9f1
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/"
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+	dev-java/glassfish-ejb-api:0
+	java-virtuals/servlet-api:3.0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/validation-api:1.0
+	dev-java/javax-inject:0
+	dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	glassfish-persistence
+	glassfish-ejb-api
+	tomcat-jstl-spec
+	tomcat-jstl-impl
+	validation-api-1.0
+	cdi-api-1.2
+	servlet-api-3.0
+	javax-inject
+"
+
+java_prepare() {
+	mkdir src || die
+	mv * src
+
+	# We *MUST* bump Groovy to 2.4 at some point 
+	# to make this stuff work correctly. 
+	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
+	epatch "${FILESDIR}"/${P}-Util.java.patch
+}
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12.ebuild
deleted file mode 100644
index 455992f659ca..000000000000
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/"
-SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar"
-
-LICENSE="CDDL"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/glassfish-persistence:0
-	dev-java/glassfish-ejb-api:0
-	java-virtuals/servlet-api:3.0
-	dev-java/tomcat-jstl-spec:1.2.5
-	dev-java/tomcat-jstl-impl:1.2.5
-	dev-java/validation-api:1.0
-	dev-java/javax-inject:0
-	dev-java/cdi-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-JAVA_SRC_DIR="src"
-
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,glassfish-ejb-api,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5,validation-api-1.0,cdi-api-1.2,servlet-api-3.0,javax-inject"
-
-java_prepare() {
-	mkdir src || die
-	mv * src
-
-	# We *MUST* bump Groovy to 2.4 at some point 
-	# to make this stuff work correctly. 
-	rm -v src/com/sun/faces/scripting/groovy/GroovyHelperImpl.java || die
-	epatch "${FILESDIR}"/${P}-Util.java.patch
-}
-- 
cgit v1.2.3-65-gdbad


From f8ef93287ac81a2ea312529f326b19f5a43631de Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Tue, 13 Oct 2015 15:36:55 +0000
Subject: dev-java/mojarra: Stable for amd64. Stable for x86 using the
 ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/mojarra/mojarra-2.2.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
index 001f613ea9f1..8b7899585f41 100644
--- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/java
 
 LICENSE="CDDL"
 SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
-- 
cgit v1.2.3-65-gdbad