gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-java
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
35 files changed, 968 insertions, 231 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 59facf37cecb..eb1bfe13725e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/boot-bin/Manifest b/dev-java/boot-bin/Manifest
index d865b53f3e68..e41b62aace91 100644
--- a/dev-java/boot-bin/Manifest
+++ b/dev-java/boot-bin/Manifest
@@ -1,12 +1,6 @@
 AUX boot 247 BLAKE2B 138d1a35bb90dc4942c480b6d48494716dfeb406d8d66186e3732df247b74d65f947de22532f51b7c5c1b1a652a65e962e2c0ccdd2ae7189b102579c3a00ea3e SHA512 06ad5b0517a2ecddfa62e03b15d7af2bf76f029e2cd9dd096b27024a9dd1f6c8bc0ffe278b510249f624c6dc2178d41561e06c41dcef5cca8699f34722d215c0
-DIST boot-2.6.0.jar 8289462 BLAKE2B c9ff3c464f0ebf536594879681fb7d84454dd7e51db355ae48f9562a2b7f09e6b8aa3adf53c95d1310e29388b167030d6637eeb2cfe9817831f107a6ca8cfac2 SHA512 715aa320c0e44a2376020aa84c0640ae8e6fb15a4842b4267ff58e1d09682aae17f74dc568e50fa611993947bcd7b1430157a0f0b6b8bcddff1eaa3149ddc9ad
-DIST boot-2.7.0-CHANGES.md 19877 BLAKE2B 6d2190988bc73f41f88101eaf14c0d43e06f4386629ea712a0e6800288250ab9cfe3d435c68557005693bdda11047dde9e5b6d984f53a5cffd5032ccce69e756 SHA512 f97148da762a1e5ea5ab747dcff59e69a53690cd655a6b8968dd894b7e4184f49eacc2d1189d81df80eba78b74091dd47d137dc4963da5b9caead0db16259303
-DIST boot-2.7.0-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
-DIST boot-2.7.0.jar 16723852 BLAKE2B ab067b0b2b42b4d8295b3de8367393e6e31192e127112a23ce6e21946afabff6f0bdb75a37b3120da361ec6a76d470185908e4264d5b5ee08f3d4749d86ecea0 SHA512 5a95b2d8e521d57e5773347df52982f0ab9cd325622606ea394f826610b9b27a1cbeed0749665d62f605cf9249b9f65d378b1b77e40c83e3cfe703d4d2fc2530
 DIST boot-2.7.1-CHANGES.md 20380 BLAKE2B 84a57834b78b752b6be051aa9513ad3360cc81b1311248892b3f61760c181a2c53083da8c61eeae2930b2501b95b71dd74bfededa2325806a83abbb0ef0f35e3 SHA512 5f8b9866dcb5e784caee89c7a0569d6a2392cda19aa498d15eaa8d4ea054900bdc0dff950ca60f6c62f0cd262373a3cd0760c755b805d952bc96838de135aeb8
 DIST boot-2.7.1-README.md 16071 BLAKE2B de0f5168f1b4151ffc76bf02343a1d965ba418e90255d04ef8c6c0c30e32d1927042ed24d1e5e1e6dad3b9dc0e893bf7656a3cfc279f6e690a5c7587a3930897 SHA512 395b6fec79bd1299f4d84fda4ba3d0db0b54c9c591c7ffd2c3c0f239f5f1bade31bf6eb1b924d6e58775fb6d412417d251d77356698d54c93c3ee31b64c9652a
 DIST boot-2.7.1.jar 8388320 BLAKE2B a5af7ee5468cd6db1c955fd7a1726da6bc370ff8fb2b38312c42b9b6577c9605cfd472f86878c8706e50a1523f9e8789e7b92aa7244f2ce0450b7447cd8d5aa8 SHA512 d8101ba2c3a2bdec655f0fcea95a3cb33aee90c9471f6cd31f465c3716cb3f6d9027b7ec0c1c7cd277f8b43cbc0fd69d2e164fa33b112bba94d4d3245caafb3c
-EBUILD boot-bin-2.6.0.ebuild 1524 BLAKE2B c968415c492f6b70529554fe4bf1d51bf36cbe115f73591bef5ad8dd76a88653156ff1e6a15369a3a0755b561c9858d35f2ae0d968d5dd2790b00c9f58ed04dc SHA512 d4f3886207b4e0057fab46c8f0a65ce4830c6d6c948f1cb37c8d3a5bbb4ff8a880bcfa920fa2c2e037d243e7f16926fa3f2105e69c0fec5564cd563b46ccb3e8
-EBUILD boot-bin-2.7.0.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
-EBUILD boot-bin-2.7.1.ebuild 1998 BLAKE2B e5e5c7d9a75fe277fa164a1cdbcd7b227011c4a945c628544f1a0afee867dbe9b5b4b8e79c64f1e59c5d5b7926e882cae1301a9d4fb89c23f4f8e4fc2b210027 SHA512 e4050452a886c3ecc9c8f9c42a8befed7f9aefd8f4123d8f49741f13c30f8bf59a73c067cbf0d4eb259ce64d353e7dd79c5de3cdb906d8348ef7f85bd3af4321
+EBUILD boot-bin-2.7.1.ebuild 1982 BLAKE2B efe1673b0038afac6d745700beb08cf6a910aee6e608c2d9c92d45adf082e41bca4778e632f7e8d6186d2277ef8eeb9bdf8b4e4304c552a1896a993665e67bc7 SHA512 64abf5291a9a696e413e74a3ae479e81dd0cc69c2c0ae80cad8cd0a7290357abf98ba8a16d54ce6d1a59139d903334d3cbda40a926f680c86433c5266a3ece53
 MISC metadata.xml 400 BLAKE2B 9b861c7bbcf7f885204ab9bfce1d364bf75b0001ce1e3623826b9d3009b51276dd8ee33817c49899583ca4d79e2108c01da676f2e815c980cdeaefe716a858ff SHA512 1293c586f0885348baaeaf2c98c031a5c673aaa3604bd81c73159341d55f83a85686efd4866709709dcfec289087422af258e4df8c4f43445e7ad87a2dc43096
diff --git a/dev-java/boot-bin/boot-bin-2.6.0.ebuild b/dev-java/boot-bin/boot-bin-2.6.0.ebuild
deleted file mode 100644
index 15ca39c55373..000000000000
--- a/dev-java/boot-bin/boot-bin-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/boot-clj/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.7.0.ebuild b/dev-java/boot-bin/boot-bin-2.7.0.ebuild
deleted file mode 100644
index 8809cdf42e6b..000000000000
--- a/dev-java/boot-bin/boot-bin-2.7.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-GITHUB_USER="boot-clj"
-
-DESCRIPTION="Build tooling for Clojure"
-HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
-"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying boot shell-script"
-	cp "${FILESDIR}/boot" "${S}/" || die "Can't copy boot"
-
-	for file in "README.md" "CHANGES.md"; do
-		einfo "Renaming ${MY_PNV}-${file} to ${file}"
-		mv "${S}/${MY_PNV}-${file}" "${S}/${file}" || die "Can't rename ${MY_PNV}-${file} to ${file}"
-	done
-
-	java-pkg_init_paths_
-
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/boot"
-	dodoc "${S}/README.md"
-	dodoc "${S}/CHANGES.md"
-
-	java-pkg_newjar "${S}/${MY_PNV}.jar"
-}
-
-pkg_postinst() {
-	einfo "This package will still download a whole lot of its own runtime"
-	einfo "dependencies the first time you run it."
-	einfo ""
-	einfo "This currently can't be helped and is expected behaviour for a"
-	einfo "java based development toolkit"
-}
diff --git a/dev-java/boot-bin/boot-bin-2.7.1.ebuild b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
index 8809cdf42e6b..91fe6b68b918 100644
--- a/dev-java/boot-bin/boot-bin-2.7.1.ebuild
+++ b/dev-java/boot-bin/boot-bin-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,16 +11,17 @@ GITHUB_USER="boot-clj"
 
 DESCRIPTION="Build tooling for Clojure"
 HOMEPAGE="http://boot-clj.com/"
-SRC_URI="https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
-		 https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
+SRC_URI="
+	https://github.com/${GITHUB_USER}/${MY_PN}/releases/download/${PV}/${MY_PN}.jar -> ${MY_PNV}.jar
+	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/README.md -> ${MY_PNV}-README.md
+	https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${PV}/CHANGES.md -> ${MY_PNV}-CHANGES.md
 "
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-RDEPEND=">=virtual/jdk-1.7:*"
-DEPEND=">=virtual/jdk-1.7:*"
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
 
 RESTRICT="test"
 
