commit: 12ee0ff6528eac6b56709bc59866b1b716c5394f Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Tue Dec 28 09:10:49 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Tue Dec 28 09:15:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ee0ff6
dev-java/mojarra: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-java/mojarra/Manifest | 1 - .../mojarra/files/mojarra-2.2.12-Util.java.patch | 25 ---------- dev-java/mojarra/metadata.xml | 8 ---- dev-java/mojarra/mojarra-2.2.12-r1.ebuild | 54 ---------------------- profiles/package.mask | 1 - 5 files changed, 89 deletions(-) diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest deleted file mode 100644 index 01c094e85fef..000000000000 --- a/dev-java/mojarra/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST javax.faces-2.2.12-sources.jar 3105808 BLAKE2B 347daf8b44171a94e7ebf09c8ad22b1b20255355f589def6c537c49e37275605caf80f219be21dd8561597c94c15e6fe2cc0c0c713297ceaf8d6be669b6a6e78 SHA512 b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch deleted file mode 100644 index 23033f652969..000000000000 --- a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/com/sun/faces/util/Util.java.orig 2015-09-03 14:43:30.953486000 +0000 -+++ src/com/sun/faces/util/Util.java 2015-09-03 14:43:57.692486000 +0000 -@@ -354,13 +354,15 @@ - // 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 support. -+ // 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/metadata.xml b/dev-java/mojarra/metadata.xml deleted file mode 100644 index 6ef2d50cf07e..000000000000 --- a/dev-java/mojarra/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>j...@gentoo.org</email> - <name>Java</name> - </maintainer> -</pkgmetadata> diff --git a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild deleted file mode 100644 index 735e0e7b91bc..000000000000 --- a/dev-java/mojarra/mojarra-2.2.12-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit 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/profiles/package.mask b/profiles/package.mask index b231a1e0fd5c..7bf22da89aae 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -234,7 +234,6 @@ dev-java/jsr225 dev-java/jsr311-api dev-java/jsr322 dev-java/jung -dev-java/mojarra # Hans de Graaff <gra...@gentoo.org> (2021-11-26) # Mask new rubygems version for testing. This version uses a new