www-servers/tomcat: removed obsolete ebuilds

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

6 files changed, 7 insertions, 665 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8b921af2dcfb..23977f7d0ef2 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.346 2015/05/07 17:01:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.347 2015/05/26 20:02:10 fordfrog Exp $
+
+  26 May 2015; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-8.0.18.ebuild,
+  -tomcat-8.0.20.ebuild, -tomcat-8.0.21.ebuild,
+  -files/tomcat-8.0.18-build.xml.patch:
+  removed obsolete ebuilds
 
 *tomcat-8.0.22 (07 May 2015)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7051c99f9dab..c192e045bc3e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,7 +3,6 @@ AUX tomcat-6.0.43-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169
 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-7.0.59-build.xml.patch 4021 SHA256 eaedbf4f596109b8b2218f4643b8433d9907ded1e81060e1694bd9b8ea1c972c SHA512 c58512a0edec2c70ed1751cefebdcfeb992f5748f83a5797bd6a23f17f99f40283521dfc8c1734868168ecae8bcf1b8435900f16ff113b0c89c2ea1d64e4dbcc WHIRLPOOL f2ff5781f8e31bbd7210a535216b8e61b6d0c000629eaba96a05fd48eb32bf828be9f79b6081aacc0071c333bb72e1fc70eedfedcc1311fb8ea7583b628e13c9
-AUX tomcat-8.0.18-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
 AUX tomcat-8.0.20-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
 AUX tomcat-8.0.21-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
 AUX tomcat-8.0.22-build.xml.patch 9015 SHA256 8d6f7bfc3b8aaddb1e7cb636e5048c64ff2f32206a3e495d35eef490dbaf586f SHA512 dbb855189281350e49184f87843db0655b831b47a298928ba942de2e20fa6cf10445911cd9ac12a73d1737611940d3330152f999b339d2a8d64e69b4240f248c WHIRLPOOL 007a0e5401870df8028b7856fe116864c45dffdd96481cbfa84d7daf5c61ef4b72b0c8ef1be46c29b9cbb960ef394dbfebd8c9b82270aa12c2ce7970145303e2
@@ -16,18 +15,12 @@ DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02
 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
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
-DIST apache-tomcat-8.0.18-src.tar.gz 5019289 SHA256 ab1085912c26356ea1526c1679f3a950fe97483d9ee2041e63a17cb058c763bd SHA512 4aa908fc5d59ee2070a10d688c5977b7a8ba3507df2ed067c76f1a3e41fff369a7b7323ef1330f2227e4b1c3e3b1c3172a800f194f62fc1c9a594c79da362f67 WHIRLPOOL f23109f0e3c5fd9f01231cc844c9e35e202f33f81b87ca84ac120f43abc2316cd97679c8c5b9ca8a46b5c1bf04ead4bcb9ce85bcd588189dfd6a41e9b98dc5ba
-DIST apache-tomcat-8.0.20-src.tar.gz 5026885 SHA256 39a39d5b0c45c0a3992a97e5cf2980c5c94cab1d5fd577da4f2db40a81f8359e SHA512 4883e490901500a01aa92ae855afba864cd985fe4ddb923b17048c9d4b80c6cc6897317550e0a8d8c08260affa3be7c357448961cbd3ea72eb3491316d2fff83 WHIRLPOOL 7967a247061ced57c81e54060155e3a1512f891b5dcdd6eedee06a95a6c53261b033001f6eee81f5ded70d89c9b9742d1f0752f78afc9bb7ea64612d4c847d25
-DIST apache-tomcat-8.0.21-src.tar.gz 4894606 SHA256 9fe0d4f0f86593a78eec952b257c7282765604926c30fe13c9dbe6f9f35674d8 SHA512 dc97e46fd1e0874613921df337577156891c84844126a6c99ce57567a61783eff81f00cdbe98faf73eec4c4db0ab7af25b96702382b0c3495f965ca0139642d0 WHIRLPOOL 338e94f4a87f8b71ef71319e8d5d5d7830e0d06779abdcd31a4c15bc71188b95fdbbbcde3434c49bd6e606e2922089f24e211236984c5875e2d656c53b78f472
 DIST apache-tomcat-8.0.22-src.tar.gz 4862888 SHA256 a7f1e511e10019217ec2ae91705886092ab5487e6e1c0d709023a472996ccb2b SHA512 7f6a0df1f2718021e0ece8034dad43286c0c2b3a83dfa125de78e4de8f576b0bfa7ebf67d31c5b8bac451a6b09144632283f499adac9b10aadcab634502c8b9a WHIRLPOOL e74dd5df9dabe5b2277901dd4507c4404f5fce63b0ed6c2069646c386a0fde7879293affe35997f27666c9e256d1d0b0b6e8fca5b78441306285649d80b27b71
 EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61
 EBUILD tomcat-6.0.43.ebuild 4109 SHA256 5577cf55a7ca8cabd213e62178c81ad6e98b7bdde8da7c1d27976d72c1514aff SHA512 782fd83b71db4a13a9c9247c3773cf0674a507f5332c7dc61129c4217b013b401621c4c233e9534b49f0713be54e2018aed6a604d54e9986192044b3b1dc0cb6 WHIRLPOOL 37e7b8cf12c98a74c43db448d4ad0bfb2b7299df44894552fb52232e3c52997ba79f335d175b2eb488d075168e4115ad87810172677fad3bf9cbe6b01cc86331
 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507
 EBUILD tomcat-7.0.57.ebuild 4348 SHA256 97e7d9865d547a70d746553cf104495378523b30dd1999616a095c0592074aa6 SHA512 268ff13f57c47faab8258769493cb5d753a2f9ffa9ab2fcc4425475190a5dc6e8de34655541d61a4f54b69f791fa787fd1d8537da359e5e2c3bb183f7308b552 WHIRLPOOL d37e8495b3e979105b5bc0dea61960ceb46bafde02e7785b87aceda431ab9bc06d2eab7e11fc0f40f5f9765a07d2dd838a2852a59fb1b4b1e4fa34eec001ffe0
 EBUILD tomcat-7.0.59.ebuild 4352 SHA256 139c44589a83570efcbf9c3ac00d0da77d91be2fa9cdf4f075f007f8cf63dc6f SHA512 2d96e0b56fa306c832528ee7baad071ba3f2d3cb274a62d070e164ce51b7018b50c110784f842b302df0f8d00ee0d05471e17e5c298e6bd8a9018b4810eb6521 WHIRLPOOL 6f6a5e9652ea117e74c11a980934b20137a67c0295392de75818acc23f974b0d7db568b9b92ba55117d482180e5377252113ca1d9204a89f04e878c99b819b2a
