gentoo resync : 16.11.2017

10 files changed, 8 insertions, 203 deletions

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 5d76453d87ff..cd99c2aa0e68 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,14 +10,9 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b3
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 SHA256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c WHIRLPOOL 1892d71346e9261afabe5a42ee961c9b61379ac17a91d98da5dda8136aedb406c57cb42ba2fa1b7e35d1cf142d7132456a065fbdf34a35452462bb7140fce675
-DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
-DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7502d44bee286176ecd187caaebf1f4e2fcf7 SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db WHIRLPOOL aef92cb2cf82c87a1b20ef7eedb30aae052882e99e74b9c33500b3a30f5c32df7a4dd23e3c79d3031ff7f0dd8abf9e2b3e061805a3b32f3e78b6b7c52db9d3c1
-DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
-DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
-DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
 DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
@@ -28,16 +23,11 @@ EBUILD tomcat-servlet-api-5.5.34.ebuild 1422 SHA256 579f5136bdff0d94e2d26d4e806f
 EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 SHA256 28e97c0d84f476846abfa4e91ab0113e9dc7cb851a37bd4766aeb9187e972e0e SHA512 13d4039bdaacdc91a678d67592ff6bbb407fe56955122bb8a7a5ad9368e1b848dedc14b57e0b5f9b7d583b64e553ea862d2e87e53cfbe5fe01edb394f4707dc9 WHIRLPOOL 8705bdeb09b243d0a76496c5bfd5d5efe243f99851486382d8fffb88c05a5acfd2fa51f26223df81f1fb8e8795a7864283567f4f759e576c348257ad78aa5b42
 EBUILD tomcat-servlet-api-6.0.45.ebuild 966 SHA256 dba97329db1d2296bb9981ecf4e1ac06f7ea62599fdf57025e2a048e6eba043a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2 WHIRLPOOL 9f0a84507230ca631fa5f9dc288f7835ebcc71d14e96354261d8d5bc1d45045d62d2f77685bd783af9cf07cd4ecd178219a7b1f7fea92aac025ad2257b3429a1
 EBUILD tomcat-servlet-api-6.0.53.ebuild 966 SHA256 dba97329db1d2296bb9981ecf4e1ac06f7ea62599fdf57025e2a048e6eba043a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2 WHIRLPOOL 9f0a84507230ca631fa5f9dc288f7835ebcc71d14e96354261d8d5bc1d45045d62d2f77685bd783af9cf07cd4ecd178219a7b1f7fea92aac025ad2257b3429a1
