gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-java
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
66 files changed, 1465 insertions, 734 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 870f3a8f8112..7061b9671845 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 19ee2f8409c6..a55bbc70dfea 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,10 +10,10 @@ DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd
 DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
-EBUILD antlr-2.7.7-r7.ebuild 1088 BLAKE2B e142dbcdb4c0d46a6ffe42b9106156e1ded900014521ce184c0b1f124c4424c059034d60ee0ce1e115baa1bc820934ab98047878522294e355291c19310b71d4 SHA512 f4d31e2a60405ad2934321406f6ade73bdb903ee79304a3726351adbdb8f5f89a1b284fe27e796b3aabe8bfa0b71d0b4941fdc045492ea001d1f0005634dba4a
-EBUILD antlr-2.7.7-r8.ebuild 1099 BLAKE2B 33c966b64de3577aada4aa8e19b367104f89e236a42e78b8ea106682030a5989512e24ed0dbbf0b263716c9c7a081fc81ff1fa77b602d39fbac0abb1b0298d3c SHA512 a308fb2c7c359d206a25fc4215b37d72220f5e33425577d126379c960d1a009c7644dd18dd0e5b5b608abb55c7c34a3f25abcd826cc2c617e0a8d581c10eba02
-EBUILD antlr-3.2.ebuild 3242 BLAKE2B 19729b322437e4ef21672eaa432568b94a6f6bc0efde5ac856e148c55a3bcccf9fbb4631421c2f25a7d09f88758033d2f830d1565ff88051eb7016473b778fbd SHA512 38d68d796dc5ea1bf214779642e9ea40840295c6caf69017bfa92ca623289f9ac532e5262a64d48bd8ef1c709b45a1a9590da8e0636c37377649a6c335bddb5f
-EBUILD antlr-3.5.2.ebuild 2995 BLAKE2B b9825d24f8743279add37e97612644fdad2ff5731ad1806fe610b87e926461c1cf5913c64ff5be1321ca88c46a466a66f5d1bbbbeaaf87eefe4b9c52352bfa34 SHA512 abe140c64f10c39f82c5771acdb2a848ca0ecbfe718a0cb9514805c2109c2f4128b97ae8e5abb81f63417507dcbf5b23b42850d48f1eb826c7e0d390e64cc0e9
-EBUILD antlr-4.5.1.ebuild 2452 BLAKE2B eeb1ef4d8aac8a1317fb494c6943f496d39f706ad4f077afb58efc90f5b92ceb7cea296c0fbd4f1f31dc2c7787f9191eda7cb47584692e7984dc53b4e1b1e1e3 SHA512 ccb84e30811f01bb4d28d38117c75c79b8e0048a86d06194bdfe1aeb7de5b33b9d08e907a850a8a3714e637dcee4a7a396cd314ffc6c8472671e236220bbdee2
-EBUILD antlr-4.5.3.ebuild 2455 BLAKE2B 13f8824ca0268841a2ff9493633d3308853e020c5b263ece94598b1db48d1720139b95554eaf8456eb24730d1645dc19f656d2cc4afa52498900d3628c08e7a2 SHA512 03e9c3c64e3c04f14ef82b3fcd5d3018778f39e8c5386da05071634c14791d6335ed3212387cd0ecd7bf4774c5a3d2a49569e566dfb61ea6a66fa71ba4857841
+EBUILD antlr-2.7.7-r7.ebuild 1087 BLAKE2B e866bec6a53c4476202468cdb009b266a3ef0748b5ed79c71e6baa2d30da07572804ebe59e332a569b2afdb97073268b0947e0747421140f792425bf61868152 SHA512 c06da2c925aae9677b26a216f3e3fc297bc40212f7255ad7b19b303895ef13a0905588b02b3f9c2521b03b82092f6692d28517bdabcefcfaf7d87e32b88fa16c
+EBUILD antlr-2.7.7-r8.ebuild 1098 BLAKE2B 4ac646f7bac4b5ef9c614436eb39f0fbb83629ef2861e1875d0901aa48f28ad0d618ab3476be5efa2c4de8c31a7d0d6428ed99923f6d8e4025b6d12fd67d442f SHA512 92e22ad8ef1ca16072bf1d436779a868149bffcc2e9e5c1ca7b9c6ac3b10a0fceafd40f33ec2e0195c422174d9929abd50e5c3d17610a63c03adb6cb5033aa3b
+EBUILD antlr-3.2.ebuild 3242 BLAKE2B 4d463526d52ef8388f2a7cdac14bfca58e9ac8fc7b5d7abfc35dc68226148de413011811bccd1bd546646f7cba66e4cf148a807af6d4b14bf578e79a24e64a6f SHA512 39c832838c3d41f2d8c73abcd19ecbf8477e32e9272435ae6e2751e2dd083f61c4ec979e5d72d0df29cf27e0ed40339e322c93fd6f076a9217b71ebbe6dc277b
+EBUILD antlr-3.5.2.ebuild 2994 BLAKE2B 89247112dc695710cebef62ccb98993d502919a508154485f2a7ad70ccefa2baa7ac693c763fd1bf8f378a256328a795b6377009f9e1e4d4f523b9c03f2c56b6 SHA512 2dccce51680acd132dffe98c26fd0a99cc5242c9a8c68e8fff2b1c208a575fe518ed4f1ad5f318942eff08535a3871ab0b15a1bd4f23fd38a38f3bd8d81bd2ee
+EBUILD antlr-4.5.1.ebuild 2451 BLAKE2B 7c7352432059072d726d3549c2086aeb90f784ab1e73fc09a9d5d0fd9326de74542a1e567a0285f4e571f8a853b33e6027858fa81bfd47401483229b92c2918b SHA512 6b82a8149c534b23285d929410138a2c6a888b6ea5283f0180094ff1f6f8239f918e011e92f3281e95a620e6d1f134d92de91067cd8abea542bd84b0a36b0ada
+EBUILD antlr-4.5.3.ebuild 2454 BLAKE2B b89f966069c356af301f53d3e6a270168d47e6fa1c349075b1aed60e6caf2567af8fe4af3b0f31f34f0360d77f6998bed80d9f72a885b3f1e75acb29e20a8587 SHA512 a55975e3c26da42281dfbcda08314d20515822688188a84a10f6834286daa815977528ff2ac3a53878ada84a49410706075185340655c16928d5fde5b0e0da9a
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 09dc38c165a3..c999d7417a30 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 10056965f258..de3952a26d09 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 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"
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index d8976fb16787..48831af505d1 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
-SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
-	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+HOMEPAGE="https://www.antlr3.org/"
+SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
+	https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 46c6402f4b20..ffbb7faf52a2 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
 SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index a7c4c1ffbb73..38d9b405e655 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 3b48b132714c..ed1027b16e89 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index a2bd7b8ae003..815192b2e69a 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,3 +1,3 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
