Dropped vulnerable versions

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

12 files changed, 17 insertions, 1088 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3432e65d0116..fd592f8b2262 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.337 2014/12/14 11:51:54 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.338 2014/12/22 17:48:04 ercpe Exp $
+
+  22 Dec 2014; Johann Schmitz <ercpe@gentoo.org>
+  -files/tomcat-6.0.37-build.xml.patch, -files/tomcat-6.0.39-build.xml.patch,
+  -files/tomcat-7.0.42-build.xml.patch, -files/tomcat-7.0.47-build.xml.patch,
+  -files/tomcat-7.0.52-build.xml.patch, -tomcat-6.0.37.ebuild,
+  -tomcat-6.0.39.ebuild, -tomcat-7.0.42.ebuild, -tomcat-7.0.47.ebuild,
+  -tomcat-7.0.52.ebuild:
+  Dropped vulnerable versions
 
 *tomcat-7.0.57 (14 Dec 2014)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 488c39392cca..04ca15f92f61 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,44 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tomcat-6.0.37-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
-AUX tomcat-6.0.39-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
 AUX tomcat-6.0.41-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
-AUX tomcat-7.0.42-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
-AUX tomcat-7.0.47-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
-AUX tomcat-7.0.52-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed
 AUX tomcat-7.0.56-build.xml.patch 3854 SHA256 51b845985859132b633371c6fd2e1e2ea5c787bf7206125546c4b8752464d39e SHA512 8da59a51e58db16b0062bcc6b24e6b0b43d13884abd7c68a37b15226ff4184fb872a8e43ac281c3c7bd379dd11a1343db3eff84175f9323808d1d0c8641242b4 WHIRLPOOL 6035466159f30b873117478a8859451d73c4424cb22e29991cec2af72fc918cf14adf2bb51d107a7a1b95ca1b770f7a3ba6290abdb036d1bdf1a9a4b8da75130
 AUX tomcat-7.0.57-build.xml.patch 7127 SHA256 ed30b302255203296a7e895924587f845ee5611e47f803d533e84927d9ac7765 SHA512 69826d3117abe07453f2c74922ab7ca066988bee2b86ae61ba6c57e8c22e751e4b627eddf89d83c58c5ca23a4cbd6e5851a214571def1f101a3a0110085f95b6 WHIRLPOOL 2a1032a989134c0e2f3c0a59bcc92d8e5d89ff134e52ed4e984cbd8eb09aa2f705f61ef0612a48859c5e334addc7a6935263d46c494c872bd129cbf4da1ff52f
 AUX tomcat-instance-manager-r1.bash 6451 SHA256 28990e664007e6eab91d1f90f58009457f683c4c9d37ef78f9065b4b6c87add2 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 WHIRLPOOL 3be20ac95b1b2e80d62cecbd5e47d0b7c768e78ec38c5ec5661e4d563962196eb45fae82d54349a9202323f5a464ac922930b1b01e197ed6e83f03a3d38f79af
 AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d
 AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3
 AUX tomcat.init 2989 SHA256 bae9e2663e5fda9c665fc97e916074cca46468560af17e3bbad030adf950e314 SHA512 0be4ed921efebc740326009bfb3cf33df0bcd3d24395381e8dfee09b993bbb1865369e7a1837710c5853d3d4534bbd4362a50edc05b30f2badbb942cf20ea65b WHIRLPOOL 0282df5c5a51449d81c8d4c38b64411c9cf0d9c66d2746f116760fc63dabb587c5f37361f2a87d1de22e2dc90ff7b53d5fc041be64caa12eddc701c7bf4fa154
