Missed a version in removal

Package-Manager: portage-2.1.2-r4

3 files changed, 9 insertions, 59 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index f560a55e93ab..d48a7bf5b1af 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.10 2007/02/08 15:21:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.11 2007/02/08 15:23:25 wltjr Exp $
+
+  08 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-servlet-api-6.0.7_beta-r1.ebuild:
+  Missed a version in removal
 
 *tomcat-servlet-api-6.0.9_beta (08 Feb 2007)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 54ee65230942..5ff6cfde5c99 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,24 +3,19 @@ MD5 66ba82dc585e7dec8814097eae04a5d3 files/2.5-build.xml 2864
 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b files/2.5-build.xml 2864
 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.5-build.xml 2864
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647
 EBUILD tomcat-servlet-api-5.5.20.ebuild 1517 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 SHA1 89a688794a84231a4bdfbf7f1efe05186083c894 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa
 MD5 09830f34f72c1f4d6e6751ed1fbf4330 tomcat-servlet-api-5.5.20.ebuild 1517
 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 tomcat-servlet-api-5.5.20.ebuild 1517
 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa tomcat-servlet-api-5.5.20.ebuild 1517
-EBUILD tomcat-servlet-api-6.0.7_beta-r1.ebuild 1198 RMD160 9d9a30aa635383367d0f0b45dc46f648ba70c557 SHA1 72d196313ac666f9c0b8f032a3f50c9292e83680 SHA256 8c0847094ffcb75b82e04d22a9c9fb35bd7c2f9820962604e44af8eace2f2275
-MD5 86161c8b921d3f98421bafcce360fcb2 tomcat-servlet-api-6.0.7_beta-r1.ebuild 1198
-RMD160 9d9a30aa635383367d0f0b45dc46f648ba70c557 tomcat-servlet-api-6.0.7_beta-r1.ebuild 1198
-SHA256 8c0847094ffcb75b82e04d22a9c9fb35bd7c2f9820962604e44af8eace2f2275 tomcat-servlet-api-6.0.7_beta-r1.ebuild 1198
 EBUILD tomcat-servlet-api-6.0.9_beta.ebuild 1195 RMD160 903a8fb4e39b3b1b6b200d47ddb694638d25e774 SHA1 349ad989f1dca2f7130946a1ae552fe7a8517418 SHA256 8fd594b3642a446c0f6a9bf2fbf7c65eeed9677035bc528de869413f12249e56
 MD5 899e6092a39ab251173e3c7f7be9ccdc tomcat-servlet-api-6.0.9_beta.ebuild 1195
 RMD160 903a8fb4e39b3b1b6b200d47ddb694638d25e774 tomcat-servlet-api-6.0.9_beta.ebuild 1195
 SHA256 8fd594b3642a446c0f6a9bf2fbf7c65eeed9677035bc528de869413f12249e56 tomcat-servlet-api-6.0.9_beta.ebuild 1195
-MISC ChangeLog 2564 RMD160 cf398dd9d475e48bb679a9dbb0c53738a8fbfa58 SHA1 0c64de191f78d1ad9373e3e5ff7b668dfe6f8f38 SHA256 8188a7209e57e579fc7aeccb565888f11cbefa5c561485f77c64b83d18676db5
-MD5 0b5f0c8c43bfc8de961bf39075bccb0c ChangeLog 2564
-RMD160 cf398dd9d475e48bb679a9dbb0c53738a8fbfa58 ChangeLog 2564
-SHA256 8188a7209e57e579fc7aeccb565888f11cbefa5c561485f77c64b83d18676db5 ChangeLog 2564
+MISC ChangeLog 2696 RMD160 9b9f4009033d9d561b24a7cf9e4ef02a78fd12a8 SHA1 cfeb8c23c1e17dcc52cc8611d4a412bf7d318ae6 SHA256 ea30e821bdfdcc4cb25f3e191d45f0a07a97af10cb5bc785fbc5da5148d63f13
+MD5 932b358a8dab08f86a8fe371e8dd6b86 ChangeLog 2696
+RMD160 9b9f4009033d9d561b24a7cf9e4ef02a78fd12a8 ChangeLog 2696
+SHA256 ea30e821bdfdcc4cb25f3e191d45f0a07a97af10cb5bc785fbc5da5148d63f13 ChangeLog 2696
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -28,9 +23,6 @@ SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-servlet-api-5.5.20 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-servlet-api-5.5.20 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-servlet-api-5.5.20 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-servlet-api-6.0.7_beta-r1 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-servlet-api-6.0.7_beta-r1 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-servlet-api-6.0.7_beta-r1 274
 MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-servlet-api-6.0.9_beta 274
 RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-servlet-api-6.0.9_beta 274
 SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-servlet-api-6.0.9_beta 274
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta-r1.ebuild
deleted file mode 100644
index ecc2dce508f6..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta-r1.ebuild,v 1.1 2007/01/31 06:49:12 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P/_beta/}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/jakarta/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="source"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-	source? ( app-arch/zip )"
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_compile() {
-#	local antflags="jar $(use_doc javadoc examples)"
-	local antflags="jar"
-	eant ${antflags}
-}
-
-src_install() {
-	cd "${S}/output/build/lib"
-	java-pkg_dojar *.jar
-#	use doc && java-pkg_dohtml -r docs/*
-	if use source; then
-		cd "${S}"
-		java-pkg_dosrc java/javax/servlet/
-	fi
-}