gentoo resync : 03.11.2019

4 files changed, 233 insertions, 4 deletions

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 58abcda96ffa..3e6ae5f59ab8 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -2,11 +2,19 @@ AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f04
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz 194920675 BLAKE2B ad509e368aba7b5fce9e6212b296442bcd970f4dfe59e53dd13977da0137674fd85164657fa1abebfdcf58640ba511f1fcd30c46ec02a08edba5b498050bc60b SHA512 7fcd7c4eddcd9e2b6aa5cba69f2926a1131cd8246348f1a0c6575dca9c73b677d245fd8e12b1b41415aaf3dd0660581398f30c29503787e17428839e3fadf5b5
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz 183239547 BLAKE2B 781647daac4ff5ac2e93a01aed93a6729c12611e1de75dafcc018c5222a442a846b9ccf8ec1e5381eb191ae2b8252a9878562843eb675299e96563c65e91f4bc SHA512 b2e2bb63706bfa197bb7ea5560dedb521666c52900c9ffe91ffcff5ddbf4e0cacdb4efddcc03081f06c9686e9451f27a905d731a3bccd8925c952ddde331eee4
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz 181290255 BLAKE2B d8d25d71e790527c572c74f7a53317933b8a0801a8b3779daa9fe92bbe8b11fad74cf7e2e2a2194dc514930fba2c86fcdd630b06cdcd0dafa8fcecd5bac6be42 SHA512 5b50f0585ae09e1d446170b40728ad915b7da2c22341385a8b014ac09ca805acc413c840c6ea8bac4b579d418200208a53f98759b446a28ad3e28b0078190b50
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz 99367073 BLAKE2B af507e3c1877a4e895f65fb4f47f8559ac626c78477919f281ff9ce34dcc0c6394f4ca4336d406efed541c3190147188e772922c09d91ba0efaac37ed7214a90 SHA512 1b166e21de8889a1aa7e90591e635c22bf18ccfa1b9d774dd01cbc97f4c0a732ebdebac8f18aed649869e52512fce35ee9a8398e1526c2e06d6109994e3772f9
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
 EBUILD openjdk-bin-11.0.4_p11.ebuild 3137 BLAKE2B 0718bcbcd50aedd6c446970a9ed652a0ea485949c505129fca1bf9c95ae2df1031000c8e21e736ec178e8acf0c056a29fc0c02283cc47e3cb20c3abe6d4d5a86 SHA512 c59cebe94522c7787487ff5e00d7abcbdd91b9332a161135fcb1d4695a6251ab84cc5b6cd10e5b98377056635bc326a08cafbd05d50949057aa6a8062196cc1e
-EBUILD openjdk-bin-8.222_p10-r1.ebuild 2811 BLAKE2B 9ca8ef7339b11f4f4154c36230656ede452addf1ca1eed2f4081898f22dfe2aef211daa0e9bf836243325aa0d77063288ee4d2b59c8b24ef96712346e024836d SHA512 bf5db16b9d8ada9c9edd8f22bc8070675a19872d0df046a94b191dddc8657a1165822400f6e304dbd0f40cf39a214c1526005ddf051fb2050c051337d6924818
+EBUILD openjdk-bin-11.0.5_p10.ebuild 3104 BLAKE2B 4afa1206018e23a98cd85f09e90d99c960c6c2cf4fbd65c2c649e46805a1b8b514767cc21abb952932f36debe53a836985f0c2aee0ae9a3f2e3769ce2d26a235 SHA512 341f180a84fc144d18900d87a5c93125f9fbdc80628b0d664a977c820351befce0b1e238e9e93aa035ab664fc63ab37f0f8bc6cef5a8f6ab0bc4e8fe16a6428f
+EBUILD openjdk-bin-8.222_p10-r1.ebuild 2784 BLAKE2B 18478667b7f7c4eddc738a66b0adfd96ae06f2c81d7fa8b9a6527dd9524550d10a5b1565d4a48c6ed1b0a33d86eeedcc2c315edceac7b22c621b802929cae107 SHA512 195842c19cf7b69b04214292eeaecdec2c5ba354740720d5c52e4a5064d31fec03b685b64c2570f0634a49c56b7aeec623583054c1979db794ac3ebf28461136
+EBUILD openjdk-bin-8.232_p09.ebuild 2731 BLAKE2B d4fd186733a850c593d70c6da8f090b18be7fd03deb5cfc1d0491418c3ebbfd1284c430ec1957fef75db1e2805e562ef22769fff47ad1a3f962692e023b34238 SHA512 93bec68d819ec37b976e56cb221d01191441f742109236272b490f460e1ff63068e674f7ab34d1d3f056a83569026ef18a887a975c91a5a1535dd39886b8656e
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
new file mode 100644
index 000000000000..3f1b4f75da71
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~ppc64"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+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
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	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"
+		ewarn "many java ebuilds as they are not ready for openjdk-11"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index c9b8c2cf4c91..7dbd4cdd6a80 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -18,14 +18,15 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -35,7 +36,6 @@ RDEPEND="
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:1.${SLOT} )
 	selinux? ( sec-policy/selinux-java )
 	!headless-awt? (
 		x11-libs/libX11
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
new file mode 100644
index 000000000000..ce7c10944e63
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~ppc64"
+
+IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv jre/lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v jre/lib/*/libjsoundalsa.so* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr sample || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+			{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}