-DIST apache-tomcat-6.0.37-src.tar.gz 3430692 SHA256 665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281 SHA512 b4f3c795aa760854f52e2286073f2612602e95245e7075d7c9033d3fb455ef6077cdd1f5b0c0229d5b75d32f2cb436154cc9c7b1a8ddf2e59e0ed2f095789958 WHIRLPOOL 3cec31dfd5e7e22fb6e3a87bfdb6a1b58e353faa023a9d3703043746e22afd379249ca5378cddaddac1e6c59130fe5465b359e887d991713aea0cf4f9bd5188d
-DIST apache-tomcat-6.0.39-src.tar.gz 3593901 SHA256 f31eba79138f5ac8223ff706fb2637205837ea44ba27c39bfb18ce9aada0f7ec SHA512 a48478d92094344b07020df879c35e0ff3afc3db3900c22982d94722c86deebe6a3a9e513f84925a8c7b96a44d49ce69125d298b0dd08cf138bfa8a574cf4736 WHIRLPOOL c117c524baec8a5b6d899a8a60970cc1bb01678a04b2b032f53f2f9b9830abf9e25dacb98e02661a51e87dc2d615f5c0f17d9fe29f6b68fd5f2cc886a51d7a0d
 DIST apache-tomcat-6.0.41-src.tar.gz 3591370 SHA256 6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c SHA512 605b33fb48772af3d34f33082d30c6791308c8ce6c52607a0e8e97b353ecd1a768a400ed65abcf2701381fff7e61d4d83a887140d4eebf753551e26dcef58e5d WHIRLPOOL c70f397308c051287d5de77e2c66b70d6003dd015cc0ba236599c09f5046bc6d5f0f03ddb672c7c9267ec860491ad7144104ede3e599a064776a931f9babfddd
-DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
-DIST apache-tomcat-7.0.47-src.tar.gz 4568824 SHA256 be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99 SHA512 bb0d2c5ecc05b69655ebb6073e92ab379b588e18ea2d4e5883297ce528d6a6e7a400e3038d93f6d5e79be24687105e4fd3d6ab62b616da715f333dd9067dbaf8 WHIRLPOOL 126b2bae767c620ed0b4bd83ed71cea3f6ea81862258bce1273e7840682b771fca55393e6090300e9635d3839b9de9d48aa346bef8d06fb87b435f20e6b32495
-DIST apache-tomcat-7.0.52-src.tar.gz 4613085 SHA256 208781c82c8355f1796696f1022e47968d903a6e5f3e429f9fcf76c21d9d1024 SHA512 a83e16c575fee90585024121414171345645377f13b6a1af15a8fdfe307fb2aca020bae8c214b6bae8bd817ff1c6b3c37f01f38749bf87c06448a7519803b298 WHIRLPOOL 3492e99ef9f100ff1a7afa75d383668c4f69a2e4b4509b0cf7989026d9ace01d1758cd06dd23878b0716ef418901f0551521060d70f6de2d3d91be0695f81db3
 DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
 DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
-EBUILD tomcat-6.0.37.ebuild 3963 SHA256 934c69c50021c2a1b8b9c2aeffd8acb47c7b08ee79d358ac889a9c3954f2fb37 SHA512 0f19f8080a6c737379431590d5d8acbb67c202d4b535b64c87250b6fd54850bb8c2c745655c7845ff1b2216d36e16dcad7fbf7b638b1a7f5e9ca5f541c6c07f0 WHIRLPOOL d17092377652126e5e614b85253ee1627655a6ca52999e9045189f126c05c171301554b42d01d2da0d41083966c91b6b45077b487218c6793a1411b3c79b7418
-EBUILD tomcat-6.0.39.ebuild 3969 SHA256 1964b2a6c1c56e5cc0a00c8f307cf91494143c57b016980c8e2f60da96c9af80 SHA512 0c9df1c8bde93c76047e43769e4e0b20ea04e13c8d610df3f9a4c95b6db5d1ecc714ee08ca5ad6ac7814259a9faa258a38d300f6550dfff01d428fa91506cca2 WHIRLPOOL 5e8d38b79b3bd3e991b499cff5cef7c3cc0450be31de4591eece5a3b06d99be0097eadff58362e04c6467c024740535a2341168cfbb1a80e9fa6194e7f498e92
 EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61
-EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6b5e1ea975f3daef321546290 SHA512 55ddd1823146d6cce2e19ed71bdd36cc778f276c01eb699147744fef0378f4ac1f6c2e357b823274d0ac42887af4f83c832306ffa09e2740ccd1f97589251669 WHIRLPOOL b6d7ee5c22d8e89903ca0f6b99ecf78c72eccb6a788f36d37c672edef9f0d3c92f585a02877653b3ca2b8dcb6fb606f76f26466d852e955e3ec4aaa621e1a378
-EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
-EBUILD tomcat-7.0.52.ebuild 4047 SHA256 21a962b9afb1f8b3e0a0d5564de05a5b79d9b8de885493ffb2304fb84833f02d SHA512 326b2fb72ac1133c21e5d4267b6aaba3d5819df1c4f513c48f8009c1dee8d7c251c9d476feac08b743b80d664a6439868f5f98c9380b861781d6f5cbcf4d0173 WHIRLPOOL c5d8079a8e5b4c49b726313ec08fe003e9e38a18fe2502efe25d8f37410cdef4b0d9f56c67b7fda84c2751e1bbc0b24536bc36c800fb5b16a0c84c5b03c67761
 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507
 EBUILD tomcat-7.0.57.ebuild 4349 SHA256 6fc213d477109c9438715922d2f86ad4b2e208ade3f5094cb308832377ce3a91 SHA512 9e37119cde5bce1fd15c8637e779ecbcd6aed21000eaabca2f1f67f6c17085379e33b364878e3e23c994ef8990edec20ff20c59f5a063a4fc8e38b7a7fed670d WHIRLPOOL cc6ebef82f783bd44e7ac5573b309ca65d67eb0df5675ddc454155603326f4d60c7503fa46c823c9213adb6653460750ab3f728a6eea97b04ead034476584440
