gentoo resync : 16.09.2020

75 files changed, 345 insertions, 165 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 707102e85cad..21d59a7032a4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 460f5582d86c..32aa2135d762 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -6,4 +6,4 @@ EBUILD bcmail-1.38-r6.ebuild 918 BLAKE2B 76256eb09047227c4762af8e3c8c209a55b01b4
 EBUILD bcmail-1.45-r5.ebuild 926 BLAKE2B 4f3ffde3e41a70c37d9e8529e881ef08d89645d78253cc63677ca6d699c6f2040c62a51fe2a158d3f1872ef4ccc81dc2582e4b84b7dedf87f79d80c4faf69863 SHA512 c4f846ae38bb7862ac39ae7472f5d25d1487cc67cc2731cc9bdf05e03d3356425f7e3e323650422b4f88f1e5d0dfb754465d8e953757cd1493a319ebe44a344f
 EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
 EBUILD bcmail-1.52-r3.ebuild 1194 BLAKE2B 87ccbd4cefcbd13e0677d550bb48f9295cb2afc501b91892138a2c96a2f2b82854168f7fec3fac27759d292150347c115ac025a3c596ae667a844637bdea9ec0 SHA512 4d30572e003a9de4553f41e5cdb70a777fdecf7acd420ee785cfdbd1f01c75b1b6188ffb7148ce5c5e52446aca8c54cd858b0627251b61d31ef7c3b0a7064307
-MISC metadata.xml 369 BLAKE2B 878e0ea0c58e12199e0370cd6898f990ec0b7c884e9937d11e8dac850e203e18f892f3a4e19e9fa98d9607899e4284c6f2760e8f4da352840702a27c07326e8e SHA512 d97ce68b00b528488ba871164a2fc5aee28d7128e756e381c2f1d1d0abd31c67204bbbfb2e61b0d3484a9545d279493f197e0254833353378aa88aacf3fba018
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
index 46b84d53ab09..952a4b9b605c 100644
--- a/dev-java/bcmail/metadata.xml
+++ b/dev-java/bcmail/metadata.xml
@@ -5,8 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-		Lightweight Java cryptography APIs that work with everything
-		from the J2ME to the JDK 1.6
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/btf/Manifest b/dev-java/btf/Manifest
index 4f5e70962321..f80521cc14a1 100644
--- a/dev-java/btf/Manifest
+++ b/dev-java/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.tar.gz 66887 BLAKE2B 62230c1af0c3c8b7d0ab294bc1e1dee523990a9b4e9aaa515d9119d4feffbf7db5fb548db9641b5709ec016dbb8e6b342509e7cb19e9e99f2b2f467c4fc8244a SHA512 ba70eea4370f090bf0295c9ac9907869a6bff62dc6ff86a443a887413f0c0fbb5c12924df6166b8ecd2348ee6bad409d954a16fe5a4a4695492f47a486e35acd
 EBUILD btf-1.2.ebuild 729 BLAKE2B a0186dca643573cd32208439004835aafd44cf5c4610d4fd11ef598685466775cc7d3a911ce79c308cab0e13b06b8b4fb6b4ced86ebca220538faf8ae083e146 SHA512 38792a5a6bd9d5852c421d4135000586d14456b475fcaafcdeeae5066f2a96d1057d2845cb234c55ab7edcfce2f577e2ad33e7b701d37d9494776e4b3dee8b09
-MISC metadata.xml 441 BLAKE2B 60b99de3da2ce08df798e93ff6dc241fb5c120477952655f0a1aec9b6a16a453df4114bc8cfd82606fcf4c832d12afcffb90dc368c2ee7b486a6e240c13cfc0a SHA512 14b2043c940657c57ca40933f9b71b14cd3856a453dfd6fbb7a0683b007107efcb1a544cc303bc758e75eba1ee733eac3fd6b88370e47baa3a5f91ac56383cf9
+MISC metadata.xml 308 BLAKE2B 0388894994494cb1389a97a956870a1c12011688e2f08a105218893ae3d569d732825d81366ee7860a3cbbe07b5fb23ce751dffd8c2cc9d55f22d0e82a0c47f7 SHA512 c57941c719ad0795cb744c05eaed8ed5692a6cdda278d543ccb68585e686d80190e404586cabf9d2bef1c7f326afadd651a82a8f475c114a12e1913b4ccfc15b
diff --git a/dev-java/btf/metadata.xml b/dev-java/btf/metadata.xml
index 3987330002b7..63ca9ada3053 100644
--- a/dev-java/btf/metadata.xml
+++ b/dev-java/btf/metadata.xml
@@ -5,7 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>Generic interfaces to the classical builder pattern and the less classical "freeze/thaw" pattern</longdescription>
 	<upstream>
 		<remote-id type="github">fge/btf</remote-id>
 	</upstream>
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index b2eb051695e6..4121f570479d 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -3,4 +3,4 @@ DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc8
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
 EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
 EBUILD fontbox-1.8.11.ebuild 1170 BLAKE2B a483121fdab73f9a92f4e9057114b92a90990f26cb3fbcfb3d28f8424af3b01a836b7eb7a8a2af11ba99dfa5db3e027f21761372d55cb00606b6bf626c79c2ea SHA512 dc7940fd45a410e30a147a7d4669aeabbbdcbbbf7415ffe59cce7c9130263980c375decde18aeab7e1956e78b2826ce6c4866393577ff7686b1b32c277dbd607
-MISC metadata.xml 586 BLAKE2B dced74e0b5e677040e5bc60d35050eb2acd6e0c9f88f02ba5fe41dfcf6d90a1dacd70e17f85d1d091b6e4a6135cf31c54629107ae0fe33ff863644f849ceb96d SHA512 d7f91851ceae4b6d8a9315e201f5e5ba09a92c29ae26f4abc8dd4faeec30b1de64b1528f89e09cb84372197de93576a468a6e5897ca55a62c8c39c53e4943809
+MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
index 86f1da025abd..fac651d95a59 100644
--- a/dev-java/fontbox/metadata.xml
+++ b/dev-java/fontbox/metadata.xml
@@ -5,14 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription lang="en">
-		FontBox is a Java font library used to obtain low level information
-		from font files.
-	</longdescription>
-	<longdescription lang="fi">
-		FontBox on Java-kirjasto alhaisen tason tiedon noutamiseen fontti-
-		tiedostoista.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">apache/pdfbox</remote-id>
 	</upstream>
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 52ec14e6fd74..c96bec1ee0a5 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 3726 BLAKE2B aabad7193016c3035c3d75c338606e865d084deb7e75f509728ecf31206455bc8b4c79130cf40a9f266a102aa329dae9bc914a86a58863912a7e336457708f40 SHA512 3019ade48332e0313aae1f4fc12f1aebde7a6734a8c7966dbc3d34b70a81aff1aa8e37173bdc2d249316ee13010928e64c8f0ae00df3adc3a73bd5eae41fdb78
-MISC metadata.xml 716 BLAKE2B 1467e6d569030367c7983485d8a2159105c2d69e067878e0fce02e33e6604739cf54f84da3a77852f6722d71d060b2d56745b22f0818d5ba958851e1a5dcff0c SHA512 ccd737b1118329a85ecd3f5b19548bec4a2e425b20955b578287d4f82dce165c31aa016019407e8a5b138a48718b61089ca7f9678c549d29d0bb27cdd9c48e68
+MISC metadata.xml 587 BLAKE2B f7ac8f38876d21fa09c3452344ca5b0c3d32090d15eb9753cb3c466d30ddf3f99289d41297c84956384f851767419112adbf349bcff99977377e9476644fa952 SHA512 6d748a94a49716fdc70c7983b87cb37ec1809d2c43b823486110957cd38fe6766db6627f3d548fec0c204af153f852bb1e75dbc112ecce2bfb26478b8db46754
diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index 45bb61f874f0..7ea0b046d2a9 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -13,7 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
 	<use>
 		<flag name="awt">Install AWT libraries, needed by some GUIs (not needed to build icedtea)</flag>
 	</use>
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
index e20f3e25d753..6d9b0f80313d 100644
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -1,3 +1,3 @@
 DIST javax.servlet-3.1.1-sources.jar 211576 BLAKE2B 5f416fe8f37e1d7b2c6fb43084b21217383157772030e7ec20df0d0326c8d50f881048057a5defd089c1ec199716bf290fb8f78099239b2df145a2dfff60b04e SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc
 EBUILD glassfish-servlet-api-3.1.1.ebuild 608 BLAKE2B 97d0fe7e2d7e3f8ac14b8622c25e378466b1e1d446d6df13e61303ea72c1b36b423738e7ac61fbac542a89c369486c4d5b4ffdc8c211f325179f26c668f677d7 SHA512 68b2bc37b97ee02a51967976f06f72a32b70f6ddce3cc16500287f4721ca48d24dc7be21007edac3afe0ae040865560e26f408bbaead24dccb94a0b9b1285d1e
