gentoo resync : 17.02.2020

22 files changed, 25 insertions, 89 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 14e58321e481..9658392e5e8a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 43fa672ccb77..b492fc930a0b 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,5 +1,5 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
 AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 67d32eca739657d15b106c711797a043ed48c6fcf7eafd7396c1f09ae04385c8af4c8a8a5b4d2d9ce1c743354c58f871cb6de669ffe4da38dc6cf95a8a9ef894 SHA512 949ea051af9ea24a954c6e9efe910332628521450b63e62df7c8733c1105f67588b118a302c286dafa30fd5183687ef920f1e3a022cdb61d422ac0ca363c105a
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1160 BLAKE2B 5cf10a9820525fc1b97808272aec07a9eb23c3a2b796d25118aaee113a930109b97025a4c6a23cdff8ba82801e12f44d48f8b8f879adeca7615bcd5993c12fbf SHA512 52802c3287279592a7647a210fc4b7dfcf50d91bb5e3f57e3600e21bf9c0848a19cc8889b00fd6709339305894f6059c0e53c14530553ff8ab0793396c15818a
 MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 2035fc35da3e..397c69e9e9b5 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index b5cb90e70273..52ec14e6fd74 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,3 +1,3 @@
 AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
-EBUILD gcj-jdk-5.4.0-r1.ebuild 3729 BLAKE2B 22321261590d701d4fe7ea32fc6dddbdb8ab6034bd46e6e567bdd21beed4c0c1150a4f3cff993929945c2796750b5526184c2f1d311417f12099130dc7de1e0a SHA512 6604821206d07f2bc5e0c872bf908bea580773099b445224357f8e7fc373de47fabaaf826655f6d1990fcb6535352a1d7d4ded86d85c577fb75abb5548074dff
+EBUILD gcj-jdk-5.4.0-r1.ebuild 3726 BLAKE2B aabad7193016c3035c3d75c338606e865d084deb7e75f509728ecf31206455bc8b4c79130cf40a9f266a102aa329dae9bc914a86a58863912a7e336457708f40 SHA512 3019ade48332e0313aae1f4fc12f1aebde7a6734a8c7966dbc3d34b70a81aff1aa8e37173bdc2d249316ee13010928e64c8f0ae00df3adc3a73bd5eae41fdb78
 MISC metadata.xml 716 BLAKE2B 1467e6d569030367c7983485d8a2159105c2d69e067878e0fce02e33e6604739cf54f84da3a77852f6722d71d060b2d56745b22f0818d5ba958851e1a5dcff0c SHA512 ccd737b1118329a85ecd3f5b19548bec4a2e425b20955b578287d4f82dce165c31aa016019407e8a5b138a48718b61089ca7f9678c549d29d0bb27cdd9c48e68
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index 48daa045a0e0..37dbdee58fb6 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 2cc672bbd8c8..1d95c323a356 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1000 BLAKE2B 8bcf285c27b81ea43cd641118f49e23f3da48a273c40e8e6f9d9f40071e7e107d086bafae6bdd73e0bf30104f8a952e9767366845cbc33ef1f4f32a7202fdd70 SHA512 29fa3e02cdb5a16de1cbaf0f94572800958be82a113deccdfd4ac04008545eb6947e9a4bc7cdd6d5a0d2249d09d7dcb8837612530031c1bbb994c091571abdd5
+EBUILD java-config-2.2.0-r4.ebuild 996 BLAKE2B a8fceed369ff112e77418d8ef9ace69305b3c827e65f350dc146fc46c476747616dfbaf1d9f38662704dbbbb78f54b4e0a25338df41c1e91eea0bc9772324fb8 SHA512 fd1d79607d52241cd66b1bceee218dbd24870b9fb55a01441cc1c02c8ab39269755b08e54a02ceaed33ceba2d3eb2a6fdcc39a85181c0fa899100af8b26385ef
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index eb779125165d..8f0cddb82b4f 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 58ef6b9ababa..d7018277c2a4 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -2,6 +2,6 @@ DIST jdk-11.0.5_doc-all.zip 51476228 BLAKE2B 4515b7aaba27446971047b4c95a8684951b
 DIST jdk-8u202-docs-all.zip 93792495 BLAKE2B c1e3f6f5a713d55a62dc6ef0fd2bba5d30b094030e8438b73bd6bf9f27a7ec3bdb924d8251f99182eb62b470f177fdf84db23f57550bc9467a4a7c305190ad50 SHA512 ad8b51bbc705d46d47164918ce2d620cbadaf92a3fe56d72528f9cbc05da900309ecfef7ebf711e9474f292f744e2e33877cb7377e2e21a5a58e1922198be907
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
 EBUILD java-sdk-docs-1.8.0.202.ebuild 1463 BLAKE2B 90333af0e93385f7c17ebcdba8a08022d4e16db20cd13e1081a8e44f7c2fed01de147767f0a52debe08559937a54e40d3636c371bbd1369ccc8fd3ca1c1857d1 SHA512 690b5443f1dbf3cb51c9b6f5201375d225bda54bf4ab83e388546c12b5f3c60a5bbe44b1abb7ebf48d85caaf550339798f5b6d9141cfa8b7bc2867653a5baea6