-EBUILD tomcat-8.0.18.ebuild 4182 SHA256 51f609db4de52c4e8005c94247f805bac85ca22c4915606644560646702630fd SHA512 13f004ab14cafa7e23b0903170049768b3c901cb58f76804afb2d9b1e424079d8b1d2a75fb33f84aade46f5843a456785da31579edc78c102fd1e3fabf85a2ab WHIRLPOOL 3c2e16cf60250c3b476b0be6e8c3237814ae1f119411137c7cdaeb7c2a703a02535bf744a6b4912bc8e7a6235eca51d3ce367c2895e297569fa25e3d185aa68f
-EBUILD tomcat-8.0.20.ebuild 4182 SHA256 859e1181db68ae0bc11407fef3cdd4e94fadc086d50a7f793013e877265d4967 SHA512 27afb7bb308f3e708c56ffd59cb1c769547ed332935e4867dd3e6daff605b9934c6b688dbfcc034acca36fc6f2fc4aa5357769cc110747ae2d627c78b80c36bd WHIRLPOOL ceb8e1e9b30485d1e76684bfd1d4adec0dbafb8f51e60fc3dcc7374c68aa214b83634d8331bf8ebe50f0d6da72937184b460394d7fa121a23f6fda75788027c5
-EBUILD tomcat-8.0.21.ebuild 4182 SHA256 2eca5c95cd568475b7ceba3684ca0109f99321563c5cac9b8f8575320a877e1b SHA512 ceedb0b5f4b7f7601b19c6f220fce5e4b1a0e3d805170aaa818790e67a7b714d3c7777c6386fbb21b3291bffe03ed49da27271eae932090323132d3d6c8acf6c WHIRLPOOL 2c795ee6fd2983ed02870f31a8e90aa99856ddb315956a813870e3600b53339eff6beb53b6be1139b8f0184a49d5db42827643f4d4a86b47003f3b9f58995f38
 EBUILD tomcat-8.0.22.ebuild 4195 SHA256 2432204f654fdaf8b06c756ee85368ce89673ff474d166b44a93cea76eecb78b SHA512 28a0c3589d5c59b6e95746f0a3cb35c6875345d8705ac49f9d7c18313a8bba7450e85a474f651bc7b848eda509bc0b74eba3a0a9c60478a78f5ae55ff9f0582c WHIRLPOOL 4c96d6071d8bcf4a25d9ddff4acec3af01d527219fe0a87492b5f84ab100930357dcead1a0a2eb4c66637a6e0021faec247d53bcd61330f8c5f6b650e67dd707