-MISC metadata.xml 355 BLAKE2B c222865afffbd8128eafea6bcc339f7e2f96422c9553076af8a3fe55d7a22b325454f82a9fd5ff315746f3f0ccf3e064b865a39ffe73e2b9c17f872f8ae270d9 SHA512 b9c26b8c7f6da20985e7efbb24f8bebc579f7df31a75cbdc2e86184c91e56b11dac48314c067d89b09ae40b706284ae798c9bfacaee6ff24cae2250b19e981a6
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-servlet-api/metadata.xml b/dev-java/glassfish-servlet-api/metadata.xml
index 76401653bada..952a4b9b605c 100644
--- a/dev-java/glassfish-servlet-api/metadata.xml
+++ b/dev-java/glassfish-servlet-api/metadata.xml
@@ -5,8 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-	The Glassfish Reference implementation of the Servlet/JSP API
-	specifications.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 4950f433f3ee..15e85767bda1 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1a
 DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e
 DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637
 DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548
-EBUILD icedtea-bin-3.16.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
-MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
+EBUILD icedtea-bin-3.16.0.ebuild 3362 BLAKE2B c3c098c3d7dfb0ff89cf506fce2ad3b3c0c622aec63186ccd3e27534015e9f08810204909e8c78b3c1a77aae85a085d7bed2f8d7ef48888a39074d95d4f22cbc SHA512 f951ba1b23fe3755a1e53c9a79bb921057e709e333e084dfca1f7f72789a657a24c2d6473e43ca43d6acc83f700e3505551bf2a00020739cb4e6f18b6a31ecad
+MISC metadata.xml 475 BLAKE2B e8d6b5bc88fa26da15340836b897ad9d003bc5716a94456890782b75d5918ccb09ddf18f0d6ef51289a98c18a5f45e693e85871ab1f3bc2b0ed76d75123b776e SHA512 9fe63a4d30a8c50a7222507356641dd9b9fccc8720d60553e7685c283ecc5b9f0705f69b12b602e56b401b8c8316d9cf59c9f663370a150cbd1f03529fc2874b
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
index 930f0f3ad547..0d8ff65ee21c 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
@@ -30,12 +30,9 @@ HOMEPAGE="http://icedtea.classpath.org"
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="8"
 KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
+IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source"
 
-REQUIRED_USE="
-	gtk? ( !headless-awt )
-	nsplugin? ( !headless-awt )
-"
+REQUIRED_USE="gtk? ( !headless-awt )"
 
 RESTRICT="preserve-libs strip"
 QA_PREBUILT="opt/.*"
@@ -73,11 +70,7 @@ RDEPEND="
 	)
 "
 
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )
-"
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
 S="${WORKDIR}"
 
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 5b10c991e945..c6a17fe82eb4 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -11,6 +11,5 @@
 	</maintainer>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 1ea9a9928d6c..0536bf2f5781 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
 EBUILD icedtea-sound-1.0.1.ebuild 884 BLAKE2B cbeab5af2535f85b974f70eb861412ea9f94e7c48adc82d72a2b51930053d45cf894dbf9c9a499f33b207a84b5fdfca1b65a95c695ed0060bf4603b1901780b2 SHA512 0de6493e5357a26f9577c98496e66e72b96452e5f5d92f7e6e1c1d3c7470563b793266d280caa672b593cadac7b5d6e21996ccc391ce3af8758432d8a2e77d47
-MISC metadata.xml 502 BLAKE2B 956158234bf2b4cf3e69d59e5db820789235dba816167c1a64ae1c94e585996f14c75b72526c8344584950336fb273c094176b9dd042fc41baaadfa56f46e2b9 SHA512 2d7a91be3364f491b4402f6cd525ff8e27fd4ed27b89268817ccc9d8318f207a0b315827fdf12bae8a443751469ebc9987e0bd6f08857199f53b62f4db93c00e
+MISC metadata.xml 368 BLAKE2B 456c9159397faa36fe3eafa4ec60a46a43ed4e2436f6c1175147da66b2ec2b6b97d4e03b08e53340382ddc06d0ad0007e8d31a6a8c90c39522c84f4393a0ec08 SHA512 e7b3e6a4142b0c38a9620af80161d2b4a2cba75dcb5a95fe19c9eb1f98f23888d0bb97369103a577a6ecc5e72d78dd3ab86d1cc7cd8d984ba9ccd9d35c17a509
diff --git a/dev-java/icedtea-sound/metadata.xml b/dev-java/icedtea-sound/metadata.xml
index 05fd5cab7ec2..b9ef3f832b7d 100644
--- a/dev-java/icedtea-sound/metadata.xml
+++ b/dev-java/icedtea-sound/metadata.xml
@@ -9,7 +9,4 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <longdescription>
-    Plugins for javax.sound, including the PulseAudio support formerly bundled with IcedTea.
-  </longdescription>
 </pkgmetadata>
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 8aa014ff96ad..c98fe7c74e27 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,11 +1,15 @@
 AUX README.gentoo-r1 2328 BLAKE2B 3a9e2be2a241eeebe501c3c97d55c9bd65b3bb1c0b33abeed13dcea238f4c981e3aa173cb385cb15ea184e1ec2d696e630b8b1c497daadb2a79b3e8e287b4600 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628
+AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db
 AUX icedtea-web-1.6-javadoc.patch 463 BLAKE2B 8c6bd88fb3255acfebf91e764bdf4f1677a12d7ea03dbcdd47514ab2d1b240cbc810b8e670c1bb472176323b346ee3a5ddf9aa359bbc1771848334357ad0cb25 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d
 AUX icedtea-web-1.6-launchers.patch 3136 BLAKE2B b11e4cb0c8c53e8509e68d30bc3190d8846e742e725cc4918fa08979102bca5d6ef643bf6a524f596a0ed9e0d98722227824bd39f1e84859c4680fc17228b057 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92
 AUX icedtea-web-1.6-no-hg.patch 2254 BLAKE2B 9939f85cc1234056de045ca8d85f256e5315d0c603a5ec8a2dc026b62a1ee1fdc142db832ebab32cea698a17172257e3eb88f427f966f9e385ba626bd257550d SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523
 AUX icedtea-web-1.6-respect-ldflags.patch 667 BLAKE2B 215247a834785e592d66717d9c88bc4c04a5adb93bb026460ca1bf729a692cb675a950e17a665086aa6b3699ef9406fe70d26c5455d44eccd7b6dd542a0f0a58 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e
 AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547b34527c845acf285b4ed1a4c66cbfd48a815391c9662e9a19b7f699199c8d37c160c9452af6e192f9e3c3af8e240d6cbe7 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74
+DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
 DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9
 DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
+DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890
 EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
 EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067