-EBUILD aopalliance-1.0-r2.ebuild 887 BLAKE2B a7587aeef882bfa4b2aaba8fc852f0b72afed62e967be6dcdf8d706bae856a99642c6f3731b68cb4c8adbc2876869a09f3fa0e3cd425efe2f0574699920b7059 SHA512 abadfa5574950edaa6ef3e40b238fadb79e63fdb73aab22ecc27c3f71d76cb3e74416d442efef798425a008f3c7c4602e458b5a925df27ec14ba559229490369
+EBUILD aopalliance-1.0-r2.ebuild 884 BLAKE2B fea455d72fb5aecbf124ad5d1cbc03c48772f67fdc8278dee0bb5ded7b734dc810b359b3ce66c0e6d194058725dd08867eee8169757c376f4363d87bea1bd95f SHA512 e413f134cc19802a46865abb8ff281ba943944234fc677b59b0053ae03e4785a80ec42d8f33b215363a36c9bb5f13460ec9ade5d651622e615c1987c9ff600d2
 MISC metadata.xml 317 BLAKE2B f5a883f65fccbed912af92c6fb31d77ab3f3b865360220c24c33a410ffb59ff7b7bfc03d9af13887dd6ec8cee4e4ca2cdfd04cfa0aa1004827beba209364f433 SHA512 566df2a1062c0a0b5be648ee6d5163645ccb7ca885b8883a28cf1c851a9528d4da7eeacded56ed0270f4b3c8eafa61a808de5b27f9790487d107535b39ff4360
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index 67ff490caef4..4c1a89b6d3d6 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,8 +22,8 @@ KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
 
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest
deleted file mode 100644
index 222661e99ca8..000000000000
--- a/dev-java/echo2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NextApp_Echo2-2.1.1.tgz 5372814 BLAKE2B 3c16154bee1f32ee06d6fa0dca4c6108a3b7cd5be9d689aaff8102815e8f63d7efc2e3a12d9e4637f5fafe98ad6df36be1d9006e0f31db9d05a11b1470b7dfce SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26
-EBUILD echo2-2.1.1.ebuild 1162 BLAKE2B fc69efe240c837f23af0dc1086d94e665326611e7be7dce59d119b81d8f8fa15ed49fcf4b5bdde4a24c49c7a541f7a1672c1465464cbd05d33c637bca61aa3a2 SHA512 82c8371709333ad61e5294062cd2c0fc57caaf49c52d99da0e8ffd1ff13feb0dbfc776e7f46511931010e9d72227ecf65c2abbd31e33deea6d2c3f761ad9987c
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/echo2/echo2-2.1.1.ebuild b/dev-java/echo2/echo2-2.1.1.ebuild
deleted file mode 100644
index 02b9fb84f2da..000000000000
--- a/dev-java/echo2/echo2-2.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="NextApp_Echo2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
-HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
-SRC_URI="http://download.nextapp.com/downloads/echo2/${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/servlet-api:2.4"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}/
-
-java_prepare() {
-	rm -rfv BinaryLibraries || die
-	echo "servlet.lib.jar=$(java-pkg_getjars servlet-api-2.4)" >> SourceCode/ant.properties || die
-}
-
-src_compile() {
-	cd SourceCode || die
-	eant dist $(use_doc doc.public)
-}
-
-src_install() {
-	java-pkg_dojar SourceCode/dist/lib/*.jar
-	use doc && {
-		cp Documentation/api/public/*.html SourceCode/javadoc/public
-		java-pkg_dojavadoc SourceCode/javadoc/public
-	}
-	use source && java-pkg_dosrc SourceCode/src
-	dodoc ReadMe.txt || die "dodoc failed"
-}
diff --git a/dev-java/echo2/metadata.xml b/dev-java/echo2/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/echo2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 5aa3cd705a67..52ae123df1db 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1096 BLAKE2B 196f94f029d9cd4fc082fd37c264587f55f0778dfd564272723dd0bb25b5a7b0b6ff4bdb05ac2cbef1b2452581c2bb57a51688a999d31234d4bbf41ea62699fa SHA512 417d45a6c6b52990a7e4ea1fafc75aea163dbb8b1f7eea87acea42597bd03bbc0a339b5ad7b829be3c2c24b5d865028c225da4de205767ace6a4af4d25598c39
+EBUILD java-config-2.2.0-r4.ebuild 1092 BLAKE2B 863a02cd241a94d3bdff5023ec2a4ada4404368bfbdfe31d95b69f09b31a070bf5df59b6c2609e4f7bbeed17d79a7e23e7d406a7f0d9e1d375983efd998b0b9c SHA512 3cc00a8c4055786ac18c1880390c0bd7d6169bb17835017fd9285ea985ac29d727a964e6c1ef84d44fbbb20d547f0b603198d780cfe052711b38e3651af40329
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index f74fb67ff8ff..7026650e464e 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 73eb27070df2..d4062a23273e 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -3,6 +3,6 @@ AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a7
 DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced90440fbc9f36d250be3c22a82b901b7f46486c8c7512784f9fe462bf3ab3109ecd7482bff13737a1c7dda57ef0aaf3eb SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1
 DIST javatoolkit-0.6.0.tar.bz2 26009 BLAKE2B d99695ee6dd9df2eef3612418aee4b28acfef06042e633abd05d8876d054c25499f4fcc15f2446adb28c08d4715cf1c1425c358324a7c323604b9f218aba5db2 SHA512 ab17ce59032286af30f238a3f0b37b5ebee2bcfbf4029239fce5f691265f87dfec3a7b29972a3d03aebe79ec22c435c2e37ca0e009fd8d53a58e7424a5e61409
 EBUILD javatoolkit-0.3.0-r9.ebuild 892 BLAKE2B d482eafeef50138a13c9f26c954d64a1dc342bed789c116fdd7d3fe76123d1fbf1c0b052d94a5457bbfb0e0eae4af079c58299b608271bde9399f106da6b0f49 SHA512 a0e91098feee018748081220a78ffbd3e59bc85bba891037a954d4e39e238bed64cbd356c324e90a13823b07bb86a984712db5b6e2dc1e375f138cc7a25b5201
-EBUILD javatoolkit-0.6.0.ebuild 837 BLAKE2B 5421371c1f81b71810b3d64dcf38d7d4d755bb6b852f6a0c65404bec5861c3ce24bcae0e3ab6974e15ab9c2f1a136e6d57a8563a09a6333759a1d7964827cfe0 SHA512 192f7c45fc04250098e460ad3ca08cadcc590d2e02c1f4abf9f36454662af7fb264b5280d67defa326264203f4952104337d6f8734a3ab023287b8258cb8e722
-EBUILD javatoolkit-9999.ebuild 681 BLAKE2B daddf6a3cecd684ea63cdf8c0a56e9e3562c58ef47263289360b63b818c5f2fb323880e13f7ca3b174ef2d9841b1162c8d7c9b9e7ca6a35fb108a2157bf3b25d SHA512 696e6bcdcea76d9b59a65a80a79cf78e1e9634d0a7eba18dd5700edb328b2773399b1dd8c973d19b0aac3c31953015bc0dee37861ee44f551108310fc249997d
+EBUILD javatoolkit-0.6.0.ebuild 832 BLAKE2B e81d4e7cb2f98cbec94475ac1293825db46b20554b1c614686c628988a3814760bc48189738cd0759d60f1ee46ac871b6591a848fb6d2ee6674fbc455c27e646 SHA512 6dbbc6731aa7ad8c624328d12efab4dd479768ef37fe606256dd3f3c88aefeb803bbbb836bfb2a6149dd67ae1275942c33230039b04e4e622c8874cb24a2eccd
+EBUILD javatoolkit-9999.ebuild 676 BLAKE2B cd8e02bb65fd37d6eb50e7283dbd74ff9c1a9636056e83069693612c0760858f9f4ea2498545cc860872fbfe704c617068423adc483ed90c9f6386826452d2cd SHA512 56812eb6eceac6151ce6ff573cd7ed2d936a5188c84571bfcbf285d9077fb5dd1219a4938062f238f3d3187c79998deb09b1fa2b7f7fea965dee8a35ebfbcbf4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
index 7ba41de80a3c..9e181f000cf4 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 multilib prefix
diff --git a/dev-java/javatoolkit/javatoolkit-9999.ebuild b/dev-java/javatoolkit/javatoolkit-9999.ebuild
index 60ab2e825142..798742d29afd 100644
--- a/dev-java/javatoolkit/javatoolkit-9999.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 97f605c98216..5f8f5fdd329a 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,12 +1,21 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_9.tar.gz 194151421 BLAKE2B f2190472dc06a297ffd9fcdb69e6c432503599297ad61795ee6fe57fe7475b1bd8b32105b29da33324f74bd34de2050809362dc4cad0165fcbd09b88d75431ce SHA512 c4703e840aa719adb35e83286fb921a3e8feae08e5b483eae726c892ddbc2c312c43bec3ba093e124b8541d08e417e46dc4dd0de3d5b1aa00b253e1532d43edb
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_9.tar.gz 180384673 BLAKE2B 51cc7f53c371dc140f9cd17c3523251929e384ca73eb34c283b969be1b5c91b1ec15bf72fe08c80b141a96aa0de5dcb0c9631e2f776e123ad5a4059174dfbc1a SHA512 00ecb0fe1e5b4f682841eeda41525dc5a9205e55ec8ccb332aa1dc724499d2df927870c8b70da950384b50a8014bbd70d0025a5ce0ccb90bfc4df028e64613cb
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9
 EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
+EBUILD openjdk-bin-11.0.2_p9.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
+EBUILD openjdk-bin-11.0.3_p7.ebuild 2719 BLAKE2B fa3bc2d29ead40bae119d5922547684d0612ac117557d3ad99dff2b8359fd847e0a86002f12f362b6bbd5db2033a3d4e4f5c18331c53acbf6e0930b16d716b3d SHA512 94f78bd9968083bcbaf72e990ce8f4071183e406c6f98fad0702845cb4f3c720a15fb088e390a70c97659e462b86993190565198e32f31d8c56f03aebde10b38
 EBUILD openjdk-bin-8.191_p12.ebuild 2590 BLAKE2B 29cc600adece87f8d040891e5ea84fdec01245e5823d7cfc9631010cdfd053545b9fa75aadb74b2b882127a87609404a7f7e4d061d7854110d5a08f4bb6359d5 SHA512 d16e2f164b8f521a3d36f24c56afef4f9b0b7f2bf01edd22d5267689f5186afc2c1079a547d73c6ad61306e3b41ab8b3dc6abbbded0f8e8444b431d4c86f6c58
 EBUILD openjdk-bin-8.202_p08.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
-MISC metadata.xml 921 BLAKE2B 9441e4d8e4ab3fd0c0523e7d96a60b6e1fd77e863fe6a2a9ab709d50864d72467304543c6771acea567440f9b02ab7b9c63053fe73c2780e655a12976964a4e3 SHA512 5ffc9ebc2ed1ecd969c0ce65032b174ecdc74614bc7f751d069d4cd2e2a17019bf24f6c1c3f27a0ba4f7ca2e78fb6ff420b51f4997fc8ec206e88af6ee8a0106
+EBUILD openjdk-bin-8.212_p03.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
+MISC metadata.xml 1027 BLAKE2B 19dba71d9f0c1136eb90f90ed4077275a75d7217618048f669879372fc863875c52f95c7f29ff9eb93a922d1dcf6249dfe742c34ed40b795b36e7be1efa658b8 SHA512 8e3eae238896c378a4807d58597566db7e059a0d892e949dfce095136a2788f49bfd736c4577c13ad35924a65c384fd308b13146944dd8ace382fdf6e101db56
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 7b83622b0d7c..5197cf9973cb 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -1,15 +1,23 @@
 <?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>Java™ is the world's leading programming language and platform. The code for Java is open source and available at OpenJDK™. AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.</longdescription>
-  <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="source">Install JVM sources</flag>
-    <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
-  </use>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Java™ is the world's leading programming language and platform.
+ 		The code for Java is open source and available at OpenJDK™.
+ 		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+	</longdescription>
+	<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="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.2_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild
new file mode 100644
index 000000000000..ad6e3e5d68c6
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
new file mode 100644
index 000000000000..8cc6752e5ae0
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
new file mode 100644
index 000000000000..d214f0e0b459
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+	$(abi_uri ppc64le ppc64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~ppc64"
+
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:1.${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv jre/lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v jre/lib/*/libjsoundalsa.so* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr sample || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+			{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
new file mode 100644
index 000000000000..302eb06eaf67
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -0,0 +1,11 @@
+AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
+AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz 41525058 BLAKE2B da456e8415ef45d07968c12082f2351910284b47bac92a952d4962fbc4c63cb2fa006696b6b175e0d1073b1fca76cca61460465d0959afe80d2f5ce9006d9350 SHA512 96b527be34c49e6351bed0d000153c1bc9491cf89f8a7f90190feccd2984cce1e3d18747e108d476c4417f15947d436f20cd34fe88f8126edecf4a789d725b0a
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz 41732132 BLAKE2B 9d3bd543fec6eb6c30eabbbb3ca6073365c5b8900dff9af47cfba5569ecfc33a8e2562ed3f8cf4940b2a7d7c427e48164a94fce1f72c8e98fa7f0fc32d923237 SHA512 b7232a3c75a8c4e67f51bd95c8441026b2bfef29cc779768a5f2d300208dc569d672402e06a2d6c6f512450723bc0631c5a18cde80cbc1ec2028c123607df30f
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz 40856726 BLAKE2B d9d4599989a0232bcc145aaf58b20dbfcedbe33adb2b3ee65b7e726dea350210f66eb81b321268a29d3234244c517642cfe908531242afb220509666e02c0617 SHA512 f9bb03cd0876f6b3b36d8ba821a14648b5ac2ec6dc6eefb95dc333aae77b55c940153cdd1715b21feaf7d7f2148bf8c272777c8afab911965e514f9792287962
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz 40871242 BLAKE2B 8a6eee7f7465cbccc575e44ab08d6a3d2cedc32954475ea71064a4b6d4379927a795225fed7394922bdaa2a425efb6966d6a0126a55a0fa0e68dc0eeb7a6e935 SHA512 3b0c560cce673fa0e9506c18c4a25b56e26c8ccd7874098f55c37f1a556387b4c2d3ba81ef0368cc666178028eef0fd7beac6307588628c8c8c051381a21366f
+EBUILD openjdk-jre-bin-11.0.2_p9.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
+EBUILD openjdk-jre-bin-11.0.3_p7.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
+EBUILD openjdk-jre-bin-8.202_p08.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
+EBUILD openjdk-jre-bin-8.212_p03.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
+MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
new file mode 100644
index 000000000000..ec0dca401e6f
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-11.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
new file mode 100644
index 000000000000..fabc13c4091c
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin-8.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml
new file mode 100644
index 000000000000..7a807f5dbca1
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Java™ is the world's leading programming language and platform.
+		The code for Java is open source and available at OpenJDK™.
+		AdoptOpenJDK provides prebuilt OpenJDK JRE binaries from a fully open source set of build scripts and infrastructure.
+	</longdescription>
+	<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.2_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild
new file mode 100644
index 000000000000..1f10efc02641
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+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"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild
new file mode 100644
index 000000000000..1f10efc02641
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+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"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild
new file mode 100644
index 000000000000..2af8e9e8e29d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
new file mode 100644
index 000000000000..2af8e9e8e29d
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		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="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 869e478fd39d..ffd589d9957f 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,14 +2,25 @@ AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
+DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684
 DIST openjdk-8.202_p08.tar.bz2 449202 BLAKE2B 8f7442918c083e94cda0e029cf2348dd9242653027f84d66deebe162e0928b2c6a86d3f273ba235bad5e5656f2b109e6521aaccfa81332fea92873d008ac0c0d SHA512 586713b889dd60c7dc65fccd39ef3ddd985ebb95a7c6c1feaef3c8d76fd1d929bbf19a99f72274c1afb77bd7f80b581d44add4aa232358d8951f7cc5befb43d0
+DIST openjdk-8.212_p03.tar.bz2 451800 BLAKE2B f8466a0d99650a07e3ff21e8dc06252ef9d31ce15e22c6ede15fc4c7b1633820e84e67aa501e816101c6bd473293fb897645b2df1530d8f7b81c6e8e6d38ce3a SHA512 ccc642da05aa00cfcc46c1eb759391dd2242218b7392bced77481600aa15b3b1d0a0c03380f59b6a6d038311721f249de1a6b116c6f651193cfb57b89fba4866
 DIST openjdk-corba-8.202_p08.tar.bz2 1033539 BLAKE2B 9cbe20fb771157142329db037866ec7d67ff7e70318bec8b74034ce59574cd730975f0e7a3d6b88fc946b1d340558a92ca867639765a205883481fd071d7059e SHA512 9b25132c76f559055698c52888f6cae287096e05b89541cb8e445b46a488126a38e58d4f28649e277862eac7aa20f75f64dbcdcf56c900dcb0530a9545c4f717
+DIST openjdk-corba-8.212_p03.tar.bz2 1033709 BLAKE2B f59b294e62425b63e881ed5534ae9beb3cc51351ff197995503671ec52ad82e34e145f8c9790dc88e4f452b4e09af80143fd0f7e0fda588b00eed08d4b2bc861 SHA512 3a786a372ab6b849a6ccd944cdfdc0aa9994a6a9f4d52afccad7d6b187e46a1fd0be30bde3da1eb03988034c36b4590b55379819245fb6f5ed4d75a958e9caa3
 DIST openjdk-hotspot-8.202_p08.tar.bz2 7918616 BLAKE2B a35cedf99a5067896dc498d4baa9b10f4ceb1ffcf946632b578c45d6354e4d025d82462797e56773507e504e5e25a25cdf63485460f9a8df234474a2e110f91a SHA512 ab53e77a4081a34c250750d7b975f790936cf370e81807d0081b006a12c0ceb452f54bd40cc8085a9f16047d270b9b610ee777f6fcd1431ff9d77461c32db464
+DIST openjdk-hotspot-8.212_p03.tar.bz2 7925246 BLAKE2B b405362450186d50228ddaf78907a98365c34d5e09a95064dc39bbc88328d1bf37e23791322fb68a44d90753cd68139627d235852dd1e03ad2b0535982badeaf SHA512 e8c8f9151c94bd821fa6810a0c70ed2749e0c39f66108deccc68718f106eb1731c91b13fb502c4a4be425ee04ecd909937247efb5891aac1ca27ee16d7bbf290
 DIST openjdk-jaxp-8.202_p08.tar.bz2 2733553 BLAKE2B 53341136b427152115ea0d4f758228090a607270104c88ebb61bc442ddd51a43cfed03c34660a47ab55bb601e1a9d8bf4fcdab05874bf0a5ada33b1ecb60df45 SHA512 9671fb56b6127359376cc2f85d91eb027fb1df1f808e36abbe3a1265d88d50809c34d73b84f52fb6e058ef78017d8d7a24bd097a9d720ad70a6861aa9fcc80f2
+DIST openjdk-jaxp-8.212_p03.tar.bz2 2734510 BLAKE2B fa920514fd499019a8f3d03edf895c11b3d67617b645444025cc5406216fed0ecb9340a08b8e314c43d0ced0ffbc1e3940f7c719930d5e4cdf9b24653d6249f8 SHA512 200516ef92b9fd50b4e7814b2f5f62c344b4654c8c836e0166c9e3669992d2fe231d3e262bc9be54d8793d6c4a3d6bdee5c93a6b6a3b6481d6a234f26dfb2a32
 DIST openjdk-jaxws-8.202_p08.tar.bz2 2541554 BLAKE2B a92aae4290e1901b736a6a93aed3b8c4bca14046a1f3eb9939ea9bf8ae0cd09785cf37045a8274641f13e543b49114ff158b9bc0cdd58163b42791e952ac76d0 SHA512 ce385f247a57695f716894137d868fa492d610776d120966c86b741688d6df54ae9538da7cf7b9530212a288ac4ff0d156e09bd5d01305b8165b939fa518fede
+DIST openjdk-jaxws-8.212_p03.tar.bz2 2540937 BLAKE2B 53c2793d9071f408a3704dacc4d61ac8f1b8ead33e75d309f217a05514661f14656711d017bcdde5821e114c5010d4417ac283571c2a52c28885d6736468402e SHA512 3e336e8cab78636b82488b7da183ba4ba2b84c0a2cb72a369c4352aaeb0fa5da05660c830db12a486e1cdfbc7a88a748d88284ca86c45b890a40dc1d23f3915a
 DIST openjdk-jdk-8.202_p08.tar.bz2 46618401 BLAKE2B e73b1341b837a0983ded4b4969ce83f9b77283e1d4d51e8d31a1b7401961a0b78943a41d2fe0aa724d85ac93dc3082511bcea341e87daecd070278ae59c8f240 SHA512 20e6747b506091383166298aeed6ff4ffd9deb92f20765ef839bf46d3ecae6b1aa218eb6857e6541df0522b8d571379341e94eb5bef765a1164cf9f59b20dfac
+DIST openjdk-jdk-8.212_p03.tar.bz2 46720739 BLAKE2B af515701052ede8b6cf828cc74f1f5938dad0874a12ed3c5c3f7b03be1f43108fce5e1820452a87e098c3469922227950f6f4fea33306f7b426487b48cc4b993 SHA512 9b3342419c82a8f243d2a7523d83b395c89629820fd99ba387991656e5754ed067877bf12b7e780368dd4bdb6eba10be09e63b1301bcbc0aa29e86e84ec394a3
 DIST openjdk-langtools-8.202_p08.tar.bz2 2392880 BLAKE2B 45ebebe4864e3274e14cf27986cd96facfe2f8e5c1292344e05743d1448f95367caf0f68886c506ce10435fbf53948c6b9f7087ad5d2cd090cf0f1becb962843 SHA512 a1e1c3dc06b3a58082e1d67d58ffeaf0bc3c5534fd1ba368e835a54d3c6ba9232e277ae685ed3ff5ccdf3cd7fe0612ad78a08ed55d1d2d06de54914a19377907
+DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eabace5d1c6568646084421fbaa43045ce0ec8d222f1a7e8629e4b86bdd5ff8eb51e90ea1eaafab3e94f34c41932754249f17b2e447f8 SHA512 15b931432cb14cf60c73627bd70e66f6d18ff25763a7b8758109cf8746d278d6c2b5d945a9f0b948a76c0813b5f42c988a3d10ac13165ec12e0f4d9eab98f369
 DIST openjdk-nashorn-8.202_p08.tar.bz2 2854026 BLAKE2B 05ba828160270e52f27023db83b1ffc4e6611b7a74b300a93a6d476f319a265834b48c7de57b0d3bea502d88279e72fd9cfbc5f3eb0e719650e34e82ba4a3d09 SHA512 bea0eaa4b2247cf1e5ee33613754c8f2f6ffe074a7be562f26e63c6327f56d67f60d4877dd363ed8a812689db1d837f5c257637460e247a1592c3258f3add11b
+DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
 EBUILD openjdk-11.0.2_p7.ebuild 5902 BLAKE2B f1cc664b678083e0562941837947798c92a64c4e00d16c3f9463877b68b3f18516e747a2f176cb12275e6efee5bb751aaedaf32f24057d4ac972db442f68afda SHA512 d4b49df6be291a6876ea04115909806e16102de96bbbe9d3e614c1ba7ff136e3062c73a9f464d1ad35a34efab4a82f1ed11514767e56febcbc5f49f86d390d9d
+EBUILD openjdk-11.0.3_p7.ebuild 6121 BLAKE2B dbce68ee1e261c329ce13dbb17f43cf5c4441bf5b64c085180bbf7074252ebf98fa55d42083b3ced85194132de75f202beb94a6270694681566133b604cdb871 SHA512 e14acf622315f699dad6f7f9bb41fc911658311cb7d1628d1b61e7e1d82b709a51a438f954d68bed0e1c360281c44779aca11e38159b209f28dd9429e5aff345
 EBUILD openjdk-8.202_p08.ebuild 7135 BLAKE2B 367571346274382c2442fa350517a5a1271def6c376a141d2719100e5776f5822d96691dab389b37b20a1baf370e8228fa6c9bba47d07660b95aa8bf8c0e3225 SHA512 5aecfd0bb06fdd13994ead308d1641018f002ab4b037df535b6c17c5876953ef656f6baf7a32fd976edf2b661685b21906ad65cddd040cd2c10d366f6fed2188
+EBUILD openjdk-8.212_p03.ebuild 7319 BLAKE2B 304bc5decc78bdc2f2faddc16ea9aab7fccbcd5ac13d61bddc632947898d72fd5ebddca519609118df50ad0bbbb3dec0ef5c19ad546c3a4060b47284e96d08bc SHA512 e8215d1c26fac6949a384cd39a830f4428b285853db6cd9c50c3805e1880ed4e3d85ca7042ea50f00b29470c85b4da2086474454103bba6a71d8412923073a6c
 MISC metadata.xml 1053 BLAKE2B bc7d07c481cee341f2778eef806dae3484592c5c8ca8e015ab4cca6dc64b8d225e1eff1f03f9c7b4d06751282e566624644348eece51dbb03a603b960b6ed84d SHA512 4a749d32cf21c2a517558c2e06ed9e5cd2470db8ba758847f727a8da82252a209e00c3d23f8896d5fb99aeb4f07df8717764a2f52c81261050b88dc91b61dab7
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
new file mode 100644
index 000000000000..026d272de5ec
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+
+CDEPEND="
+	media-libs/freetype:2=
+	sys-libs/zlib
+	systemtap? ( dev-util/systemtap )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+"
+
+# cups and alsa required to build, but not to run, make is possible to remove
+RDEPEND="
+	${CDEPEND}
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	!headless-awt? (
+		x11-base/xorg-proto
+	)
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+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,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+	# currently it still bundles lcms libpng giflib and libjpeg.
+
+	local myconf=(
+		--disable-ccache
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PV}"
+		--with-version-pre=gentoo
+		--with-version-string=${MY_PV%+*}
+		--with-version-build=${MY_PV#*+}
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+	)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	emake -j1 \
+		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
+		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${S}"/build/*-release/images/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/openjdk/openjdk-8.212_p03.ebuild b/dev-java/openjdk/openjdk-8.212_p03.ebuild
new file mode 100644
index 000000000000..e190f2bf302a
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.212_p03.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+
+BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="
+	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
+	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
+	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
+	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
+	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
+	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
+	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+
+CDEPEND="
+	media-libs/freetype:2=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	!headless-awt? (
+		media-libs/giflib:0/7
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+# cups headers requied to build, runtime dep is optional
+DEPEND="
+	${CDEPEND}
+	net-print/cups
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl:0
+	media-libs/alsa-lib
+	!headless-awt? (
+		x11-base/xorg-proto
+	)
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+		dev-java/icedtea:${SLOT}
+	)
+"
+
+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,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+	local repo
+	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
+		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
+	done
+
+	# linux 5 is ok https://bugs.gentoo.org/679506
+	sed -i '/^SUPPORTED_OS_VERSION/ s/ 4%/ 4% 5%/' hotspot/make/linux/Makefile || die
+}
+
+src_configure() {
+	# general build info found here:
+	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	append-flags -Wno-error
+
+	local myconf=(
+			--disable-ccache
+			--enable-unlimited-crypto
+			--with-boot-jdk="${JDK_HOME}"
+			--with-extra-cflags="${CFLAGS}"
+			--with-extra-cxxflags="${CXXFLAGS}"
+			--with-extra-ldflags="${LDFLAGS}"
+			--with-giflib=system
+			--with-jtreg=no
+			--with-jobs=1
+			--with-num-cores=1
+			--with-update-version="$(ver_cut 2)"
+			--with-build-number="$(ver_cut 4)"
+			--with-milestone="gentoo"
+			--with-vendor-name="Gentoo"
+			--with-vendor-url="https://gentoo.org"
+			--with-vendor-bug-url="https://bugs.gentoo.org"
+			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+			--with-zlib=system
+			--with-native-debug-symbols=$(usex debug internal none)
+			$(usex headless-awt --disable-headful '')
+		)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	emake -j1 LOG=debug JOBS=$(makeopts_jobs)\
+		$(usex jbootstrap bootcycle-images images) $(usex doc docs '')
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${S}"/build/*-release/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index eafe2f1258da..9000324141a9 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,4 +1,4 @@
 DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
-EBUILD osgi-core-api-5.0.0-r1.ebuild 578 BLAKE2B e696c120900d0726faeb42b6df8f9c95934c5a04d55a2838769dcf9fe68daf5987d4137cdef04a2b8627051b6c2ee6fe1fea7ceee6c3f09ff2dbb3923bd29f71 SHA512 c9df706529c2a57dd98b3054612d8e19dd1aff63db7a53cfefc4c3f6c50d7ace0a5240d707a8810bb232d6f8c220ba88747a7e1a2e0956bf798cb6d19ca256d4
+EBUILD osgi-core-api-5.0.0-r1.ebuild 573 BLAKE2B 3dda6dddda39e67478de66c50274bc8b4edfcb7b0be2927187e3da2aaaff9945f31e11e9bf0dfbcf213e8d411e2a4d368d27d8f62f5ef14fd42ca39e7397c29f SHA512 8dffdca34200090664cc8d0134bf6d852cc8245102c2bca7bc298f0282451e1f567da54492493e06919f1e3e1f1b7a7331698b7d866aae702082d554392f3a89
 EBUILD osgi-core-api-5.0.0.ebuild 562 BLAKE2B 7bc84b27e2bebd6417a985a80c529ba84f847fb98359c0fb029d9c723b59b22c3a76c8efdd7ca0dbfca5186ba1ad2773c80b6ca92ae58cf1b33978c5839d77aa SHA512 1b62a12d5c66b1a67ce1560441745ccc288db9a39c40676f87aa753f387977f0560c624241b546acc4cc2f136449b0cfbc4679b7f18b9c607a41f8bbb7bb1837
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
index 30e9dd6437d7..4ba35b58ab77 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index fa9cb8f33369..2eb00db3e4f9 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,15 +1,6 @@
-DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
-DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
-DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
-DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
-DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-java-3.5.1.1.ebuild 2095 BLAKE2B 9cb63175cfb02d00fa2e9273aba56bc3fe640d5a485af2746dde34505d6ec9317617dc41e7da0f7dba3f728673a9a846363f61889bb4c4fb46916852623435a5 SHA512 1cc3f361b4cb240b80cd3a5b43b7e3f8d95b08152b33e09aeb7a96a07683d621384468730cdbf1b99f24dd6937aef3745fe3678e0b57ba9f314b6a21fa2139ec
-EBUILD protobuf-java-3.5.2.ebuild 1814 BLAKE2B fd690cc2a8ecbf5d568ea3d20cd5c494dc97f75c3f61b3c506e2e39168bb5e138e0ffce2f1d3ae846e13c535372dc4638d32b356664849248d3b2e948dce5c4d SHA512 df61e203370b90295a3b48eea64c80fa53e9cabf51730e2c49db2520017833961560d7895f80060f08807089d3df54220c74df852807fa1d07efdca3b84991d4
-EBUILD protobuf-java-3.6.0.1.ebuild 1112 BLAKE2B ed95623a91d20e3c8e2ecbb69c8c52421441c0eed3a3f36bcf84486b98cc67cccab53da1f83f3299b071cd0332f59461af952d29be82dd9f65d58fb68ab47ef7 SHA512 2746cfa9ac7a844aac943cf6ea5e0b09b5544f0be8a2ef46bdd9d46a3e8261892d0cd153e668bffd5b7babe31601ec3338c81f79de3788353f48921ae2890f2b
-EBUILD protobuf-java-3.6.1.1.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
-EBUILD protobuf-java-3.6.1.2.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
+DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
-EBUILD protobuf-java-3.6.1.ebuild 1109 BLAKE2B bd8fb8e90a5f6386f16a9d98351b30e34b3307d323565fa016b22d69285cea18495f4fb29c6ec7bd4052bab2cd5d7af82219209e36a7303de55ca92cba1797cf SHA512 cc09ccf03e073edd2c7ec711f3e4c55afe7dae532ee94916f9f4319c3c9b019c49b42f8ae5c43c2de6ea11dfe3ea34fc5f7c96a2bc66f3d7b02ce1bc7749ec32
-MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
+EBUILD protobuf-java-3.7.1.ebuild 1417 BLAKE2B 5762789bc4fd0095ccfedbb3812b33a62a09256c5a6df191cf9294faf5556f0a07c4773347b2478ee666f513bcbf40167cb80ae0e03627a70041e3943f2feeeb SHA512 bfbcc5ba53f08681b6b7e8afc0a0be9312e85770d55b3e2aacf7fa212805969d424e8331b631f04862e10ea102f385065f93b9637322016e6961995bee13479a
+EBUILD protobuf-java-9999.ebuild 1337 BLAKE2B af6d9b896e31dc453640066e7576a0a71e0a0a5e4467fc0511f791d7a5420e199ab99219fa74dfa02434377e7db3f911b1578fc11d4eb70e1947f9943ea8995e SHA512 1c58cecf9831d9178352b8d4ad26da70b17f9709ba1b2a7aaa508c21b2003209620d371ce7d24df3456500c0662720e5293a989d2329ccb1af9535200cc62c02
+MISC metadata.xml 652 BLAKE2B 7c402c1ed247fad130bc21514855634041718335e7b43285560165d5b9d30649a760a124d50c57e940a19fa524c2bf5bfb85a7761d17b6f14c050edb53e100e5 SHA512 bb608da39ddc541c7cfc3a0db10da20db6f5f88da9b4a966d9b30c7a1bfc9390773cd9400c24c2be15d62e0a0e890df8a4259adfca4baac36cc6d4047b352e54
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 0697e5cc44b2..fbdd6bacc234 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -13,9 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="nano">Enable code generator and runtime library designed specifically for resource-constrained systems, like Android</flag>
-	</use>
 	<slots>
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
deleted file mode 100644
index c0a6932d5146..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
-	~dev-libs/protobuf-${PV}"
-
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	pushd "${S}/java" >/dev/null || die
-	einfo "Compiling Java library ..."
-	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="${S}/java/core/src/main/java"
-	JAVA_JAR_FILENAME="protobuf.jar"
-	java-pkg-simple_src_compile
-	popd >/dev/null || die
-	if use nano; then
-		einfo "Compiling Java Nano library ..."
-		pushd "${S}/javanano" >/dev/null || die
-		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-		JAVA_SRC_DIR="${S}/javanano/src/main/java"
-		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
-		JAVA_JAR_FILENAME="protobuf-nano.jar"
-		java-pkg-simple_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
-	JAVA_SRC_DIR="${S}/java/core/src/main/java"
-	if use nano; then
-		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
-		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
-	fi
-	mv "${S}/java/target" . || die
-	if use nano; then
-		cp -Rvf "${S}/javanano/target" . || die
-	fi
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
deleted file mode 100644
index c60c8f9317b3..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	einfo "Compiling Java library..."
-	pushd java > /dev/null || die
-	"${EPREFIX}/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
-	popd > /dev/null || die
-
-	if use nano; then
-		einfo "Compiling Java Nano library..."
-		pushd javanano > /dev/null || die
-		"${EPREFIX}/usr/bin/protoc" --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-		JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH_EXTRA="../java/core/src/main/java" JAVA_JAR_FILENAME="protobuf-nano.jar" java-pkg-simple_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	local JAVA_SRC_DIR="java/core/src/main/java"
-	local JAVA_JAR_FILENAME="java/protobuf.jar"
-	if use nano; then
-		JAVA_SRC_DIR+=" javanano/src/main/java"
-		JAVA_JAR_FILENAME+=" javanano/protobuf-nano.jar"
-	fi
-
-	mv java/target . || die
-	if use nano; then
-		cp -r javanano/target . || die
-	fi
-
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
deleted file mode 100644
index 5c4309e854e0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/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.6.1.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
deleted file mode 100644
index 21b22d791b71..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2008-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/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.6.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
index 21b22d791b71..828c0e6a2a78 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,23 @@ 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"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+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/17"
+SLOT="0/18"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
@@ -22,6 +33,10 @@ RDEPEND=">=virtual/jre-1.7
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
 src_prepare() {
 	default
 	java-pkg-2_src_prepare
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 54c8396f2ffb..b066b80a8320 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,13 +6,24 @@ 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"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+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/17"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/18"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
@@ -22,6 +33,10 @@ RDEPEND=">=virtual/jre-1.7
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
 src_prepare() {
 	default
 	java-pkg-2_src_prepare
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 125a35de2f6d..84d56180156a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,16 +10,15 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e0
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
-DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-7.0.93-src.tar.gz 4786577 BLAKE2B 8b72418c98369e0e104c5f51e9d822c287487b5d3b66a4a6d005535b33a35a6cbc50c49b48100555bfaba0c6c983ea11dcdf381d2fba80a77fc17ac0df20efaa SHA512 5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc
+DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
-DIST apache-tomcat-8.5.38-src.tar.gz 5253678 BLAKE2B b2ecc732128934a3afa314ddc569b1b3d330ccb12b99b0ce4b12e1952347ac57cafb3a5637595997a0c9e77752ae41665e637c826c3b9ae9925799124e735480 SHA512 b84d96fa972a9d24957ef047cdce0fb49de3d365401b07990eaa5bad8f3c87a6b1ad1eac077c4be595ee291daef68720381fe63461815de47664275b486ceeee
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
-DIST apache-tomcat-9.0.16-src.tar.gz 5654943 BLAKE2B a412457c2d34367301b4335a3a4bf46a647f8e60440be751874e1eaad400a0832b64fcae4c9f81585a4afbddafd75f2929bc78c12eb05b20539b11de686dfecc SHA512 60fbdefbddaa6fac4bc9d0ca4c1d9a119dd53063fd4574c474daf5f346fddc9cb7fd174f1be189e965d5ae4670710347d84fcf443c7df01faac9a1b84ecb33ce
+DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a SHA512 aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
+DIST apache-tomcat-9.0.19-src.tar.gz 5692733 BLAKE2B 771d8afd50e9032edda09abb5d03e16663a7475d36ee9a5561cd54fbc948169c145ea95bc16ebc690280e5327a5a9868e56a29bd08acb6c10c34fc4e7bf94cc7 SHA512 0461ab9a4e5f021636957b5bc8fbe45714488837e53ca2df4bf9faab5c620270c3041859e034135ccc6e2914ae70e4e38cf4b4353cb17b543ed3dc3a7628fba1
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
-DIST apache-tomcat-9.0.8-src.tar.gz 5115250 BLAKE2B 8eaf0aa963711f90278d6d20986f4ba583c64e9e2b1f0b82ccc676a854a2078fe29c3b691d49af529074c9eea02ba78802cc9a4bb5cd7a3e561f6dfcb342c50b SHA512 22a3c9a2c9f2fa87b218ec5deb50248af201e83111bbeb7fcfbb7dde5aba3e2d61b53bc40500b3e364a9fb94b576ad8a4683979534274af0f3bcdfb86aa045e7
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 849 BLAKE2B 88f6dc377d4c33eb50a3559f5b1b275cbbddf077c119e792afc567458d74e4f6fa710a97e71543c19caecafb8a7e26ee0cfb4cf34006a2aaae9a97924cb9463b SHA512 085c9e220972fb0f923b710a33a76977aaf76c8abee84c5c0c80ff40932585fdb0cd3a00705a60ef615558a0c20f93522cfd705fc5e5c0af70fe9eb2e640ee5a
 EBUILD tomcat-servlet-api-4.1.36.ebuild 982 BLAKE2B f7c7e92165fcd0181b65bd9fd905f818653c44262b36672986140a78466d16933f980dc75e886f46f495d775777506bfe76ad37efc2903c2f09e5e21190dc26a SHA512 c5bf0955bcde88055150fc42af73b43eaa6657106918c5aad142ebb9a09ace3554ab49c07270e9ad2c5730af0fd7dcde9ae9de76e9dc40e52ac5f51c90bf5c75
@@ -28,14 +27,13 @@ EBUILD tomcat-servlet-api-5.5.34.ebuild 1419 BLAKE2B 8c55639dd2ef3367f74b6371561
 EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
 EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
 EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
-EBUILD tomcat-servlet-api-7.0.92.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
-EBUILD tomcat-servlet-api-7.0.93.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
+EBUILD tomcat-servlet-api-7.0.93.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
+EBUILD tomcat-servlet-api-7.0.94.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
 EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
-EBUILD tomcat-servlet-api-8.5.38.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
-EBUILD tomcat-servlet-api-8.5.39.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
-EBUILD tomcat-servlet-api-9.0.16.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
-EBUILD tomcat-servlet-api-9.0.17.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
+EBUILD tomcat-servlet-api-8.5.39.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
+EBUILD tomcat-servlet-api-8.5.40.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-9.0.17.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
+EBUILD tomcat-servlet-api-9.0.19.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
-EBUILD tomcat-servlet-api-9.0.8.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild
index 15794b7e3626..412dd425bf5f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.93.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild
index 412dd425bf5f..15794b7e3626 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild
index a6df79ab2dec..640c06837c8c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.39.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.40.ebuild
index 640c06837c8c..a6df79ab2dec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.38.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
deleted file mode 100644
index d66f7a815533..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild
index e35055493b79..d66f7a815533 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.19.ebuild
index d66f7a815533..e35055493b79 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 242b0ad063c0..0dea478d7872 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,4 @@
-AUX xerces-2.11.0-build.xml.patch 1685 BLAKE2B e7fe7be5efe89a5c6d19ed885e0a6ceb8acdafab6137a320b7733d37768d3ca19d301539c1e750353fb15bc4dd3739f52cd099d92479ac8bdd7a995b1356e53d SHA512 e0b1b195104d65e12a25fb6f6a39e8de5f91b1c258b8cca18fae781802e20fe0cdfe4049968ef7411a2f18aad3ac562f655dbb57b62b5b502ef8ee3a1f3f7db7
-DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
-EBUILD xerces-2.11.0-r1.ebuild 1528 BLAKE2B facae44fa13b7c1fb5faf512969ed4f026d9d236d10d8a51f56f89efaa95e569cdaaf1f2257acfa31cf3e8b31aaad159428394e8166b4ba408030b85c4274258 SHA512 d5b7a351bc08e75185fca0f63298887906642b09e57172e41e7ddad0f001954ff8029c7366416b40a8a71d48d7e2e15324b276c0a2176e7db3eed33c7a158027
-EBUILD xerces-2.11.0.ebuild 1646 BLAKE2B 58ea1cdd93ca0a65fd4dd1d3d8d6f52addf69f70e71bff5c4ae1226d0b9e82468dab3a9b7a9a48e9feb4e90eb84ac53a1934e288d3a37d334497ad9bdf42660e SHA512 63dbfdc7236c78028157c902f510d386b1dfedb66a32bfaed3f9a5d09c227d722b36fbad9391f1cac3881ee0f60a54755752bb6fd9323808ac47e5397fb871d1
+AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
+DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
+EBUILD xerces-2.12.0.ebuild 852 BLAKE2B 7c83c58d2d170c7df692eeca7cc729aadc123a994b8abedc379be3bc85677e90dec14c1a1096349de6136dec597cfc6862dc284156038364164b491a4f421b73 SHA512 dc34eb8b10d1cf1bda87346387abbcc67e26d24a462a386e3fbc56ceb6227f8ec58abaae431ea217bff990865f7f15ba336b5134639d05d4d898905958fe59ee
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
deleted file mode 100644
index 61afcddad9a4..000000000000
--- a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Don't reference non existing jar in taskdef. #351394
-Don't let user properties leak into build env.
-Don't bundle stuff from xml-commons-external.
-
---- a/build.xml
-+++ b/build.xml
-@@ -39,18 +39,13 @@ Authors:
-   <property name="tools.dir" value="./tools"/>
- 
-   <!-- enable compilation under JDK 1.4 and above -->
--  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
--    <classpath>
--      <pathelement location="${tools.dir}/bin/xjavac.jar"/>
--    </classpath>
--  </taskdef>
-+  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
- 
-   <!-- Allow properties following these statements to be overridden -->
-   <!-- Note that all of these don't have to exist.  They've just been defined
-        incase they are used. -->
-   <property file="build.properties"/>
-   <property file=".ant.properties"/>
--  <property file="${user.home}/.ant.properties"/>
-   <property file="default.properties"/>  
-  
-   <target name="init">
-@@ -247,7 +242,7 @@ Authors:
-     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
-       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
- 
--    <!-- now deal with API's:  -->
-+    <!-- now deal with API's:
-     <unzip src="${src.apis.zip}" dest="${build.src}">
-         <patternset
-             includes="org/xml/sax/** 
-@@ -269,7 +264,7 @@ Authors:
-                 org/w3c/dom/views/**
-                 org/w3c/dom/xpath/**"
-         />
--    </unzip>
-+    </unzip>  -->
-     
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
diff --git a/dev-java/xerces/files/xerces-2.12.0-overrides.patch b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
new file mode 100644
index 000000000000..2e31002065e3
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.12.0-overrides.patch
@@ -0,0 +1,66 @@
+--- a/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:08:03.187783332 +0000
++++ b/org/apache/html/dom/HTMLIFrameElementImpl.java	2019-04-17 18:09:38.640274335 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+ 
+ import org.w3c.dom.html.HTMLIFrameElement;
++import org.w3c.dom.Document;
+ 
+ /**
+  * @xerces.internal
+@@ -161,6 +162,11 @@
+         super( owner, name );
+     }
+ 
++    @Override
++    public Document getContentDocument()
++    {
++        return null;
++    }
+ 
+ }
+ 
+--- a/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:06.833172177 +0000
++++ b/org/apache/html/dom/HTMLFrameElementImpl.java	2019-04-17 19:14:56.755428976 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+ 
+ import org.w3c.dom.html.HTMLFrameElement;
++import org.w3c.dom.Document;
+ 
+ /**
+  * @xerces.internal
+@@ -138,6 +139,11 @@
+         super( owner, name );
+     }
+   
++    @Override
++    public Document getContentDocument()
++    {
++        return null;
++    }
+ 
+ }
+ 
+--- a/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:17:26.624199895 +0000
++++ b/org/apache/html/dom/HTMLObjectElementImpl.java	2019-04-17 19:19:23.691802087 +0000
+@@ -17,6 +17,7 @@
+ package org.apache.html.dom;
+ 
+ import org.w3c.dom.html.HTMLObjectElement;
++import org.w3c.dom.Document;
+ 
+ /**
+  * @xerces.internal
+@@ -251,6 +252,11 @@
+         super( owner, name );
+     }
+ 
++    @Override
++    public Document getContentDocument()
++    {
++        return null;
++    }
+ 
+ }
+ 
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
deleted file mode 100644
index 5a696217d556..000000000000
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/xml-commons-external:1.4
-	>=dev-java/xml-commons-resolver-1.2:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	>=dev-java/xjavac-20110814:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE
-	dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
deleted file mode 100644
index ec1b7dadb09a..000000000000
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-COMMON_DEP="
-	dev-java/xml-commons-external:1.4
-	>=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	>=dev-java/xjavac-20110814:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE
-	dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
new file mode 100644
index 000000000000..220873851392
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xercesImpl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xml.apache.org/xerces2-j/index.html"
+SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+
+CDEPEND="
+	dev-java/xjavac:1
+	dev-java/xml-commons-resolver:0
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="
+	xjavac-1
+	xml-commons-resolver
+	xml-commons-external-1.4"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${P}-overrides.patch"
+}
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 7e0ec4062130..2a5b1b100ad3 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,6 +1,3 @@
-AUX xjavac-20041208-build.xml 1088 BLAKE2B 45fff43f290db1e415427a3558556bfc89de78b59fbd8dc8794016c600de6cac64c1cde973925949d383f4321c8c85019e799d775a8262876e02b9692f4c5d2a SHA512 5ed5cfe711a4666d2db2dbe91ba8ac0d1dc9e95cf5be82891382632db6e4a250775aabbd38111134d82a09fa9d7d81efead52256e7511a726144689e1e389469
 DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
-EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B e700eccc7deff99e5121184a349cb8a50e9ad364b78091e8fed10d2955a41919ff469b34539d30ad80407b41f15ac6f2ccd65fdb8899c01b8526dcae5fac9eff SHA512 a9c4908b869f9a6bf7d954e2e197e10f377a3a249c503147821a826767793ec9191fcc788408b183f85fdbcbc58a6e926b5718e5f36bcecf37c1338432d8af47
-EBUILD xjavac-20110814.ebuild 952 BLAKE2B f143d3429c9eaceb2948303ad39947d0dc2caf2a85a2c7cbb5d80b4c4e2f44c5f6b1dad864b08d57c4491794d55e4a62b60980216614692287246d701e2bd2c2 SHA512 f9323cf655ac2e5328255732a4267062757b4205f49301e76386ebb54c4b7234088c2a8961f48ca880742bb23a10ab3c97b3a84f099fe6aca15be1137c2b5981
+EBUILD xjavac-2.4.0.ebuild 666 BLAKE2B 53ff28cbcd4e403313f686547f95e5454722840563cd3f8d2db905f35aca4071327e5acf09a37f66d368e9e7439ad697b6cb00906563e2d59d9b181e0d2b00c3 SHA512 4f28557c34981eb71bbd59d8390f8fb6d23a767053b58b26b6860845d9779d7aeb2b53ac02e5d968fbe0214cdda9797bfcdc0868d04ef1ebb5e60b13438178cb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml
deleted file mode 100644
index 5c9a466ca8e8..000000000000
--- a/dev-java/xjavac/files/xjavac-20041208-build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xjavac" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="." />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="jarfile" value="${dist.dir}/xjavac.jar" />
-	<property name="target.jdk" value="1.4" />
-	
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			classpath="${classpath}"
-			source="${target.jdk}"
-			target="${target.jdk}"/>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-</project>
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
index 8198e0008d8d..c3c95f345da0 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
deleted file mode 100644
index 9478e4db552b..000000000000
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#Note that the tarball has xjavac-ibm-1_5.patch already applied (not in upstream)
-IUSE=""
-HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}/${PN}-20041208-build.xml" ./build.xml || die "failed to cp build.xml"
-}
-
-src_compile() {
-	eant jar -Dclasspath=$(java-pkg_getjars ant-core)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-}
diff --git a/dev-java/zemberek/Manifest b/dev-java/zemberek/Manifest
deleted file mode 100644
index fa19f3872a2e..000000000000
--- a/dev-java/zemberek/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX zemberek-2.1.1-classpathfix.patch 514 BLAKE2B 9fd8277e7ef3e81ff504d9f785385da358030a1a9109d6989aefa39efb38941688075967d7fc5f17c972766a24c5f5ae48401e94bd53110862b831b167dda285 SHA512 71ed0b82ff218fd8bc041fcf7d1fc669ad3fd3df890aaeedf2ea3f6ece5f6e484c1d4db709ecc5704d32aff934ae160285b64ef280be83849dc1fe8587c52178
-DIST zemberek-2.1.1-nolibs-src.zip 1196289 BLAKE2B c8ddc242e8f6bb63ecaff586b2a1f051ca928ab31033881dc2d76e1c9a0c2e0ac1648bbd77fa6eae6d84054b64d78495446369acd72ed97ce67cb87f4d7e305b SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955
-EBUILD zemberek-2.1.1.ebuild 1798 BLAKE2B 0b2765ff106474eafdde7be43d32b76dcd8d515536c9ec8d5f9a356669f011b91f88a73d3a860a0857b3d0b08c7fe2a00a43e776c05a68557a639f698a7e7959 SHA512 1a92b2a8239d750451c94e1b9ba2529dcc4177504d7a7a63e82422bfe58ad401b016e306547d4faec0963d329f45555d79dbb87620610ada6b16718596cfbc7b
-MISC metadata.xml 354 BLAKE2B 17e4ad083f477637706216dce4fca7c4e8c07866a6e28220cce3b8729837d61b13c4800366f7847d12cf4cc0eb72a9f81263514be5bcf620dee50c08d1b9bfa1 SHA512 546242cb1f76ce63ff5fd1b6a67ad35f6f16aed97f01e886b980a868d3f6bec8c8af4c003389530c6ebe3b7dd35a72b2297c6de2167c47c81bb5be627a4a8709
diff --git a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
deleted file mode 100644
index fa6c572c1cbf..000000000000
--- a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur zemberek-2.1.1-nolibs-src/build.xml zemberek-2.1.1-nolibs-src_patched/build.xml
---- zemberek-2.1.1-nolibs-src/build.xml	2008-09-01 23:07:28.000000000 +0300
-+++ zemberek-2.1.1-nolibs-src_patched/build.xml	2009-04-23 23:03:01.000000000 +0300
-@@ -42,7 +42,7 @@
- 	<path id="classpath.build">
- 		<fileset dir="lib/dagitim"/>
- 		<fileset dir="lib/gelistirme"/>
--		<fileset dir="${build.cekirdek}"/>
-+		<pathelement path="${build.cekirdek}"/>
- 	</path>
- 
- 	<!--   dagitim kutuphaneleri (eger varsa) -->
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
deleted file mode 100644
index 804d6e9e3ad2..000000000000
--- a/dev-java/zemberek/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">zemberek</remote-id>
-		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
deleted file mode 100644
index 50f66f788140..000000000000
--- a/dev-java/zemberek/zemberek-2.1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="source doc test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Zemberek NLP library"
-HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-LANGS="tr tk"
-
-S=${WORKDIR}/${P}-nolibs-src
-
-IUSE="l10n_tk +l10n_tr"
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-	test?
-	(
-		dev-java/junit:4
-		dev-java/ant-junit4
-		dev-java/hamcrest-core
-	)
-	app-arch/unzip"
-
-java_prepare() {
-	use test && java-pkg_jarfrom --build-only --into lib/gelistirme junit-4 junit.jar
-	# Added hamcrest-core as a workaround
-	# Issue spotted by Markus Meier <maekke@gentoo.org>
-	# See https://bugs.gentoo.org/show_bug.cgi?id=253753#c3
-	use test && java-pkg_jarfrom --build-only --into lib/gelistirme hamcrest-core
-	epatch "${FILESDIR}"/${P}-classpathfix.patch
-}
-
-src_compile() {
-	local anttargs langs="" jar
-	for jar in ${LANGS}; do
-		use l10n_${jar} && langs+=" ${jar}"
-	done
-	for jar in cekirdek demo ${langs}; do
-		anttargs="${anttargs} jar-${jar}"
-	done
-	eant ${anttargs} $(use_doc javadocs)
-}
-
-src_install() {
-	local sourcetrees="" langs="" jar
-	for jar in ${LANGS}; do
-		use l10n_${jar} && langs+=" ${jar}"
-	done
-	for jar in cekirdek demo ${langs}; do
-		java-pkg_newjar dagitim/jar/zemberek-${jar}-${PV}.jar zemberek2-${jar}.jar
-		sourcetrees="${sourcetrees} src/${jar}/net"
-	done
-	use source && java-pkg_dosrc ${sourcetrees}
-	use doc && java-pkg_dojavadoc build/java-docs/api
-	java-pkg_dolauncher zemberek-demo --main net.zemberek.demo.DemoMain
-	dodoc dokuman/lisanslar/* || die
-	dodoc surumler.txt || die
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4" eant unit-test
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-java
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)