dev-java/tomcat-servlet-api: removed obsolete ebuilds

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64

9 files changed, 9 insertions, 266 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index aad1f9f43a4c..731d17debf51 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.146 2012/12/06 00:53:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.147 2012/12/06 11:01:40 fordfrog Exp $
+
+  06 Dec 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  -tomcat-servlet-api-6.0.35.ebuild, -tomcat-servlet-api-7.0.23.ebuild,
+  -tomcat-servlet-api-7.0.26.ebuild, -tomcat-servlet-api-7.0.27.ebuild,
+  -tomcat-servlet-api-7.0.28.ebuild, -tomcat-servlet-api-7.0.29.ebuild,
+  -tomcat-servlet-api-7.0.30.ebuild:
+  removed obsolete ebuilds
 
   06 Dec 2012; <ago@gentoo.org> tomcat-servlet-api-7.0.32.ebuild:
   Stable for ppc64, wrt bug #446146
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e5805a462186..52e63c1387a9 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,14 +5,7 @@ AUX servlet-api-2.4-manifest 310 SHA256 134371e8d3d0b137096e268df05751c4bcb29911
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
-DIST apache-tomcat-6.0.35-src.tar.gz 3403286 SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764 SHA512 fbf9d471f67d6dbd22c37f1963e24c1f45f39431049feedc78557efda86a793565ec5b0b5b31735d9d98a639a00a42c034ac6ddcf7b649cfdbcb8b4c6b160a39 WHIRLPOOL fe747f3ebe937b93bfce8cf15e1bf46a8d4fa9df860223f74021157c0333db9ddabee40a62cd04fc3248e817e3259a7c0fdb4fc452e7b5c095213d4e3cdb332c
 DIST apache-tomcat-6.0.36-src.tar.gz 3411736 SHA256 8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c SHA512 6646c54c6e2ce440b07401b0560617204cf6e8d65885120165cb38a9cabe8f3dc61d07330e5b03be1ad480bb131f2d63aef86e367d180df96e053200587384b3 WHIRLPOOL 5e168a6cd3389cb98d0a01a2bd23f4fb49eaa82af134175c21eca3975c1ca1a6003db023d8bc069f95d4ba43dd053e28e03ff626a5b09da74dc2ba365b8c9821