-MISC metadata.xml 653 BLAKE2B 4b0309721007539cdfcfc155039efd0dfdf2bcfccb1673cc4c930ee4267e73b5aa1c29b777a139dda6bb1c804fe827160366f59709843e9a03f66ecad41b3c8d SHA512 0b0cc5e6a5226dce345c2ebc01df0459ebaf4dc37d5241748bcba81d80e0429f599ab41d7a3e7020c581eb0c40825f07ad37e5340dbf643240ebb9830c0d500c
+EBUILD icedtea-web-1.8.4-r1.ebuild 2369 BLAKE2B c3ee179fa847cea338038e91a46455e1ee430060eb67cad4626b60aaa1c0697abfb4807686a53dea8e48e64a10bd09836ce36d98df8f5057cf888a2a5b14ba1f SHA512 740f82359a81a92ee26d1aa91a950676b7d514a32f7b8f23c980aed783e22a23c7ce1869b1497f05f238a2d2df88e898c5a349ffa808b6680a062f2f6335ad67
+MISC metadata.xml 742 BLAKE2B 77af156387b358bd5d7193c7ff3d1860ad18dd4f3b65eb2a4437f4278222b61dcd821e3ac680e49f49e28cffac46a880d6b1820bafca47a82ee6f27e4accc70e SHA512 10f58fcaced19937c90c9fbf9b23bb7d8cea129d14261d95c9d8cff24ffa0faa52435ff34577636eb9fd7257e62f71c4f93f856cb9d3af19b0226eb9a0c01f64
diff --git a/dev-java/icedtea-web/files/README.gentoo-r2 b/dev-java/icedtea-web/files/README.gentoo-r2
new file mode 100644
index 000000000000..4644f988e7e1
--- /dev/null
+++ b/dev-java/icedtea-web/files/README.gentoo-r2
@@ -0,0 +1,14 @@
+Browser plugin
+--------------
+
+The IcedTea browser plugin (NPPlugin) is no longer available,
+as modern browsers no longer support this plugin format.
+
+JVM selection
+-------------
+
+By default, Web Start uses the JVM
+selected via eselect environment variable.
+Note that this doesn't have to be an IcedTea. Openjdk will also work.
+The choice can be overridden using the itweb-settings program.
+Simply blank out the field to restore the default behaviour.
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..297c3d95ea68
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+README_GENTOO_SUFFIX="-r2"
+CRATES="dunce-0.1.1"
+
+inherit autotools bash-completion-r1 cargo readme.gentoo-r1
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
+SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+# tests require ton of java deps we don't have packaged/working
+# but rust tests pass.
+RESTRICT="test"
+
+BDEPEND="
+	app-arch/zip
+	virtual/jdk:1.8
+	virtual/pkgconfig
+	virtual/rust
+	doc? ( sys-devel/bc )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-java-0.2.0
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}/IcedTea-Web-${P}"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_prepare() {
+	eapply_user
+	sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
+	eautoreconf
+	cargo_gen_config
+}
+
+src_configure() {
+	# some functionality (tagsoup rhino) is disabled, because dev-java is
+	# unmaintained and a lot of things simply does not build anymore.
+	# native plugins also disabled, modern browsers no longer support it.
+	local myconf=(
+		--disable-native-plugin
+		--program-transform-name='s/^javaws$/itweb-javaws/'
+		--with-java="${EPREFIX}/usr/bin/java"
+		--with-jdk-home="${EPREFIX}/etc/java-config-2/current-system-vm"
+		--with-itw-libs=DISTRIBUTION
+		--without-rhino
+		--without-tagsoup
+		$(use_enable doc docs)
+	)
+	unset _JAVA_OPTIONS
+	export bashcompdir="$(get_bashcompdir)" # defaults to /etc if not found in pkg-config
+	export CARGO_HOME="${ECARGO_HOME}"
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
+}
+
+src_compile() {
+	# races in makefile
+	emake -j1 #nowarn
+}
+
+src_install() {
+	default
+	rm -v "${ED}/usr/bin/itw-modularjdk.args" || die
+	rename -v '.bash' '' "${ED}/usr/share/bash-completion/completions/"*.bash || die
+	rename -v 'javaws' 'itweb-javaws' "${ED}/usr/share/man/man1/"javaws.1* || die
+	mv -v "${ED}/usr/share/bash-completion/completions/"{javaws,itweb-javaws} || die
+	sed -i 's/javaws/itweb-javaws/g' \
+		"${ED}/usr/share/bash-completion/completions/itweb-javaws" || die
+
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	# we want to override cargo.eclass' src_test
+	:
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
index 50b2caefc775..ebaf03b08ffb 100644
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
 		<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">AdoptOpenJDK/IcedTea-Web</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d34659743877..fdee87883ecd 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -12,5 +12,5 @@ DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb
 DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.16.0.ebuild 12343 BLAKE2B 970d168c457217a1396c9d5552999eb2e15e567a8f8930391256756a10f420cece2f4f1c3ac9781796962fe5224e228201570740dac8c789af86b93576fe6b33 SHA512 e7eb6e347acd606ab43f64ac80aaa8ed17eb13607b870151030bf5f1613943205c04050f218d5eb3d7a5c828eb09a59b133e8487e87c549f4327f36bb6359c73
-MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
+EBUILD icedtea-3.16.0.ebuild 12291 BLAKE2B b079701037aa68c3b5c7658faaccffd19c706c6be2971bf712c7b838bb166d9001d40f1e4103f5dd39d1f447c32519b2ae49bcbd49fd11c51c4fcdfda53cb1d3 SHA512 0fb5fcea871a064db66321da2ba5db7b640c2893d36bf7bc6b08241606768f272c8a31f581e1c24d839abd8ec1451b53daeeed9389e234f45d28067a4f5a3a38
+MISC metadata.xml 2078 BLAKE2B 62fdcb5253303938fdb76f663ddc6f3916435a3c9ed96bd4dbace4def75710e6dfe651466cf2ec9783cb897e13347c64eed12b20c90b68635865c395979bd67a SHA512 1e7b759aa3b3e5a50347cfd788c50435a28dbe094cead897e35c7be4fc85dcc47fab0091592d8ca74f7274e77e57b75658ad97385faaa7d3287579f88a198cf1
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
index 0d8a40ccf226..436fb8fe611e 100644
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -70,8 +70,8 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
+	jamvm +jbootstrap kerberos libressl pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -155,9 +155,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
@@ -371,6 +369,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
 }
 
 pkg_postrm() {
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index ee6c54b85989..55c624c0a067 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -27,7 +27,6 @@
 		<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
 		<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
 		<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-		<flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
 		<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
 		<flag name="pch">Build using pre-compiled headers.</flag>
 		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
@@ -35,6 +34,5 @@
 		<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
 		<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
 		<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
-		<flag name="webstart">Enable Web Start support (via NetX).</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index f0a29e39ba6c..fffc59199298 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,3 +1,3 @@
 DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
 EBUILD jackcess-1.2.14.3.ebuild 765 BLAKE2B 72186e51221b6f8459dcd0965a342555c4a41d41c5cac157961fac0636ab3cca5492a1940de06f1965d1089885bf59fb8ba79341d71e51809406137c9bb9ae15 SHA512 56ee74aee1f86d43eb9356e8a54ccb7664dc6b0e8d6f502a40ed86ef93082d7f0532cf6a7366671efbf5151a562963448b9d5a2706718c4ba80d810561de1c6b
-MISC metadata.xml 447 BLAKE2B 1f2f25d4bb0aac307100f878e24706e8b85f7cfb4a19e612e126859722ccdbff8882da02657b3d1fe190bb3141c85849ff3e57768e5d75159d79e3b528b16a52 SHA512 a9b4f0b7a6f59d972c792a8bdf6320680825c8f1b7bbd0dc83e9ef54abf79dc4f7bab890dadd69484f15434a6414af2909c1dc1978eae9eb21403ed243cbedff
+MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/metadata.xml b/dev-java/jackcess/metadata.xml
index dff9128b4a5b..c36d884665a5 100644
--- a/dev-java/jackcess/metadata.xml
+++ b/dev-java/jackcess/metadata.xml
@@ -1,14 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-		Lightweight Java cryptography APIs that work with everything
-		from the J2ME to the JDK 1.6
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jackcess</remote-id>
 	</upstream>
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 1c6801df256e..56dc541b8727 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
 EBUILD jflex-1.6.1.ebuild 3561 BLAKE2B 81a856b2da4e16fa09e939797757a10ed77c3f47a8382511732b2f854b959706b5198972fb460b49ff5e39ee3f90771e75cb214822075eb1cf4625924123a11a SHA512 9f392e643ece0f86ee089dbf6fd4722cdc635bed73f75de8b7424b5cc73ac6596d082bc1eb59da348a503a2fa9bfbe784086837b18fbbc7b7fea475b5a533894
-MISC metadata.xml 365 BLAKE2B 59ac73e145626ce1448d4edef5ad2b115fcf762d368131b3b59438e3d21a8f4aaee0d56723a3c79539b7806caa8c456acf0554ce22333b097caf9f3f07dc8014 SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jflex/metadata.xml b/dev-java/jflex/metadata.xml
index ac2a2c1b2b7b..2444066aa02b 100644
--- a/dev-java/jflex/metadata.xml
+++ b/dev-java/jflex/metadata.xml
@@ -5,8 +5,4 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-<longdescription lang="en">
-JFlex is a lexical analyzer generator (also known as scanner generator) for
-Java(tm).
-</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index d5dc726a0b69..b1306c7f8fc7 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,3 +1,3 @@
 DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 EBUILD jgoodies-binding-1.1.2-r2.ebuild 701 BLAKE2B 9d429a21a19ed9a7c275975a71694dd96cf6eee3bcea6949cd8c5e11c5015c9a10b7f1ccb8a6032f1985be2bcff509cadaf672675e9f37691a1975c1b00109b7 SHA512 2febcba8f94e884c6d260012756e0a43889930a492153f7b1a152dd0fc45170ea2e85978a3aef68d2f05d886b517e37e8df4e60e3c6f6b37ac761c934103a0b6
-MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-binding/metadata.xml b/dev-java/jgoodies-binding/metadata.xml
index 6cad2bed16e5..952a4b9b605c 100644
--- a/dev-java/jgoodies-binding/metadata.xml
+++ b/dev-java/jgoodies-binding/metadata.xml
@@ -5,7 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription lang="en">
-		A library to bind object properties to UI components.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jnlp-api/Manifest b/dev-java/jnlp-api/Manifest
index eeba35d1bfe2..f54373e17d1d 100644
--- a/dev-java/jnlp-api/Manifest
+++ b/dev-java/jnlp-api/Manifest
@@ -1,3 +1,3 @@
 DIST jnlp-api-6.0.18.tar.bz2 10518 BLAKE2B c5e9f1c3f14dac45c2bdd979844ff3a49f573c6a79010d3b412086a2496ca7429a8ecd6211224c934cba90f40f7cc903fe23715006570e5876a504070ac797d8 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f
 EBUILD jnlp-api-6.0.18.ebuild 605 BLAKE2B 62e3b429e0b6a120c6b95aa6a6dc76d7162b524f764345a43d0801867ab7253647afa5b8aa7be7e20942fd2c611f0715884585123f591617638eac1a8fb9100e SHA512 a8082c8a10c131d5609968018bd07a04d35495a8ab5260229a91970ced0a23e3cad00e33b01606763da38a888b9199d69d2b0ffce4c11b1d2db349ea1b6aac29
-MISC metadata.xml 353 BLAKE2B 6a6cf692b1e5a04174a9bd865d146d766aaf581affb8f98c389ced1186f6f31645df53ba7306f4f210668f3b53bd9cac496bba2045091b11a6c0f41d8a846191 SHA512 488871f2e58d0fc66bc3ddeb7f6ad7a62be17716e5af4f33cde5e2c755afa760e25ee935f50a186a32dc91a3e74ec635cc84d59dcdb6c2ee8f6bf67cf5588d0a
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jnlp-api/metadata.xml b/dev-java/jnlp-api/metadata.xml
index e1ef333647f0..952a4b9b605c 100644
--- a/dev-java/jnlp-api/metadata.xml
+++ b/dev-java/jnlp-api/metadata.xml
@@ -5,7 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-	JNLP API classes (javax/jnlp), repackaged from the icedtea-web fork of netx.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
index 196830290d88..997cf06a718d 100644
--- a/dev-java/jrrd/Manifest
+++ b/dev-java/jrrd/Manifest
@@ -1,4 +1,4 @@
 AUX jrrd-1.0.1-javacflags.patch 263 BLAKE2B d20065e16d2648c6be5718a40b0ec164ee66f644b611f932ee379470d993062038a9ba3cbfd5cac09a2da909c4aab1c1d1fe66407548f67b05e9791385627b1b SHA512 1c1475647f7535c359b1a686295edffddb9a1b2d53529f51e9a17d0d7e5de2a39846e56e9e4eb3441519b05da645052ed177b3d2e7a2779f6385ec5ace0609ba
 DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
 EBUILD jrrd-1.0.1-r2.ebuild 797 BLAKE2B c91de90bca8f7a0c333354a8b8e3715c24f762538cfd4c8098da9d7abe2965d8fc6c4740437bb6f647add90045706bf76ac72a6db78fbb6b4f7a02c70abb5886 SHA512 baac4ac46d64c1edbb8c69a1386962392e033557e4175041746a31f9a4586812228fb1e82f9a3be916a50f8ccf11fc40b6e8510c395a0bb9dd558ed9733c3741
-MISC metadata.xml 396 BLAKE2B 66db2600dc0aa0b7ff5e5d6275f265495f0c7c7ea97baab568f993c49642dd2b928042fcdab7dbf5e5aeca154d5f463d472be2dfd4339b21f8429154fdb05e5c SHA512 4d701ce0342203d158d1fdb3d00d1c2f0fcdaf7a5f891584be4cb33e2b3ceeac22a25b780410c9be7c1c4c3a1f4494561a2dddaf37981b68b23911d55ae1f26c
+MISC metadata.xml 313 BLAKE2B 3fdc90e6fc3c9fe919ac862555a4d9463999776d4665b43109faddc9b3d8179e23e5c74a7011cd4e4824c4b07435f6172146f8b3c3d9bef871f7885b6629b686 SHA512 d872cd4e19f79a2c3966435faa85f40ada954e51a0561e90c1055113254d653d51e387cadb5d79a15a30eb4764fd3fa985f1e2183fe52a5bce2ae9dd2c824089
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
index 4b68e08c8e01..fba66bc4abac 100644
--- a/dev-java/jrrd/metadata.xml
+++ b/dev-java/jrrd/metadata.xml
@@ -5,9 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-	Java Interface to Tobias Oetiker's RRDtool
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">opennms</remote-id>
 	</upstream>
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 8135779f13b4..135188b9131f 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -2,4 +2,4 @@ DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5
 DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
 EBUILD json-20150729.ebuild 700 BLAKE2B 28d118fc07ab4f4bc52e00f43d36f49291fa69fc91304ee2d89df9c111e72a09f7eea10e659d06ac8eccd5c3a9d038d7ac57dca5f50fcf9d9246873bba6559c9 SHA512 112177c08691722e2b9e0d0bbcc11bbe68da87c281a4918ff6e4ef64160b7137ecb1187a697bf0f7c3db01acc9cc4baa79a67b7e9385af9cdbf5b3cd4036b26c
 EBUILD json-20160212.ebuild 700 BLAKE2B 982fb6fc37f874641f6984877eef6ea42a5b106fcfc59080f85737ed2ccc61df3834c7ef5d974a155ff822bdcf55d91dc8503eec38d7229178b2b4b51fb84be4 SHA512 23df25d4363faa278ab84475c26b992374f61a39ed816868f8695567f66e0bfae4e54c6021bca5c38dc87110206146576cd14b02d713ca576d2c6d60f8cc38b4
-MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
+MISC metadata.xml 327 BLAKE2B abaec74a31eb623fce20ab570725ed7e9773ea21b4ad9eedc30278b5b76fdd690bbb3ce6d612656df7cd94c0c1d13815881c0d03d845a68bb8241af90bbf8a69 SHA512 013b860fc0733539e646aca9f7ebe26f6be0f349bdb45076ab6e48eb213aef1ff029ce90721ea35b9b53b09e51747f8d6e9f8504cc4b4cf7ed7771e6f9e7d981
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index 8ec407117502..ab2a8a11f34f 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription lang="en">
-		JSON (JavaScript Object Notation) is a lightweight data-interchange format.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">douglascrockford/JSON-java</remote-id>
 	</upstream>
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
index d8a0f519e468..5e336d7ad52c 100644
--- a/dev-java/ldapsdk/Manifest
+++ b/dev-java/ldapsdk/Manifest
@@ -2,4 +2,4 @@ AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 BLAKE2B 44a69a7364592f1913f04a8ddd4f9b9792
 AUX ldapsdk-gentoo.patch 5569 BLAKE2B ade856d7048ab2ab7b728bc3bc7b49ad9c3bac9dcf8e1fa860c8ab6a164e57df1e570c0611c153f7da3a391e0a299dafb1a20ee5b0f0bc4b4a5d08398867235b SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c
 DIST ldapsdk_java_20020819.tar.gz 1068301 BLAKE2B bb49f97908014218ed7a2c38bbc4ee4cb84e63866a7cc300a484588e0868a844367428c7a1008f6d69ba7e40031f03bd50ae595c2122d7a5b1fed91d4570b082 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d
 EBUILD ldapsdk-4.1.7-r4.ebuild 1309 BLAKE2B 9f0a6a0248bb9288e3875ff29baae0a9c656db77efc6287c5457662e4178a05ed0af16001f6c8041637c7d672d7c431df9696a8f332d7e60b8a2d87b5e275cfa SHA512 8c6b76e8f3f72016c2fec988d4faf90530e8d0c1e45a7fcec313d78ac734591500325b1fcf7a6bec8411c9204abcb6818447d5019e8f039b5c1bf2d498dfc205
-MISC metadata.xml 313 BLAKE2B 9e8564589bccd808a56750e2cd40cf23c8d7414a458a69ef2f11b567c36c5d3013199b743c25efc56ac5c4bd9f2653ee0d2235e2365e5fbe2bc07f0c8bbe74de SHA512 5b8c3260975827e81ee947fa27f70953bdeb6adb436eed116c63f377fb957aaf16e686bc86a0a3ee4d25ed8c752f9f5403bd831dafe731d8d297c9ecbb3b0240
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
index 730175bdcb9d..2444066aa02b 100644
--- a/dev-java/ldapsdk/metadata.xml
+++ b/dev-java/ldapsdk/metadata.xml
@@ -5,10 +5,4 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-
-<longdescription>
-
-The Mozilla Directory (LDAP) SDK Project
-
-</longdescription>
 </pkgmetadata>
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 972dab4e3398..9d4e977e9bb0 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,6 +8,6 @@ DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae
-EBUILD openjdk-bin-11.0.8_p10.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
-EBUILD openjdk-bin-8.265_p01.ebuild 2192 BLAKE2B 11b930ccf8a10ce61709f8b133a45e389e69eb0a2aabfe834ce1139fd0423939f84352cb614d9750e680fe0e83a30198f81d21e3b8344992930793c32b929969 SHA512 261fe03b409acf9dec6e4d3d7a2436f5531ee9897edde3e35e13ed9a7a8032c7ca33ab72b3aab0c9fa7476ac3ebb20dfc8c094c2d20ecb7928a7fab46bbef8aa
-MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
+EBUILD openjdk-bin-11.0.8_p10.ebuild 3024 BLAKE2B ff43aaa57ea239c48fca7e99051fb4d7066933fb5f556483cf4c5ac8840b7438e1c96cf2192c8bc41142b90c6eafe4073a7e535a917d0bfa3e3309580db6ade2 SHA512 05eb2babac28ee14f6a3126d2b3ca21c1a6497a3b5797afc435dd8899efcb50f967894a3674a57d8479b37645316f23d98590b9190506e90aeab357c128cb44f
+EBUILD openjdk-bin-8.265_p01.ebuild 2062 BLAKE2B aa603f7bf1aa0dd9f1e236cc1ef1804c9aa860fae780a0a1d3c63ef07e2b369c0721fa36ee57259803579590ad421426ba117c4ce7bb2f849cfcac44558c9dc5 SHA512 17ee3f142dcfe56bd723654e701f28a74089d887f069f5eafe823c103542154d8c672636881b496b1d46b44bf766347cc93917677b48d027044800cdef690dc5
+MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 941e830900e4..85cbb949c92f 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -18,6 +18,5 @@
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 		<flag name="source">Install JVM sources</flag>
-		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
index 4ccc0089139d..6037f69440ec 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc +gentoo-vm headless-awt nsplugin selinux source webstart"
+IUSE="alsa cups doc +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -45,9 +45,6 @@ RDEPEND="
 		x11-libs/libXtst
 	)"
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
 RESTRICT="preserve-libs splitdebug"
 QA_PREBUILT="*"
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
index 1d7080434ca7..9374723c43ca 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64 ~arm arm64 ~ppc64"
 
-IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
+IUSE="alsa cups examples headless-awt selinux source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -47,9 +47,6 @@ RDEPEND="
 	)
 "
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
 RESTRICT="preserve-libs strip"
 QA_PREBUILT="*"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 31badb8df4fc..4bd833b31f70 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,6 +2,6 @@ AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
-EBUILD openjdk-jre-bin-11.0.8_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
-EBUILD openjdk-jre-bin-8.265_p01.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
-MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
+EBUILD openjdk-jre-bin-11.0.8_p10-r1.ebuild 2659 BLAKE2B 64af93f9838f36e31f67aea9c0cebbe74932bb6f88eded2f2b3e5efc820808adabac60bf4b44276d305caf01803b3f36185fb2da0466f973bccbc035c3723c7b SHA512 a78a4445c19ef5fe09810f0ad2f00d072658d2cb82aa985cca995a7a69a52599f38785c43673f5cc36f4bb43e169491f8956682af38fef801b3c7648d6f3add2
+EBUILD openjdk-jre-bin-8.265_p01.ebuild 1802 BLAKE2B 290351a68bb64e3e4d7f48a8c5c2262ac81d6ebd9e48ef24a2248fa8463d0c8e0e303d4becff1f24d63256ee47d9518d69d989fcd5d4c14641606b29a604986e SHA512 90a02c3138c1bd1e55407a1f2a099b65905b67d282d20088b416065e8508e7cc8453b64256b2221aa5cfd55c1504bc7d582cd029a00e595fa42dfc599e200355
+MISC metadata.xml 895 BLAKE2B 894e6ab5eb085e8f732946b64f5685a972919a4e715705420150e758910534a08246e3565521023f8b36d9d7030ec226f72c89483fe407a73d18594cd47b8582 SHA512 407d287db80d5d7d2139d2c0b1d478ab85dab99bb219bce49e8b3d3e6bb4d8c5efdf4a9bdd891e655fd29d70a885639eab755ed7a990b3429e4acf16fad2bc28
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
index 7a807f5dbca1..8fa79b50533c 100644
--- a/dev-java/openjdk-jre-bin/metadata.xml
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -17,6 +17,5 @@
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
-		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
index 23e7a0fbadc0..a6aade59d9e1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
@@ -22,7 +22,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -42,9 +42,6 @@ RDEPEND="
 		x11-libs/libXtst
 	)"
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
 RESTRICT="preserve-libs splitdebug"
 QA_PREBUILT="*"
 
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
index 512f8678a758..16aae21f0a4a 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64"
 
