gentoo resync : 02.03.2018

21 files changed, 48 insertions, 48 deletions

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a9b6e9274ede..f68a8f3ce1bd 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -24,24 +24,24 @@ DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f318
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
-EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
-EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
-EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1408 BLAKE2B e85fb32e1837f8118fbd06ffafaa9fb4facbc0137d6d12689ec230c4e038e502d1ddd4b843b8db3c0d5a0aa0721ff4ea73a0c3ba6db643b30e1e5cf472bf3b59 SHA512 c40b0a1b9986b2a83ababe7cfee1b86da05ffbb00fc101771bdb8a90253fd57d7f80229fe833b3b259ad0388ec7bb06d393c9e1733f9113d9b3dd42a3bc70ae8
-EBUILD tomcat-servlet-api-5.5.34.ebuild 1421 BLAKE2B f8216cf7b3933757f8d0f1a906d6704acd133b4bc3acee4b064b2189327580f06160178e85221a134ec8a66c7b6c19ba87b55f2b7602dfc0b3759ef877c10fb5 SHA512 e34b2993c265d5340c7c48df3cf1f347601e5c8426a20086141c38ed2e80de0679d671c834b25b873e69ea328490bb1427ce320ecffeb607d383c6708e4805a0
-EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 BLAKE2B 4c535b70c79c97db06b483d23cba3d8a1a7b81700caf60a76e9340f09ee695180c67faef8eb97b4748cfb5fcdc10dca4409f052eba0e23065033081ef7c76024 SHA512 13d4039bdaacdc91a678d67592ff6bbb407fe56955122bb8a7a5ad9368e1b848dedc14b57e0b5f9b7d583b64e553ea862d2e87e53cfbe5fe01edb394f4707dc9
-EBUILD tomcat-servlet-api-6.0.45.ebuild 966 BLAKE2B 5d6a7edaee6709eb57ea31b35bc002eefe40a05ead3e7ed0af29378496a1bfe8b85aab9240641f5169a0b3efae32f4165ed76e55d778b343b1965edff6c19b4a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2
-EBUILD tomcat-servlet-api-6.0.53.ebuild 965 BLAKE2B 79ee853118429bd20b1c08f260865f01ae250e1c2ce67c4a48b31f8d5e4dd5711ec68acdd07b127a900014ecfa77a1a75bd02345c66cbc5744e1f1b535bc6990 SHA512 2ab89d11d3b6eaaeaf677e48cbae4d09e313dfac63ac9296d5a3ad3e37a93f23a548c06d3cc5fb79da73e83d32f5fd5a6c9eec899aaea36ec90873993d8d3f3c
-EBUILD tomcat-servlet-api-7.0.82.ebuild 928 BLAKE2B 1bde5610507919c8ea5926e62d9f9e8a002e28cd0158847cb12355f9a7ec3bd5ac619f4b31c742e2f0e7fa05f0291f6d8a916fa6f7a121b2620a3138af224e6c SHA512 e620d89395876f3ec079b8793561bd2290a614587fcc3d8b4b251e04b05f3c819ceeebfaa923e414b86e8d3bbf3aa33e8668cf4ee681ea5e1e50d2b68503d341
-EBUILD tomcat-servlet-api-7.0.84.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
-EBUILD tomcat-servlet-api-7.0.85.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
-EBUILD tomcat-servlet-api-8.0.48.ebuild 986 BLAKE2B f326eedb07b5048e2e6b0231fcf98dbfe00d2b7a6de0892e6ab30be25b74d758a389892d74897cf8f59749ec77b3f6e68fa3a0721a428e991846e4b49335727f SHA512 477f040dbdca1c4503f94b0e2cdb16e2910d117ccdf473751c3af0670525db08f004beeffeb7b12c7cfcf8d603e0ffdf3ef0323e2e0632d8253e7dc99fda1292
-EBUILD tomcat-servlet-api-8.0.49.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
-EBUILD tomcat-servlet-api-8.0.50.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
-EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
-EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
-EBUILD tomcat-servlet-api-8.5.24.ebuild 1034 BLAKE2B 56a3a1d3f53d267dbfa60bd5f87ea5b1ca9c0e48fc500592c8be4324f9a2c3b41e9e2a32c6c1507f64559fddffee8dcb1afe86bd2ae8607add8cd2e618d4ec09 SHA512 18f7cbbcad7c7d36b101d76b136040a54ff5a3c3bb6d12de1e555cfbd9cf590fa5a9a2b6c99a66912324ca45fb36d367628b8dd302b2b5517281a6c09e6bd863
-EBUILD tomcat-servlet-api-8.5.27.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
-EBUILD tomcat-servlet-api-8.5.28.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
-EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
-EBUILD tomcat-servlet-api-9.0.5.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
+EBUILD tomcat-servlet-api-3.ebuild 841 BLAKE2B f046abedec62ab2daf51ab5f0a45ea5003cd505e7e2fc10b32ba6c46c5d6c844776ac6bbca0cb7b1ff4798bc1f87af11e7c4e25a5d5397a4ea427b16660aa6db SHA512 532299ee901a84368a297a4fc033c37e3bedab95853fe1856b67f883a787ded535ecd4add05711bd57fd6e232e110ce9ed1f2ffeb462d0b8551d807610bb8ad6
+EBUILD tomcat-servlet-api-4.1.36.ebuild 974 BLAKE2B 138b53684d8e667e00e805e2069d51188dc453140d91bc58700a38b531ed1ce226db4dcf9fe6b030d85670c1b7a04640b09ada55388a7b95b22a0c69ba25b04f SHA512 5d4d397f7c77823074e4b6088792063cdd3c9edcbcdca4031916bdd05cc49bee175825d366ad6fdb6980adab29fdda8636ec2304cfb27dfd9e7b93f2d6353136
+EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1398 BLAKE2B 2c306ffe33485118261a81834212e5f6845e96c91b08d1b78324c237d8277ae0eb6f8ccfd10b9f01e10ca0513e2b17577cc50172f80181cf0d96e3be3db05990 SHA512 30c63a9daa1bd517e36b08795b120e4a9922667de60b30890aebd65479ec75d7c70d59251988ed06b3ecb4f4ccb941aeac6a518434d5c262250401558fa605a2
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1411 BLAKE2B 81fe1bf1b27e5d63eb26caa9ab6e2eb99f0c8f8cce173f3567db2f6a0d9332b90978dc691143c0a3d7c31520fce2551c5566f4d66e8f373bd5e2fe2d952e87fc SHA512 866e2ab524effd6ffcfafb2ce0642cbf3ddbcef457ed9606b30a0fab2efdfda67b69eceed3bf5def631b999f654113f962c2e49de8897a85dbf1a4a049ea1046
+EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
+EBUILD tomcat-servlet-api-6.0.45.ebuild 944 BLAKE2B ec11ffa4834b9dc0966892c0d221640ec7ef75633806394b69b0bfa79d51728ba552809cf3c462d063198982de879a2acb32be2ecf5d5dd30d5db8eae60a0b78 SHA512 a9ec48dabbf5d7668c7e23b8e891faff8be25bd3f4beae55b0e8d95cff271ab81c03f13bdd2f127fe40aacb70f4db845452f8ffd66c82f4b11604d4cbfd46141
+EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
+EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
+EBUILD tomcat-servlet-api-7.0.84.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-7.0.85.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-8.0.48.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689f32ce5b9a6b29d397cc94c41eab20194489ea551d66dc69e8e1689b17ff9a158d31387677893d22ba5dd759d5bc1dc78e780 SHA512 f7cb5af08726a44158c0ffa080737c2ddbd8f14f2c29768392af2a413fa0c98e87b5f96828c569fa34241e5dbde8857fa5790dfd69c347c592ce207ca633536e
+EBUILD tomcat-servlet-api-8.0.49.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-8.0.50.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-8.5.11.ebuild 1004 BLAKE2B c60fa1af6d8f0aa830b231315a425dc5388ef69916e583387d266da060ae18a4c9d9896b5cd39d2d99788ebac2bb1e60811e70e24077fd789991c23a9fa5e4d8 SHA512 867a52e39a6a74e8504d42deb6506842f1f87f3a70b0639b89fc2073f10b16d4dd6d3a375fde1ee5a91611acd70b04c4feeb02932289e39fdbb092041a4b7d63
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1011 BLAKE2B 1e3d6f70bb2d80a52db97755b123aee55a26d22c0a6c44549fb54065d09da823155295f1f4a498e92b6f8e19086bcf11af84eec68319fa94b4199fdeaacbfef5 SHA512 34ccdf6994076a8f9d25adb7b3b908e84a1b9c8ba1346b6db034d22f8ae647a3f27f2ecf2ed8167293d1ce71501bb6dac04be4a48df797308a0e4e5feb6d45d6
+EBUILD tomcat-servlet-api-8.5.24.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
+EBUILD tomcat-servlet-api-8.5.27.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-8.5.28.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-9.0.4.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
+EBUILD tomcat-servlet-api-9.0.5.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index e598b2041c7f..3cefbcea4c6c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index 0e5528db2026..e4b85456cea1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index 959d50adb8db..5fcec51d736c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index 092400c6f849..88034e482586 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
index 4aba63da9699..8ecab83cc461 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
index 26121ea67adf..2fec3f8c4603 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
index ef08f2239026..f0f2a14f33b2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
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 e698024957d5..8349619ca6c6 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
index b0fc5f672cf2..f0304e00ca2a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.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-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
index b0fc5f672cf2..f0304e00ca2a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.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-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.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
index 776cd13fd833..8a7cc91eceec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.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-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.0.49.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
index 71c284a0ed23..be4a03387b4a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.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-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.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
index 71c284a0ed23..be4a03387b4a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.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-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.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
index f8477cac7dfe..078f1e2fc734 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~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.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
index 9ac5da83d4b9..e9d9db39df04 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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-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.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
index dd1e671df369..06c703b27fb1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.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-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.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
index ee8c1d72fb55..c543bdd19c25 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.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-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.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
index ee8c1d72fb55..c543bdd19c25 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.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-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.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
index 16548ef959d5..f00a9f12c2d2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
index 16548ef959d5..f00a9f12c2d2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"