@@ -44,9 +45,9 @@ src_prepare() {
 
 	java-pkg_init_paths_
 
-	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" 	"${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
-	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" 		"${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
-	sed -i "s|@@PN@@|${PN}|g" 					"${S}/boot" || die "Can't patch PN in boot"
+	sed -i "s|@@JAVA_PKG_SHAREPATH@@|${JAVA_PKG_SHAREPATH}|g" "${S}/boot" || die "Can't patch JAVA_PKG_SHAREPATH path in boot"
+	sed -i "s|@@JAVA_PKG_JARDEST@@|${JAVA_PKG_JARDEST}|g" "${S}/boot" || die "Can't patch JAVA_PKG_JARDEST path in boot"
+	sed -i "s|@@PN@@|${PN}|g" "${S}/boot" || die "Can't patch PN in boot"
 
 	default
 }
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
index ea5ea27c54b1..c99a0ffadad9 100644
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@@ -1,7 +1,9 @@
 DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
 DIST classmate-1.0.0.tar.gz 57807 BLAKE2B 171a82fb61fd1e183a5d435912099fd663d41c5d68791502c3a25752b77e809da817d2a8c5f8be55a211c4ab192aff6e2e566e8400c12fef688dfc05ea8a1b16 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5
 DIST classmate-1.1.0.tar.gz 60936 BLAKE2B 07fe05e3f5e77b4d3551c99940b2c1e53473c37f59c592cca631266d9015618c0e72b4e659ffba999cf53bb6c5fff38a1525dbd2f49852b60ccfe66c1cb75e01 SHA512 461838806e9c181764433473af8a8d3e24539a8a8ccaed29fee8eab9c6a7a2a0b1a7dd4435931ab08ae46566330a69ce3a1d2efadb3bab2535aeb041c530ce9a
+DIST classmate-1.2.0.tar.gz 62150 BLAKE2B fac7cb24e527f69863cfb4c59e634ac77165aa5a1ecae9d887511818a87ae9cd2652eb47e72844f3e38bed3c4856185020db6ece90553d14ce84cf6ce859cae7 SHA512 82f38229cbe57531354300b967589afcf064970a2b41ac56ad3520582719416ca878d9a4adc46d46a4470077e5f14ddcf2906b0af03156863301dca0b20d4151
 EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
 EBUILD classmate-1.0.0.ebuild 1161 BLAKE2B 2603fe68a5a76351ff3201e5e8afb8e89ffbf8e981a852b554d45022c61a5fba7c8c7a51dd0b6462d92fe732d795596c4c77f81f866a11a411e944f3f7ca0138 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3
 EBUILD classmate-1.1.0.ebuild 1221 BLAKE2B 4bc5b7d808f7068564b8b7cb7a641d7c469634664b4845aa9b9d63c1032ecefce973d6038facbbce4f8d7e4f33a22935ef88c2d29cf8d03d3ec0b8b42ac962c9 SHA512 1117e04a48578ab393ffa9222ea2bff023986e566c7fe12ee37ec0e502e7836d867cf512ab56a5236c95347de66cc03a46785b9ca1bd1e8822f668afeb3e2fd5
+EBUILD classmate-1.2.0.ebuild 1116 BLAKE2B 25424340aa51ee12ea829a0c53e730eac4c7efe3ce275fde5b89f0d784c869b3c7d98cf66c9f5d53310ac232b5e7d9db54cc57a4a4bf7f9f5b2d031fa98ea23f SHA512 3e3ef8cc197635ea6e0e271bfc632def2a893b38d1549f0f2248c279880fb92b232b0a3e496e0534a7ebb6460fa3ba8c0ec57eae0f829fe3b1c216ef07d84982
 MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-1.2.0.ebuild b/dev-java/classmate/classmate-1.2.0.ebuild
new file mode 100644
index 000000000000..5b084f9f2a6c
--- /dev/null
+++ b/dev-java/classmate/classmate-1.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/java-${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	rm -v pom.xml \
+		src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index 29816a8283d3..f3df38aa906b 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -2,6 +2,8 @@ AUX commons-math-2.1-r2-buildfixes.patch 770 BLAKE2B 99782f38b6efdfa94b0b69390bc
 AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735cce14307d33772701a6240a8d5a094b2156faf4fc775454c0c369df066f9404a0d5a5671f809647ae1e5389648ec4 SHA512 7f7d4a469843b218e90e3482360101058f027cf7d2319f1f7a5a4af7c09b6e4b05237c594eb217d5ffc3f07793fcabaa733be52686148af94a12727e4fda89ed
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
+DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
 EBUILD commons-math-2.1-r2.ebuild 903 BLAKE2B 2b390b4109fd875bc79f957b2fc22a0e3ce1536476ed331bd57e32d1e90417200002f14045cd7af145f0a1a172e23773531682ac427f0a20e905cb10b8ae305f SHA512 aacd02d27d30d7f27c5bb35cad318b21a4235b0264282527244d892f509e3e0032eaf5407bfbab9b6c4f548c7e9efcbe68629bf0502899c1e9c6d32fb8ad9a4e
 EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
+EBUILD commons-math-3.6.1.ebuild 693 BLAKE2B da9523bb624ece2699913f23672a5374ec63ef447252fdbc27e67efedfb3c402d7679b55cabfc883000e758f8845e16128ab503dc3eb1b5e76be9fb72e858d65 SHA512 7e927986aa818cd297864fb3ceef5f23a75befa6001b924df7256448c2f021888bd13f406ef31339ff8dc4eb89954ee5807ebdb1a4fe0ae763c18fa9d90e5bd0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-3.6.1.ebuild b/dev-java/commons-math/commons-math-3.6.1.ebuild
new file mode 100644
index 000000000000..5578f6ffa3a0
--- /dev/null
+++ b/dev-java/commons-math/commons-math-3.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Lightweight, self-contained mathematics and statistics components"
+HOMEPAGE="https://commons.apache.org/math/"
+SRC_URI="https://repo1.maven.org/maven2/org/apache/commons/${MY_PN}/${PV}/${MY_P}-sources.jar
+-> ${MY_P}.jar"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~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/commons-net/Manifest b/dev-java/commons-net/Manifest
index 2000ec20a9d8..0de387995e64 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,4 +1,6 @@
 AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
 DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
+DIST commons-net-3.6.jar 435798 BLAKE2B a8c28909715d76469ad4760ece6f7b3515c56badf8ce19fcadb5b776e0cf341b3f970689a22267d19f22dc12fc8d5e2a071347df1850f290231747d0712263b7 SHA512 50006ebef259c9d4f514bfd4e6b4578f8867e2a105edfcf30542a039e385a02e9c48dfeee0b287c39c375e1418817290713f7d0792b357267723a977a07062c5
 EBUILD commons-net-3.2.ebuild 1260 BLAKE2B c78c4c247038135b24d70b60d660b5d5bf98df859894e574f149f86ca9dafaaee81439ac394fff5143c732c18e8ca1103200105c135792dc1a0676926e049410 SHA512 f5cae63603d9fc2423431c21913b584103bf1d15a67c744a7012b9b0fc7ae303e51ebdcec162c260f005a58fe1a52a4a9215e801d3944c051f40e8788240de51
+EBUILD commons-net-3.6.ebuild 653 BLAKE2B 5a213d1165cec70de88d22f101ddf30d2486885e6cda3d40fcc670e1ffec7a4cafbe80cffb7b33a8474c96fcd4e27d3b93291badc8b18e9ba4436b7105ee5c3d SHA512 9380e5630043664be8d9db21825d005cc860d85b29e06f7068c9a9ba7840162012fe53da3184c92369ff79e6f28b634592a41cb4a839d7de7b8f5547db0f87aa
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-net/commons-net-3.6.ebuild b/dev-java/commons-net/commons-net-3.6.ebuild
new file mode 100644
index 000000000000..f102092a49c8
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${P}-sources"
+
+DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
+HOMEPAGE="https://commons.apache.org/net/"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~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/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 3ea7430c16ea..4dcc776e92b1 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,32 +1,32 @@
 AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
-DIST icedtea-bin-core-3.7.0-amd64.tar.xz 61959572 BLAKE2B f8241b980ac4f8296af0aa58700d23607829c99e0fae7961008d928caaff955e14ab32c4b65305da60c17014ed7dabfd3a4406900ce999354cfbb8991127509c SHA512 680ffb17bec2f8534ce08f6158dd912413fb0ee8afe2186a8a259dfbabee99a7fda8b1b6bd68a8520946f18a482cd370f7ac2a139a34b9409d45bc19dcebacf7
-DIST icedtea-bin-core-3.7.0-arm.tar.xz 58035752 BLAKE2B a745e93a8a794845b25cd08ad1078ddaad6bc5f339dd2123b1c012feaa4aa0f4b6ae170c8691bb2e35052ee7048e33d8076e4532c8796f2813b4f06140ce9058 SHA512 b54ed397da26d9178368e7cb3efff4d43c90b76f3a110bfc29d98493567801d5da3fa7063ca82288bfbc80d9680385ddea8e12fa2d581cbe4ffc5a3b6e4fbb2d
-DIST icedtea-bin-core-3.7.0-arm64.tar.xz 59140980 BLAKE2B 5615ba4c7ff2af6890a2d82a9a58bc896129d4fce362b5fadaaeb4e82203b346c0af6c89191bce3283f8f89f7c00ac728cc9e511d4893d59d48a0ae5efd4da22 SHA512 2d79ab55da14087c51ce997b3bd62b37cc769f1b2a3ead821fed574a3ff3012f0c2c07d2e9f92b385b10478c35def75d2da1226d5874c632dad8711b97e7c8c8
-DIST icedtea-bin-core-3.7.0-ppc64.tar.xz 54288800 BLAKE2B 4858529c37e05158c481f634796202a9cfeb3dcdf0c11dfe3b84d63d238790c714f0f4aaaf37a54d7d13ddbdab7d7a7083d73f9ea684508145ba0c6a725ce346 SHA512 b6411ef98525bd90c42c017b91a2acc3e4a94e9965391b7432b60d24d980667cdda27f527d0dfeb2d60285c3d34b2aaa4e7485b4b8f07e8e47b07bbbf5fd9b94
-DIST icedtea-bin-core-3.7.0-ppc64le.tar.xz 54323992 BLAKE2B eb03570034b7d271974c50c5649891522b89c3bb82437f7feeab12a228685f2d93e827493df7f72235cffa253e6c83ca9c9ae2bd16204987f3b67af452307cff SHA512 593c0947252bc5290684f8056a20ba7ebbe9517e0c118009446df43da15a6e18a1e4593675242bc001edab078e3a914a610a86559e4d7ea20b6d2349cf3977c1
-DIST icedtea-bin-core-3.7.0-x86.tar.xz 61466288 BLAKE2B d63b381f9ad6f1724f9fe549550252b8d298b8c5cbb1351ee13c7ecf9c052fdc1ce0a4d4eac27b9a4a5700bc1734f3d3f985deec0f97f97c473911ac749dabeb SHA512 cbec66498b016daae78a8ed7e8646a844538c0b7d87615aa71dead9539164799991cf8c11f51de8ae438045b2f8ae8a9c99b79c7b0d04e09d97d208d6d544b35
 DIST icedtea-bin-core-3.8.0-amd64.tar.xz 61957580 BLAKE2B 8648338daf7152a0c0317e33fa1433dd44b9e3f712e49ec4e9af907f94063e6c193effd350265ab9b89ab19d3411ac523693d381c0cd7f604f45c241d1843820 SHA512 856a9d2da9b4b1f9400742d17f6f4c0cb43e37c738c5ea8feba763554b8a4ef2f529f59e81fc6919318df7cf7fb1d94a8a682220fcd82b4d723376031b8575ee
 DIST icedtea-bin-core-3.8.0-arm.tar.xz 58006344 BLAKE2B 6792056b8ebe82976dbd288cbf2906b00124aef4958ad2e073d57c746d6fee3e0181c61381744bdeb34daf54524ddebae692e01a52f3a5cb88fc34e1156bc9c1 SHA512 e2025746421ae197f0ecf0702890f3a8be62ac7bd7cf08b35250a88ccf7fa37ab52bfa0c6c09d8801f6c8d4282677f957ccbcf54c7f501b441b196dba7eb9f9c
 DIST icedtea-bin-core-3.8.0-arm64.tar.xz 59142392 BLAKE2B aa653348bb9d76ecccf27c76daac5f25e8bb58e95a0aaca05c233fbdec42f9c0f285cef1397a99cc5f15f154c8d2fcb9c9e36867da369a984692abeba57b711d SHA512 fc6531dec845e8a0dbe2ffafc0f01093ac5ed861b4321825e04f9a72892c0eeebbe5ff36186ef6ad098aed0d6fe79a5324c55e709362cb5f44bdc7d5666a19be
 DIST icedtea-bin-core-3.8.0-ppc64.tar.xz 54282712 BLAKE2B 78f9f9fbbcdb5f36a970497eed6ea77ed142d32beec74caea489ee7105e08151878a622fef5ea66b521103dc5b561203c4bf3fe7ab2b80ac304b5d4bd2d1d84d SHA512 d354b2eeb591dc73c9547a56f1421b034c7789cfb44a7f6b717ebce39113b319b3c3afbc7367e14c86b42a52e2c27fb69a016657581ab7f3586b6a7cc62b0137
 DIST icedtea-bin-core-3.8.0-ppc64le.tar.xz 54314152 BLAKE2B 4a7988672a1bced1bc10c8ca7d6299e27aac624af6f6d1335c1a4722508aadb408e3f210de82491f3acc2873868d7f04bb26840161c56741ffd16c6c43e84430 SHA512 1382711e50f90ab1943c98214fdfdb971129eeb6ebdd710ecc8bf777487ce85aaee0e5c8dd17ac403e00f20a8829c1f1afcdf648794a08da6be9b0500d959815
 DIST icedtea-bin-core-3.8.0-x86.tar.xz 61435788 BLAKE2B 5b4da8a54354287994d249ab2b3d2011ccfc987675e1899789f2a09b709e54fbf586b76a98839acad88b81fdef624b58e3821fbd416ea8bcf710293619ef9941 SHA512 623fc1b1f125b241642219e3060396395a6d802c73b440689c984ea259a1a0bad7b8ae04a300058f0a2815abb590e2b77bcaf3b4cddf2a9ed37a0789b87f25ba
-DIST icedtea-bin-doc-3.7.0.tar.xz 11682076 BLAKE2B 6c4629cfee975532aae9692061037662761ff4a0e3d13e72e167edfa90c81894894b48e97ad0077b38ba9e7081e21d157969f471988150a11f11a0b1ca6bf073 SHA512 e9c9ffe923fd6d6cd2dbb1bed402cba282baf17791c87b6fe12907fb4da3e401f4d101a06e1e6614d1d75d5b49a3e7cc60912a67af4dc25a4351d38c5c8ed391
+DIST icedtea-bin-core-3.9.0-amd64.tar.xz 61995800 BLAKE2B dbef63538ae68e5e9d2e664fdbb8d1422d9d5a32c9dbb6bf77fbc0b3602eb9de3a8ae830df480bf3e91cc89d9a3593f2892cd3001eba782512e8e5ab9f8b58ca SHA512 349f7ab0dbe11614bc659f9a3a5cf75b7b1d1765cbf9f651684365cfc5fd7f608312b25362fb086521a077610cb88b19d33af4fce10e69dbeb29d8f4a23bad61
+DIST icedtea-bin-core-3.9.0-arm.tar.xz 58032620 BLAKE2B 1646096d659a702b5ddb08c2c1d56f2eb53d91d08902045973b177b640d0bc7abb51343e81594fee669506a4710b5ca012af11ef4c4490d27e1fa2a7cf52a3e4 SHA512 f362170bd60e0a6ecce0f712aaa00effe9d52d082e4ae524f88e4ec91c02908108a0b8496cc21787f94605c265212c7fe7da164959d0432cb927d274f79ec56b
+DIST icedtea-bin-core-3.9.0-arm64.tar.xz 59190292 BLAKE2B 8778d668e96a660b73371e4d67bd3c8121b981efea1d3c900c8d38b6be3bd3de65e79e87deeaa88b86be2ce766750471e332e0fbad08fb669b803eba3c367903 SHA512 577bb5bca4c9b9bc9ae14ba50fde73c89d37515e7287ff611d297394aecc2dfd69f4d2ca347ba5d833c41584cd4b644060f21ac5b6c3c11bf710037176065314
+DIST icedtea-bin-core-3.9.0-ppc64.tar.xz 54302616 BLAKE2B 6a354a96bdfd3d6398832e0840f88c50981a1ca304f076c599603f98d3f61b32192f03b5a9830966e3a683af63415c56769977202cda6a618bc6953922f94f89 SHA512 534d1c7d7e64b69cd6352b62c46da005df0855bb5a8d01657462a9202d1149f3e9d3e89b8fe499b53f3f7faff976b6fb665e200bc05ee7ac17c981096c7ba584
+DIST icedtea-bin-core-3.9.0-ppc64le.tar.xz 54336300 BLAKE2B 2cee58d745faee8dab0ad8b064b51d60552995d33407f40e50794a17f7d993b74fbd340db3aac520642e11a926a89554e9d686cd425b05bed4194eb1bc957e5f SHA512 6d680a987dddff0d569417c3d33d8c8b73bf2aeb454906047226be3ff7277ffc62d272c0dcd6c2bc9ee3724eacf77074ef9e931f980232ffb356e9e919f2247b
+DIST icedtea-bin-core-3.9.0-r1-x86.tar.xz 61523320 BLAKE2B c5c1415faefaf1199937158d953bdced763c1cb739cb521b5439d37dbe66d659546940154a4139c3a8b7ef13c822da877a335c7e09299c097ed97c22eb65c50d SHA512 8239e56248923d67174a7729cf0821862b8b349edfee46ffb92d25121b1b8bb7b5aac7e67b8cbb35ca97c480ed9292ae9a5eb14cfa03142de2fa77f93a1e4f81
 DIST icedtea-bin-doc-3.8.0.tar.xz 11683136 BLAKE2B 37fd84b58f6d6934b4775b23c3cfd47dbf275083719361ef74d55dcd2385f822b8cd0257e76cf4a194cc6d555c579a8373b39f72f4a8e80b8511acb5a0b2b537 SHA512 aee063874fa2de7cc7848deb511b1373df14ecb530eb00887920ca82b9af80763616ac4df641cd0debbf08011f71b20e8b250384e9d142387139e7698dece53a
-DIST icedtea-bin-examples-3.7.0-amd64.tar.xz 1856720 BLAKE2B d5e4497f946b48cd5e5a85c770674df5a9976d95fa4a5a562b53b0073ec51d4be3d6a9ca7145b3f79a31f89a3400493efe8c6cf425359d259c78dfa4f384bd6a SHA512 1155b8bf339b04e33ce986f0eb3fd9736e11d55ff2c3f7e515c74e83fe9cdc52e28a156f81b9f76efa769312fdb5a4080725ba7ef3e321e76caf6c911e8b7cd2
-DIST icedtea-bin-examples-3.7.0-arm.tar.xz 1840032 BLAKE2B 3f9ed953df3ea7d47dc43855256cf54c834d4b1ad4cc20114c2ba9cbf02f3cfcc1603da7e17325414368d7acddb717b116433efa52d987aabd5ae2dd8d1d21c5 SHA512 ff21951c7d81819c86366d4b6b450a14de6f45ab7916ae1061a9e7ef631f466df30434ed1f44bf007b7ae6693899e653e36e95c1e9f615e67f66bd4607dc62b3
-DIST icedtea-bin-examples-3.7.0-arm64.tar.xz 1838264 BLAKE2B 00c55e5af20654e3225622e7ccf55fb844870ee7e77683d9bb4b37181aab3ac119d5e7b4418bb0e50ebc87c3eb6ec9f37f745bfc5f0073ce33b8991e2ab20d68 SHA512 deeabd2bfc87eeb7d1f94b73501ec54f3c54a29fb9a857dca5cbe37fde49a63ec81049b62840eb6a36f6313ccffcad0910bd5d75e8de31ebabd59a129d613558
-DIST icedtea-bin-examples-3.7.0-ppc64.tar.xz 1847956 BLAKE2B 25ee12262da772e6fbecb57f67644981603919ce4711319bdcb771f6208109b6ef23ee0b6c5595a9490d1eb8f556303a023caa9d92d4d1059aa4c486f264ea14 SHA512 9f1dd454b3473efb5b32eec1abb5babe0d1fb16baaaa7daf197770add5bb230575b4de5c52b15c0eae65cbda8341a7f5fbb2f4092752e1dfc135cb2eaa77fa43
-DIST icedtea-bin-examples-3.7.0-ppc64le.tar.xz 1845292 BLAKE2B 1e8cdf15a1e4bc641b707f8df0432da83d874e74b41cac81445c3cc32d239d0e1370165ec847dcf4fbea8023fd44980b4b426459b4b4f69d850cd21aacd919da SHA512 a1c71085e8a9053ff8cf0c3c10c901657079a3df631994ce4c621ba25b9e89f211372fcb95c9b0dc1828fe4fa76ee2c0a33716da1b7c0a4af491fd418b799df4
-DIST icedtea-bin-examples-3.7.0-x86.tar.xz 1862536 BLAKE2B 7b033ad8e12cd4bb899acc40803bba9fcad1b5b6761cef65bdbb02b578478e09c64fda815cb4c518608d2a8120683a7d932341cd6d971adf381beb9cea7cbee3 SHA512 b3eb96ce677ee525ff5447e7ec0391e2bf5d79f451c71a3d78923c66664e8fa08008a4a3a90af2ae4c7a65787b86cb2f5a3689393d3548f2e9b229157313e887
+DIST icedtea-bin-doc-3.9.0.tar.xz 11685100 BLAKE2B 3c0301193e295b1441f657247263994deaf84c3c534b110db9a7e4fd3e6fe73d2499a2661dbed4f9d2751634c0b99242963b92a0cbea3fa846230d7dbfce1604 SHA512 d5190f0c341181321aab1a0113368cd138550a12d6be684568e45899df509b3e9ea95abd72c1505c298d6a14977ca2fcb07e85e6ab4d2d554959af35f993cb8f
 DIST icedtea-bin-examples-3.8.0-amd64.tar.xz 1856688 BLAKE2B c6ab09ae55a2c1ae42485acffa72ed7a16a5a19e5ee105f2e4e856c7929ac9758a5ff04873a5e3114f4fcb84184a85d30503904eeb21c34010b72b23b2b9f98d SHA512 de48a06fc39393e5967cf83565ce42845ce864104038a2094555cee4331ce1dbe1cc7e56668b773581a9f2e8bbd11c23dc77d922d20e0d80251ced09edd509be
 DIST icedtea-bin-examples-3.8.0-arm.tar.xz 1840028 BLAKE2B 9b4023252d5a862d2d769764cffe702ce6fe24c3870554b3c15cf0726435bb079f3c5bd53adcf851aee5af1f3ce9cc9c0d0b5ca53e8902935f88a2a423429a53 SHA512 70b5134bcbf41ace25967a1a75c6d8b55c9bb0f1c72bc4ef3bdb45a18356340b828d0666b1581ab4c2605244256db9acea9a229e53c5bc53e016a32057eb27c1
 DIST icedtea-bin-examples-3.8.0-arm64.tar.xz 1838420 BLAKE2B 6be665c5ee12ab6063fa01f13e4d5cdd957f844a498b6267a585c5f84faaff378661e012b6ef37ffc8e1fd81d14962413308a1717314d0928ae351d6c5de58c2 SHA512 30c32731ba7744d8dd1ea8b09c1540fded244f4fd641b29db441069510ed5691a2937a38821e821f47f73724e1ae3714dc5f9bab766daf1547b1a39ad5a346f1
 DIST icedtea-bin-examples-3.8.0-ppc64.tar.xz 1848128 BLAKE2B 2326df5f72f0c597b547afa06c2b73117b12d2eb96ef190a39c23a3b16e6b792487a077d4f07b00f6cfd446bff6069cc33bdb0635af8503b1ce9e38d5bd4c001 SHA512 266c7def17c119cf1b1f18729a8160a819a578868d73d175a18d486d924a355162a0c74858eb7bb21c75974ab6bc16e9de83d27d519bdc2ebefc9cba88ee669a
 DIST icedtea-bin-examples-3.8.0-ppc64le.tar.xz 1845000 BLAKE2B 1a08259383e40c7759af27b653835c5ece49721b9f12b21b24ec29e9f43d276d4fab616db7270ad9e290f49a08fbb5cf3a8b157bd56391ff1b209507e33df1be SHA512 51d7ac3901126a075825627e48f306b14157abcab82bd0c9989c443892c4fd7743fd37efa9cf6decc5465a1a682e7a0f710713991970a8b99d76619e36fb30dd
 DIST icedtea-bin-examples-3.8.0-x86.tar.xz 1862620 BLAKE2B d7ec2c538708620ce6dac1e09a91054a16e34400a2cd96266044c919d98a6433581089fe2f4d7e79c8253e258a19d4f32c45b10abd204baa43067eb3259e9388 SHA512 e7c6cc7f98f345987e1c003c479d65546deb086c8c281e99e475c448a470423789058575ff366a5b4819fac9115fbf648de686ac393450989e6dee75fd01fc9b
-DIST icedtea-bin-src-3.7.0.tar.xz 45735652 BLAKE2B c972f209e42df27137da8c03bb8555ec5831d49915c7b139578ff5e60efce9a1dbf390682604302d21bbd91f8e41da5079106ca0b016e2211453c5067e3de172 SHA512 67377e2dba3226146f220d7b923ad2a693949241d0c40dfcbceb47f691a6ce4fdedb28cbab3f4f5976029021b918cec49a7e61b373385a4b0514e10761fd3254
+DIST icedtea-bin-examples-3.9.0-amd64.tar.xz 1856872 BLAKE2B e5e4e20e289fc59c04c1987312e14baf94151b0e58ffc26d0c9c231c44459a34f9e2b0d464ecf30e177f52f140700ba23a30d6631436d838c86591783e978b57 SHA512 bf655e4eafe8e757a240c16eb85ee25a0404917d48829a0d4c0c6fa21771b1ee82ea4c3aa3123f21574abcc8455bfff62e0a5b254a9828f874c51285a685d380
+DIST icedtea-bin-examples-3.9.0-arm.tar.xz 1840572 BLAKE2B f3a5e470b4bcbc731066068690230e854cc6950ecd6c22cffcebd6afc6e18e0979bcbde272d97135b3bc2a3e1fdc5a43fd3d40efba3f770a53b1d9e524e14702 SHA512 db560fb4e2542c2aaac4d134030aba058c6591008cbac9b5ce45cd6f7a115fff4a97270e9825bcec17e66f723f0f6614095006cce791c326c44d75ebf42470cb
+DIST icedtea-bin-examples-3.9.0-arm64.tar.xz 1837768 BLAKE2B 96d870c5a823c5b8accbe540548ad29f648466a094a0bef2351770758c6f7481b359c6d64c4229e61a168c0514375174634a0fa5c74e63351e50de4b2b87078b SHA512 28a00121176df9ed71d8a65eea1c7592669e201b1b2f57bad4d219c64d14fc891766a7f33e9c4a7f6d28dadab9ff7f174612936cfc20ffa2802d4b477c3b11c1
+DIST icedtea-bin-examples-3.9.0-ppc64.tar.xz 1847612 BLAKE2B f14e5e4c2b28b19b9e05a98e98c930dfacf3afaac3bd7e791d3de51ad276316506f370e35e73b1f6cefc14b1215da2a6a51d2cba5f94cbcf76233a3fa51fe23f SHA512 334b5db34987eb0c2e17c2570bda2fc45de8c445ba226137a9dbf768d1627175c3621a29408e9f31fb40c0aa1b3801f3e050bc6bfc81e87a43da9fcc64d9cdad
+DIST icedtea-bin-examples-3.9.0-ppc64le.tar.xz 1845088 BLAKE2B 95f98bf4d76241ebaa3966675a78f871b388de7aa5e3d672b804fcc010e7506c961ea8a0c46e4e3a966007198a95144aa7f1d1abb0fd3fe1da610e4f99ffe49b SHA512 4be2961f5b042d0edacc944243c3cdb66ebb71919247a38f3e992e792c3a5c85a72a8b0fa87d614b21b6f93e5e96062be145666e9b5e9ace7982ec2976d9ca31
+DIST icedtea-bin-examples-3.9.0-r1-x86.tar.xz 1862632 BLAKE2B ac63c7f38ec35dd63b01e5f9472a1f226fd3eac7f5e5f8a55e5d211b20344b86ad2d55cbe8f67acfe80a30bbddc72f8de091ae6d3b7df454bbe43c42ec957726 SHA512 d5b377e015550f14996deb040ce753fa4f88eb1fc0ed76babee6e187feff61c8947c54c4f876d25e5fc6344b1411c4c93b75d362206f966e69b205a14d18380c
 DIST icedtea-bin-src-3.8.0.tar.xz 45741844 BLAKE2B b06e21b2d243a4be4e8328e7551285df9e71697b04b74a98a10293cbc8ee13bb570183e3c15511434e0b21a9052fbf945da8872c5db40fe28564794557f2d67e SHA512 527bbcec8d1c6a638e0861fb8041c94eda4d5d51ecc5a6ecaa615db155ba8cb1563e5009c4031c6b161328ff75654f2b46b09b08279260745288c5876336bd3e
-EBUILD icedtea-bin-3.7.0.ebuild 4356 BLAKE2B bd289cf7f42575d459a230abd0a0222815eb3ae18c79ebb665243840ef0ab6a7bfefbb667fe74da5168d6bad4fb638b16faf30691bc15c73a9d086e1f6096741 SHA512 04ec5586aa23ed5158be531b05dd9b13a9aeb8e057362582c977b8fa90648399d31aa484bf51e29aa7ecd8d16b124e60ebfc37f2f265f9ee2835a45dfa0095c8
+DIST icedtea-bin-src-3.9.0.tar.xz 45749212 BLAKE2B 2b66ddd1639e84c637775321648d24e6161c292f54af40d6ce1dbd07e9bbcbb177d5895548ea82a6168b35811d48807e58292533846091f13745f13408ee055e SHA512 05b4df389d84f7be144bc99c10cf544183db77b4a7c141826079edb445b5af333440a5bf0ac627133043e276334993969be22caca2db9edd6249560a4db031e2
 EBUILD icedtea-bin-3.8.0.ebuild 4357 BLAKE2B 333332b4a0d14ccac77464bdf5454ecd74471d8aa5dbf0f78f21a2015c6a8d59ed1dc0e2e29ffff69788af8f49f819bed8bede71507e98b86cc3ec306f26411e SHA512 8d2c6e326dc72070d7a8be2d567fc0fe274e57673e16842cb2e9b3ad4304a46d92d3810cb841e90f35a16c0cdb178eea13f865923216038bfcab70263f15f10c
+EBUILD icedtea-bin-3.9.0-r1.ebuild 4385 BLAKE2B 0c8570ad329da2c8655f520229ca1be1b801256b576e09270073a8bbfdb1f6ea7e837a3d4cd1612602731c2af7f8855706a55679bff24559711f57b76813c5d4 SHA512 24bc509dc03d592f206cd27dbcc82b6ab394e7db12f0e080ec2abb2f6b4b83cec93e2a3dc118303e3d970b0b39802894385410b67661ce3c5f70fe82776143b5
 MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild
index a196cca5d69e..47acc0d18744 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.7.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
 abi_uri() {
 	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
 		)"
 }
 
 BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
 SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
 	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) )
 	big-endian? ( $(abi_uri ppc64) )
 	!big-endian? ( $(abi_uri ppc64le ppc64) )
 	$(abi_uri amd64)
 	$(abi_uri arm)
 	$(abi_uri arm64)