-IUSE="alsa cups headless-awt nsplugin selinux webstart"
+IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -43,10 +43,6 @@ RDEPEND="
 		x11-libs/libXtst
 	)"
 
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
 RESTRICT="preserve-libs splitdebug"
 QA_PREBUILT="*"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 9f86ebbfc1db..6ab4509588ad 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -9,6 +9,6 @@ DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d
 DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418
 DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
 DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
-EBUILD openjdk-11.0.8_p10.ebuild 7785 BLAKE2B c777da7f26aa85dad821799fd32523e958d6e4f525f299dd49854892bbb4a01329d3a77ebfb60f0b12f006f0b0c1d34a553d5c6eceeb0ae8a9d8a1d52e524bd4 SHA512 89413c17eb82991b3b597e74b6097e3ffaaef5a7f18326a18188b2df7bd416055b094f91135ac9e1efb400432dd331a1565aefd993a47dd7f92ea1fcc048f044
-EBUILD openjdk-8.265_p01.ebuild 6044 BLAKE2B ef734afa0c13e6ce7fe43ab981466d0acb5816e561c1415539da2c911069cca62b327ff8e5d2e7d71f6056cfb17a8171965b0dea4602fe531520a21e31e791f9 SHA512 2cdb07b134decd2a17d0e316f1987e3b957ec80e1fd2b4a49a1785b208144477b4639b76211a4804d9ca05e30ca8a37005cc56deb3b5f56637aed6f6fea61c45
-MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
+EBUILD openjdk-11.0.8_p10.ebuild 7652 BLAKE2B 9ab04d8e05b7ab65029db969bcfb828db8cb09e93e7e11076cd24f5e4907cc576be0242e1278e801648f26b58d7eeb9d87adc830cf615a433eaa2a72d1388f0e SHA512 2a4b8bbfac4ef720b3a5b29d0a8d5cf8ec09987722df791fecb45b1ca96837ff225bd6605b47073f819a53bb8cec7e2c701e464bc3ffb5dfeec93ae3e3f454c0
+EBUILD openjdk-8.265_p01.ebuild 5979 BLAKE2B d20e84a3cc26ae804c999aec9a0880631b8454cb2443c7af394c9e846916db28774010650e78b6a01325d65733db445cb6b76ca242d598c26a76059b8d07a94a SHA512 7f559217a67e6e86bf404c34c55a5f579b48aea6110548bda5dde6344167a29da446ff9cf4ffe5c62ae56e0171f21617004dadc46dd51ac9cc942b9b12170507
+MISC metadata.xml 1313 BLAKE2B 5642f3fd86732997585e5215e2adf9b9e10af572d86ec1eab1db31667ec027a170825fad97fbf2c9e42c6266036dae8219ff689cd361e14d6e31c9640becd1f0 SHA512 ad6667c6fc65f81754455fed779dff5a13920abd85905c750d9c3ed2d2f2dde6a02616518024cbc1dcd5204cb66c00a0b165f03ff039a59f69948b5c1c178bf5
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index c9555ad9e77e..ebcb18f58970 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -24,6 +24,5 @@
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
 		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
-		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
index 35a2c27c3f85..403654841b0e 100644
--- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -68,11 +68,6 @@ DEPEND="
 	)
 "
 
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
 REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index d88de6a02a77..df934d0962ae 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
+IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -73,11 +73,6 @@ DEPEND="
 	)
 "
 
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
 S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,
