Fix building with java 1.7 compiler. Patch by Robert Schultz <robert@cosmicrealms.com> #486376

Replace dependency on servletapi #398689
EAPI bump and cleanup

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

5 files changed, 93 insertions, 49 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index cc219ae285f0..054df1e6e401 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/commons-el
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.28 2011/12/19 12:49:28 sera Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.29 2014/01/20 13:30:27 sera Exp $
+
+*commons-el-1.0-r3 (20 Jan 2014)
+
+  20 Jan 2014; Ralph Sennhauser <sera@gentoo.org> -commons-el-1.0-r1.ebuild,
+  +commons-el-1.0-r3.ebuild, +files/commons-el-1.0-java-1.7-compiler.patch:
+  Fix building with java 1.7 compiler. Patch by Robert Schultz
+  <robert@cosmicrealms.com> #486376
+  Replace dependency on servletapi #398689
+  EAPI bump and cleanup
 
   19 Dec 2011; Ralph Sennhauser <sera@gentoo.org> commons-el-1.0-r1.ebuild,
   commons-el-1.0-r2.ebuild:
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index 56fa9c7b2bff..d097e2c96947 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX commons-el-1.0-java-1.7-compiler.patch 738 SHA256 1c6e91bdb41da37c2cafcd9b052371a1a3a4ec2054071b87e103fe4eb0819326 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807 WHIRLPOOL 88d780b5749fb9dfa1bc581eb119b017ac8af1d8b097ac8cc0e94fc318f6b62b7d5a6196bc0d37215701b30c010b71f8ce7a1530f32714f89e9004207205b276
 AUX commons-el-1.0-manifest 557 SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1 SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e WHIRLPOOL c742a839ea456460b7f57d7618a1962140163548522d9a0d02986d48853642d79338061c92f77b8c22165cc55db3640188b5bfccb02cb4a393a2ca1d34801c50
 DIST commons-el-1.0-src.tar.gz 64009 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 WHIRLPOOL 5f019e0dac1211f713a8b3dd8818277c6241af133d3dc460e355332da40c58357e4d606e28301e770fe7dbf30f19885ba57f252e90cdd8923fbe258bec052ab6
-EBUILD commons-el-1.0-r1.ebuild 1414 SHA256 c88d5c556facac3528f6bc58d60ea6c4acb968b6f068034a901287c07d84fe63 SHA512 463124f4bcae5d70568cda5042a9a072f9b1c7b42f9b72c06f878b1b41584cf1a47fa9506507dc687889c52654b088555f4044c37001daa8f93057f179636d09 WHIRLPOOL 1127ad48d50bf3dfd8ac91daa8078d63e0e13f1e88c24b8c28de411db0fb5752da8f71a5041bf15c8a664d03976bcdc18fde349a83f2158fe6d27b906945b474
 EBUILD commons-el-1.0-r2.ebuild 1498 SHA256 38ce321ed34bd3385e77763731e149b57d284cdacd5984350e69c48b3963b737 SHA512 ceed486ca11e994ddc3b1acd1cf61ec575bc8e9a70f88969baafba7cbc640f0f101be41c7f576fa6091b38ce69db2397cc0c9149ef271b74ba1b7cf18d01b1aa WHIRLPOOL 31d24e76154dc69e11a96a1b18a379763076742c8aa9eedaf8afdf6cc0afc2f9e454dff98174792b10687f3c5be19fe3991e46139ab8aeaff50b17509874b030