-	$(abi_uri x86)"
+	$(abi_uri x86 x86 1)"
 
 DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
 HOMEPAGE="http://icedtea.classpath.org"
@@ -41,7 +41,7 @@ QA_PREBUILT="opt/.*"
 RDEPEND=">=dev-libs/glib-2.42:2%
 	>=media-libs/fontconfig-2.11:1.0%
 	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.6:2%
+	>=media-libs/lcms-2.9:2%
 	>=sys-libs/zlib-1.2.8-r1%
 	virtual/jpeg:62%
 	alsa? ( >=media-libs/alsa-lib-1.0% )
@@ -65,7 +65,7 @@ RDEPEND=">=dev-libs/glib-2.42:2%
 	)"
 
 RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
-	>=sys-libs/glibc-2.25[multilib?]
+	>=sys-libs/glibc-2.26[multilib?]
 	virtual/ttf-fonts
 	selinux? ( sec-policy/selinux-java )
 	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2715aa383293..bfcd8c865c30 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,17 +1,17 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.8-aarch32-bd08b7f27e11.tar.xz 6762428 BLAKE2B d5c6b97ad133faf21f16328e1a86fe22a1e3bdcba73d43728cceddb6341f529661202e5384f3a7bc9f0de4bac9af897b86f942cbfaa310a44b959b0be5b55fde SHA512 99715812bf7b71e2031e96e27b27745d6963ee9749886a61a982628b5d95b9491a7696cf733d06adedef75dbb8dabecf5ffb72531e6b19329121b0e4f1b08afb