-EBUILD java-sdk-docs-11.0.5.ebuild 1271 BLAKE2B aaea3979d6428d5868272d8e2caee269765a9a11e39c8a057272a2010ec71a5972e13d555db1998ea278e14f41a3ad2cda1cedc97a19f573dd4fd99c7ee8ff58 SHA512 8a1eefe9742b9a080661500379f412ab1f8a82511d8fccb8d1345c04499838411fe9c6f3be5d4f145708879b6dc120acb14059b04bdb136be79f753121263223
-EBUILD java-sdk-docs-9.0.4.ebuild 1271 BLAKE2B dcf1970875b54852d6ac66fab6b0464c50723ea669e47dad8184b443d36bb49b45d7a4df2df29396909eff8a2625a902e9b81a8fa4bb74b2aa7b279a8f1f8342 SHA512 11335c99f7ef5f44ed6a8b4defb2607036fedc8c826d79e39cb01cc8a912317317512accf60f4a0faaca85175eea6cd69cfe2c6893fead160f4ba4690b5d638d
+EBUILD java-sdk-docs-11.0.5.ebuild 1271 BLAKE2B ba0bd21e7152812761f5ad647a8fdae7224b37ee46e7f4c3f9d902427c7441b73138410caeac3b8d0ad7787eb6e151f47da57213f7cf3fb9a398a4f293178558 SHA512 fddabae8599e811a9133a60f499d60203abe9ab994861bddfcec2bf2e33f6e5f7887d6d8b7308e539abe4dba08ff52e3388f5c587acd19df84bb273e89564a30
+EBUILD java-sdk-docs-9.0.4.ebuild 1268 BLAKE2B ab204f51b780bf7baf6aca9988c794572cb2c304d3be13a11e4abb62192b1181e22d6baaea46897650ffab54cf8601256d43413d7a073132413488d89d1a3011 SHA512 e2d4eb0603fcabfbfde942ac41d0dd3e2e90ba242aa4e180a8bcd03d1b987ab12aab0c1629b5d4f9275300e1717b2f3378aaff62675774ae6a73c00fc6c6545e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
index 6009e54b6396..4ebb1e6d8d5b 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
index a155428af70b..7fba329b2417 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 2224bf164d27..dc34a5e3725f 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -2,5 +2,5 @@ AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
 AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
 DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
-EBUILD java-service-wrapper-3.5.25-r1.ebuild 1421 BLAKE2B 815e5300a102e50be7ad3119a777d0f919928b9600e70fbc52fae94c763916733bbc581d2b05320c85af468660c504775c154cfba12bb6aacfa683a7d69b2fe2 SHA512 f0b2fb500ec37633e06887d46a8b4f166bd30b5032a1281f76976075d0a8555643135cfa7c949d186f0f7fee8ce1802905120a52dd281d32aecd4cdaea6785f3
+EBUILD java-service-wrapper-3.5.25-r1.ebuild 1437 BLAKE2B 72b09940425e80a16fb72242a3e86c07ec9ff952b888fcae99f84ad9109d91fa0fcaecc3f54b8ad2a88a4a6e529fe94d3af3ecd5feeb15832d32d1ff9fa89f03 SHA512 99108aff91c500390d346ce330fcb241c89eeac636f626fa7b3e529f20d27e18e4c1e8c78607650b110052d189cef2672cc5cfc826fd697930ebee4f2824d73c
 MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index 2261beb2f119..db759bcfd96d 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_PN="wrapper"
 MY_P="${MY_PN}_${PV}_src"
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 514dd056b0c4..d74dea9457ca 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,3 @@
 DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
-EBUILD objenesis-1.3.ebuild 643 BLAKE2B 799808fd95f71995eb2aec6f39c422018ce436593eb5aad45ba9d740f5d78788eee223e6848c0784bf4261d98afe75a19c2a773635913bfa5c2379a57abc897a SHA512 2c40d6bea042b962616d320622644f0a607e942f70a1067e539f9fa8209ec584dbad1683d770a7deb92f5b1f5a047d7b04eca96c87f61145e7d85f0f8e976e68
+EBUILD objenesis-1.3.ebuild 640 BLAKE2B 6f067beab07e849b7fc6f703cd34dfce294f7f4a3ae873156254c21f06a4669f809ff85fcfc6394ff4621aeed5fe6d157d08bacb28c49bdebe027189261e4185 SHA512 3cc3e667bf3f1bf371239b0dbe6248dc5e513473aac39f2ca545ead0c0b78ad9f1ebc45bc8af2b8303668d1366a2f3625a48a5c3cd1a85e00e9c4ad467e41a6b
 MISC metadata.xml 315 BLAKE2B 2190fc553786144aad4a8887b7d040a8597cb48aacb4f9ad04261bab6b7752d2d43779edd3f4bfb8fc700c7decbb0e82f80216dd8f1722f6bae6f2522aeb8a50 SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