-DIST apache-tomcat-7.0.23-src.tar.gz 4103854 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0 SHA512 32923e45c9485f22b4691ef5b36046aef5a07613fac21810180b86675220cfa6fbc3e89b1067afdae919a6681c20d5835ea1a537877a69f36d8f4950c6d485d1 WHIRLPOOL 9b203f818f2dbf2046df764e7b882a17523fba9775fc41d4cfcedcd94534053fbf4f7404c2f38008392eb984ecd434ef4d24396ca2f487c9abe60b35089ec9f7
-DIST apache-tomcat-7.0.26-src.tar.gz 4127697 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e SHA512 3b4c981a75bc89e61ef09a6658d6c4c862a07ea516825a5ca299b888200ae58b647964cf4d2de955a570654f1473729857bf510f9de07eb4378bd0b857a7beae WHIRLPOOL 59b6d7b4f399c872a93aa2a57e4b9b538aa1af27ac1e025166fd97a55a803e77b2fc2fe821f88ebc79a3d8360f244dcb4f86ffb4e03db1ee671f06bcee4124fc
-DIST apache-tomcat-7.0.27-src.tar.gz 4189578 SHA256 9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9 SHA512 e2b00777157e0cd66dd1cadcfba4302defd3c45d4233261d56e5e7322260eefb28d3015026322f72809c9ee4403ab83886353bc1618415d3b1115ef2e5657429 WHIRLPOOL 1c523a73c7ee5894ca4eda22f3833fb79a5d9694a164a1a7ac207638a36fd2aa587ca255065c670163850e516cc741598afc5ad32293c701719bfd728584a84d
-DIST apache-tomcat-7.0.28-src.tar.gz 4222498 SHA256 a035eab4aa7372534161314ee09bdb086dc00179345fb002a358e157e8fb2c42 SHA512 b6ef998f79029ff2c71a9f04fb3bd7f8859fefe4762c6af25e431c571a8e9b6cebe12c982cae2ea8cd5c282a15ee7026df6ac5c4f01c5fa1c361ff7e869b823a WHIRLPOOL 2d0a5b38ada6f836960ba730f8d1e00b98dd258f07e7e6decba9c7dc8f46dc252b56c7ca72b7ef218777eddc95d4d60e5f34f01b3aaffa0123bd6ff19fa1c4b7
-DIST apache-tomcat-7.0.29-src.tar.gz 4212630 SHA256 00d42b13044303d735103373a5faf7680786879b304ca231d73844c893f6e0ea SHA512 f17a6e0c2535fdd7cbcce518c918a940ebeebef68fa1c6afb482a2d0f5001b87f973cf86f1fce9026d39cf75f2a3763b8a155fb67538e7e1f7d71472660d50db WHIRLPOOL 3b52c6118f9595b85a96302e6d1a0fe421c12a1f16c30f90380195717126911eec0f785e36ec713e80b6d9abe4d72d1104e9d1330534bc8e7d590cd017948f35
-DIST apache-tomcat-7.0.30-src.tar.gz 4229801 SHA256 c8396fdb6d15326991ed286baef385d62d58d47740565349c16410dc77ebf685 SHA512 0cb0f0a6bd65c403b6871b4891ffa7f58df205dab02faaf5ba37c5cad4d511f571bd00c127d13510f378b02016d04c86f5389073f790b25a3ae9f64edb588a46 WHIRLPOOL e10609defef2c1b85b39337d1317afd0a9048ce2ce543b0e78bc403c2019f916a4e172c92d89db429aaf5b01ec148abc319a5d1478f097e090f75f0c53d02b5c
 DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
 DIST apache-tomcat-7.0.33-src.tar.gz 4240455 SHA256 f665b4b39471b6f7ddd10845058a76308694a8be24b7651971de86a34ca66243 SHA512 c0daaa785ac90c78fa52db576a9cbe67ab51d52fcc2f2155ccab188489e9c81cd9a6dc4302ec0a43b1628fad85245f382dc39adb62e8f8c1a65cde0439e1e62f WHIRLPOOL db7ddd69e8227c37278e5f2f95a365ddf0ad4d7d27dd697352fdc9e6138a9d0b3192ada7ffc5e9079ef6493e1a999c1cc979ba192219878b45003f0042138f3a
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
@@ -20,15 +13,8 @@ EBUILD tomcat-servlet-api-3.ebuild 1020 SHA256 61b963d839d4498080252504d95c0f0cb
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1144 SHA256 760a639f1db06019140df2d3fae8bef8ba3acc07bc5e2aa589a14556470bc653 SHA512 be3c516dba70fdcb83ef5a14b73d17854ddecf66601a9f81df73db578e64aee0dfeaaad069ada7e9bcab3ff4d0dc0851393d7d089b05ee632324e85e1aa66277 WHIRLPOOL 2c371d8ead6f42024dad8c6e72bbe13b349e8cb911b52a0694cd1e7f74f9da0990c94f37967dda673efd8a5d98c7aa8ad37f3debb3aecc3a1c2a85c69612cdf5
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1569 SHA256 1c5128987b55e888b911e7624de4e80ef85cbd5069298eef47ebc8833d02777e SHA512 447b95366f49edcd47d4316fa4d2c2a745d4b13a662bfee83448a89b29fdb6ebae7ccd287c55a64626cf32df19d25a0a4c387209da16cbef238600ebdea8e070 WHIRLPOOL 4685db2d9630d39c48153cc7aafca28d0e1ba25d8fb60c8311a7623c966a03d48e510f8a21b1d10398f44931ae358fb8e4c4a247c48151855dde83779b589f5a
 EBUILD tomcat-servlet-api-5.5.34.ebuild 1569 SHA256 ab0cba8b24713b5665914a4f0df8e8d6f441c96f73ef12880319d4739343f653 SHA512 b231ce4ec828228d26c605c6539a353ed8c6806e4592e0a12e3a182980e58a3dd8c2e457edc34b72e18e642f8b5e76f387f28b8442fd330e36dbe5046cb2d7ef WHIRLPOOL 71c80a315aa84a734cc8a795794813ec1172a92f72e8a239111a242850242511abbb8da509f55a5385256b2231cdfe6a2bd615d7712480fed6b486be96b8ffef
