Version bump. Update jakarta-jstl dependency. Patch to disable Groovy support for the time being. Fix bug 551032.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 95 insertions, 7 deletions

diff --git a/dev-java/mojarra/ChangeLog b/dev-java/mojarra/ChangeLog
index f09dcd9a2746..a3febe13e8aa 100644
--- a/dev-java/mojarra/ChangeLog
+++ b/dev-java/mojarra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/mojarra
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.11 2012/12/16 14:13:11 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/ChangeLog,v 1.12 2015/06/08 21:36:31 monsieurp Exp $
+
+*mojarra-2.2.9 (08 Jun 2015)
+
+  08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/mojarra-2.2.9-Util.java.patch, +mojarra-2.2.9.ebuild:
+  Version bump. Update jakarta-jstl dependency. Patch to disable Groovy support
+  for the time being. Fix bug 551032.
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #95685
diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index c98ef8f304b2..052369917ee2 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,15 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mojarra-2.2.9-Util.java.patch 1293 SHA256 efe23044365260481a042ec974c58939c8cb0045384289c428fa3d1aa8b39755 SHA512 a77f43d5bc06c86abfc7940ee1a1b3dec31540cc02cc4c41fa6e3441cacf6f56cc8fda0f21034ba09951546c6cb5861f5620ea3319282b119d5fcd115056c4f2 WHIRLPOOL 168414cc4c5803147fb933aa7f338b8cfb105de00c8e0e2b01678637974293fe749b7e89f3a29f144edec6c0362c327b072670e7daddc97f80bdbbfe764698f0
+DIST javax.faces-2.2.9-sources.jar 3098257 SHA256 f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512 a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3 WHIRLPOOL 040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
 DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256 c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512 125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac WHIRLPOOL 62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
 DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256 8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512 6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144 WHIRLPOOL c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559
 EBUILD mojarra-1.2.15-r2.ebuild 2437 SHA256 a22796679364217317ec4c7c9208a3a08444424cc0b4a74a5e387231a6b5c292 SHA512 3e64adda7a930a09636ea5098307bd4e91710613ea5dcca861a8294be70b40d8735abe19deeace158dd1a3548878adde743426927a10eaf5b9d3bbed70ab4c1b WHIRLPOOL a58cc2db8696405a998879223b718f8fb939b4b93635b1d5005ad698671162ca77d253cb84031acb79548fa8dbd06f9122e5917298b30d1c5405af8eab75c72f
-MISC ChangeLog 1683 SHA256 601dccf8123169c197272aaa6822d6fa2f478bbfc4d9b87680b0837f12a83afc SHA512 a263e94d45fb575a92664c06a71dae72c5325fb269a9067d894c1e193c1ada4afda34d84106cec9c2aec106453721c899a54ee3245a83e1b63e3a781f8d0286c WHIRLPOOL 1026b759b2a754ef2cf3dce6660c40238060895db649617e1bc084ee06ef0d62818f37bed3e59e554998ec6824f7a35aadabda9b7953ee7606f4782233a4034f
+EBUILD mojarra-2.2.9.ebuild 1428 SHA256 d0de93011022c345786f0d665cb6334d7db241c9e063acdd54e92d5c29413b07 SHA512 12529e56fb7b652d9e1dee40b4ebc1a04b32a5c736f6a9e125577b934f51659fef025650902c7f4a523c0dee592b743f8d85f7fac3d42b7a333e9269bde27380 WHIRLPOOL 4133ddee7b06b3bdf59acc208446417049b938384f845a241fb76569352b292461f7ad5e9df62ca526c85ed760e939edad0e72aa9cfb0fd26b69b1f11488c596
+MISC ChangeLog 1953 SHA256 607de25282ab89cd3a6e88c13fb89ea5c7b8c8e19b63b3c67f4dbb45c8ca308a SHA512 29e6245275740dc0773be308f3460c97cfc6c571cebed392535b1a07ad2a05d919b994f9779581b75fe27599e3920d9a35009e58de52b06f8e857470a0a5ae46 WHIRLPOOL 7123ef2337d3221828acdd2190747ff033e2eaa0b132de310baa908199b072651aa142395bd90375a54ba968e736db787f257148052c1bcf2049e35e9bd7a9d2
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlDN1vgACgkQCaWpQKGI+9Q6LQCfbq1cjPCOx4Vk5d/uWlEiy/WJ
-HsUAniNA4KTCDAHB5tPBZimYJJ/KpqH0
-=XQUc
+iQEcBAEBCAAGBQJVdgpiAAoJEJGRpfGTSRu40vMH/1ITRgWWAgm2TlISPUjfvzFQ
+MrmI7rutP1sUgIY8wnryir/k27PCVuBKI/hGkrURuUPeVGCY8pDjFViA92T+40XN
+YbNiUn6RIdN5L1RwiXJJcGcPTSVnl77/N/VEEVxugdgmcc8IORdG6BUiYi0e1nzr
+BZJ8JN11bOaIZtV3zNxN9WhHIwTJZgI0hY2cdym74svnSkxzFPwz6cdC22bbWiLy
+0VNL6egf+urab9SuJ/kHS9sq4t1kfFqa1lJt+WtHZyXBu1bbUuIa+r9zcz7P1+kY
+O9Azpkr4hg2OBBBw4CyzF3leyYsDR2n29cJNPR2usJrWcWE9/Xy9I4lK/HkNTls=
+=q+P7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
new file mode 100644
index 000000000000..d73ee9ce0596
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
@@ -0,0 +1,26 @@
+--- src/com/sun/faces/util/Util.java.orig	2015-06-08 21:08:39.770000000 +0000
++++ src/com/sun/faces/util/Util.java	2015-06-08 21:10:12.719000000 +0000
+@@ -315,13 +315,16 @@
+         // as the same adapter in a standalone program works as one might expect.

+         // So, for now, if the classname starts with '[', then use Class.forName()

+         // to avoid CR 643419 and for all other cases, use ClassLoader.loadClass().

+-        if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {

+-            if (name.charAt(0) == '[') {

+-                return Class.forName(name, true, loader);

+-            } else {

+-                return loader.loadClass(name);

+-            }

+-        }        

++        //

++        // Disable Groovy stuff for the time being 

++        // since groovy 2.4 hasn't hit the tree... yet.

++        // if (loader.getClass() == com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) {

++        //     if (name.charAt(0) == '[') {

++        //         return Class.forName(name, true, loader);

++        //     } else {

++        //         return loader.loadClass(name);

++        //     }

++        // }        

+         return Class.forName(name, true, loader);

+     }

+ 

diff --git a/dev-java/mojarra/mojarra-2.2.9.ebuild b/dev-java/mojarra/mojarra-2.2.9.ebuild
new file mode 100644
index 000000000000..62adeaa7f9e4
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mojarra/mojarra-2.2.9.ebuild,v 1.1 2015/06/08 21:36:31 monsieurp Exp $
+
+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_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+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
+}