-DIST icedtea-3.8-corba-75fd375dd38a.tar.xz 942152 BLAKE2B 86ca4a62d8dfe7b8fec3a90471b48e2d0711fe708654695ddddbbc400bf71f1f3a3926f28989940ff325c0e171989336082d271ab468a13e38dfd93d680437d5 SHA512 a41d53d2d6471b94878ba18caf525f1b64e72c2ae6926a9f1f5dac2e9a9366151d35156fb519cca8aeeda97d8e42cc258a93390170859b3035de4da69e48e321
-DIST icedtea-3.8-hotspot-cb5711bf53d9.tar.xz 6838240 BLAKE2B a2419e93d736458c7853800c0efbd8a5035b2baa2b239e4326bdf70c5b6f08d36a96ae53b29de978e493c40ccf146f2c2115a08413b1fbf25c51850eb83fc4c2 SHA512 8c4b060611b867c43fbe6cac3d2f06f6979950781872b387220e12c7066b3efde24160b7bd03189350a6518615b492703425c2ea67a26c6b4d187f843093a780
-DIST icedtea-3.8-jaxp-2b279bb3475b.tar.xz 2287836 BLAKE2B 3705c8137a29a706aefe3dbb32fb0042e81c50cddcc54c31448d2c6f2c5a27ab3ea7e7f03f82990c379b9f39368aaeb6d8ee8adb56ecbf21faddb35d1727be07 SHA512 3eb04788776612f0de0b058908417c4735e6b1cfb56afaf73748e1f3121b25d6eea710cd1d72ed19f8788c8e00b701265d79237da3542d0947c00d37b4308e9c
-DIST icedtea-3.8-jaxws-c54a27559acb.tar.xz 2270928 BLAKE2B 2c5adb94aabd276fb00840ef6b0dfd04a36d728c603c8281bdbcc3d13b393144fb2336d4da54085ab999ef6725b6f706d727645a36b77f4a1294177947b6059f SHA512 1431e71e2281eef893904e686c8d33587c4332ed7cfacd5fd2e278fe0a4e6f225e03d22b8ca73517b030e3e33ffba964f023bed9b9e4f4a6f14b8cced43ce0a5
-DIST icedtea-3.8-jdk-9c9ff65b03b6.tar.xz 39146448 BLAKE2B 1f9a4efcc5697ce73af9018d39c632cecbca6945c4065f089db027d1fa86b6c315ead93f3acd291615c68edc057b470abe1cd0316300f54113eada7789b3a5cd SHA512 9f6b6e42e8bea6a00c9833bd9775bfa5c63d1126e25fc376f4ba2cf5601dea8ab6a3f1d442d5fb188de3f74ce0a6410dc3a8463f798b1aa23822a272faa5aa73
-DIST icedtea-3.8-langtools-21524ad5b914.tar.xz 2070064 BLAKE2B 5a5dcc0e40e08330e29850d99810fe62fc233390347ebb21fe12f606ddc6e8b5fe2060fe181210626d1e2ddc92828779f8fc138bdfda90f7b66f88e75f80ea43 SHA512 fd57023505d69246593ed24d90ad7052a88362ef7106900eca59e61ad5cadc247215cc9e8d410f9150e33a72126247ce1bb809540985062515b3d31d77d1535e
-DIST icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz 2317148 BLAKE2B 9d85532853dfde6fcbf406d52f29e3b8130e5435e38200a48aadb16b4aa8a9dfe70fe6f7f83c4bd170e25a61fbaf3a8499893ae247239594e004f1a4aa37e708 SHA512 7c6d51a6565fe8c670a59caf001b1c0821b7fb2e42b2bbe24b35e337df4fc664c87868e0c55dcaa168f9c3e973ab9e75bca93d660e242c07d0f21eff83d674b5
-DIST icedtea-3.8-openjdk-499b993b345a.tar.xz 335928 BLAKE2B bb49fd086851110e9beb993167f2cb9b217800086070a1ba04a6b96b9e130157a2d8420a056e2e71e98144cd94454aa4c3a568c038f1b282cbc06b25df49a54c SHA512 e438a7ab0eb4e4374278afdbd40cab66875c9704f80a8963f0c965ce995744bcf23814c734ffd10e95329c7b767337fff18e3478c3f03481f8e15a5a9bfc853f
-DIST icedtea-3.8-shenandoah-c44a9eef4985.tar.xz 6954776 BLAKE2B 348735f8a2ecd656c4d323dd870fa63d028757a57babe0f4ffa0977d0446f17cd80a6709147b98d6712e1b5d26719cfad1ea01536930dddcf7389947b43a7d7d SHA512 2e84c6b398f35e59d3819e5ce23dd573e76c385c47f9971d6b77def1cfc1b19a86288e3cdbd78aa6dcdab068128852f4a1c82cf13229a760b1f625095cd51514
-DIST icedtea-3.8.0.tar.xz 1496972 BLAKE2B 9a376539ca2c4c8560aeaaa2fbc65c61a90519b9c87e924e2d54ef150401676e90df0fb5143fd90e9e4c6d254db56617456a668bf886573854f299402af378d8 SHA512 6336d35c11dbe16c96bc07eaa760fd849a2cd317416aba72b0732f8f1e52c9e3fedde5398d4a7f5a3057d4b6ae229965d597b3f5df09a76b5f31bbad0ad02a9a
+DIST icedtea-3.9-aarch32-891d70e93fb0.tar.xz 6771692 BLAKE2B 915e3287b7a3f251e3f274e84c127e16c3145e550305d1f5dabae56367e3f118810fccd3be3c0f773f02556e9411812f30964bc38f6b44234f5e08b69c0362e3 SHA512 a15670f1c3593367aec89d40946115f6bc03bf4ba439cbcc0544293f46cbc5c0bbd4bb1b644fc00c29d8c82cdcabd00d993615b1852fabade097b433de0190fa
+DIST icedtea-3.9-corba-c120c4fb7b31.tar.xz 944220 BLAKE2B 545430b398f6f33591faaf436a294c11d6a1ae83ed2c4ca474407568c01709aad0ecb3f7fe2a8b84900f1257b627890439439e200322b7c7d1d410c8f25a39c6 SHA512 644203f6b951b8a6af1291f732c0c1fd5a060ba87e0e371e77e6d40c8e36a094799ce8b29cbf094dd9a53a91aaaeea38f63c7340c8adba162ceff7a2695863ff
+DIST icedtea-3.9-hotspot-d78088224b98.tar.xz 6851860 BLAKE2B 1006b9840e7e0a76fda362a47503ffdb689a0a2ed025696dd57cafc5a17167b21373b6c225d01c1d6ad8583e39d4eaac99157cea361daf193c9d992972764630 SHA512 e7e333695e5871a7ebf9d663d5c5a7d16a31e3eca33a7f974d7d6941598732bb8514cff8f0da8baffa2cff639d404f27aca23f450198e8a45262acc69d89f25f
+DIST icedtea-3.9-jaxp-55420c5cc9f3.tar.xz 2289624 BLAKE2B acdc7ec79393178b7d8a7f46605e8114858f2040e445e1c6388e9ebf21bd2367d21a65d3f1f041b316f45978fae970af1c7340679c9fefb8385a45e19564a98f SHA512 98792ceeea825c91c6642bab14f43dfa8c3aeffcf9091c1b5c9587d154c6613c24bfa9d83a362393baf1eb0a71e424baaca4302729d1a8a30c0eb17c3688b6be
+DIST icedtea-3.9-jaxws-f824de94c42e.tar.xz 2272684 BLAKE2B 150d3ced87a87096eee0d4aee40a9f055047d4af1cbfa71a77902599bcc3addc6808e99538bfec21337909a3cd4240e79ee8fa28bd946abdae0f8ba6a5b6ddfc SHA512 d97f86bc8775cf83b7931f2503fc2c824e4433be46587416b314f6fc114e5d1117071625344305eb99101576e4639c8b24afa8be9c57387c9dd12b376150e835
+DIST icedtea-3.9-jdk-7b289a33ab97.tar.xz 39194584 BLAKE2B d08416b2757847f4218412dd8854b3488c4040e782dc672d77bd556869a91d6a7c4f529c79b5d3f3c69dad9996869c3d94359514b572ede879a2b1afb2d44b01 SHA512 192093916f442cac6d7a756f831a71e13407b327bb772031a795cb4578d82215c7eb38623e26781064f049ec7532bfac09bacda1d5241aba41f675ec84aa6730
+DIST icedtea-3.9-langtools-8496472630c5.tar.xz 2071464 BLAKE2B 321bc7817d437b93ddec6e1f2167521acc1b54a33338937352c3f4c59d3fba4ea06d6fc4a67d58e14b47d7357f4bec11dd657b5731b42676ce04a62c9cd0ba96 SHA512 20f7a53701621a827f45f8ec18b3a186b4d8ec2e58c11283a253c54e1182878e6c9ca0b6004c9c487c701ead9533912b7fe0d66339cdc8a39dab12a6da909064
+DIST icedtea-3.9-nashorn-79a2c8e2babc.tar.xz 2314292 BLAKE2B 813a16728ca48c7cf9c414caab721f5ff46878d41bf05221d85c7da27dc3bdcc1c9ca4da5acde5b030fe04a466dca950fddf0f0771557bf73f7e868979365e15 SHA512 e149ee35efff265074e57351d5ba4870ec241516e4d73d23cf75a3420f07e666e610847c996f9c1f742586af49d23518776c4c60d8d1051a4e05b39be163ddd0
+DIST icedtea-3.9-openjdk-3b2d372838b9.tar.xz 338056 BLAKE2B 1118cf74d6728685b7d9dcbee8351f462ef7c19020e7596e38e4b3b080d6108966c0f280e866e8925c620292592dc39e627808cde15dea47a01a39bcd675493b SHA512 775930ee4806ddcf39d37ddf0f7fbacad1e1bb174cb2754a830bb1f7941a636e013ff5d844e431c4840c423480238fdb88a6c28d345e3c1326ec1dbb1c511c85
+DIST icedtea-3.9-shenandoah-b8b742251e42.tar.xz 6990872 BLAKE2B e3ac745923932de3e5c8e41f418234a698ad06e1d4a9256c8b9bc0b07157259afc5abafa12f015e3dc3fe117e08d469f600de74f18f68891240b6e5927bcd478 SHA512 399406402e6f7a268e5ec837b4f8d4cb0a775c177596a71a964d8a5bb2ac915fcff050a521e8342d036a1ff48e8902dc22d8c1439237073f5983fc38201d38f3
+DIST icedtea-3.9.0.tar.xz 1513688 BLAKE2B 1e983a844cc45397d2c2b238a2a788b49aeedf69e6b2c9ac8210cee135aeb06490363a7d59d047dededdde6f9f2dce4eae7d8c66605e9ba1989e6aa7f16e80aa SHA512 a35b600f7fa7ef19bf980e26e4cc22b57ad7daf363c91ffcf4ab1a52af48bfb316bb5dcba75d0d9966b799d25f71bae2d04fe89ae28103c82f7711ba1e346465
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.8.0.ebuild 13422 BLAKE2B 63fdd99ae1c59aa76e9725a42ce1c00438496e2e9287dd12f230296b1ec1bee43c9b882282cedd43762db9ad1e5642c12894379a55343a28dc12780b59ecf1e7 SHA512 fcb67c2743f3503b626cd4214f7232e9c9acfe3f088807d5cad4b9699298ea92e9036b518664cec4f9e12192ff60b848145386779b7e16fbd24cec89c19cd2f2
+EBUILD icedtea-3.9.0.ebuild 12854 BLAKE2B 306a3e8d407eabda27795c43c92011817c29952fdcdd7015e51054128aea8a48bbb0ca328ce2eec4057fe89ae6ec8103e622ddd5888885f36915a2ba3fcb45df SHA512 0bdb481a8c30d9acd81fb7df4892abec1338f318019f2fdadb30a2ca4bb2a53155661d3d1d798e052a1f0b8a127a6763fb32899be1a38d61d3d712cd156d4f1d
 MISC metadata.xml 2310 BLAKE2B eab8a40ebfc3b3f462fed14a7f21187aa0546e9b3925d8e08951c99ac8ebf846c184d37ed271f07d6bdde6379be92f7fa0244d7be8d0cec29a354c1ac75f69a2 SHA512 e4f1924775a63f058fbc5a385ade16a95115cee0b9ee3c4de05f2e904861e1c3de4f643c4c330da90879ed0a54eed7199b41def3193a494e0eb038ce820e673d
diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild b/dev-java/icedtea/icedtea-3.9.0.ebuild
index cca3e65acb12..ef84f38c763b 100644
--- a/dev-java/icedtea/icedtea-3.8.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -6,23 +6,23 @@
 EAPI="6"
 SLOT="8"
 
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
+inherit check-reqs flag-o-matic gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
 
 ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="75fd375dd38a.tar.xz"
-JAXP_TARBALL="2b279bb3475b.tar.xz"
-JAXWS_TARBALL="c54a27559acb.tar.xz"
-JDK_TARBALL="9c9ff65b03b6.tar.xz"
-LANGTOOLS_TARBALL="21524ad5b914.tar.xz"
-OPENJDK_TARBALL="499b993b345a.tar.xz"
-NASHORN_TARBALL="bb3e3345d3ec.tar.xz"
-HOTSPOT_TARBALL="cb5711bf53d9.tar.xz"
-SHENANDOAH_TARBALL="c44a9eef4985.tar.xz"
-AARCH32_TARBALL="bd08b7f27e11.tar.xz"
+CORBA_TARBALL="c120c4fb7b31.tar.xz"
+JAXP_TARBALL="55420c5cc9f3.tar.xz"
+JAXWS_TARBALL="f824de94c42e.tar.xz"
+JDK_TARBALL="7b289a33ab97.tar.xz"
+LANGTOOLS_TARBALL="8496472630c5.tar.xz"
+OPENJDK_TARBALL="3b2d372838b9.tar.xz"
+NASHORN_TARBALL="79a2c8e2babc.tar.xz"
+HOTSPOT_TARBALL="d78088224b98.tar.xz"
+SHENANDOAH_TARBALL="b8b742251e42.tar.xz"
+AARCH32_TARBALL="891d70e93fb0.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -154,23 +154,6 @@ PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
-# @FUNCTION: get_systemtap_arch
-# @DESCRIPTION:
-# Get arch name used in /usr/share/systemtap/tapset so we can
-# install OpenJDK tapsets.
-
-get_systemtap_arch() {
-	local abi=${1-${ABI}}
-
-	case ${abi} in
-		*_fbsd) get_systemtap_arch ${abi%_fbsd} ;;
-		amd64*) echo x86_64 ;;
-		ppc*) echo powerpc ;;
-		x86*) echo i386 ;;
-		*) echo ${abi} ;;
-	esac
-}
-
 icedtea_check_requirements() {
 	local CHECKREQS_DISK_BUILD
 
@@ -241,6 +224,9 @@ src_configure() {
 	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
 	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
 		hotspot_port="yes"
+
+		# Work around stack alignment issue, bug #647954.
+		use x86 && append-flags -mincoming-stack-boundary=2
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
@@ -254,7 +240,7 @@ src_configure() {
 			hs_config="--with-hotspot-build=shenandoah"
 			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
 		else
-			eerror "Shenandoah can only be built on arm64 and x86_64. Please re-build with USE="-shenandoah""
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
 		fi
 	else
 		if use arm ; then
@@ -349,7 +335,6 @@ src_install() {
 
 	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
 	local ddest="${ED}${dest#/}"
-	local stapdest="/usr/share/systemtap/tapset/$(get_systemtap_arch)"
 
 	if ! use alsa; then
 		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
@@ -365,14 +350,6 @@ src_install() {
 
 	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
 
-	# Link SystemTap tapsets into SystemTap installation directory
-	mkdir -p "${ED}/${stapdest}"
-	for tapsets in "${ddest}"/tapset/*.stp; do
-		tapname=$(basename ${tapsets})
-		destname=${tapname/./-${SLOT}.}
-		dosym "${dest}"/tapset/${tapname} ${stapdest}/${destname}
-	done
-
 	# Fix the permissions.
 	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
 
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 83f7ee4f065c..cac0b62c5fc5 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,7 +1,9 @@
 DIST jdk-10.0.2_doc-all.zip 69312792 BLAKE2B ad2cad74e78098672ecc7d4f80f0babbded5ac564948c51ec5eb50b4e4e2688bec5bb6804d6829ea6137354ef8b1554b0ef6f8d0e62fe40b2e0bd80836691b6f SHA512 424ca11b661eaf4012d31cbe200ce5209098dd8fb21648eae5838ba2dd55d96aec5a263664d0b4ab21bc5f8cfe13cfbc61294cf92353dcbf8d8134613b25f67a
-DIST jdk-8u181-docs-all.zip 93487519 BLAKE2B 4ae2901174d072f2bf44800c3b12f6700f70bfcd89adc709678a0e8f48da94fea352bc2571d9dc611d85a5a3a21b8c33b5bc5f8c7b9d86a1e5e456164491279d SHA512 157d33432829a86326d7a24643dd8a61a11d72e98647c5ed44145fbb81fadcb1a51fca86fab82fa671193468b9631e5c8ea92d265bc0bf5969584dac40d4a1ec
+DIST jdk-11.0.1_doc-all.zip 51573427 BLAKE2B 8b08e383922367f19a570e3c112c30ce0306292daf95678cd699d5a15fa4003e6b231ea2ecb278f039cdf9525a82b4e95e3c9b7866a09beb4240945ec293d2bd SHA512 9cb0e5e1b95874de46d63d747685eeeabfb6de5b80e3018025341f265fdf3d54e769479cf2c5f0d62af934a4c9c647fb8fd89920a9ae4ff1ef612eeccb4f0e99
+DIST jdk-8u192-docs-all.zip 93801790 BLAKE2B 32c8441a55f102f8f479fc02fe20f7ee6d65c707d56b99b70cda1a02b3061a9741bb551cd94b4f7e28d22199dec3df72bec2e978c80bcaa973402ac74805ffe5 SHA512 2a64e45596e01a80694b325ce5f7e0747436890373f45bd5a4cee5b54ae13580d7bc62a1981ade41101b4b9bab79231fbd603ed83ed1283f5b6104670bbd0f17
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
-EBUILD java-sdk-docs-1.8.0.181.ebuild 1363 BLAKE2B 4e1af9bde37896fbaee9df13c26b2b2b3f6a991a456e9cb2ea6fdb15c4eb7ba5ded0e173a2281f2de58b7300d716d4296bbce5fb3661169b5463a77e1e5d4e2f SHA512 2fb385c575a900d27ea2cfedc2eaa29222346a34b21b9b18384261fb086e45235dc2bb07d4351644f72db6130633512384c9d65a5ab8164f36dfc169d66ac4e2
+EBUILD java-sdk-docs-1.8.0.192.ebuild 1463 BLAKE2B dce52b0da9ceff29a07d6191074b2f2e5f0a4f12286b4bca860701f2e8f25cd6c69da1210956dbd761b368f5befc735cdf585596679c6dbc66c7ba8d7599b2d7 SHA512 3c32a082f69d98ea878657063f108a475443e56f50351edf91fa03d67524bfd215f1063ad383d7a12715b967f196e58926ddd49a9878ec6469f538d65cfb14e5
 EBUILD java-sdk-docs-10.0.2.ebuild 1278 BLAKE2B 9e65d585197edbc771d06524cc1b10a1206397d413f51af1e903212e155ad7e486390e28399e3d7c310157a98a5dab7ef737a02856035c42cbdc56f4e69c79e0 SHA512 c1883973538623b240c0104df6c4610e9af82113872274326fbfb3bd17336454e5c5a660e70c6b089d71fd1b952eac9499b9f4dd64e21918ad28dc7a1cb17728
+EBUILD java-sdk-docs-11.0.1.ebuild 1276 BLAKE2B 62d83b8826c0db27f7845e0c3da9b75b09d07b8fffdbf5297849a41d223cde5a6a1329a42b72a23965e09424592370e73a85adad272bcc9d41e0fd6bd9cbd1ca SHA512 3a387c687e75f0a45cbb39a4512935bb2b25bb0dedcd9d1c25923ea17aada3cc2d9035f821ba3560e4497ea3fbcaea1c1e0af50ff301f43dd4fe6c219fe2e5bb
 EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.181.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.192.ebuild
index 82f3255d8409..290ac84e7cb9 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.181.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.192.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,13 @@ pkg_nofetch() {
 	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
 }
 
+src_prepare() {
+	default
+
+	# Don't need both .Z and .bz2 archives.
+	find -name "*.Z" -delete || die
+}
+
 src_install() {
 	insinto /usr/share/doc/${PN}-${SLOT}/html
 	doins -r index.html */
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
new file mode 100644
index 000000000000..06d84404b0f4
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-11.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11-doc-downloads-5097203.html"
+
+SLOT="${PV%%.*}"
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+SRC_URI="jdk-${PV}_doc-all.zip"
+LICENSE="oracle-java-documentation-${SLOT}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "by agreeing to the license and place it in your distfiles directory."
+	einfo ""
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report it in bug #67266 (link below)."
+	einfo ""
+	einfo "If emerge fails because of a checksum error, it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
+	doins -r index.html */
+}
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index 4ac531b334e0..a5e5371c86a1 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,3 +1,5 @@
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
+DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
 EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
+EBUILD jcifs-1.3.19.ebuild 797 BLAKE2B 9dd98545ba043ab9ad45aa4337fbd2bf9e07a7a8820d7f8920a1acff96702ce6be8ea5e5b1c1245ed8b875592196ef4f455d9490f8953d61d93d5a97917d067c SHA512 256be2f575be136208dcf58989386d294076f53cc34b99c3e07e6a0f0f39ddfb9196c3b2362a43d539d226d167d368c14ec54a106dc915e02d78edb22399d7ad
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.19.ebuild b/dev-java/jcifs/jcifs-1.3.19.ebuild
new file mode 100644
index 000000000000..de48d1147b20
--- /dev/null
+++ b/dev-java/jcifs/jcifs-1.3.19.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
+SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
+HOMEPAGE="https://jcifs.samba.org/"
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
+
+JAVA_SRC_DIR="src"
+
+DOCS=( README.txt )
+
+S="${WORKDIR}/${P/-/_}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+	einstalldocs
+}
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 6c861790efc2..3f68c985d0c0 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
 DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
-EBUILD json-20150729.ebuild 688 BLAKE2B ec6bb2b42536b33e4a15144d4c0f0d5785c7b932e413881105242ac388b46d71282559377d1737080d76fd75392255e5c9c5e68d63a6349f57c28759d6ceae05 SHA512 7d7fb2348310ea877e5406bb20e156dd120e269cd3b0b4c144901c01fef8d745b763ff2809c9cc2f46f1d012f9e9619c35ebb1a3aa472f91f5da9eac72f13b33
-EBUILD json-20160212.ebuild 681 BLAKE2B d9f70c2ee4959cf9e197b51c7bc4c28b56d13486a03a7a6c31c7118d9989c216ad3f918069b77bbe201ced2ca026a7fb41ea5bd028b67347aa376e25e208c1d6 SHA512 bddd61f652ba800c27ca13e639280519d5fef30cc042a3cf02f9d416a4f91cb89e787db5f600c9b680a78a837676286344ced491d9a1bc3273ef8a5b72ef74a1
+EBUILD json-20150729.ebuild 708 BLAKE2B d3a14a757874cf3fb1d1c89bea956f3b98f9ff7b85877ee6bcbba4381d3dc007b3baed77f3b2330eb5037d2b62b4446d2457194d4e3a4355aa409d94b1cf9865 SHA512 c844bf4315d1bf805d85692429080260e3fc6dbb53240891bafef307b2d11e8099566ea17425918916b27aa940c2fe47ebc52651b06408a1046f46ac34c54b41
+EBUILD json-20160212.ebuild 701 BLAKE2B d3942025ffd549fa10739ff5c302d0baf3c2f8a3224d64d8fda0e2965ee9054670ed556f4227eacea4dcfa946f9ffa2300c09532fec72babedc8c382c1abef77 SHA512 8560f39e1389819ad9f822007786c3cb9577fd47469ceba7c0bf95853631808f43d98f1836066d6ad0615a7e77cb96c016e43fce2515b7fbbc6aea64d826fe51
 MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 5c65acbd6d3c..6af44fe16dae 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/json/json-20160212.ebuild b/dev-java/json/json-20160212.ebuild
index db4c7252b880..09e93dc08282 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/"
+HOMEPAGE="https://github.com/douglascrockford/JSON-java"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
new file mode 100644
index 000000000000..d8d1b64142b0
--- /dev/null
+++ b/dev-java/openjdk-bin/Manifest
@@ -0,0 +1,6 @@
+AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
+DIST OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz 193328951 BLAKE2B f7586ed6b5e5562f6b1b4ed155abadbe31cb85459c982b0011e75d85046261c0a78dcaab343fb5c5c7a382c3fd1ac52caefc8194262e35c3601b9aae5a9b94e3 SHA512 b2e5bd25fd62425e25a9a60cd2ca4b080748a352c04c29f206ab121245226c61fa5a8573d342d8bf88efd83a9a7890fd85cf90d700dae28f632878a60d79ea75
+DIST OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz 176285783 BLAKE2B a64f86a4f69302efe0eb2645d39c44ce89bcf58c765c12c109735fb2ede5959b0659d4b9f85cf8e79102fc6f00443b99a78fc5745086b1b5e16bd41958db1ed7 SHA512 84eb35634a985647d4fc90c6c4a1855c1c059e5fde8cf3ef7665fa754a7549cb3905a1c35710c6c936426efd6e0bc1ac773fbef11550dbadbff622fd2c201d74
+DIST OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz 195689094 BLAKE2B 4d65b7993fddd113964103a1066faa6e7e83ab7807f6403c1f5bc5a72ca82dc51287d4911e264ba5754b7c1184aa1f1d1c94d19ae242ab02bf238f6c359c0de3 SHA512 f7a427bc33b2e8a2f68c7955b23d14f2eacf7b526f2990b29e55bdb1ae96d3e14f3d7c169c76ba4b18fd8195cef81d7199a37a81ce73d6b21a72f07388e70793
+EBUILD openjdk-bin-11_p28.ebuild 2775 BLAKE2B 20fabb82d8101b07553d846723eba61a7fbb2190778219380d0d765d8bb37a90bc7d283c362c9ead2a8bb976658ed106aa2403dca13c021a9d8cfb8edb0bbc8e SHA512 bdcd5bd21dd5f2bad6de0d49ea2a27994abf1cb005bfd0f84c385a6636ad9f76ba01b130a48540da2ba0cc2cb3496b0dde4d9fdc186798a0f9bf218a919d00b6
+MISC metadata.xml 921 BLAKE2B 9441e4d8e4ab3fd0c0523e7d96a60b6e1fd77e863fe6a2a9ab709d50864d72467304543c6771acea567440f9b02ab7b9c63053fe73c2780e655a12976964a4e3 SHA512 5ffc9ebc2ed1ecd969c0ce65032b174ecdc74614bc7f751d069d4cd2e2a17019bf24f6c1c3f27a0ba4f7ca2e78fb6ff420b51f4997fc8ec206e88af6ee8a0106
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
new file mode 100644
index 000000000000..9e9c5ec54870
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${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=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
new file mode 100644
index 000000000000..7b83622b0d7c
--- /dev/null
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild b/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
new file mode 100644
index 000000000000..bb324e59cec0
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 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}-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"
+RESTRICT="preserve-libs"
+QA_PREBUILT="*"
+
+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] )"
+
+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/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 7b8282c7ab84..a9cd4b6d196f 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,9 +15,24 @@ DIST jdk-8u181-solaris-sparcv9-demos.tar.gz 8869506 BLAKE2B 518519ee84e7b4b03062
 DIST jdk-8u181-solaris-sparcv9.tar.gz 98921065 BLAKE2B ad02fc872bb23c36990c3c4915a7f11beb490559382463852a6db9bbf046f5fa3f4003951c85d8e4b2bc870fa135967b083b125f9a11e3de996b4444e49fbaf5 SHA512 3acc108955b8669cfb83f26512d750ea977fb84cde0f515d791df76a2ea67a0951d0ebb120e00184d542e24678afcac35671d35573b7bb961759d8bf95b1ae91
 DIST jdk-8u181-solaris-x64-demos.tar.gz 8835006 BLAKE2B 32269b2bb6e8b2a6552ce53f666aec820838189c35e0f44491e944150422453a4a4bbaea3824053483a1a116f08365a2a13162fba11f5f632cdb3790d3146943 SHA512 ef27f42a0d9fa0bb8ee289a882e08c9ce1311cc2424439e7d342ef63885cc68cf5464fa7cebc715ad1efffaafeffd55720a121a1cf093fb2fd10bbe6f4a3d7fb
 DIST jdk-8u181-solaris-x64.tar.gz 96580362 BLAKE2B 03007adadcf89d8c0984fab34d6d5b01f0136eaea9a02da7f1afdb1fb4b1544fb04ad2943dcb0dd6da51375f1de3ee3e72e5170697a31b871a8da0d124d1070a SHA512 ecbd9c3fb5d757504186dcad0a9606f2aec6549f2fb3424527dd621618b9726152a7c3168c32eec8f28731e547feab96fa190fc4eacc713f608fe851658d10e0
+DIST jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz 9508019 BLAKE2B 6eabd83f98f1497c2c73cfb5972985ca879efba002f474dca9a0f4d30e3986ccae7886aac074f2f6ffc4100cc8c96514ccae0bc60af845028e8e89b301fbfcbb SHA512 8b5e79d55e2c88127b53f9c52fb0e7033b1023daddcb59b43c991baf46db7276a5fabf8b39516b097967aeed354e4d7399c459a5784448cd4f6f4872b1d758a0
+DIST jdk-8u192-linux-arm32-vfp-hflt.tar.gz 76544503 BLAKE2B fdafcddd9e277a9421e9218e2b5de83792f9533cfc3b3e99afe8ee94776ae573fc97ed73702dbf7e96461741e7939b111ac8dcdfba9bdf28d2b6951acad8479f SHA512 ccf6c6fbae9453c86b53255e13a3eaf3cc1ab999480244c8a38236c7d29ca46e9f1a0ce9e9fd02295a0f98eac97f3ac5231909fab655c0eda0f24a2d42c7c4ed
+DIST jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz 9506333 BLAKE2B 1928bab95e3877fd9f5c28a7ac988c37613f5ae74abca9646c8fca1d9ebb2c4d984783699411263537bd957b0268647e1dd1d62036a15f6dc7d918e4582ccebd SHA512 cee7a8de81fddafb26ca4b64f6c01052c51524e28e281863b17536200068de0e68ae66494e9e0d86cc6bad1dd01aafed281a9690e3e1c0a05d890a3e32850e5f
+DIST jdk-8u192-linux-arm64-vfp-hflt.tar.gz 73317460 BLAKE2B 5be8ac7829ecf7a95c7ee60436abf5ca318003d11a4c3ad9ba75306983c934bd3edbce2e54fbfd472a8a6ac6d7b24be57ef87f14c7af2ad4d5acb2c74ce167c9 SHA512 8471afed26e5ded356bbd39b95d8f1ebd3a5147ae7cc4a94c90efa9bf8baff23dc8f4b10f2973307a1f48d3722604603c3e4d708bdf21c4f5aacfb0cac088b7d
+DIST jdk-8u192-linux-i586-demos.tar.gz 58483041 BLAKE2B e333914701dcf4ae57506f12846b19de91b323a63cb11f1bf840d4f3dc1b620ff141b0b7c5e2a21e4d2e2e3141c1e9a9ea6ccb01d0a5bc97d51053e9ac4e5f9e SHA512 d9b2e4b2f1052c56dad3dc0c715ab51e3cd68eeb8e6911a4f15683fec98873bf510b36541c8725263bfca7fcba65e4cb6c8bb47e4bc7e67d660b06b7e0cf0fdf
+DIST jdk-8u192-linux-i586.tar.gz 194717101 BLAKE2B 73f59da39bb5b9c2bcedec5e112b4f7ad16df144a8ef0d030f157903eb3a51bbd7a7f262da5fb478c4441658c2a0a30ff96e497d72c24a143e2118e4b3ae6b96 SHA512 a4bd3bfa9dbd9d64d270c75b23c985ccc5bc2a706dedcf5007b6cd027249acf4e1a0379e470baf9cb2b83f8b3b26a3720320171b4ea286c38d9c1318195257d1
+DIST jdk-8u192-linux-x64-demos.tar.gz 58589568 BLAKE2B 3a025954ed0b9a174f3bd642fe3a650562e200a549e6dfde4b34e01df0137a24a8d89b30b3bc9a2f7f189b4a41236b3678d54a7012a7c3555e168ed258a2bb3e SHA512 48e1b112c91e7b81579625b29050a48f3237b18b15a278750ed4436a3eb9869392af091599e39f1d492eb3b92cdf932a8c772040539f9e10f0d263b1afafd1c4
+DIST jdk-8u192-linux-x64.tar.gz 191757099 BLAKE2B 42135add35e5acf2ebe539a5667828f41e88de1dbb79d39228353d5cb5597899b6a15cfc5637317706f209888120af5d044cf3a074bbea960f425226e8e4002c SHA512 96ce0662ab474b33d28fa14edada040bd6b0a17b9374741bb132f7e9cc21b6f5f03cf8926bdef5e44669a9ffa593f887ab82d42b7b701eeca74a173f70dfdedb
+DIST jdk-8u192-macosx-x64.dmg 257868944 BLAKE2B 86e915111aabf53fddc46cdea4d7a1b6a9425e1238d156888e5d2f2784a685873c7a388cf066099d8bf5d164ff7d14380c3b9c329a48accb4d300542d95a67a5 SHA512 db059e7c8ec627dabbad46a388c0a36ec5591ae9513e9f82db9a0bd154c6001e97a526234c5f435ead867702986995dc8b866d925b63dfe2ff6d4d6394f10db9
+DIST jdk-8u192-macosx-x86_64-demos.zip 58763903 BLAKE2B b38c05db314582c5015ee7253473aa8bf81bb098e27e952153b139186390047b9357a5134ed1574cd0923d9fea4fafd265248ed65179c4288b4d57c0ae86044a SHA512 c55ac8338b494cc20cf521163b500856d8583f6873100b30d1d7eb388789c28907f76f8504bfb1ccd657094280a1c26b26d5c0122bd95de6b30f3e72e300428c
+DIST jdk-8u192-solaris-sparcv9-demos.tar.gz 8867227 BLAKE2B 76d8a98475eaa3ae2c0209d11640dbbd32aa677f8db40fcc87a9a4c86dd249fbf6bbc3ae9b84ae268468b8082dedd23374b1cae41438f45f7bf42038b2c2a5b9 SHA512 d5ccf03d693ab8ed10aac35b2bbd6823524e915a32e953dd162352cfa1bad7b5fe0db5cd1dcb44d79ab454bc2566d1ca6ba145ab4b28dba1a6c6a001198f3f91
+DIST jdk-8u192-solaris-sparcv9.tar.gz 98913870 BLAKE2B a27a3dc4a6e68972919417f769aeab5716410ed4f793f46886a081799fd4f8b0c2de6f30d7a0a65e08fe9dafe35c83e33f2c26d5e71e9161b6ef40ff3e05d8b4 SHA512 e241c00b29b3e18a3d0ddcc3f88f35c092488cc1b93b0daa348088d85f0a117a43903c5cb3c9edc93653e6f420c4c2f2f8a2647682ed0a2a509add5dd844012e
+DIST jdk-8u192-solaris-x64-demos.tar.gz 8827060 BLAKE2B 9306b0cd984139a5ab1c32c8a436e1e294dbaf0118e1b88eed5079eada806d9049b0acc41279de385173bad94f351891e4bf6baeef4a0478ffb552773fab4dad SHA512 d6f2dc2a8c61b65b3a16b206b7ed7767153bd0713701b1b0d545cc1305739239dff6f1c33d0b7f1412f59262666bcb005b48154ae6d9ef4dbbc900e3ae253c88
+DIST jdk-8u192-solaris-x64.tar.gz 96644048 BLAKE2B 24cdbdc006c45ed28fb7eb855ec295f568bad1c866d57961085047901dcf72e341d05b407fccba43f66896fcf28b09bed8e02e6ee5069071a430b4424bdf1af4 SHA512 7db73b08d3ef52a7e486a99140265091916433c3d0768e2b0631de5ad649ca76a9792e40122de49677caac67951f036824021f91f50f36026d7cf7971b93e4a0
 DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
 DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
 DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
 EBUILD oracle-jdk-bin-1.8.0.181.ebuild 8502 BLAKE2B 2eecdd0539ad7080ab396b1f5af53fa256ba856d454c88bb6b5af80b8a062467ae3d3adf23987c8476bcb4d21c8a6683237535d74e33dea4549586f6903a68d3 SHA512 35d1b8277cd384a29818f3dd2a08e037c3e3ab1634c02f3f5a52564c86569648c824258dadd16ddfe35f79b85acc71579567e8e2fa4876fc54a15a4c03f454c2
+EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8500 BLAKE2B 0c4a5bb29e08cee4502b11d39b6ab8656950385a326a23738cc5cc30e512eb6e511a9fd94af735f9f26fa0745ad2a9af89402f75fb657a69fa873057f7b2a5a7 SHA512 6476542f112f8ef34945bfbddc67a2241fcbdea3864f037819bb53df7b9c432052a47748edce337a517803684b8e945296f383223ae39f3ad5958cc4f7729b5c
 EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
new file mode 100644
index 000000000000..26267a2299bb
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
+ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	case "${keyword#\~}" in
+		*-linux) continue ;;
+		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
+		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
+	esac
+
+	SRC_URI+="
+		${keyword#\~}? (
+			${ARCH_FILES[${keyword#\~}]}
+			examples? ( ${demo} )
+		)"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	local a
+	einfo "Please download these files and move them to your distfiles directory:"
+	einfo
+	for a in ${A} ; do
+		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
+	done
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		local jdkgen=$(get_version_component_range 2)
+		local uver=$(get_version_component_range 4)
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+		mv Contents/Home "${S}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark m ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/missioncontrol jre/lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* bin/javapackager || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v jre/lib/fontconfig.* || die
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d jre/lib/desktop/icons ]] ; then
+		local icon
+		pushd jre/lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use examples && [[ ${A} = *-demos.* ]] ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/jre/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
+				"${ddest}"/jre/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index c68a2da8d1ab..63136d646e3f 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -3,9 +3,12 @@ AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
 DIST jre-8u181-linux-i586.tar.gz 84309787 BLAKE2B 3aa9f47698a35ca91bbc61d2f3ec43f5ee626b74fb913eb11be8e1478d8aad780b5ea672de4dcb6bd6c598058786d26d491d01a45d5f3cb5044d1f48db26c7d6 SHA512 86e4532248e383f6bca875bf039f4f852b79260b4d5affbbd5deb9cf2ea3e585ced9f1fe054526529dcc3dfbe031a829df078a7591dbc3cf3da7913703de7231
 DIST jre-8u181-linux-x64.tar.gz 81191893 BLAKE2B c29d638b7dae9cc58d9de6e43f1af397cab04786045e4956d05cd8c3825af1f27e8a77b42a9d4b9d8ab7d15aa5b94349fd8c98ca37fadb271dc0bd868d513491 SHA512 dea7bc79210d23ddc58a7013bea8386169b9ab6c156995a2190dac298919c933641639173cf3426730b248004767449c5a62057d6736f897831d8c86b36c5bed
+DIST jre-8u192-linux-i586.tar.gz 87804679 BLAKE2B bb1dea51f0d45dcd3aabc82668790ee274c83f2e3c596d836d7b57c971ff6535881849cce5757132fed1b537a4a9677fbbb0b8b003d423d26ee72cb71047428f SHA512 5c749f358aa5b55513765eeb52dd2e0d3cb2b3223cc93739aa36445af8c6a3171a01cab673e106312e816c0a3b584a8a1be4aed1e2662e86b6d318d86a135485
+DIST jre-8u192-linux-x64.tar.gz 84597342 BLAKE2B 655db641df8349109e2944838f16f37ea208772580f0753e664a0642649745c123b2a781497ca3b9028f55c0bd2816cb5746d7d1d04cc83bb536ca0b467a4fc0 SHA512 d786f9e032bc286f3d4f361c382b6606c7462240b191d04606ca5ed9e59e3d7703cbaf1d57693c6763d00374c76c99cdb2f58c0bc372ef5c14c6304d556b4c8a
 DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
 DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
 DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
 EBUILD oracle-jre-bin-1.8.0.181.ebuild 6054 BLAKE2B e7319d43fc1a84633f7366f3bc1bf691db58aa40de51e163e57cda9be6c23736e35201b01629722d3cd2f35f55c805d7b75abf11db03812e363dfe37e734377e SHA512 8c8d6a0575e4807d74feebaafe10bcf4bff5aceaaf46e2e3bbce261ca4e2613fa2fae915a09a25a22da2e71351c38206ccb62f98dc16ffcfbba29a49309b2c87
+EBUILD oracle-jre-bin-1.8.0.192.ebuild 6052 BLAKE2B 9bce83faa61dbd88c7c816c5ae52e528e753b9c7988ee05efb53e713686835912b979bf0b93b4223721de923551445951435bd84af2b3f534d8797c7b8f872b8 SHA512 e7f02f6ebf068681acbbdaed5487b81da33ecebd8ce147f154c01404e79774256bf2d54e755909bc3de1832bc6e714f06deb5fc9f129207443d708b77af1850d
 EBUILD oracle-jre-bin-9.0.4-r1.ebuild 6278 BLAKE2B fb43030f8341cdd68644921776ccc397bd2bccb5d1df0112e14bf33d2c9e6c1414323b13cf566d828ae53f6bd0db5af546bdad7137eb011309a37591a5650d7f SHA512 f52656f65e214e26bf9bdbbf411c75392f41247071d95ce2976fe2eb21ea17b41181376f2bb15a87839745bc76a85bb08a0779dc2702b3ed45bae9e20ffb61d3
 MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
new file mode 100644
index 000000000000..a92c6e3e01b9
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* amd64 ~x86"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}/jre$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_prepare() {
+	default
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 4832adcb2eee..a1c33db740bd 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -5,5 +5,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 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.ebuild 1112 BLAKE2B f8ff861b086b130132f712a85066b9c3b05f9ed8673bd8e8787a598cc9bd78818b586255f0cddec1a5b2d1cf846d84ab35a5a78ce4fc6e940ed757e397579b91 SHA512 39aa4611274b54b2875eb8d8ff196c80362cbeb484bdfc4b0c058a179dba7451a7c6938aa01c4f187b018b3f3c3b3f49ace697c6960bcd99df04018b2651dd24
+EBUILD protobuf-java-3.6.1.ebuild 1109 BLAKE2B bd8fb8e90a5f6386f16a9d98351b30e34b3307d323565fa016b22d69285cea18495f4fb29c6ec7bd4052bab2cd5d7af82219209e36a7303de55ca92cba1797cf SHA512 cc09ccf03e073edd2c7ec711f3e4c55afe7dae532ee94916f9f4319c3c9b019c49b42f8ae5c43c2de6ea11dfe3ea34fc5f7c96a2bc66f3d7b02ce1bc7749ec32
 MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
index 798a81f93df2..54c8396f2ffb 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index 6064f06e6989..5e0fee619326 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,3 +1,5 @@
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
+DIST trove-3.0.3.jar 1793123 BLAKE2B efc6ff678d2f5cef8c68403faafce3dfb66ba7b3c1ffa42ad6727cd71c6dbd77fa06b4a6eb23c44a794982a8f2933afa10d4a5555a8749f49cf5e0ae227afb5a SHA512 03e0a376258730cb79fd0dd0a68bfacba6ca4baf3a352cce621d64e091ccd3f24c143b592f3bbd5bbac26529bc425b814dff45680ac46fd323eca95b36d2b640
 EBUILD trove-3.0.2-r3.ebuild 804 BLAKE2B a45abfcf97789427544d1b181d6f1b1d1ae5b282ff6e4037ae7ccd4698d99e4d1d39a32521fbe7fea573b816428246c107e4684161eac702d7a947dae4702274 SHA512 fa0cea4d9739bbc1f3624de5b9032822b14c787321b6317b0ee1d078eb533fdedf053722b9800b532bdb93ec5647e28cc2d4f543d79bc228e34549516c3f9f48
+EBUILD trove-3.0.3.ebuild 664 BLAKE2B 6807abf758cd4a595ecfb521ecaf34f884e310e4a048b80b60de2fbe0a08a011520a948c34ede6ca0feca24d8d7a9689d5d7dd24a7635f3f9d55b0da1779455a SHA512 489bcab10a500cb16efe782610e7bd5c2bb69969e7691db843b8801952bd94ee8b01fc1876bdfcea5c8ca4a3842b4ee0461449009867a76fb506006a93405d75
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/trove-3.0.3.ebuild b/dev-java/trove/trove-3.0.3.ebuild
new file mode 100644
index 000000000000..b8993f5ddf18
--- /dev/null
+++ b/dev-java/trove/trove-3.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="${PN}4j"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="GNU Trove: High performance collections for Java"
+SRC_URI="https://repo1.maven.org/maven2/net/sf/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+HOMEPAGE="http://trove4j.sourceforge.net"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+src_prepare() {
+	default
+	rm -v gnu/trove/impl/package.html || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-java
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)