Updated 2.4 to latest tomcat sources, package needs to be renamed and versioned accordingly. Starting to have issues with it being out of sync with Tomcat

(Portage version: 2.1.2_rc3-r1)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 141 deletions

diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 7d4bbbc8b877..437eedd455b7 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.17-src.tar.gz 4282022 RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 SHA1 d59994d06608fe13eb42a65484ccb1fdcca325e2 SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8
+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
@@ -29,18 +26,14 @@ EBUILD servletapi-2.4-r2.ebuild 1479 RMD160 dfc60ee073d72d9e295b00c93ffada831cbd
 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-r3.ebuild 1335 RMD160 95bcb44aa06a0effc48557c67fd2ae8e9cb99697 SHA1 25f56a1aa89aaaabe4051587726d5c87aac52534 SHA256 3a81a1e103eaeb7fe503be3cadaf39740ca73a8ee09b950a0d7f8426a2428779
-MD5 cc2d1c9baec7d8105135b3ce1982af9c servletapi-2.4-r3.ebuild 1335
-RMD160 95bcb44aa06a0effc48557c67fd2ae8e9cb99697 servletapi-2.4-r3.ebuild 1335
-SHA256 3a81a1e103eaeb7fe503be3cadaf39740ca73a8ee09b950a0d7f8426a2428779 servletapi-2.4-r3.ebuild 1335
-EBUILD servletapi-2.4-r4.ebuild 1330 RMD160 5790f29324534415c26bc87cce8d57058cbd8963 SHA1 e841cc7842844db051f4686e274c1cb7df95173e SHA256 67c31b60490e93b7999e91c0e18e608f94f963cb814054f36ac26fd2e67c4361
-MD5 4449e0584c8ca32ba583cddd2573c718 servletapi-2.4-r4.ebuild 1330
-RMD160 5790f29324534415c26bc87cce8d57058cbd8963 servletapi-2.4-r4.ebuild 1330
-SHA256 67c31b60490e93b7999e91c0e18e608f94f963cb814054f36ac26fd2e67c4361 servletapi-2.4-r4.ebuild 1330
-MISC ChangeLog 6767 RMD160 30a7f2caf55f12383798e55fac582572cf5f2a9b SHA1 915a9cf3c0a4b7f375d8ba5f269f6060e95fd280 SHA256 c69e1f58ec31665c015722edbdf1dc179852b810c04cde3c0e846c20c7cc9376
-MD5 44232265cdb31537a6f27335f155914c ChangeLog 6767
-RMD160 30a7f2caf55f12383798e55fac582572cf5f2a9b ChangeLog 6767
-SHA256 c69e1f58ec31665c015722edbdf1dc179852b810c04cde3c0e846c20c7cc9376 ChangeLog 6767
+EBUILD servletapi-2.4-r5.ebuild 1368 RMD160 455cd26b5ada7483cf41c6e12975e1ba01b5aa2c SHA1 cc34f8aa1475069cb380f0aff8fbe4af592843c5 SHA256 6ff077ba276d52a6644262cf4c395f585b23b81ee0d5ddb5badcbf3b3f4d9b4c
+MD5 acba94a29e5a221c40f89ac42145b280 servletapi-2.4-r5.ebuild 1368
+RMD160 455cd26b5ada7483cf41c6e12975e1ba01b5aa2c servletapi-2.4-r5.ebuild 1368
+SHA256 6ff077ba276d52a6644262cf4c395f585b23b81ee0d5ddb5badcbf3b3f4d9b4c servletapi-2.4-r5.ebuild 1368
+MISC ChangeLog 7101 RMD160 a5b4801d39e32772115416f040c6929f4cc3fa17 SHA1 0628f7e43c2119226480bf823cb278f545811b36 SHA256 0e08a59c81158e12faf40403bce24e4d240c48617d6f099ecc9df23468d6ed7d
+MD5 1b7b3fe3a71569033b815ffb5e9bb96e ChangeLog 7101
+RMD160 a5b4801d39e32772115416f040c6929f4cc3fa17 ChangeLog 7101
+SHA256 0e08a59c81158e12faf40403bce24e4d240c48617d6f099ecc9df23468d6ed7d ChangeLog 7101
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -60,16 +53,6 @@ SHA256 d18a0f9186b7833ca045d8dc2360c218931bb93a38e7f8d78490ccc04e5d50b0 files/di
 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 9c6f972d9ddc95a03214e0183501eba4 files/digest-servletapi-2.4-r3 280
-RMD160 6a2200b227a5505f3a483c8bff8be82a45a969f9 files/digest-servletapi-2.4-r3 280
-SHA256 4d402c7af5197bb866cf29d86cbc5cf9098765d6a74d875bdf587cc226eed112 files/digest-servletapi-2.4-r3 280
-MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-servletapi-2.4-r4 277
-RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-servletapi-2.4-r4 277
-SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-servletapi-2.4-r4 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFeoPjAiZjviIA2XgRAoaxAJ4oKqVhafAQ1At884J4DN5YEl1Z2ACfWU7E
-k7AkCZTsS5TOIE+nU6Z4rME=
-=feE5
------END PGP SIGNATURE-----
+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.4-r3 b/dev-java/servletapi/files/digest-servletapi-2.4-r3
deleted file mode 100644
index 2d7060069885..000000000000
--- a/dev-java/servletapi/files/digest-servletapi-2.4-r3
+++ /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/digest-servletapi-2.4-r4 b/dev-java/servletapi/files/digest-servletapi-2.4-r4
deleted file mode 100644
index 51d603367aa1..000000000000
--- a/dev-java/servletapi/files/digest-servletapi-2.4-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022
-RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022
-SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022
diff --git a/dev-java/servletapi/servletapi-2.4-r3.ebuild b/dev-java/servletapi/servletapi-2.4-r3.ebuild
deleted file mode 100644
index db5a1772548d..000000000000
--- a/dev-java/servletapi/servletapi-2.4-r3.ebuild
+++ /dev/null
@@ -1,53 +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-r3.ebuild,v 1.4 2006/10/05 17:14:27 gustavoz Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-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="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	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 javadoc examples)"
-	eant ${antflags} -f jsr154/build.xml
-	eant ${antflags} -f jsr152/build.xml
-}
-
-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
-}
diff --git a/dev-java/servletapi/servletapi-2.4-r4.ebuild b/dev-java/servletapi/servletapi-2.4-r4.ebuild
deleted file mode 100644
index 748264ffbc5a..000000000000
--- a/dev-java/servletapi/servletapi-2.4-r4.ebuild
+++ /dev/null
@@ -1,53 +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-r4.ebuild,v 1.3 2006/10/05 17:14:27 gustavoz Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://apache/jakarta/tomcat-5/v5.5.17/src/apache-tomcat-5.5.17-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.4"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}/apache-tomcat-5.5.17-src/servletapi"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#epatch ${FILESDIR}/gentoo-${P}-patch
-}
-
-src_compile() {
-	local antflags="jar $(use_doc javadoc examples)"
-	eant ${antflags} -f jsr154/build.xml
-	eant ${antflags} -f jsr152/build.xml
-}
-
-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
-}