From 958a2a989f3adf0537e541b00de39d586edeb5dc Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Sat, 21 Nov 2015 10:59:39 +0000
Subject: [PATCH] dev-java/jakarta-jstl: Removal. Fixes bug 551032.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/jakarta-jstl/Manifest                |  1 -
 dev-java/jakarta-jstl/files/build-xml.patch   | 12 ----
 .../jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild | 64 -------------------
 dev-java/jakarta-jstl/metadata.xml            |  5 --
 4 files changed, 82 deletions(-)
 delete mode 100644 dev-java/jakarta-jstl/Manifest
 delete mode 100644 dev-java/jakarta-jstl/files/build-xml.patch
 delete mode 100644 dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
 delete mode 100644 dev-java/jakarta-jstl/metadata.xml

diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest
deleted file mode 100644
index ee50f00bde71..000000000000
--- a/dev-java/jakarta-jstl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23 SHA512 86189831d7836bfb32915be54518f8a8746000f7184d92a7e1b2f0da8d1ba4ab98861022e6be24074fe3bd487d6d413d72b3e2c8990b1f63a680b481b746d1c6 WHIRLPOOL df56675c21be28aee7ab825c77f07b2c767da6559354522aee1eb748590e06a5a3e6961a52c881b38c1eba77a8ecd85c9c8b69ae672e6f43f7077fe7fb345d3b
diff --git a/dev-java/jakarta-jstl/files/build-xml.patch b/dev-java/jakarta-jstl/files/build-xml.patch
deleted file mode 100644
index 85e5e1041582..000000000000
--- a/dev-java/jakarta-jstl/files/build-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- jakarta-taglibs-standard-1.1.2-src/standard/build.xml	2004-10-25 16:26:23.000000000 -0400
-+++ build.xml	2006-10-10 16:33:05.000000000 -0400
-@@ -170,8 +170,7 @@
-     <javac 
-       srcdir="${library.src}" 
-       destdir="${build.library}/classes"
--      bootclasspath="${xalan.jar}:${java.home}/lib/rt.jar"
--      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}"
-+      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}:${xalan.jar}"
-       excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
-       debug="${compile.debug}"
-       deprecation="${compile.deprecation}"
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
deleted file mode 100644
index 862d8ebcebca..000000000000
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="jakarta-taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
-HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
-SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEP="dev-java/servletapi:2.4
-	dev-java/xalan"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-#	test? ( dev-java/ant-junit )
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}-src/standard"
-
-# Needs cactus packaged
-# https://bugs.gentoo.org/show_bug.cgi?id=212890
-RESTRICT="test"
-
-java_prepare() {
-	# put xalan from bootclasspath to classpath
-	epatch "${FILESDIR}/build-xml.patch"
-	# due to JDBC API changes
-	java-ant_rewrite-bootclasspath 1.5
-
-	echo -e "base.dir=..\n" \
-		"build.dir = \${base.dir}/build\n" \
-		"build.classes=\${build.dir}/standard/standard/classes\n" \
-		"dist.dir = \${base.dir}/dist\n" \
-		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
-		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
-		"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
-		> build.properties
-	#use test && echo "junit.jar=$(java-pkg_getjars --build-only junit)" >> build.properties
-	java-pkg_filter-compiler jikes
-}
-
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="javadoc-dist"
-EANT_TEST_TARGET="run.junit"
-
-src_install() {
-	java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar
-
-	use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc "${S}"/src/*
-}
diff --git a/dev-java/jakarta-jstl/metadata.xml b/dev-java/jakarta-jstl/metadata.xml
deleted file mode 100644
index 7303cef96964..000000000000
--- a/dev-java/jakarta-jstl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
-- 
2.26.2