Removed older javaa gen 1 ebuilds, and removed unused 2.4 patch for ppc.

(Portage version: 2.1.2_rc4-r9)
 (Unsigned Manifest commit)

6 files changed, 8 insertions, 212 deletions

diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 6bf1ac73fbfd..0e5be8ebabb9 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,15 +1,6 @@
-AUX gentoo-servletapi-2.4-patch 4281 RMD160 68e22c84152500655640efb7559311d21533170c SHA1 e121290cbce775945dc8eaf4e57c4d8792c58237 SHA256 612b65746f3d68ac3b025a96352d2dffec53203c31446d5aaa17015d6db67676
-MD5 9a8f107226db82b54f939c300a6d68e5 files/gentoo-servletapi-2.4-patch 4281
-RMD160 68e22c84152500655640efb7559311d21533170c files/gentoo-servletapi-2.4-patch 4281
-SHA256 612b65746f3d68ac3b025a96352d2dffec53203c31446d5aaa17015d6db67676 files/gentoo-servletapi-2.4-patch 4281
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST jakarta-tomcat-5.0.19-src.tar.gz 3645543 RMD160 dd3b98c52d3f0ce4df341ee1d9baefb64ed0cba1 SHA1 a52fb165281c30687b677d1ca5d16e449d026a3a SHA256 59bc6f5a7a49e9132ac4c58c33e0859bc806d6da6ee6042553d3b56beba337cb
 DIST servletapi-2.2-20021101.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 DIST servletapi-2.3-20021101.tar.gz 127874 RMD160 8abc64d7099de3a247e67acb5cb4fe9434ebe2d1 SHA1 ccdaa9108027fe7d8b72f5d0c7022493c01f7698 SHA256 1f73439d3d0f6e95e24d4226c10829c1622a86911a346d93ceefed5035a6caee
-EBUILD servletapi-2.2-r2.ebuild 925 RMD160 c0af96d15a9161431ec3b294d1c510939de799d3 SHA1 89187f44385c34bcd31e45ba70dfad388a61fa3b SHA256 d7bd27b713c0bbb07f77f1ff14ca839cd9b0e17fcbc4a36808c01c398ffe6c90
-MD5 fe25599e394932ed73d2c9091bda8382 servletapi-2.2-r2.ebuild 925
-RMD160 c0af96d15a9161431ec3b294d1c510939de799d3 servletapi-2.2-r2.ebuild 925
-SHA256 d7bd27b713c0bbb07f77f1ff14ca839cd9b0e17fcbc4a36808c01c398ffe6c90 servletapi-2.2-r2.ebuild 925
 EBUILD servletapi-2.2-r3.ebuild 798 RMD160 9cbe1111b11c1cb89cad91c9bfb2a1a8b67ed23b SHA1 f3d78136ed76f16f7b7d464de95e16d5b616e79e SHA256 4c1cc23c42db8f49109a87db6e023631861021cd4eead488fbb78ae73da6635a
 MD5 db2583471a00b8ecad12bf4309dbdd97 servletapi-2.2-r3.ebuild 798
 RMD160 9cbe1111b11c1cb89cad91c9bfb2a1a8b67ed23b servletapi-2.2-r3.ebuild 798
@@ -22,25 +13,18 @@ EBUILD servletapi-2.3-r3.ebuild 838 RMD160 2cc8e123fc5466ac68b9549d6344d8ca8672d
 MD5 833159b59cf48ba2edee052da3a44a8c servletapi-2.3-r3.ebuild 838
 RMD160 2cc8e123fc5466ac68b9549d6344d8ca8672de9e servletapi-2.3-r3.ebuild 838
 SHA256 8e6f81510911f480bbacb9e032c6723248e6e697f6742141c74be06dc17ffe06 servletapi-2.3-r3.ebuild 838