-MISC ChangeLog 80292 SHA256 60e22303b6e8e7cb61ba48e054044372b56a23ee50b7bd641c1a8e066abab30e SHA512 18a08dcbe9deaedff76de4fbc3ff9698c91710e34f47f64719994d291207c1528fa583363b75244ef1a811cafba8c296c56abb801d623e6b4b5166d29face48c WHIRLPOOL d0871910475497056a276333b9b0d547361dbd95539a7c7d8af9865380d7031b9b6c22d4a232bc178ed6e40012ad4eff0445f504c9f5dd6d50c4bfe18073668b
+MISC ChangeLog 80687 SHA256 bc76d7c57f2809d536fbbf8c7afa57a6dbba478e7a5b9a00d79841e1d732fc97 SHA512 ab7352dc939bb3fe9966905575f7ec1e1e4f9e0ba7b175afb6bd0b7f3f7ce9171c30b935363bad060cd45b974e9b0499f0ac2be8f16709e3f102365cf8916854 WHIRLPOOL e27feb3716dd2be0b705b29cfa06e829888e99e348face3ca9f00fc471731579998c799f1bc909ed25ca5784850d30ffa6adee70a7ff864906f532386f9c0e46
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUjXnfAAoJEKCEBkJ3xQHtv8IH/iSNf6fIjTX2VcHA3zBSx6+w
-Q4VtxX750EY8pvPgio7/4DJVrpu+mlxXN3OkJvf6t1gPf2WtyuXeEDx5lcGO1HNR
-B46siSGZXPZXpj/7b6geBG9JbgszAMvZBj3sNaaXH45XyEUK2uqXfZhONRSBIFCb
-WAHECByNmdVkhfA5UaaaZ/GaZWJsVwsjvcKu/cblrJWrJX7nYHc6tISrosjvr/xn
-BsP3HODqfVWMorI0tfaXeC169vZ5pOu75bAv4CsR8DYer6WtWlvMOIjptT3H+APl
-vTffvZ0V7DoJzEvW/0ADDDTwKAt3YZux+4161TGxk5sbIYZ1Acom+iyIevMx4yk=
-=hQfj
+iQEcBAEBCAAGBQJUmFlaAAoJEKCEBkJ3xQHtGVIIAKTSCUpF/H3kfSuH5IFYxE5j
+26Zfmu5VA6n7ZmC6xxcQ/ujS4VM3EDLirrrLfN3BV783sJmEcUr0RXLsgmlRCXn+
+3o27YsluOOIQ9cMtq/yuIpjjHQmjO16DnBI2bUv53MJko0ur8rIvlHCsqytZ1VME
+vxsZwkiJpB2yfhC8CrzNNlvck0uE2lPlac5/T+EYj0P12UEJTulb+Xuaes40kEVw
+NTJNlNQBMyPUZ3UypOrccINublpGYofGjeBvdIU3Kpb17qHXuG5m8M1FZAYRdE6X
+U0fsyMq8QegquS5WdmtrtLpHHmbO0H1tHY8ESI28cXweq4aoeg2IF0gLDe+DiY0=
+=figQ
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch
deleted file mode 100644
index 6517dee4d196..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- build.xml.orig	2012-07-06 20:26:21.361299240 +0200
-+++ build.xml	2012-07-06 20:26:56.085899911 +0200
-@@ -487,12 +487,14 @@
- 
-   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
- 
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
-+-->
- 
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
---- build.xml.orig	2012-07-06 20:31:31.387806167 +0200
-+++ build.xml	2012-07-06 20:32:33.185315885 +0200
-@@ -646,9 +646,11 @@
-       </fileset>
-     </txt2html>
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-   </target>
- 
diff --git a/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch
deleted file mode 100644
index 6517dee4d196..000000000000
--- a/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- build.xml.orig	2012-07-06 20:26:21.361299240 +0200
-+++ build.xml	2012-07-06 20:26:56.085899911 +0200
-@@ -487,12 +487,14 @@
- 
-   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
- 
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
-+-->
- 
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
---- build.xml.orig	2012-07-06 20:31:31.387806167 +0200
-+++ build.xml	2012-07-06 20:32:33.185315885 +0200
-@@ -646,9 +646,11 @@
-       </fileset>
-     </txt2html>
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-   </target>
- 
diff --git a/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+    Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File 
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
- 
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -918,9 +922,11 @@
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package"
-+          unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile"
-+          unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests"
-+          unless="noget">
- 
-     <antcall target="downloadzip">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution"
-+          unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+    Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File 
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
- 
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -918,9 +922,11 @@
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package"
-+          unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile"
-+          unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests"
-+          unless="noget">
- 
-     <antcall target="downloadzip">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution"
-+          unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch
deleted file mode 100644
index 9b07137451aa..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 3ff8f81..83357a4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -613,7 +614,8 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-+    Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -621,7 +623,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -629,11 +631,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File 
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -834,13 +837,14 @@
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
- 
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -918,9 +922,11 @@
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
- 
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
- 
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-@@ -1355,7 +1361,8 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package"
-+          unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile"
-+          unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests"
-+          unless="noget">
- 
-     <antcall target="downloadzip">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution"
-+          unless="noget">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-6.0.37.ebuild b/www-servers/tomcat/tomcat-6.0.37.ebuild
deleted file mode 100644
index f80ef253e155..000000000000
--- a/www-servers/tomcat/tomcat-6.0.37.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.37.ebuild,v 1.6 2014/01/08 06:09:20 vapier Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="extra-webapps"
-
-RESTRICT="test"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	#use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-6.0.39.ebuild b/www-servers/tomcat/tomcat-6.0.39.ebuild
deleted file mode 100644
index 2a1209d5afbe..000000000000
--- a/www-servers/tomcat/tomcat-6.0.39.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.39.ebuild,v 1.1 2014/02/19 13:16:49 fordfrog Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="extra-webapps"
-
-RESTRICT="test"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	#use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.42.ebuild b/www-servers/tomcat/tomcat-7.0.42.ebuild
deleted file mode 100644
index 30fd375535ce..000000000000
--- a/www-servers/tomcat/tomcat-7.0.42.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.42.ebuild,v 1.5 2013/10/07 19:49:00 ago Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.2"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.47.ebuild b/www-servers/tomcat/tomcat-7.0.47.ebuild
deleted file mode 100644
index bece72ddf37f..000000000000
--- a/www-servers/tomcat/tomcat-7.0.47.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.47.ebuild,v 1.1 2013/10/27 07:50:48 fordfrog Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.2"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -frv {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.52.ebuild b/www-servers/tomcat/tomcat-7.0.52.ebuild
deleted file mode 100644
index 76c1b84758fb..000000000000
--- a/www-servers/tomcat/tomcat-7.0.52.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.52.ebuild,v 1.1 2014/02/19 13:16:49 fordfrog Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.2"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="
-	dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}
-	extra-webapps? ( dev-java/jakarta-jstl:0 )"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.8.1:0
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -frv {} + || die
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	# so we don't have to call java-config with --with-dependencies, which might
-	# bring in more jars then actually desired.
-	java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat{.init,-instance-manager.bash}
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}