index 497a66930e04..1b50c28dec33 100644
--- a/dev-java/objenesis/objenesis-1.3.ebuild
+++ b/dev-java/objenesis/objenesis-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 5393479b72c4..4adc97c01eb5 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -17,8 +17,8 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86ab
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
-EBUILD openjdk-bin-11.0.5_p10.ebuild 3105 BLAKE2B aaeed182ade3dac85ba5439594f9ddb3f3c5e80e9e3d42ee368d61eaf992a467846eff5bc2dceed6f86a7d32019367c97e7588cbe24c8f421071329666ee5179 SHA512 f110e0df728cd1af627738c5bbe62501a2b91d748885094587aad36f22c3fc544ac0388b5c31a742aef2142eb59acf00798bdce1186f557d9cfa22084ee0fbf7
-EBUILD openjdk-bin-11.0.6_p10.ebuild 3138 BLAKE2B 6e4e145f48abec6cc80e9aa32ffa8be9506442f1c19179a28722b08a205bdd296912d1f1631053331b0776e12852b752051c8e84ae51b76956824d4cb77c51cd SHA512 ea78c81dd2ca860cdc1ecd4ed8cbf4db6449cabe85ad49dff2d67d4e6ae797084c8aa8138d40950245c80ee922e8f5a67aaf1296720aa257e2b8d3a92d41b01e
+EBUILD openjdk-bin-11.0.5_p10.ebuild 3121 BLAKE2B f42fc9c4af752a45e7eba91a60ae62524d98407b8bc706d34016dbde3c6001d04c96b9973946008709a6f592b3d7e9da821e0e815310198b2cf54525583e21c8 SHA512 1e3b4081757887329fb983334df87fff552e89e1cc4522890561ded45724331cb31136143743b79c46fdb8cdca6f1e7a0d35fe3dd177bcc4004d5d3cb22666a4
+EBUILD openjdk-bin-11.0.6_p10.ebuild 3154 BLAKE2B 616c366bac9464a7e76c7d0b765130576e2e4daa6c34d740981f586ac0f79d42e5fd08948cdeaba3519e52cebc9e3d1fa112a4d4911533287b803de94090afa9 SHA512 dcda83c2280ba3e03e0b7f398cc1e09e95813ff3b2309cb47b71041e523a99df0123240944b94147be9be8cbff2a7c29a5c57fae92660c4fc25a0d86331d6fd1
 EBUILD openjdk-bin-8.222_p10-r1.ebuild 2183 BLAKE2B f36710e5dd56938f76038d6da74e4f2517467ccfad68c85f3dd6eda2025bdcf4c4cdbbc6fa23572d6e4195c576ae2130e9bfe5424396fd7ee8467c5ba766e9c6 SHA512 2818794ed02d3c08d70217b98c79c9bebec1b4a55411124ff81292e1e0116a278604e41a1b1ae0476fa767ac35a22436c512810596446f0902d3c144c0fe6a71
 EBUILD openjdk-bin-8.232_p09.ebuild 2186 BLAKE2B 06c43bf0a9e88d9b2c3e1cce4aa8fee732f525c5b693638ed85956b4783db59e15826380fbcb2cd4eaaffd005e7dc2567432fff95aa636015f7e66325627d4e6 SHA512 5a17f4e42402bb1257ed5d4ace42533142eda1fd58bceb60cc5c1bc868bf725cbdeb3a8ae8a97748bf15ddb05f4ed0b7f5992374540e9a6db4927fa24df0f7c4
 EBUILD openjdk-bin-8.242_p08.ebuild 2104 BLAKE2B ecba03e8375d28e49089efbfff1cd43333cccf0673b7e968827edbb8f6ffabfef39500abcc0ac2549d13a38166beb4fb547637036efcc3c91d2e4b4fe289f9de SHA512 c008707c598e3ca9e155c41b225ef5de1177bbc14fcbaee5783ad4d22b26a3adf8174fccedeaa9f3b4e8aef846d6a2cd0389a0affde0382b09b9a39bc87ebbe0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