-EBUILD servletapi-2.4-r2.ebuild 1479 RMD160 dfc60ee073d72d9e295b00c93ffada831cbd52e7 SHA1 31e8370a365e2e6c0abcb7dacff632b3a50004fe SHA256 86ff5a75f4319df9735b982ebe8013d2a80ad593599c06b3aa08ef801565715d
-MD5 f862a301aa3127e92e5f37c772bf2977 servletapi-2.4-r2.ebuild 1479
-RMD160 dfc60ee073d72d9e295b00c93ffada831cbd52e7 servletapi-2.4-r2.ebuild 1479
-SHA256 86ff5a75f4319df9735b982ebe8013d2a80ad593599c06b3aa08ef801565715d servletapi-2.4-r2.ebuild 1479
-EBUILD servletapi-2.4-r5.ebuild 1366 RMD160 1dcfddd5f4fb5d6346a8e24c972b28fe1b9aaec1 SHA1 407da6d7b73b778bfcb87e61600f501f8482f6b0 SHA256 895c7ab5a7b1db9618915814bc405c8c700f1101e997d30eb5b23d89c1fed3e7
-MD5 c9681aee9a864223831437de4705a065 servletapi-2.4-r5.ebuild 1366
-RMD160 1dcfddd5f4fb5d6346a8e24c972b28fe1b9aaec1 servletapi-2.4-r5.ebuild 1366
-SHA256 895c7ab5a7b1db9618915814bc405c8c700f1101e997d30eb5b23d89c1fed3e7 servletapi-2.4-r5.ebuild 1366
-MISC ChangeLog 8192 RMD160 96c2c88c15bb7443fc84603267c89be57a6b3e46 SHA1 f9ee0df15326b9debb6b370e2c4e62dc2fcb1b22 SHA256 81dcde6159d2a39130bc9096062b9a8dc7e11e5e82b07631ad714c973361ad49
-MD5 f0a07d653a11a5c7f0b358f472bcbd28 ChangeLog 8192
-RMD160 96c2c88c15bb7443fc84603267c89be57a6b3e46 ChangeLog 8192
-SHA256 81dcde6159d2a39130bc9096062b9a8dc7e11e5e82b07631ad714c973361ad49 ChangeLog 8192
+EBUILD servletapi-2.4-r5.ebuild 1285 RMD160 3c341187915ed71500ec8087c23f0f307f53c795 SHA1 6731bed604509c9bedb8bf29b2adb99470efb0b5 SHA256 7c0664770678b808fc523602229684e9f8ff163c619f99fe1e443390e9dbe85c
+MD5 9d0a44d86b2962ac1b2633719fcccc2d servletapi-2.4-r5.ebuild 1285
+RMD160 3c341187915ed71500ec8087c23f0f307f53c795 servletapi-2.4-r5.ebuild 1285
+SHA256 7c0664770678b808fc523602229684e9f8ff163c619f99fe1e443390e9dbe85c servletapi-2.4-r5.ebuild 1285
+MISC ChangeLog 8443 RMD160 cdacacd832958d5309b09834f2815f915f8db69a SHA1 d1206f4c9dc28b28ce94f49693ae44221cd2fa82 SHA256 83a22d624ac9b7804a6ba48bfdfd40b96ea4badbbf6ef77470f777a3caeb8c20
+MD5 e5fa5cb078e7093d5e67a4fbbfb1bc24 ChangeLog 8443
+RMD160 cdacacd832958d5309b09834f2815f915f8db69a ChangeLog 8443
+SHA256 83a22d624ac9b7804a6ba48bfdfd40b96ea4badbbf6ef77470f777a3caeb8c20 ChangeLog 8443
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata.xml 370
-MD5 ca0766e94f3c3f3f33552f4fd1c2ea89 files/digest-servletapi-2.2-r2 268
-RMD160 14bc1218327b73bbffc5cea35118754a25bc532a files/digest-servletapi-2.2-r2 268
-SHA256 ca8a25d3ae67aeb3217211fb5ba290d1056de87b3ff18b585e5f59ca942c77a5 files/digest-servletapi-2.2-r2 268
 MD5 ca0766e94f3c3f3f33552f4fd1c2ea89 files/digest-servletapi-2.2-r3 268
 RMD160 14bc1218327b73bbffc5cea35118754a25bc532a files/digest-servletapi-2.2-r3 268
 SHA256 ca8a25d3ae67aeb3217211fb5ba290d1056de87b3ff18b585e5f59ca942c77a5 files/digest-servletapi-2.2-r3 268
@@ -50,9 +34,6 @@ SHA256 d18a0f9186b7833ca045d8dc2360c218931bb93a38e7f8d78490ccc04e5d50b0 files/di
 MD5 80c654087b8f83d8c86b414ee1f6560b files/digest-servletapi-2.3-r3 271
 RMD160 26a41b0d20fda701dbc91c68a85d61b47dffee1b files/digest-servletapi-2.3-r3 271
 SHA256 d18a0f9186b7833ca045d8dc2360c218931bb93a38e7f8d78490ccc04e5d50b0 files/digest-servletapi-2.3-r3 271
