Update jakarta-jstl dependency. Remove old. Fix bug 551032.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

2 files changed, 35 insertions, 31 deletions

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index 5e1e12ea6e46..714c2359ff19 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jelly
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.19 2014/08/16 10:03:00 johu Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.20 2015/06/08 13:09:39 monsieurp Exp $
+
+*commons-jelly-1.0-r6 (08 Jun 2015)
+
+  08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-jelly-1.0-r6.ebuild, -commons-jelly-1.0-r4.ebuild:
+  Update jakarta-jstl dependency. Remove old. Fix bug 551032.
 
   16 Aug 2014; Johannes Huber <johu@gentoo.org> commons-jelly-1.0-r5.ebuild:
   amd64 stable, bug #518928
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
index 4be9394191ce..53616deff949 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r4.ebuild,v 1.3 2010/05/22 20:06:49 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild,v 1.1 2015/06/08 13:09:39 monsieurp Exp $
 
-EAPI=2
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -13,49 +15,45 @@ SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="doc test source"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.3
+COMMON_DEP="
+	dev-java/commons-beanutils:1.7
 	dev-java/commons-cli:1
-	dev-java/commons-lang:0
+	dev-java/commons-collections:0
 	dev-java/commons-discovery:0
-	dev-java/forehead:0
-	dev-java/jakarta-jstl:0
 	dev-java/commons-jexl:1.0
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
+	dev-java/commons-lang:0
+	dev-java/commons-logging:0
 	dev-java/dom4j:1
+	dev-java/tomcat-jstl-spec:1.2.5
 	dev-java/jaxen:1.1
-	>=dev-java/xerces-2.7:2
 	dev-java/junit:0
-	dev-java/commons-logging:0"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${RDEPEND}"
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	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"
-
-	mkdir -p "${S}/lib"
-	cd "${S}/lib"
-	java-pkg_jar-from --virtual servlet-api-2.3
-	java-pkg_jar-from commons-cli-1,commons-lang
-	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
-	java-pkg_jar-from commons-beanutils-1.7,commons-collections
-	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-	java-pkg_jar-from commons-logging,junit
 }
 
-EANT_EXTRA_ARGS="-Dlibdir=lib"
+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-2.5"
 
 src_test() {
-	ANT_TASKS="ant-junit" eant test -Dlibdir=lib
+	java-pkg-2_src_test
 }
 
 src_install() {