-MISC ChangeLog 3260 SHA256 8453a27fbf5b7750a028f56714eada3914fd77e91f910a609d559da5ff8c1db4 SHA512 ebd9b0a56e8f315a253b5ff07e65f20fff1c0f39200cb550e02989a9d17414db9fedad7b2c63726adf79c61320af41c51a7e19f299244a6803a7e405ac759e97 WHIRLPOOL 36ac4718258185475432917ced1f91a7cd2403ca5ad6165ae43914a725cbc5cc8d31d9c0fa2735c86fcd45aa8b27b14e194e881733f5daf4e54554cf667d7429
+EBUILD commons-el-1.0-r3.ebuild 1340 SHA256 f11b4bfbc8529b0d5f4a25ec07c3ff8da453abcbbe31818fb5804e64f47ab010 SHA512 0978c9e87d711a69d1abcaf172e1680ec6deca6889fc4b7d36823e1de7d5fb67ad432d8b7f0b2a4c7a5918374c6baff9ae0674d031974db90f896520414b29ff WHIRLPOOL d742a4465477aec160752ba7b49b6bea378267c87b55df9479234bb666b0a74e6a1f4c7629590d579bd18935ab413e36511b16670dcfb5346dda8a050f638d4d
+MISC ChangeLog 3614 SHA256 69f3966a95e8bf33d327a8aad1f9601499a9e931b15b97a3df1cf27e48a82d32 SHA512 441cadfdd72dba277376e8868efd5a5cb9107061b4379346c455a093f42e72d40a3ea493f08cbef645f0b1a616e1a14ea61fd30ef8d7fbe5e3122ba2e31dad2f WHIRLPOOL 845b75cad49b3b6dd54a3ca571ce16307ffee9affeae71e1d4de63a66726664670d4e6b663b104923899324353fc5f48167dac9dd513fd4ab850a87fd220707c
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJS3SUAAAoJELjwI6Q8XPdaLWEIAKSM9yiBhoVGmTtH0Ojgk55o
+15HsI8XKz+JlHDjvDYK+zT5JT7OsMAuwgMViSN8U5st9MIwEoqiuis5vYuxBdER6
+NUgH6dhIGNfy5NE3wuS7AWEIkLC+O2aYseOift/okzDew0Mx2cQimrUHnnEQpTky
+uYylD05CKvgA5Am/L/jlidc6Z1vRTKaku89tr/E4Zq1I/SkUADwqtYHnkI7bt69l
+bv35TXG9kNiqr0Jg6zPvhbviRQX/IcmznsJ9Y12qPaIavSMReY0sxGB0+kExmeWa
+bD8GlEKW8wqBrgQszlDzAWErgi4Ceb3Bt43jfvzTo92kuA6Hp7Aa61OzwDQaNfI=
+=3fAZ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-el/commons-el-1.0-r1.ebuild b/dev-java/commons-el/commons-el-1.0-r1.ebuild
deleted file mode 100644
index cd046e78c18e..000000000000
--- a/dev-java/commons-el/commons-el-1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.10 2011/12/19 12:49:28 sera Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache."
-HOMEPAGE="http://commons.apache.org/el/"
-SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-COMMON_DEP="~dev-java/servletapi-2.4"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	source? ( app-arch/zip )"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv build.properties build.properties.old
-
-	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
-	echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties
-	echo "servletapi.build.notrequired = true" >> build.properties
-	echo "jspapi.build.notrequired = true" >> build.properties
-
-	# Build.xml is broken, fix it
-	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar || die "Unable to install"
-	dodoc LICENSE.txt RELEASE-NOTES.txt || die
-	dohtml STATUS.html PROPOSAL.html || die
-
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
new file mode 100644
index 000000000000..3159b9a76e45
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r3.ebuild,v 1.1 2014/01/20 13:30:27 sera Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache."
+HOMEPAGE="http://commons.apache.org/el/"
+SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-java-1.7-compiler.patch # BGO 486376
+	# Build.xml is broken, fix it
+	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="servlet-api-2.5"
+EANT_EXTRA_ARGS="
+	-Dservletapi.build.notrequired=true
+	-Djspapi.build.notrequired=true"
+
+src_install() {
+	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \
+		"Apache Commons EL"
+
+	dodoc LICENSE.txt RELEASE-NOTES.txt
+	dohtml STATUS.html PROPOSAL.html
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
new file mode 100644
index 000000000000..60f94c512a46
--- /dev/null
+++ b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch
@@ -0,0 +1,13 @@
+--- ./src/java/org/apache/commons/el/parser/ELParser.java.orig	2003-03-30 20:17:07.000000000 -0500
++++ ./src/java/org/apache/commons/el/parser/ELParser.java	2013-10-13 14:55:24.277749201 -0400
+@@ -1838,8 +1838,8 @@
+         jj_expentry[i] = jj_lasttokens[i];
+       }
+       boolean exists = false;
+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
+-        int[] oldentry = (int[])(enum.nextElement());
++      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
++        int[] oldentry = (int[])(enumx.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {