gentoo resync : 15.02.2018

7 files changed, 111 insertions, 102 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f7793e6c3d61..afcc410a0807 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,32 +1,32 @@
 AUX tomcat-7.0.82-build.xml.patch 5271 BLAKE2B 0dbb5c994bc0d81e604569373d66691ecdc0015c4ddcdd9602156f1e5cf73e2c2bdfd27f1d1deec900c3046b979365ccaba73418a58a7a2e03b9ffe7d3489879 SHA512 160c0117e89a2ef5caae95004b426d155c64e19e6c708a9cc11a53308cba037799a60e4f901c3a5bb5af2d2ca8452246d7dd66283b91fad4a339004026148fe4
 AUX tomcat-7.0.84-build.xml.patch 5836 BLAKE2B 2c79524b53ffa777b3e3efbb9f3dbd806f138df0d62058abdcabcde03e687961c355b1c6d58bf5bd757fc594a08054109b17407774663b082eb36b5ac8e9bf1c SHA512 ff04ecca86808e0f8d8a5f93902b9adace7722bf6b497e97fc9d5cd20925004e22e9759e980a6c184548170e63c299446a26be34833c2b23e70d25bd245cc557
-AUX tomcat-8.0.47-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001
 AUX tomcat-8.0.48-build.xml.patch 10703 BLAKE2B 6a3621e4e46fa193390115815be73cf7b42c4a241ce48b853c22f0837b66f2da71b66e1ce074a0d454f674f855f567216caaabfc64fb8b01f6b495652a5a3d82 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001
 AUX tomcat-8.0.49-build.xml.patch 10844 BLAKE2B 339600eadad8cfb11b7c32bc731f0a4f6ec3d291fc74d6d3ea4cf9139f7889efd2591cbc0afbcafc466b2e55eb48a1d4f90dce252b7750e60c164621d416ae33 SHA512 c177774153663f368fa14c8001ac41312c5fae85dfae57642d807a73fc18b93cc09b8c456db01275a349baedfa225dad81b758097a107d9e837ec1408ca8e297
-AUX tomcat-8.5.23-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
 AUX tomcat-8.5.24-build.xml.patch 10323 BLAKE2B 754121fe17ea72678af3fdfd0a59e5cf6a21c86e4765bafe8aee7f94e950e6eafba665782474f31de1b21e631e4d4473e970f89ea07a5d73b9057d7ee256d3b7 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72
 AUX tomcat-8.5.27-build.xml.patch 10464 BLAKE2B 658ee0da1b8ae96dd40df7345cf9efea24e409eaa4024f5bcf695bb1f91811b6513f31f70fbd0899040aa23314a2725d2871dc42e81977cd184de6a86a4fddc3 SHA512 5f7f25eae6c5f7e9ca943800b48bea084e7279110d73fa7a54bfc89eabfc617cd82a36f3634aaa9d14580e9d2bf9115214d6cde663b38545f1a3977f597b14e1
+AUX tomcat-8.5.28-build.xml.patch 10464 BLAKE2B 658ee0da1b8ae96dd40df7345cf9efea24e409eaa4024f5bcf695bb1f91811b6513f31f70fbd0899040aa23314a2725d2871dc42e81977cd184de6a86a4fddc3 SHA512 5f7f25eae6c5f7e9ca943800b48bea084e7279110d73fa7a54bfc89eabfc617cd82a36f3634aaa9d14580e9d2bf9115214d6cde663b38545f1a3977f597b14e1
 AUX tomcat-9.0.4-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1
+AUX tomcat-9.0.5-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
-DIST apache-tomcat-8.0.47-src.tar.gz 4996505 BLAKE2B 8024ec5248fed57bf1841a320fc23fa8a7a99b2352ea9635f3d4dc903bd363f3a15adc47f48250a4d732ab9c1724443bcb602b459b6ede2e7908051a5c3fdea5 SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
 DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
-DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
 DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
+DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
 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
 EBUILD tomcat-7.0.82.ebuild 4279 BLAKE2B 21c8b0b0d3823ed1535276a03ed63b2afd840648036a1175f52babf19e3801f85d6bfb0822ef8a30aad1e731428511c2816d77d0afdd7587777775c33072fd86 SHA512 3f366efa7559235ef48b8dc297cafa6af9854f7ea6e4bce0e03e1be956590f3fa34fdbeeb5fd8ac7bd4e7ed43a4bda381a3c2b7f2b3e5a0e1ae50523ce5d5def
 EBUILD tomcat-7.0.84.ebuild 4168 BLAKE2B 13d55a2939d6e532abc64c985a2a83ace8fc4b865cb4abccd9b054c012cf3c090570fad4eaa6d9e2101bb7ba2a20fbb53c064a20163ac73af1ac02c46384dad1 SHA512 67bebe9a934570b75c6c69d3395213f8bfe4f433ee201743900469111a663a794402726502bc154a515e9ea96d528daa79265ea5ff61c878b6933b916c3a34c6
-EBUILD tomcat-8.0.47.ebuild 4471 BLAKE2B b9e4bf2549bc087f2ede1c2d21f8a28734b65155539ff9686d4d21937a3877a38cf8a8e60310a708f9122d1e4cdd7dbc52c6a8e2ab4483fbf2ec79b62b61a541 SHA512 e97bc0a73e8a1384c30915d42e1cfcfa4431ae63dccf85b997c30333a464b3042ec5aee48678c2dbcb045d30532d7aa17ec00ecff14f0d8d7caeaeff9cd3f5b2
-EBUILD tomcat-8.0.48.ebuild 4472 BLAKE2B 5b0b4c1df76282c0f266ac921275285423834f3c75e44b8e5779e74eb444af738e2dda68d8940f7fcfa9d10d6850d148b46dcf58b8ff2d25afcd51dca7b4c614 SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620
+EBUILD tomcat-8.0.48.ebuild 4471 BLAKE2B e644b15681482a9a89e0f8f598f6a4344824ed616302e9d76d86fc556a6c8d0cae243c163cab00797afe63d064fddb74b8721763646bbd62933a8a3b49935cfb SHA512 f9d2c7a69c10474acf5379ccb53f029d493987c204bb3cb1e2a2351e2b312196aad5743e961f9863c28ad95786239b2afd0ce79a18b56ae3271bf0fc533b5a94
 EBUILD tomcat-8.0.49.ebuild 4472 BLAKE2B adc088c5195c8ee33e73ec195114cd347dec109bd9b43844bf4104761a5f62f9373d0b7031b16f2cc073b8909fc2c0364206d7218169a9bb57b84065a1d60a79 SHA512 8eaf07510458087946fc4d8655de962d67e5c550c9270608b35ead3fe0bbbe8be0445d9ce5fdcffce9f3bde2933c874fd369f409949b7eef1aaa041792c15e32
-EBUILD tomcat-8.5.23.ebuild 4519 BLAKE2B 89e25b96d1b794e910ce1c549bc20d1c788f8dfe034d961614c358ff08883177923a45e25f719f850196e7f6d9fedc144cd445f522e85cf78fd951d1040a1725 SHA512 c63e34cac14b2739588a81c5d7b667fe9431f43df0a14d3f596a24e9414a375fcf6466d066e35395532d01b681ba634b026c34691dd10d63590858b6bbeac5fa
-EBUILD tomcat-8.5.24.ebuild 4520 BLAKE2B 1d117a461e056afcd51d4311759a51f6a519e92fe059fbc6c7b497fb34afdf1c7702fa917b3531156c93eb27438a251a2a3766b910f44be410a01b910e63db97 SHA512 2c50bbd367df38f7214d3bb04606e5a5f10f68a2d305a939477f2686d26ff4b9596dd4703a9979179919ad9ee9f034db2dc7dff5d0fba0c0b75b00abe6c3c918
+EBUILD tomcat-8.5.24.ebuild 4519 BLAKE2B 6a298cd733ce5cb37928a8fa8b3fb86be1811222c90edf6265bf91fd3b3320578ff694a092283b07b7c55b2b2cafaff9faf3a49ec553754f50dffe24721732a5 SHA512 dd929c7657a1b3496ce321e3dc9bfa2b0c135b3c9e2257387b6e1bbbb6d490b8dd835e3d2ab0d883f3059854fd762f65808a8a7e69111c5940d885011b1e9ae5
 EBUILD tomcat-8.5.27.ebuild 4520 BLAKE2B dd196056f5a9573c3a96ade1d2002d8c2941d7184fabadc08679f5cc3f4c22251c1f7e33e98aacde15e8f9d24fece6e0a82dc9389c1ff0145ae8fe2369cb0770 SHA512 9090868c52a1b844202618651eab855e9e7ef48fcb5f6b0ad546c9c223d4835ca3cb3047e44906298312359d3cabd54d7a19c1e02c9b19b361e8e6431536a43d
+EBUILD tomcat-8.5.28.ebuild 4520 BLAKE2B dd196056f5a9573c3a96ade1d2002d8c2941d7184fabadc08679f5cc3f4c22251c1f7e33e98aacde15e8f9d24fece6e0a82dc9389c1ff0145ae8fe2369cb0770 SHA512 9090868c52a1b844202618651eab855e9e7ef48fcb5f6b0ad546c9c223d4835ca3cb3047e44906298312359d3cabd54d7a19c1e02c9b19b361e8e6431536a43d
 EBUILD tomcat-9.0.4.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
+EBUILD tomcat-9.0.5.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
index d83440c0c4d6..e08dd17c6cc3 100644
--- a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
@@ -1,8 +1,8 @@
-diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml
-index b1b2666..263800c 100644
---- a/apache-tomcat-8.5.23-src/build.xml
-+++ b/apache-tomcat-8.5.23-src/build.xml
-@@ -714,24 +714,29 @@
+diff --git a/build.xml b/build.xml
+index 2b3c7cf..b8e57e0 100644
+--- a/build.xml
++++ b/build.xml
+@@ -717,24 +717,29 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
      <!-- Servlet 3.1 Implementation JAR File -->
@@ -33,17 +33,12 @@ index b1b2666..263800c 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -1005,14 +1010,14 @@
+@@ -1010,9 +1015,9 @@
  
    <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}" />
 -
 +-->
@@ -89,7 +84,7 @@ index b1b2666..263800c 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1608,7 +1615,7 @@
+@@ -1610,7 +1617,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -98,7 +93,21 @@ index b1b2666..263800c 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1756,6 +1763,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1750,11 +1757,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
    <target name="javadoc" depends="dist-source,extras-webservices-prepare"
      description="Create the Tomcat javadoc" >
@@ -106,7 +115,7 @@ index b1b2666..263800c 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -1820,6 +1828,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -114,7 +123,7 @@ index b1b2666..263800c 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1860,9 +1869,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -126,16 +135,16 @@ index b1b2666..263800c 100644
        <link href="../websocketapi"/>
        <link href="http://docs.oracle.com/javase/7/docs/api/"/>
        <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" />
+@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" />
    </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}"/>
-@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -144,16 +153,16 @@ index b1b2666..263800c 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" />
+@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" />
    </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}"/>
-@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -175,7 +184,7 @@ index b1b2666..263800c 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
+@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -184,7 +193,7 @@ index b1b2666..263800c 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -193,7 +202,7 @@ index b1b2666..263800c 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />
+@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -202,7 +211,7 @@ index b1b2666..263800c 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
+@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -211,7 +220,7 @@ index b1b2666..263800c 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" />
+@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -220,7 +229,7 @@ index b1b2666..263800c 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
+@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -229,7 +238,7 @@ index b1b2666..263800c 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" />
+@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -238,7 +247,7 @@ index b1b2666..263800c 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" />
+@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
index b0862aef305e..87f869dd4c0c 100644
--- a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
@@ -1,11 +1,11 @@
-diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml
-index 6b4465a..ab4008d 100644
---- a/apache-tomcat-8.0.47-src/build.xml
-+++ b/apache-tomcat-8.0.47-src/build.xml
-@@ -715,24 +715,29 @@
+diff --git a/build.xml b/build.xml
+index c1331c9..b664cc3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -719,24 +719,30 @@
        manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
  
-     <!-- Servlet 3.1 Implementation JAR File -->
+     <!-- Servlet 4.0 Implementation JAR File -->
 +<!--
      <jarIt jarfile="${servlet-api.jar}"
        filesDir="${tomcat.classes}"
@@ -13,8 +13,8 @@ index 6b4465a..ab4008d 100644
        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}"
@@ -33,24 +33,19 @@ index 6b4465a..ab4008d 100644
  
      <!-- WebSocket 1.1 API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
-@@ -1000,14 +1005,14 @@
+@@ -1012,9 +1018,9 @@
  
    <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">
-@@ -1067,7 +1072,7 @@
+@@ -1074,7 +1080,7 @@
          <exclude name="${jdt.jar.filename}"/>
        </fileset>
      </delete>
@@ -59,7 +54,7 @@ index 6b4465a..ab4008d 100644
  
      <!-- Add sources for examples -->
      <antcall target="examples-sources" />
-@@ -1101,7 +1106,7 @@
+@@ -1108,7 +1114,7 @@
      </javac>
    </target>
  
@@ -68,7 +63,7 @@ index 6b4465a..ab4008d 100644
      <!-- 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}"
-@@ -1116,7 +1121,7 @@
+@@ -1123,7 +1129,7 @@
      <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
    </target>
  
@@ -77,7 +72,7 @@ index 6b4465a..ab4008d 100644
      <!-- 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}"
-@@ -1220,9 +1225,11 @@
+@@ -1227,9 +1233,11 @@
  
      <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
      <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
@@ -89,16 +84,7 @@ index 6b4465a..ab4008d 100644
      <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
  
      <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1613,7 +1620,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}"/>
-@@ -1752,7 +1759,7 @@
+@@ -1612,7 +1620,7 @@
  
    <target name="extras-webservices-prepare"
            depends="extras-prepare"
@@ -107,7 +93,21 @@ index 6b4465a..ab4008d 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1947,6 +1954,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1752,11 +1760,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  
    <target name="javadoc" depends="dist-source,extras-webservices-prepare"
      description="Create the Tomcat javadoc" >
@@ -115,7 +115,7 @@ index 6b4465a..ab4008d 100644
      <javadoc packagenames="javax.servlet.*"
        excludepackagenames="javax.servlet.jsp.*"
        sourcepath="${tomcat.dist}/src/java"
-@@ -2008,6 +2016,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path location="${ant.core.lib}"/>
        </classpath>
      </javadoc>
@@ -123,7 +123,7 @@ index 6b4465a..ab4008d 100644
      <javadoc packagenames="javax.websocket.*"
        sourcepath="${tomcat.dist}/src/java"
        destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2046,9 +2055,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          <path refid="tomcat.webservices.classpath"/>
          <path location="${ant.core.lib}"/>
        </classpath>
@@ -133,18 +133,18 @@ index 6b4465a..ab4008d 100644
        <link href="../elapi"/>
 +-->
        <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
        <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2781,7 +2792,7 @@ skip.installer property in build.properties" />
+@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
    </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}"/>
-@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" />
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
    </target>
  
    <target name="download-test-compile"
@@ -153,16 +153,16 @@ index 6b4465a..ab4008d 100644
  
      <antcall target="downloadfile">
        <param name="sourcefile" value="${junit.loc}"/>
-@@ -2872,7 +2883,7 @@ skip.installer property in build.properties" />
+@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
    </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}"/>
-@@ -2898,18 +2909,18 @@ skip.installer property in build.properties" />
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
  
    <!-- =============== Utility Targets to support downloads ================ -->
  
@@ -184,7 +184,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" />
+@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -193,7 +193,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2940,7 +2951,7 @@ skip.installer property in build.properties" />
+@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}.tar.gz"/>
    </target>
  
@@ -202,7 +202,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download and extract the package -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2951,7 +2962,7 @@ skip.installer property in build.properties" />
+@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -211,7 +211,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download and extract the package from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2969,7 +2980,7 @@ skip.installer property in build.properties" />
+@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
      <delete file="${temp.file}"/>
    </target>
  
@@ -220,7 +220,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download the file -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -2979,7 +2990,7 @@ skip.installer property in build.properties" />
+@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -229,7 +229,7 @@ index 6b4465a..ab4008d 100644
      <!-- Download the file from the two alternative locations -->
      <local name="temp.file"/>
      <mkdir dir="${base.path}"/>
-@@ -3002,7 +3013,7 @@ skip.installer property in build.properties" />
+@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
      <move file="${temp.file}" tofile="${destfile}"/>
    </target>
  
@@ -238,7 +238,7 @@ index 6b4465a..ab4008d 100644
      <condition property="trydownload.run">
        <and>
          <not>
-@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
+@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
      </condition>
    </target>
  
@@ -247,7 +247,7 @@ index 6b4465a..ab4008d 100644
      <!-- Downloads a file if not yet downloaded and the source URL is available -->
      <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
    </target>
-@@ -3024,7 +3035,7 @@ skip.installer property in build.properties" />
+@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
  
    <target name="ide-eclipse"
            depends="download-compile, extras-webservices-prepare, download-test-compile"
diff --git a/www-servers/tomcat/tomcat-8.0.48.ebuild b/www-servers/tomcat/tomcat-8.0.48.ebuild
index 424ec1de47d9..3af577f397b6 100644
--- a/www-servers/tomcat/tomcat-8.0.48.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.48.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
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.24.ebuild b/www-servers/tomcat/tomcat-8.5.24.ebuild
index b00d9e34c116..959e4f90437e 100644
--- a/www-servers/tomcat/tomcat-8.5.24.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.24.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.23.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild
index dce4c263018c..17a74d0fb02b 100644
--- a/www-servers/tomcat/tomcat-8.5.23.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.28.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.0.47.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild
index 0275eef00644..bb86ba9675bc 100644
--- a/www-servers/tomcat/tomcat-8.0.47.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.5.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
@@ -7,30 +7,30 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2 prefix user
 
-MY_P="apache-${P}-src"
+MY_P="apache-${PN}-${PV}-src"
 
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
 HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
 
 ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
+SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.7"
+	>=virtual/jre-1.8"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
-	>=virtual/jdk-1.7
+	>=virtual/jdk-1.8
 	test? (
 		>=dev-java/ant-junit-1.9:0
 		dev-java/easymock:3.2