-EBUILD tomcat-servlet-api-6.0.35.ebuild 1009 SHA256 e0e3af3c27b5c23130933ec0177c6471323db1c46e145a360a1bd3d146cccde7 SHA512 c4479e797ca7ab514070aeb99609caa1844aee8b14dc4dc3a2dbe17197cf792b79ec8b805e7d666ff8a15b91bf5b114063cf67228ef40398cf784677efd9f673 WHIRLPOOL 925c6ba7e0741b113fbbfc77bb3a864a6bcc283c50baf69f0ca62dd1582b0015ce8645499c955dc7adb37d7610fc66405dfe90f8e4c56aafafedc621ccd2e2d6
 EBUILD tomcat-servlet-api-6.0.36.ebuild 1002 SHA256 505d6848165ea7265df9f428fefd1ef93f661b6eca0595358ff1a0c1a2d6e11f SHA512 7713de5fa64b88c62d7677009b03f6e3fa9ddcd44aaf24c67ed15a9d0ec085f2c1dd08be289ddc26ed5a8198962fe7851a262ceb46774bb99e57c89e3a85f425 WHIRLPOOL b2b406e66c633425b77c6c5293242ec79e9622aeb7b774411eaa3a97b48bcbb9ccb8042f4c5ac035e93c66fc761220fb4384dfd804b405337e585e35be5b31b1
-EBUILD tomcat-servlet-api-7.0.23.ebuild 1115 SHA256 73a217aeb024a22e0125aa3244d7d4c7ddff8d5e4d1e87228f1fee378fa6bd7e SHA512 080bd92cd986f8b74ca6cb80ae03b1f2816b03507eea78f4bb5209ab1ffa634d603ef186e756a04adbf19ad20749f5150110218a49c994265efb24fc25c83ff8 WHIRLPOOL fb5ca67a990ed4209b905b374c5ca3d0614392eb7d59dd725d92d26305662b3208fd1104c4411676e8cd6fe9a8bd718677f35324a6e6ada42ab6e2dce7d1b5cf
-EBUILD tomcat-servlet-api-7.0.26.ebuild 1117 SHA256 ae15944dacc907bca888ed346580a5bf10273f683f298738a06760634022d106 SHA512 67be73dfeefb664bf457f38ec77347cca1a679bfecb383fa35c3d57bf405ea4631cf34ce5e3cec4a5be951263b8186d70c047af662c5a717295de352aab6cfeb WHIRLPOOL 3a3ecfad4e097a803b067f48441a30f21dae4b2184bb0d526d52d70e8faef4d9f0c8dc250c056fbaab43d61d3842ff142b285208b3621d727029c8ffb9469fec
-EBUILD tomcat-servlet-api-7.0.27.ebuild 1112 SHA256 5ff6c7faf9caec26eab4c839746e09d8adc8d4bc34f6b5b306a3da7c694de872 SHA512 135368de421f0f5b772a79dd53ee05e859d83c9d51c5c398210888941debb223ef0f6e1f730ea4d44f8149c0301069e06053bf8fdd293e22d6b4086adcfde197 WHIRLPOOL 9dc3aa0b53008b15a91ed55e0b0d5e94544855c76995c82245c8a576abf13db0d757cd44f74b7249b119a8661ab4302644e4a0fe48568f8b7527ad03905e2eb6
-EBUILD tomcat-servlet-api-7.0.28.ebuild 1120 SHA256 807c83c3db2a156751b67f26b2b4ebad5a118eb6c05a18821698b68a813fc213 SHA512 383a7cbda6bcfc15acda43593da894343de193501a99f9f5695f6aa37ff581daf9796a756f1f67e938194eeed6e83363358472929ffbf6e16adfd5a30678e690 WHIRLPOOL 7265be8db04ab71d46b06619b5ade19c068ce1ed8e7331ceccae105bd8470d4ae25292a546339e41576b38627440dd7d6d206cf90cc96a36a3963f461ec34155
-EBUILD tomcat-servlet-api-7.0.29.ebuild 1120 SHA256 959b258fd16f79116c6a8e408453035d5ab48ae5931de1e378d3d47aa79141df SHA512 997ee813fc131a91624a73d47999972561ed3596fbe898fa334e588262bb514330d19c930fcd7e77f854e784f661f466e58c5a0de468d0969bfe644654ccb07b WHIRLPOOL c479ed23ccfe2f2d3961629642ddd25e62efe177866e4f7e4e4e4d4dac1c3a995710f0ead365edec8afb397b0f58445ecedba158d852c13591824319f9882b9e
-EBUILD tomcat-servlet-api-7.0.30.ebuild 1120 SHA256 7715d23ea966269ffc5e4a109b042e038f8008ed2a317c9b38d0ac7bc2ae85d2 SHA512 1e5225d8d09a189fa70ec7fb9dfc0285a19073ae5757608a6379d2f6ccc3af283b63dce8a0e79ee49c709f2d1f67c73e2ede60f738cb61931405a9d27600f203 WHIRLPOOL 710b542f5618dabbf96cb426e57e146be5829a0db6b7bb052b16bb08ad2fee1c2d00060384b70b74ec1792df26ce72facb72a9e885f52b60968bfd5f7f42b8f2
 EBUILD tomcat-servlet-api-7.0.32.ebuild 1111 SHA256 795ae51834bbdda9c658fda11c2ba45f1e09dfc45f253c0691bc7fd5661b07f9 SHA512 fa70dd0604ff243c57607f2d758de49467d8a4d1733252bc3694936ef52b0fc6baac1689ffb21582ba002b8589594c20ebb71f20519f0a8666248e49bce63ec2 WHIRLPOOL fb0a30d49fe1efb4aeb57299453d3c53cb380d0280bfd445c3773e37555b0904864357aa7214e2d6be80be823c9ab3148ab8de37be3a3176f44e03e11daec054
 EBUILD tomcat-servlet-api-7.0.33.ebuild 1120 SHA256 91e5a0827335ffc74ae3faf3b5953e6b1e089c357489f3e0e35a9c596dc8134b SHA512 e2c5c884967e5e96fe8c0c67ee8c3ca198e0a663dc30082d7dd4ec5f44fff455fef2d84b84bea56cbe654725010c5e2658c85c6945c8291590138c86f83da0a7 WHIRLPOOL ded59ad694db98128d5dafccdeaf63210aa07494f8c01d5ec28bffe7012095d1490040fcbb6431d2888ad7fa3da5fa9b6681318b37705d15cdd4158438f437e9