@@ -223,4 +218,5 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
 }
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index d9c01cdcda1b..6ba70b534cd6 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -3,5 +3,5 @@ DIST oracle-javamail-1.5.5.zip 1794428 BLAKE2B 6bcba7aa40ad668b8cfd55ae3b4afddcd
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
 EBUILD oracle-javamail-1.5.2.ebuild 1242 BLAKE2B 4b78ffe20c74bf8a95544b657846d9197f31534c1f64057c3304509625b7bcddac1fe78d6e0a87ea4e44661ed24879b29f9d738cb788c3d7ddaca07954722f4c SHA512 da9bb50b684173beeefae7c3c7b08d634ded0b5766032e142cbc1a30e5432df625df1fc69193e894af4391399d0dd5ef0dd25f0c30df00e413e69a3cb060ab9d
 EBUILD oracle-javamail-1.5.5.ebuild 1257 BLAKE2B bb9eb357f3297185acc36e1337018d4f2a864d512e772144e882e26f90a82c162ce8e49911802ea9925b2203f959567809bbc37e32a7e82de70dd27041194416 SHA512 ea40d4db114504653cbc39780c2a8c466d116c55d7d9e8822305fb10e21662dc829ff2d3dacc634f63afcff9406622dadfd757445fcc5020404172a49d8b8941
-EBUILD oracle-javamail-1.5.6.ebuild 1264 BLAKE2B cf3e3825d165a1f636c643f6d9d1ffbf9a4c2e4c31cf747f3aa74aa9541c448ecab27ccf8e7bbf587d667c2776b80482bb6cbff227cbd70f33a06403e53f7f9b SHA512 ecb9b1e99ff6d3e3fd3ed79af538ba5b33c82a654f14ae2ff140e1c4643d1232144c08adc1404a175f74cd91cd4a222a156d5da9cde38e592881c7ae188228bb
+EBUILD oracle-javamail-1.5.6.ebuild 1259 BLAKE2B 23df8cc69879f8f46455af9ec07461896a82b8dcff688ce660a608f7d9d7e4419458e7ac0c545e74e8b2072f3807f23cd1256fefed61e4153c8d9a8864cf6b82 SHA512 e3c61398696a2834594ccbfe99035a3661d551c51e892729c8dfa672d0422dcb22348f8e214bdff6347947a5405d93d463af838b68f1dd651d2f3168cfb86336
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index 143e962b47e0..b9cfbd3adefc 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.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
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 11356d9916b8..a61fc83a11d6 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -18,4 +18,4 @@ DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5
 DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
 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
+MISC metadata.xml 960 BLAKE2B 08132d03d01dbfbbaab7c4701da19fd3e8ecf9a8877e672e9c6d01afca3b4484d228f065a220fbf63277a0e1eda0f8ac6d918e653f6c527402db3d220adff034 SHA512 e43885c5dcd4a5e5a8d69e6025a0715da57131bd38f740449364c6e2f65abfc507eef3f1fc31272e1710b772b5f317f1fee63ea20bbede79fbf1b82cd014dd7a
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 366ecb8eaf22..ef1e9ad9d7fb 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription>
   <use>
     <flag name="commercial">Install features requiring a commercial license for production use</flag>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index e3ba43b7416c..e51a031c4abb 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -3,4 +3,4 @@ AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4
 DIST jre-8u202-linux-i586.tar.gz 90106000 BLAKE2B e756771caf8567c58870a267aafc9d48e98f06da1373a33bfdf40cc564c8df1645df38ad2f6951bc34d703bb0f4646b52ebf008dfc470231b4e93078c7730862 SHA512 573e32dc715d280084e71999e71a2875a488cbbba2b42c5107c55669c8842dd4ca6c6f42034b5e0b705c22a7a1d9799b456211034a6f351bc9d8e8fd803e0ad3
 DIST jre-8u202-linux-x64.tar.gz 86883826 BLAKE2B 8e69f4e8d6ce7d556ce7c8f30f5c71a50997103f729935269581f0af054fd1dc769b7099ad3a35d4baf41c8a6bdd76b049ae4908714701b196c4ce57ff61b39b SHA512 2460cde88162b00f5ca5600084f5f6b8720b8158869f5f5832fe886a5a6e839eb48398e9e3df47c45be257d9f6915e682d294d560b09e097ff610f09a76b1760
 EBUILD oracle-jre-bin-1.8.0.202.ebuild 6059 BLAKE2B 54348f5c7582bbca652c441d64639f6ae96db3775b299460db927eab5ae382bbc1680a791d91d210096dadca473b66990a96cba470441bdfeb6ab8a13e236053 SHA512 2671d78ef0b0f57392a58d7eb05e858d0bdb5facbc4ee46cb0044c19f63bbb9a532cca6c9214bd45dc9997ace391d86ce96aa159178e48db35808e320259031f
-MISC metadata.xml 669 BLAKE2B 45622e9b66d725d20eca519ef4a61be14c1ee2c7166a77b471fafc8cee81a008e23bdc46f2c87ccea2cee65d94e0ac7deeaa72a757fe776047ad8d4074bf067d SHA512 f1ce240052a322dc2cfe12a5b263156d4e008a5b74c5bf7b84f652d6d20abffb765b95a183aeb97df199a736be57a35e2fc5bc8c06cb2f296b453a6589af8746
+MISC metadata.xml 567 BLAKE2B 78bb5f186b86d6aff00538825186ed77d31e1270370a812e0aa5b6f059358144f01677efff63fadd1d9e9a927b40f87e783b0e731c883e28e6f8414faeba112f SHA512 77de100308e5febd2d11e2fc47bb0c5872be620ad6f382f6173574df657fb5ad0b0478246a5a3576457fc168df13b444dc1661228e87d0c5378e1288785e74ec
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index 200fc738babe..121d93f8f12e 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
   <use>
     <flag name="commercial">Install features requiring a commercial license for production use</flag>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/pat/Manifest b/dev-java/pat/Manifest
index ba98b9b03267..0012dfbd5ed5 100644
--- a/dev-java/pat/Manifest
+++ b/dev-java/pat/Manifest
@@ -1,3 +1,3 @@
 DIST pat-1.5.3.jar 135452 BLAKE2B a70e015f8510a9077922423e3623c64fa4f84fd7aba53c7b64e4ce367f400b237ddf42d09745c0954c186e782ffeb53075b6ec2cc0730c6e3f5440180e9836ba SHA512 4c62906a9f236351f8de457198e746229c48dc983275a95546815fe5af0083a54e204226abaf71ef01cf407c8be34f8e5594f65b126d45ff3e4ba75630ccdabe
 EBUILD pat-1.5.3-r1.ebuild 603 BLAKE2B bf7a13d715e1f7aa9adc4cbbffb167719e5af23ec9f52de33a7c2dadb444f37f9804a341c56a417555f63de93632c9cbcf9ed475e5d313fdab3507199754e913 SHA512 c2824e617ef4bc004b30db33e2b553660f1f68e7cb223ea4fd4f88f425d05c9b5738dac9d95cf467d98d82dfc3b781b630567436911701826b6483ff0c756694
-MISC metadata.xml 378 BLAKE2B 54e9bfa2522d4c005730794853ba9418511fc412b4f02f90eea095d87a4490195a9cc72e0c8ece2154b462cf622fa12e50654605c887fac3ac57d4f3afbb307b SHA512 0d49a8cd2b00fbba9c006ceee45537e4c1dcfa5a361df41aa6ea759e00e2949885b38febf3d11664be5a0690e3a6c0a56d0fb13183b219b99a39c4844aa5c408
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/pat/metadata.xml b/dev-java/pat/metadata.xml
index 9dc5267010cc..952a4b9b605c 100644
--- a/dev-java/pat/metadata.xml
+++ b/dev-java/pat/metadata.xml
@@ -5,8 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription lang="en">
-		Package pat provides a mechanism for compiling and matching regular
-		expressions in java.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
index 27ab7945006b..c8547d7444bb 100644
--- a/dev-java/pdf-renderer/Manifest
+++ b/dev-java/pdf-renderer/Manifest
@@ -1,5 +1,5 @@
 DIST PDFRenderer-full-0.9.1.zip 3877379 BLAKE2B fb8db9b4accdb18e423c2b4d659af07fd3f750e61e87cf047972807cd0774d5c1e04c15a9678efcd138b1c207770edf7b565468f3e8de50f21f89bc0fba4c71e SHA512 a678b7f89068890a00317a84557c659b4401450a94d8f7776df652715891a4c41ab138dbfd35093197848635e44ca2e3a114465a6049e746df87ab668ea74a17
 DIST pdf-renderer-1.0.5-sources.jar 1736806 BLAKE2B b897d4f30ae0143a6eb7c3499c5d7c165cd4e81c950fbe3185066d5ab6dbe68d874a5ff7561d35a65e014a6d8b82f92de73574018f58dd3817a32488c5b09ed7 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b
 EBUILD pdf-renderer-0.9.1.ebuild 775 BLAKE2B b16adbb2a0a2bb0c93521ac40b5b6a6915085a5f346bd06096d04216a15bd3e7eaec0b1821252783fb7bac50b21f8f879f64a01c6593ef1efb91e3e5ef9fce88 SHA512 27aa46678a3f31242ca0658a89a1f09bcca494fe77f1c9118224e621c7cefd40384ba6a2aed688e36506f6d354cfb9e15c38f477d26ce0cd7def19792b6bebc3