index 50bf2b6b9cc7..ced0929e899c 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-vm-2
+inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
 	echo "${2-$1}? (
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
index a8cbd6ba1b40..bde265d1c316 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-vm-2
+inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
 	echo "${2-$1}? (
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 0a67a4f11a39..11356d9916b8 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -16,6 +16,6 @@ DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4ee
 DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2543e966efb2498b62f8d1179d9b47d6af8a411a59dc9b1733423ea73d330cba3cc59f10911e6c81dd6b9f5b497de6ec2f73a864 SHA512 e02fe78552e3c21d40c9bf380228bafd5ff46034d6b9040d0c08ec725003aa5be7da8c61a72a8175bf49074ba89e0e172019db8aa823b5b349414950afc56d33
 DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
 DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
-EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8507 BLAKE2B 21f150ef74a2c1139d71508a1e94d8527cd9639c3e3c71849ffe28ce6298b0ff7538d6982cc8e5c3263e17036da82c1b3a47005ae3b95af8f8581c52ee5704e2 SHA512 cfbbd1a81bedb21160ba00a3df6a6c9dfdb9300416453c5721b56a88d8b4dd9e6e3d8bd81c5b8815da9b5e8cf2c6c21892798f0894ef2f1321e6a834d9870b8f
+EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8514 BLAKE2B 5112bd68fcfa9b62af4d4f23b939ee4fe91681e4dba68d775e423fa6714fd53bfa5b28e5bf26bbef40c88dc84374f9e6ef8e524726709bb95ab758c64446081a SHA512 f92a5d30ae8e77006c1463395d05acea8a49a1d141a8219ddf42bfc09afff157b6d45eb0e961a5932aa4f614a9f4e9db52f3e218943a7b144ed79562bcdc8918
 EBUILD oracle-jdk-bin-11.0.2.ebuild 6929 BLAKE2B faf728d437351afb603fc2fff362ed3c0333c61355091de3705e014d4337e77afafe3f896d69dc9d55937b523689db4bba48050a208acf1b7e0e767ae9879233 SHA512 dcf92793aebc5a8cef0fed6ba2d031273afb8f2f540eab13c8f63b565e39d17fd0cb8abd483f24a5aca09ea88f50eb20ab288d7cab9226ff6ef552dd395650f0
 MISC metadata.xml 1058 BLAKE2B 1244803eb809b35a51503b49d50f49f08f10e39291c9bac3c4534b7f9391dbc0f944422ad3e80a4a8d35f2a4054add8ce2e5eab7860b60a0ad2a1786e0703860 SHA512 a03c7f2240090c96033a0739387f2cedd94bda4047b8698685ddaf229de7817ceff70cab3672d77db759e6364614da53ce151f5293a17d7b87ec1d855f5e54fb
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index 6961bd389bef..03aed071bd2e 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit desktop gnome2-utils java-vm-2 prefix versionator
+inherit desktop eutils gnome2-utils java-vm-2 prefix versionator
 
 KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 69cbbede56f5..e969e596661e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.21-src.tar.gz 418909 BLAKE2B f7559f204941cd8f8383bda7591e167c247062b4f79c507a5a449715a5554194197c4d34197f30622cbcbd81952597ae757623c903f11959dc8b4fa81234e127 SHA512 7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
 DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
-EBUILD tomcat-native-1.2.21.ebuild 1178 BLAKE2B f69f4effd576d7a50a24280e1a081461bff626e1e50448edea43d8e36817f38b6c0bdd134e47566305594d44cb5fad65fc74bbcfa1a8c4faa53a66deeaab70c0 SHA512 192715b2f01b2e8f4423f2990883360d275a45394288bcfe1fae3dc7f63b9611c01aadb41ee7ea647c89761c33b955e79f6556999ea8a694bf4dfebf9af8c63e
-EBUILD tomcat-native-1.2.23.ebuild 1179 BLAKE2B e18fbf8af973c9e262600ecbea14558d0bd701e07b973b06887f90368cae5cf4a3791443f982de1976b1419c5d4cefcb4c47026c9b18160515ed68dc1430ba5c SHA512 c6237df322fae9f55eed05a35510e6bdf90ad8d0835630099b488e36bb4026e1e69e40ed0d831bd257fd133878c08b03b02b1a91fb8fb64edb5e8953bd234ee3
+EBUILD tomcat-native-1.2.23.ebuild 1178 BLAKE2B 10749abb4552c7f7411f65b225afb1c8f42095912077b1f8783de3f597152c5783ed0d986e644ebac986d9a59e835ff888e4ac0d0461eb31d2202b6fd01e6ece SHA512 b62fc8cc5d355898530a7a7dc9db642ce3074d5d72a6da7a2ee25a211c55120d29b631a61b1d3ac5cb4aa7c1341333a18929c0d6c1fb8cd2223ea5a9b12f64a2
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
deleted file mode 100644
index 82f1d3aede1c..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
index 176381b24148..566f24ceaf17 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"