-MISC ChangeLog 22866 SHA256 789226b2380b4c97307499be9196fb6267fd15119dea7453df88e663738f0921 SHA512 2d2b7dfc76a1589b515deb197388fb00588af04002e558a4482b34cc50c36852b455ae96b8f54c0c0a14ea01ddda878acc65f3b7632e1866d28ef54329fbc1b4 WHIRLPOOL df6b0b9d58a904eb321a8a6f46d92612c4c2df7cd6bb92504bca833da1ac6853eba850215a7bfe18984d40eb2bb636b5f86d85fd98cfaa7d612c70af7772416e
+MISC ChangeLog 23204 SHA256 6b89a67c62cf28c26e09e98e5632faaf7458302c5fce16f9f41f183f95fadeea SHA512 5d4b13c2c53b0b8ee1477c4d5d29d4e9d81000765406f0611047a762b045be225fa3467f12042eb80e5848b8f7995c7086d29a0ddc72e11b59f02a64119665ed WHIRLPOOL 46b91f33fb0ed882c2dedd100391d431f0e54fe7802b16a9d1e8477d087d487f17758c38d0b6883caeea199dc36f6c9ef90c1c029381acb7f8ab51c891ad40cd
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.35.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.35.ebuild
deleted file mode 100644
index 59e89e55820a..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.35.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 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.35.ebuild,v 1.6 2012/04/15 18:52:57 vapier Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-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/tomcat/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.23.ebuild
deleted file mode 100644
index 2c776fdf540b..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.23.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.23.ebuild,v 1.5 2012/04/15 18:52:57 vapier Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.26.ebuild
deleted file mode 100644
index d66d8dcb617f..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.26.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.26.ebuild,v 1.3 2012/04/15 18:52:57 vapier Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild
deleted file mode 100644
index 4ed9312a4991..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.27.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.27.ebuild,v 1.5 2012/08/24 13:37:46 xmw Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.28.ebuild
deleted file mode 100644
index 76f6d2d71ff0..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.28.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.28.ebuild,v 1.1 2012/06/19 14:34:53 fordfrog Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.29.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.29.ebuild
deleted file mode 100644
index 8295a01c3a45..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.29.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.29.ebuild,v 1.1 2012/07/08 21:34:30 fordfrog Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild
deleted file mode 100644
index 6b6ef539d7fb..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 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-7.0.30.ebuild,v 1.1 2012/09/06 14:49:29 fordfrog Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}