-MD5 9c6f972d9ddc95a03214e0183501eba4 files/digest-servletapi-2.4-r2 280
-RMD160 6a2200b227a5505f3a483c8bff8be82a45a969f9 files/digest-servletapi-2.4-r2 280
-SHA256 4d402c7af5197bb866cf29d86cbc5cf9098765d6a74d875bdf587cc226eed112 files/digest-servletapi-2.4-r2 280
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-servletapi-2.4-r5 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-servletapi-2.4-r5 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-servletapi-2.4-r5 277
diff --git a/dev-java/servletapi/files/digest-servletapi-2.2-r2 b/dev-java/servletapi/files/digest-servletapi-2.2-r2
deleted file mode 100644
index f9a8fc45e279..000000000000
--- a/dev-java/servletapi/files/digest-servletapi-2.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ab97805b2ba8b55ba21ff580f99ed6a servletapi-2.2-20021101.tar.gz 65342
-RMD160 9fc0def14700c4850455da1312e50135fd56eea9 servletapi-2.2-20021101.tar.gz 65342
-SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 servletapi-2.2-20021101.tar.gz 65342
diff --git a/dev-java/servletapi/files/digest-servletapi-2.4-r2 b/dev-java/servletapi/files/digest-servletapi-2.4-r2
deleted file mode 100644
index 2d7060069885..000000000000
--- a/dev-java/servletapi/files/digest-servletapi-2.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3555d6ee9374cf2afd2c01b72f71969a jakarta-tomcat-5.0.19-src.tar.gz 3645543
-RMD160 dd3b98c52d3f0ce4df341ee1d9baefb64ed0cba1 jakarta-tomcat-5.0.19-src.tar.gz 3645543
-SHA256 59bc6f5a7a49e9132ac4c58c33e0859bc806d6da6ee6042553d3b56beba337cb jakarta-tomcat-5.0.19-src.tar.gz 3645543
diff --git a/dev-java/servletapi/files/gentoo-servletapi-2.4-patch b/dev-java/servletapi/files/gentoo-servletapi-2.4-patch
deleted file mode 100644
index 140fa7ebf856..000000000000
--- a/dev-java/servletapi/files/gentoo-servletapi-2.4-patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp
---- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp	2004-02-14 11:26:44.000000000 +0100
-+++ jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp	2005-02-04 15:32:05.474146784 +0100
-@@ -1,3 +1,4 @@
-+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
- <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
- 
- <html>
-@@ -15,7 +16,7 @@
-     <blockquote>
-       <u><b>Change Parameter</b></u>
-       <form action="functions.jsp" method="GET">
--	  foo = <input type="text" name="foo" value="${param['foo']}">
-+	  foo = <input type="text" name="foo" value="${fn:escapeXml(param['foo'])}">
-           <input type="submit">
-       </form>
-       <br>
-@@ -27,19 +28,19 @@
- 	  </thead>
- 	  <tr>
- 	    <td>\${param["foo"]}</td>
--	    <td>${param["foo"]}&nbsp;</td>
-+	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
- 	  </tr>
- 	  <tr>
- 	    <td>\${my:reverse(param["foo"])}</td>
--	    <td>${my:reverse(param["foo"])}&nbsp;</td>
-+	    <td>${my:reverse(fn:escapeXml(param["foo"]))}&nbsp;</td>
- 	  </tr>
- 	  <tr>
- 	    <td>\${my:reverse(my:reverse(param["foo"]))}</td>
--	    <td>${my:reverse(my:reverse(param["foo"]))}&nbsp;</td>
-+	    <td>${my:reverse(my:reverse(fn:escapeXml(param["foo"])))}&nbsp;</td>
- 	  </tr>
- 	  <tr>
- 	    <td>\${my:countVowels(param["foo"])}</td>
--	    <td>${my:countVowels(param["foo"])}&nbsp;</td>
-+	    <td>${my:countVowels(fn:escapeXml(param["foo"]))}&nbsp;</td>
- 	  </tr>
- 	</table>
-       </code>
-diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp
---- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	2004-02-14 11:26:44.000000000 +0100
-+++ jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	2005-02-04 15:32:14.639753400 +0100
-@@ -1,3 +1,4 @@
-+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
- <html>
-   <head>
-     <title>JSP 2.0 Expression Language - Implicit Objects</title>
-@@ -34,7 +35,7 @@
-     <blockquote>
-       <u><b>Change Parameter</b></u>
-       <form action="implicit-objects.jsp" method="GET">
--	  foo = <input type="text" name="foo" value="${param["foo"]}">
-+	  foo = <input type="text" name="foo" value="fn:escapeXml(${param["foo"])}">
-           <input type="submit">
-       </form>
-       <br>
-@@ -46,11 +47,11 @@
- 	  </thead>
- 	  <tr>
- 	    <td>\${param.foo}</td>
--	    <td>${param.foo}&nbsp;</td>
-+	    <td>fn:escapeXml(${param.foo})&nbsp;</td>
- 	  </tr>
- 	  <tr>
- 	    <td>\${param["foo"]}</td>
--	    <td>${param["foo"]}&nbsp;</td>
-+	    <td>fn:escapeXml(${param["foo"])}&nbsp;</td>
- 	  </tr>
- 	  <tr>
- 	    <td>\${header["host"]}</td>
-diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx
---- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx	2004-02-14 11:26:44.000000000 +0100
-+++ jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx	2005-02-04 15:34:24.910949168 +0100
-@@ -6,11 +6,12 @@
- <svg xmlns="http://www.w3.org/2000/svg"
-      width="450" height="500" viewBox="0 0 450 500"
-      xmlns:c="http://java.sun.com/jsp/jstl/core"
-+     xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-      xmlns:jsp="http://java.sun.com/JSP/Page">
-   <jsp:directive.page contentType="image/svg+xml" />
-   <title>JSP 2.0 JSPX</title>
-   <!-- select name parameter, or default to JSPX -->
--  <c:set var="name" value='${empty param["name"] ? "JSPX" : param["name"]}'/>
-+  <c:set var="name" value='${empty fn:escapeXml(param["name"]) ? "JSPX" : fn:escapeXml(param["name"])}'/>
-   <g id="testContent">
-     <text class="title" x="50%" y="10%" font-size="15" text-anchor="middle" >
-             JSP 2.0 XML Syntax (.jspx) Demo</text>
diff --git a/dev-java/servletapi/servletapi-2.2-r2.ebuild b/dev-java/servletapi/servletapi-2.2-r2.ebuild
deleted file mode 100644
index 9841241a0fc0..000000000000
--- a/dev-java/servletapi/servletapi-2.2-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r2.ebuild,v 1.4 2006/10/05 17:14:27 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-1.1"
-SLOT="2.2"
-KEYWORDS="x86 ~ppc amd64"
-IUSE="jikes doc"
-S=${WORKDIR}/jakarta-servletapi-src
-
-src_compile() {
-	local antflags="all"
-
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "failed to compile"
-}
-
-src_install() {
-	cd ../dist
-	java-pkg_dojar servletapi/lib/servlet.jar || die "Unable to install"
-
-	use doc && java-pkg_dohtml -r servletapi/docs/*
-
-	dodoc dist/README.txt
-}
diff --git a/dev-java/servletapi/servletapi-2.4-r2.ebuild b/dev-java/servletapi/servletapi-2.4-r2.ebuild
deleted file mode 100644
index ba67222f0144..000000000000
--- a/dev-java/servletapi/servletapi-2.4-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r2.ebuild,v 1.5 2006/10/05 17:14:27 gustavoz Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://apache/jakarta/tomcat-5/v5.0.19/src/jakarta-tomcat-5.0.19-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.4"
-KEYWORDS="x86 ppc amd64 ppc64"
-IUSE="doc jikes source"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.4"
-
-S=${WORKDIR}/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo-${P}-patch
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc examples"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} -f jsr154/build.xml || die "compilation problem"
-	ant ${antflags} -f jsr152/build.xml || die "compilation problem"
-}
-
-src_install() {
-	mv jsr{154,152}/dist/lib/*.jar ${S}
-
-	if use doc ; then
-		mkdir docs
-		cd ${S}/jsr154/build
-		mv docs ${S}/docs/servlet
-		mv examples ${S}/docs/servlet/examples
-
-		cd ${S}/jsr152/build
-		mv docs ${S}/docs/jsp
-		mv examples ${S}/docs/jsp/examples
-	fi
-
-	cd ${S}
-	java-pkg_dojar *.jar
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
-}