-EBUILD pdf-renderer-1.0.5.ebuild 509 BLAKE2B 021e603295c0c604ff24513a0fdd15f44383329c296960c86ff0f4740814a3adf921d8a72f0ca58e17c29f4657d2bb712fe942cb37e5c37d7137b70d5b93282e SHA512 186043909b93ca9ff85798522a0684e855743041b3a24a8596d651a422f947e176da0c9c550785a1448a3fed12f5646b7a20ee412447cfcf3efe8c839a31cafd
+EBUILD pdf-renderer-1.0.5.ebuild 511 BLAKE2B 2cddb4256d5c1a4479d878474429e3cf916399a75493438cbaabbad72386ccce090f35ad948be28ff8b5fb79acb2d3b1001758de8b4b2d10614bc210e2eb0172 SHA512 3266d368b3ec55923a87cd4ee5b40356baf33c247bff442a062580086c8b26eca290e97f0b3a32fd403d9a9928bc37380f8c9f33d4dc2237979028f52ecacb00
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
index 6a0cd762677f..bc86a6023c2d 100644
--- a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.ja
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
index f4f2da5b7195..8def47a74113 100644
--- a/dev-java/prefuse/Manifest
+++ b/dev-java/prefuse/Manifest
@@ -1,3 +1,3 @@
 DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
 EBUILD prefuse-20071021_beta.ebuild 1067 BLAKE2B 1728970ae824f34a7c49d9bc8c1fc8eb872fa6407bcb4310bfcde096f6bd71536e4daa7aef840b754ce19d5e9e2967d6b676093dcc2e0a02cf3e7754006cf11c SHA512 873497e2f5aa231a0edf3ae37d4ea819e51440db21e25f996c17420c697f175bcd5de72c1c66b5ad5b3f9ef18301577d7b53e3b883103b2b807d2766f0d52b08
-MISC metadata.xml 463 BLAKE2B 4533a338f44bf64fa4ec9875db7e6016ad374ad8fc579724697cbf1f098d9f7b96fded2a6836a4e0923820d5b25c5f9ff73e20d6e6082a21d5b48f0f2725caf6 SHA512 b3a36d44af155a6e546a49b098a2ceeca3885716c558fec5a4e15dc9f08f0e0dc5dfa4f8c723802d58b3ef3959e6199609eb8ac5cf538cb5435f8c56a19a0a42
+MISC metadata.xml 313 BLAKE2B 4c58464a558ef769445dc029aff83a61f00a624b682a6833afd628af131a6199dd2026207e1588a17fc76130887067fd77ba5dcdc91b7c32a2bcc4bb000876e8 SHA512 101594b620b635c505b85a05d8978894d22ee7fb60709ffc0c5144fe1e8b949e64932a62c2e9530fbe6fc37ea15b29178e0465c39f0001e3635de00d2ba18745
diff --git a/dev-java/prefuse/metadata.xml b/dev-java/prefuse/metadata.xml
index 618ca6a39cdf..0a5f19a7b6de 100644
--- a/dev-java/prefuse/metadata.xml
+++ b/dev-java/prefuse/metadata.xml
@@ -5,10 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-		User interface toolkit for building highly interactive visualizations
-		of structured and unstructured data.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">prefuse</remote-id>
 	</upstream>
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index ebaecdaea6a0..37509418908b 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,8 +1,12 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
+DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
+DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B e0844dbc8e68248c33131d2738940b29308180e6915e76fd4e2226ae1ff41a58cbd686246286f2da8655d0295e0de995537b831f33cec37155865dca8473463c SHA512 4898ef42ac269dede35e5bef0ccf36fa3801df0cc8c7f4367575ba138b5ff9783a9f2e9086f7c0d1bda2d3d247b6f9ee8c3bcfb1eead59af6a63c2a7cc0a4e29
+EBUILD protobuf-java-3.12.4.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
+EBUILD protobuf-java-3.13.0.ebuild 1407 BLAKE2B 9beab81a4efe605df1e064a6f0aba18593ecca121d3c430e6fb362f86af8f4fe11285edb25e579aa8b5a4566ce3697763a8547c2ba40c7ef5f8d697ca7748ff7 SHA512 6320ebc0a8abde69c8063a510b2f2448419f0912988fcbdf0a991b76b59b8a1607bab9f1e5881face94a40ed7d2795ce6c5b4e9b9c18e34db1fe6a111115a202
+EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B 618eaa7131820759feb68c280eaf968dce8caf6ee527acb0f2be9fed4d6641340dfd4663ed8e3f4dfec479d74fd0da80d421466a5aea5bc7f8b9608988d40f55 SHA512 b6d704eb44be00dd49d7c9fd7da33db993803ccd691f262ef9467794a4e55958a2b5ada5fa0e52a6727b58f6f4143763c1af865c115d3da43d099066984ab0e0
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
new file mode 100644
index 000000000000..09a8150fe7e7
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
new file mode 100644
index 000000000000..00495e65a87c
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/24"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index f4a234c2ae7b..fe8374195d67 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
+SLOT="0/24"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-java/sblim-cim-client/Manifest b/dev-java/sblim-cim-client/Manifest
index 7b8f1da70802..108fdcb6eb8d 100644
--- a/dev-java/sblim-cim-client/Manifest
+++ b/dev-java/sblim-cim-client/Manifest
@@ -2,4 +2,4 @@ AUX 2.2.1-no-network-tests.patch 2189 BLAKE2B 279e37abe9d43333099ed671a4652283f1
 DIST sblim-cim-client2-2.2.1-src.zip 1082959 BLAKE2B 7750fc15e5f8da1f98496e99a5b5adacb89ac72782af88d8fb467c1071c2a4a736f2ab68a00bc381f91e20b756eb98ad96540bdd4836ba35ca2759cc2848277c SHA512 b7e1f56b87fa24c97d8b3e97261195ff04ce13839e72f4b8824daa8b9854158ba10c0bddd16e0650197125510d68adf6f4458089d132278510e10bd2b25b4aa7
 EBUILD sblim-cim-client-2.2.1-r1.ebuild 968 BLAKE2B 736eda2fb5b383e38ffbbf454bfa64b1ae518ae16667c0f53ffcf28b170d598562f21f52bfebc8d18c678beb17b1c3b97eea7b9c1e8a70eb64894f2ea52e30ac SHA512 619ea7d2d9c2b6bfdedf545a725d0974a01204a92c18e777cabdebc969a5ad197fe6c14a15f3e822421dfa699358578fdcde88b563f396a2f5a8cf4430314731
 EBUILD sblim-cim-client-2.2.1.ebuild 890 BLAKE2B eab501209ba82371ae0ac7f2ac646f513c06c8fa86a19dd03ea8b8f91de43cc1bde4a5084e64520d8b96e3e9c13fd67e423e3e8074f3e1173e6b2b03e9d94f65 SHA512 27a228fc5eeb7a2341d0abeb65124153c21377514949580835304b27fe636056dbe76df08110f8ba646e9303a6b898dea475d6f7f8cb45e5cc3b7bb790d0f9d7
-MISC metadata.xml 487 BLAKE2B 3ac468868caa94f00b2f06259b16cae8a263731bfe01cdad3b1bcaf701d32a7a7d78b06ad4a5986f63d1bbf75e7b5909e5ddbfb628740fc4b12dfe2e7775bd72 SHA512 502f8ff73e7b292c109c2529b6c5f638bef938275374f99ba2f9a54202225dbe456d1724217019c0ef85647ca90e61926502cca7084187059b4c3beb1ff21127
+MISC metadata.xml 311 BLAKE2B 8b486e7644b87a394ec5ccc61dab397aefb22e4db94bc1a42ef764b072897f71143a992c7dae561da05b4d3c04a361583584f4401b8687b982e8e87f3baa7891 SHA512 8675574db0408285a6c8ea63bbd507d1f594f3d67b33769fd31fda4ff215d4bf451922b45f2adb92a714f89c27e0296776938aac5fcd38667ee35cb5ee36d111
diff --git a/dev-java/sblim-cim-client/metadata.xml b/dev-java/sblim-cim-client/metadata.xml
index 2fca60503e43..30c9b9a40524 100644
--- a/dev-java/sblim-cim-client/metadata.xml
+++ b/dev-java/sblim-cim-client/metadata.xml
@@ -5,10 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription lang="en">
-		An implementation of a WBEM services client that includes an IETF RFC
-		2614 compliant SLP client for CIM service discovery.
-	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sblim</remote-id>
 	</upstream>
