gentoo resync : 18.05.2019

5 files changed, 14 insertions, 195 deletions

diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 302eb06eaf67..65c73a4c5fc1 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,11 +1,7 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz 41525058 BLAKE2B da456e8415ef45d07968c12082f2351910284b47bac92a952d4962fbc4c63cb2fa006696b6b175e0d1073b1fca76cca61460465d0959afe80d2f5ce9006d9350 SHA512 96b527be34c49e6351bed0d000153c1bc9491cf89f8a7f90190feccd2984cce1e3d18747e108d476c4417f15947d436f20cd34fe88f8126edecf4a789d725b0a
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz 41732132 BLAKE2B 9d3bd543fec6eb6c30eabbbb3ca6073365c5b8900dff9af47cfba5569ecfc33a8e2562ed3f8cf4940b2a7d7c427e48164a94fce1f72c8e98fa7f0fc32d923237 SHA512 b7232a3c75a8c4e67f51bd95c8441026b2bfef29cc779768a5f2d300208dc569d672402e06a2d6c6f512450723bc0631c5a18cde80cbc1ec2028c123607df30f
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz 40856726 BLAKE2B d9d4599989a0232bcc145aaf58b20dbfcedbe33adb2b3ee65b7e726dea350210f66eb81b321268a29d3234244c517642cfe908531242afb220509666e02c0617 SHA512 f9bb03cd0876f6b3b36d8ba821a14648b5ac2ec6dc6eefb95dc333aae77b55c940153cdd1715b21feaf7d7f2148bf8c272777c8afab911965e514f9792287962
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz 40871242 BLAKE2B 8a6eee7f7465cbccc575e44ab08d6a3d2cedc32954475ea71064a4b6d4379927a795225fed7394922bdaa2a425efb6966d6a0126a55a0fa0e68dc0eeb7a6e935 SHA512 3b0c560cce673fa0e9506c18c4a25b56e26c8ccd7874098f55c37f1a556387b4c2d3ba81ef0368cc666178028eef0fd7beac6307588628c8c8c051381a21366f
-EBUILD openjdk-jre-bin-11.0.2_p9.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
-EBUILD openjdk-jre-bin-11.0.3_p7.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
-EBUILD openjdk-jre-bin-8.202_p08.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
-EBUILD openjdk-jre-bin-8.212_p03.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
+EBUILD openjdk-jre-bin-11.0.3_p7-r2.ebuild 2753 BLAKE2B 2faf9a916ffb567b1dcfc04b84cdce1ad1e509a24993d5af0b0b8c7545eb61e5747c62b6f415f0a9b41210ebfee80d2e89f10903d2cccde31ada118d7cf86924 SHA512 5e3c0d813a2ed17c3816a4db62d72a6f301905d3de53fe4c79e47eefff8056fd412581ac801e96f7150f60e7f52e9c67aaffd84882b68d05d1656614ed1bb3df
+EBUILD openjdk-jre-bin-8.212_p03-r1.ebuild 2585 BLAKE2B 5c04a4f23619b9d6ee335dc24a58ffb2e4806522ebef4179f78168d0c25d51d59a3d6a8822033aafea1d7ae4d4823c4b290fe6902bd9350c08274c755d31b716 SHA512 7f7181844f9021931b38c8939841e496a53f2b3ec4f4e13d8d4f5e98628d1356df89cdc21ebfae003f7dd054f1f5b961f286ccaced04b286f188b046d147c390
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7-r2.ebuild
index 1f10efc02641..1c307ac5c275 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7-r2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -51,7 +52,7 @@ S="${WORKDIR}/jdk-${MY_PV}-jre"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	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
@@ -68,9 +69,13 @@ src_install() {
 		rm -v lib/lib*{[jx]awt,splashscreen}* || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || 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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild
deleted file mode 100644
index 1f10efc02641..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03-r1.ebuild
index 2af8e9e8e29d..072337c14fcf 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -53,7 +54,7 @@ S="${WORKDIR}/jdk${MY_PV}-jre"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
 
@@ -69,9 +70,13 @@ src_install() {
 			bin/policytool || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || 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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
deleted file mode 100644
index 2af8e9e8e29d..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}