-MISC ChangeLog 81955 SHA256 2970c51de7df301c61d8bde2b44e27f60ecae0ddb532b0d6cfe4b5da83a4d744 SHA512 6215965751e23b78d1c4812813352e9d88e833dbd7e9811e8c37e203155e490c756d47004f58a3c2dbb05dd830dbfb8ab2b74f1314f8ecfaf7e41458b6811d65 WHIRLPOOL e5656219fd53c961c93e052deea36209ffee55f5916b84a0608b1fd6a6f0dbf1b26a74abc1406c47eda266321895206b1e3625006688190c01175b781becda7d
+MISC ChangeLog 82146 SHA256 10976f05559158d88ef514d6a4c5f096f07d162491a3fef59fd1aa4e730da82d SHA512 acbe74f96bc3edf7a3eba0b6e9262b710f4a98942ba27bca3f634d374d310a4c658fb4dcb465c9392f65c86b52f489960bf0344fd57c1e8b9e79d46c0ed915b4 WHIRLPOOL 40deead74f10123d170adae7c165f73afc0249ffced9a16742db02fa3ed82848d0c9c3064ca0e6c94cb04c64f2e72222859d8ef5bffa13e09b1320a054830ff9
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
diff --git a/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch
deleted file mode 100644
index d7479598837b..000000000000
--- a/www-servers/tomcat/files/tomcat-8.0.18-build.xml.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml
---- apache-tomcat-8.0.18-src-orig/build.xml	2015-01-28 15:10:36.112146352 -0500
-+++ apache-tomcat-8.0.18-src/build.xml	2015-02-19 18:08:37.971396016 -0500
-@@ -703,24 +703,29 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.1 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
--
-+-->
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -992,14 +997,14 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           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">
-@@ -1059,7 +1064,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1093,7 +1098,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1108,7 +1113,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1212,10 +1217,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
--
-+-->
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-          that needs to add entries. If there is more than one a more complex
-          solution will be required. -->
-@@ -1519,7 +1525,7 @@
- 
-   <target name="extras-commons-logging-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-2">
-       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-@@ -1658,7 +1664,7 @@
- 
-   <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}"/>
-@@ -2703,7 +2709,7 @@
-   </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}"/>
-@@ -2746,7 +2752,7 @@
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2792,7 +2798,7 @@
-   </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}"/>
-@@ -2818,18 +2824,18 @@
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2841,7 +2847,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2860,7 +2866,7 @@
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2871,7 +2877,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2889,7 +2895,7 @@
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2899,7 +2905,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2922,7 +2928,7 @@
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2933,7 +2939,7 @@
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2944,7 +2950,7 @@
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.18.ebuild b/www-servers/tomcat/tomcat-8.0.18.ebuild
deleted file mode 100644
index d79cc503a052..000000000000
--- a/www-servers/tomcat/tomcat-8.0.18.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.18.ebuild,v 1.2 2015/02/20 11:56:20 fordfrog Exp $
-
-EAPI="5"
-
-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.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~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.4"
-SAPI_SLOT="3.1"
-
-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.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	>=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' -type f -delete -print || 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"
-
-# revision of the instance-manager script
-IM_REV="-r1"
-
-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${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-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-8.0.20.ebuild b/www-servers/tomcat/tomcat-8.0.20.ebuild
deleted file mode 100644
index ac409b4085cd..000000000000
--- a/www-servers/tomcat/tomcat-8.0.20.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.20.ebuild,v 1.1 2015/02/24 21:06:23 fordfrog Exp $
-
-EAPI="5"
-
-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.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~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.4"
-SAPI_SLOT="3.1"
-
-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.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	>=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' -type f -delete -print || 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"
-
-# revision of the instance-manager script
-IM_REV="-r1"
-
-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${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-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-8.0.21.ebuild b/www-servers/tomcat/tomcat-8.0.21.ebuild
deleted file mode 100644
index d6b96fd14b76..000000000000
--- a/www-servers/tomcat/tomcat-8.0.21.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.21.ebuild,v 1.1 2015/03/28 15:54:37 fordfrog Exp $
-
-EAPI="5"
-
-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.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~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.4"
-SAPI_SLOT="3.1"
-
-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.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	>=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' -type f -delete -print || 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"
-
-# revision of the instance-manager script
-IM_REV="-r1"
-
-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${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	doexe "${T}"/tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-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."
-}