diff --git a/dev-java/shared-objects/Manifest b/dev-java/shared-objects/Manifest
index 56fca0e189b6..51c6de2f9163 100644
--- a/dev-java/shared-objects/Manifest
+++ b/dev-java/shared-objects/Manifest
@@ -1,3 +1,3 @@
 DIST shared-objects-1.4.tar.gz 45304 BLAKE2B da6e3a117e4fd8c626d22860a341eef3d48171d6259c4c22d3a386b2a1177af70218eaad928c10d479bc31d4226f9521fd07c8ac3e530f9f28e45a92a7f93b6c SHA512 f051458244a88e44c249167bfad0f88f0efa971fdadc578efcb83ff5ea805356fc68250bb4511ec181b5a062b4aba69463f212e913cf96ba98bdd3966e219f39
 EBUILD shared-objects-1.4-r4.ebuild 598 BLAKE2B 2a815d67f500ef795fe6051f01777b9c104fa8c623caec692909cd568669edb2f3d6309a1cab69b2f34a88a66ef95b57f51bec320bde75367cd28207c1cdca3d SHA512 f7d35ec52d9309c761c467a497b3b4eef18aa30f030b0ea31bbaeaeeb167fe444e9bf118b97c8ddaa85adbe62df8a6d5e27dc1d486a171e60b7303245a51a90a
-MISC metadata.xml 353 BLAKE2B 0dcefae2d966516c5cefd302af327b8a0d45ef40c61158eed9d1e0e679e28261fb10cbb87f1dd46e684700f5d8c6ae1fe5f93d839180b8320ab59664504ae9b5 SHA512 400b92deb52a44c66bca90bbc8bba37a66f803a611ac740cfd087769543372ea9a2861732f1a894219ac7ca98dc11919989a49d5afef05def23f7b9266f74f33
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/shared-objects/metadata.xml b/dev-java/shared-objects/metadata.xml
index ccb440ab8c97..2444066aa02b 100644
--- a/dev-java/shared-objects/metadata.xml
+++ b/dev-java/shared-objects/metadata.xml
@@ -5,8 +5,4 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
-
-<longdescription>
-A Java Class implementing a core factory for maximal sharing of arbitrary objects.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index c21176b3d38a..3046c872e493 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B 572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36 SHA512 5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
+DIST tomcat-native-1.2.25-src.tar.gz 421399 BLAKE2B 5033b389cfb8b2899fe57c75f5d6d6bf77f4646f3c17aed51109c30760fa5642a8bfa5137ff5f97c571a853b0ae5b1b16244bf286655b6b252ca7ad4c2e3892a SHA512 e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
 EBUILD tomcat-native-1.2.24.ebuild 1178 BLAKE2B a99246469d416372df02e87f7a401e3caf013a260c8d75ba519c26ad0fe0b0b7d56462b738690b6635b265e6d343942320a437699e3837f802929b30829bdb40 SHA512 eb969c2d30befcda019b155e8845a922471d16be31aefa8b2d15ee21c14153a491b812d838b31261867e669d35759e2975674d719e6bb80990a2fa0ccac8e215
+EBUILD tomcat-native-1.2.25.ebuild 1179 BLAKE2B 6f6768247218c3f40ea7b89d03468e1bded2962b354f9d14cb4956a3d0656ad84017a2d9b717d12b0bb4c65c7e5587f21ed014974ca86e7c84911261ae81a0b1 SHA512 25aff507afd4a8b1e4f0a485b643caa31b234079ba368a6a8d524f2cc70d9c32de19a967f176c8a59dd276eb3504a01bb684ae6b438fbcd102f1e416b1e863ad
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild
new file mode 100644
index 000000000000..2dd1db52c691
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.25.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a13a8546b3f0..4630d40ec677 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -16,4 +16,4 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cac
 EBUILD tomcat-servlet-api-7.0.105.ebuild 906 BLAKE2B 275c28cec529a0e2eb3a1dfab4faca4a557555744ef8cf3a6b68c88fbd48233e67bd414c809d03aec790a33536117605d5c199a10f5224c15e07976d19384503 SHA512 37763c6d8945329c26fa0c3222b58ad5e5944fd35708a58c149269cdd1596bdca80db0c450a9db6604bca6ec87da4c9abc4f53fddf1decc94b25d4b9dfd7205f
 EBUILD tomcat-servlet-api-8.5.57.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
 EBUILD tomcat-servlet-api-9.0.37.ebuild 1012 BLAKE2B 0bfd9e19febd187f1a79298e5c051e8eba1bb4f72c64cda5bd90f64b34772b851008241b3866ebcec0a59aee0c0d4d29d2b883ce2f9c9a3253280e58577fe3b6 SHA512 4831af547dce2d5372fb7fe9f79cbb2bafc1c5bba3435477adf71c06ebf9498792f06e2ae321bab32a4cbad6eef64961c1bf6c4db611c796f036bdc5ff8bcde7
-MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/metadata.xml b/dev-java/tomcat-servlet-api/metadata.xml
index 61b379cee8a1..952a4b9b605c 100644
--- a/dev-java/tomcat-servlet-api/metadata.xml
+++ b/dev-java/tomcat-servlet-api/metadata.xml
@@ -5,7 +5,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>
-	The Apache Tomcat implementation of the Servlet API specification.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/vecmath/Manifest b/dev-java/vecmath/Manifest
index 57c27a809274..27ad04cc83d3 100644
--- a/dev-java/vecmath/Manifest
+++ b/dev-java/vecmath/Manifest
@@ -1,3 +1,3 @@
 DIST vecmath-1.6.0_pre12.tar.gz 121968 BLAKE2B d93e159a5d235ebf3724880ba19195466955844272e6ebcd4f59061967305e2bc63bef21d651aab3f8998358816602ea529b7d25f71a9b030e74594ee3a983b5 SHA512 b885a83b91af7c3560e7f8e94d7a8da3b00ad7db4a0f2edef19c1525fe7ae48e897d865ef2bb64800bde197bc9c969517c9c526d6ed27d25cfe87815a64bc5d7
 EBUILD vecmath-1.6.0_pre12.ebuild 804 BLAKE2B 41322635fd87a0ddb313010052ef7ed0ed26c713dc1b4e60ecd6d00bd14a6672e724450a954f439e38df8f0fa9ad96c5c0ce88ca910d9f6ff776b7b01739ec83 SHA512 da7f20c953d40b1ee5920132823cbd657712e99cf814e017c685de5a48e6220b30ba81064738ecd84df67a2f5bc01c7af0a854879eff68a5021e303b63f92ee1
-MISC metadata.xml 405 BLAKE2B 3f8eb80b854cf3b3f8de935d3c27ed68ac216ec6de9d353e6803984ba7233b0cf7294dc5ea7abbfc0ab4fa10a6dd5a3c8630198a8225df51988264eb5377a3d8 SHA512 a133b08ff3f6125ba1f3b7bae14f62b9615f1588a54a9c9d44f4c6598616766d7e54610e616f0d2687aa3e6cb36ebaf924a6b3acc1f73c66aff5f7cb7c176ead
+MISC metadata.xml 318 BLAKE2B 47aafc750e8c9b1ddcd39b0eeebcb5968dd85d2e469e2e5a1837f9391879899ebf4d81b08e407c6f9f6cf89a7e6618726bc6992f7ed4d290ec7fd3f66f8035cf SHA512 8309ed8b503817623e34fcad53b58fa3d7a6735fab011f598941a9811f6333cbd0e18b1a045473ed289c79fb0cf986d6af2d8205e777cde3710c70be199f028b
diff --git a/dev-java/vecmath/metadata.xml b/dev-java/vecmath/metadata.xml
index fc75a8b361f3..278351f839e2 100644
--- a/dev-java/vecmath/metadata.xml
+++ b/dev-java/vecmath/metadata.xml
@@ -5,9 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription lang="en">
-	3D vector math package, javax.vecmath
-</longdescription>
 	<upstream>
 		<remote-id type="github">hharrison/vecmath</remote-id>
 	</upstream>