-EBUILD tomcat-servlet-api-7.0.79.ebuild 927 SHA256 5edfb1a431cb6185ba619738d19cd1290e599a69a16015eaf1ec124620079f93 SHA512 96113b7743840fed2384b5e66e5e827d8d1c964270013109477d0da876aabe77bbd8d1951402f05a3aeeb394ef32103a093f5176129fab0d5ab348cf39bc584f WHIRLPOOL 73743a06471fa91c719dcde9330cfc5549701b54d591f0f8a1393aa21259d526ee0d115efaeca503f36aa1b201991fe6f627b3ce0fd7eaa31f504805529c6c3b
-EBUILD tomcat-servlet-api-7.0.81.ebuild 927 SHA256 5edfb1a431cb6185ba619738d19cd1290e599a69a16015eaf1ec124620079f93 SHA512 96113b7743840fed2384b5e66e5e827d8d1c964270013109477d0da876aabe77bbd8d1951402f05a3aeeb394ef32103a093f5176129fab0d5ab348cf39bc584f WHIRLPOOL 73743a06471fa91c719dcde9330cfc5549701b54d591f0f8a1393aa21259d526ee0d115efaeca503f36aa1b201991fe6f627b3ce0fd7eaa31f504805529c6c3b
-EBUILD tomcat-servlet-api-7.0.82.ebuild 930 SHA256 7fbdbd5c44b70a7b0981d6e943e798c2a13892dd913335f5c1b7604c17159e35 SHA512 6bf3b79a969f386de7cbd02e7f6f95b9fc9f0f4a514aafd6186ec775484b9925018e8a89872dda714d490e65864cc26cc557b4ab4519a74f079c6db89f7af931 WHIRLPOOL 50d442f51d0d2720323437d3a048ede5d4872413a94531ca539114600511c9295818f6d9393fe9d4fd7722b04f3d59ef36f99131ab6641079d544068086d27fa
-EBUILD tomcat-servlet-api-8.0.45.ebuild 984 SHA256 2229d012d8c674186822e3c000fbccb613dd384bba0cc21b352f3bc13b4ed125 SHA512 b637bca8b28b3f540ee616da3f514d4b391cd0845b7875d3c0ab4d737e398cc8fc6c96f94bacc505af2eb9a5ab26a20da1e4b19b9a63be51d2f2dd6aa6392736 WHIRLPOOL d578941e6f15a4c09b42f8a198ca1dce941ca3e64714e62b0e3e7fcb15ac1a2db39c2ed9fad7d534293486e7c82171fddac52d1d0dcee187f942c715315d0e94
-EBUILD tomcat-servlet-api-8.0.46.ebuild 986 SHA256 4b7dfff5eb9a6c3e2c9cffe1b719354483636836cbff40c3eb28ba591ebe28d9 SHA512 0d6034c322f7c5b09c093312b6316148a74261cc8889a6cb6040dad41134e451dbb2b42820c62a73a19645bd652e9f3cf8071235b10c7499fb3053acb464592e WHIRLPOOL f1e653bbca5a73dfb121bbf29a6ad032f06f868bf146db664a5045e6f90a6a2445c26192e66cf61e2fa22c0f20f809d8e7adc2e5333f2ee0b0ff7a77cfdd8471
-EBUILD tomcat-servlet-api-8.0.47.ebuild 987 SHA256 42d99f04dc3abd88003d9bb9b98009ed99d0c43c3ea0ded318e7983d611eaf33 SHA512 099a8a34aa8b90ddc7e005b3d5c65658ec3f112f68144d1ed9dd8085de62ac77472f238edfc7588a43a4f9cd598ff5c491f27cbb54192b3ad5322d6679adb945 WHIRLPOOL 0d635f1f9e3e391af6206f67ca69a6bf69b0fc6e2c126f056f6b862eaa964aba9cf9e63b33b08123a45d8bff4c067396f79a88fda542799b1b20c1828dd55e67
+EBUILD tomcat-servlet-api-7.0.82.ebuild 928 SHA256 64641f4a7bd847daa228fe7d0bea14d9b821c55a65afdfce344da4616c3c1af4 SHA512 e620d89395876f3ec079b8793561bd2290a614587fcc3d8b4b251e04b05f3c819ceeebfaa923e414b86e8d3bbf3aa33e8668cf4ee681ea5e1e50d2b68503d341 WHIRLPOOL 6495f308fa0f0da8608527339634952a800b223e71905d77d73764a620df38687cc7d45ba9ef1f0a6985fcaea99ccc36c93327bc58304d7f399051f50d9ab3a3
+EBUILD tomcat-servlet-api-8.0.47.ebuild 986 SHA256 4b7dfff5eb9a6c3e2c9cffe1b719354483636836cbff40c3eb28ba591ebe28d9 SHA512 0d6034c322f7c5b09c093312b6316148a74261cc8889a6cb6040dad41134e451dbb2b42820c62a73a19645bd652e9f3cf8071235b10c7499fb3053acb464592e WHIRLPOOL f1e653bbca5a73dfb121bbf29a6ad032f06f868bf146db664a5045e6f90a6a2445c26192e66cf61e2fa22c0f20f809d8e7adc2e5333f2ee0b0ff7a77cfdd8471
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 SHA256 82596ca542bcb30282b47144458afbcd4027da26161b6182ff0bae3715e14542 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b WHIRLPOOL 8578559ce5171e0e9b5181fab5f96f643c19ca444ac3ab1765cb0127d9ea9503668ff2d1ab606bc5095ac172b47be7ad9322a16215109bdeccf13cf81de92e0c
-EBUILD tomcat-servlet-api-8.5.20.ebuild 1033 SHA256 02888bd97fa3c2cedee2f77bbe2e63ab5bc8d426192b0b1c8ce0594a064128ae SHA512 ed93f5f5d38e9b94ad4cb2458208d73d643c768926ac346c9cb80308c3f78b7566aa0db1b039aefb17fdbb122f15b677dd5e926c63d57acd2ad4ee7f2e86c3b0 WHIRLPOOL 40e40ea0be0cc8b281efaab7a351fb04e80f9785eabbd223e567f8aa8b47c189add1891dba7c39ae22274e9df3d75596816f8bb1edb7a4e3c31e324705ba87e3
-EBUILD tomcat-servlet-api-8.5.23.ebuild 1035 SHA256 39306aea73523dc31c82b76d1054a18abb170fbc311db5f7bc82b139431d86fd SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b WHIRLPOOL 9481c7bb3a2a4b5adfcf4f6d9aef2ecb38412bd5d1d074f988c0e40eb93c3bb97ac032f5d28e913158b1582481ded87be3fe45f91ff5094cd23d79db4c68ecfb
-EBUILD tomcat-servlet-api-9.0.1_beta.ebuild 1056 SHA256 5602b6fded7a7a28759417cc3047c838a80e95f6b6083d28ab4652da266b8b9a SHA512 c805996dea68bb3226da5dfa71caa6a787e7ff9815812501c7db8e5baf4fa222e779662e5fd132d339c41e5f40924b02bc265abc29fdbf81f16ad06903c7d933 WHIRLPOOL db7009e4488b83ee2b8e626974f0dba35a74a66311b33cbb7b5d1d48876614e539fb52eed5873ba0074d865c4db4ce640325d9668202ca3b252460980204df8a
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 SHA256 ec655b8bb17bbe9991c473e7e90c941b1889c4476272c4b13e2f0021263e75b8 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c WHIRLPOOL bb9c203b358047a0c6fd874e2ab61b4b954a17095e0875ccd1d32914daca8626251670870453ac8a1245a97e0d9f324812ce323ffdf1bd616d8d67069451bdb7
+EBUILD tomcat-servlet-api-9.0.1_beta.ebuild 1057 SHA256 61a4af58463bdc21ef9ad8ec4525604e8139584406072fa0568302002a329496 SHA512 f8c9dde308a0a45c0bf05068474a87219ec43148507986acfe52aa08c35a7cc02421597f89c18f03da8bd4f68a7a4bbd8f1e7d539b21698593ee8023ee2575c4 WHIRLPOOL ae45ad1419e9d47d764ceef504aeddcb0b2c780fa40d9bea581e055a4413666d420f3e30a58d7f1c8fce4dc15935b79f1538ffd2069f35e09d5c72278c4a4d05
 MISC ChangeLog 17432 SHA256 8b6288a8095ed64e177d6cb9f5373e9a3e65a54e1e25cde51d2bd3b6e8b3b17e SHA512 140569db363b9b6310904a01902a7ae4c27fbb95c8dfda7d0afea9d9e87734c1bd05498936d01966e320608baef77f3c08efbbd3fdf262135b67543c4d2b808c WHIRLPOOL bd28e9fbe25c5f1e85503be1446349b2429cc44cd7a31a6fb3055ffea894a124f56d01258f73b2a120e9675c530c85da0ddce5e14fbb3a94c54e87f3101d6a35
 MISC ChangeLog-2015 30850 SHA256 18cfe0d4d26a564a69b143cfaf08d42730974d66f957b9567449450c41e0a548 SHA512 e434b831101df030125fdaf248eed561c6fde8f99b39cf3ceef4e792c6f63686f6e4b525175f6cc489a2539fac287e87efccb62511afc722eafa341d4de9b764 WHIRLPOOL 33db2f588bf6e4266be779c3d8f63ddb351fada11efcbc7d19197c3491ba8bec65dd75034f95b19519fe2c2c1c6e0dfcedde7a148fc53a7920b953d08a18c972
 MISC metadata.xml 343 SHA256 62c7a4ea1333a9631a516e6cd02f524ede7f3d7ad467feeca0777ed556d8a298 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3 WHIRLPOOL b923a685ccba79b4ef25d2e64341112df472bbc31c281179947929d3075f652d3490f0a2fdf3963e2ad83b73b19d808574e9e7b7816b0a3e8b7694534dfe66a1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
deleted file mode 100644
index 44456ff69fe6..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.79.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-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.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
deleted file mode 100644
index 44456ff69fe6..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.81.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-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.82.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
index 897fa02caece..e698024957d5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild
deleted file mode 100644
index 5fdc913baf1d..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.45.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-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' ')' -exec rm -frv {} +
-}
-
-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-8.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
deleted file mode 100644
index c987d5ccd920..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-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' ')' -exec rm -frv {} +
-}
-
-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-8.0.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
index 4dfe83e0e403..c987d5ccd920 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild
deleted file mode 100644
index 932cd232285d..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-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.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	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' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-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-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
index 4fcff024f711..9ac5da83d4b9 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
index 58ce612254a0..94987d88ef53 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
@@ -10,7 +10,7 @@ MY_PV="${PV/_beta/}"
 MY_A="apache-${PN}-${MY_PV}-src"
 MY_P="${MY_A/-servlet-api/}"
 DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
-HOMEPAGE="http://tomcat.apache.org/"
+HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"