gentoo resync : 20.03.2022

4 files changed, 14 insertions, 14 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5418f46a332a..fbc6ccfd9cee 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -29,9 +29,9 @@ DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846
 DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
 EBUILD openjdk-11.0.13_p8.ebuild 7470 BLAKE2B 51487f24150b411a085a022f83f539c11e2532b82afafc76f03a15a6ff96b3b04d3ce9078a3cde6b2c91ffcedf55dac2976eb00bdbb0ad4352c7a428df4d5956 SHA512 644cdae2f094d080eb27054a4f2b7fc3dfb6a540567a15e1c07d0cf0540dead5a97f7751747e2d4db2ed9e860611f19bd958eb4732c2db0d95c5119d61df8a34
-EBUILD openjdk-11.0.14_p9-r1.ebuild 7771 BLAKE2B 10a62c7c57432f86fedf3102c9ee278f2a4b55875fea4f199c727d09d9f51bec19871e01a5d0ac27b8435daecbe850be5c8cb42d5298eeeaa30973e667e71aff SHA512 ef6a23ca55993f0b4dfbf2dbe4c330fb82796cb250d10dd4fa85cf8e7e15db185d780c4f11f585dc50f43bdd6b208f9bcd8a19993bff6cbea8c3811d45a5a05e
+EBUILD openjdk-11.0.14_p9-r1.ebuild 7768 BLAKE2B 242092fb322793922d01c4125dbef63edbc1ccb12176634df8cf07048de88faf04106f7138a8c862a76b3fedb1d2f9ed680ad2ad68e1afd1389d59e8da1c861d SHA512 9b43396290e3958809c0bdb97d2de3df4cfd5756b2c5d046e7e5661fa3a5de091a156dbd4c4995c18252dd93c284a796ed005b67ed415cf1fb7448e4954c49c5
 EBUILD openjdk-17.0.1_p12.ebuild 7855 BLAKE2B cb7a7215afcd9382edd8053ea4182012d46743fdff5ba03ac4ff2f8750b454c352b25ec4ca04b0b3a5dcfeadf64cf24518ebf119a87cde7ca7f2c9a09bf39256 SHA512 5bc08b0e7707725dafd4165d8f7af2964981195d19fc95ae5465ab3f2907bd4c81d2ba2bfbf6eb42dd331dd8a9eb2c8c0584615146163669514a2c2773cf68df
-EBUILD openjdk-17.0.2_p8.ebuild 9144 BLAKE2B 13c56192cf50286fb2c7676b2781f96b9d48439b9dbfbca5c0427dabc74b249754a413cbbcf0360e7e1e6edcdb33c2dbceb30ebfa17f7a413bef3b08a93ae967 SHA512 2c959301483293c2232308c9b16984b17e44a0b037c924a5835fd56363df0a618aa629483d72bd1b363b8914637db8cbd0aaeef21a6dfad88bfb77f3be0375f9
+EBUILD openjdk-17.0.2_p8.ebuild 9105 BLAKE2B 0510a231c319d95ba3c3ad411524956872184bb958993dce100e2b39c7654ddea8cd4842f9ece6d7da53efa54b06d165db3c15d4d69be08a676a5cd6d42978e1 SHA512 bc349ca6ab90f97cdaecf6bb0634b43a1b122c086a808c854613799ef896b61617736b82fac0a209c37fafbe54d329da546076cb077931f11112c5e2bc0e7863
 EBUILD openjdk-8.312_p07.ebuild 7399 BLAKE2B b07477683dd271a5c1cf0830137f9c846df5375666ac0d3863f3647f9c0ca3db3bce0e68e4f3931124a071e9b0fb81434733d034194cbee3a764056cfa2721fe SHA512 467b1479f425e9d36be216c24d2f226a2c4a1aec9947fedc73d0b4703e1efaad727c36c427c3010a78576db997d2975623d0209d11ba6adbd65e360265173c10
-EBUILD openjdk-8.322_p06.ebuild 5859 BLAKE2B fe046363d60b08ca2569669f74a2cc71552086c84fa24df81a937970c5b3d4521720472686caf043e9aa860020ecfaa55e652caacf9d4e02cd8bd88256387055 SHA512 99315a5ba5fa12b4b059cb4787928e8ae02f04cc83c5064597b510da35386408c469af700dc3c99c43cbac4221e23a10501ddb62cb5b1b192a1062b816bd5d66
+EBUILD openjdk-8.322_p06.ebuild 5855 BLAKE2B 18c709101374aefadc63785c8930de08319deca6ea6ce7d54929dc269d571253bad6638317c1f33373678c3e58d39233e98d85b5610eb5bf2124d30314672c33 SHA512 ade8377a8efa05bb475cc251960cef4ebe7d068ab0e5f435fbede1530095490ae04f216346d759557635b8697f846d3ec03465853cf5aa9a397491e072ec7cf5
 MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index 9b1ca168a49f..b1990f6ea4f8 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
index 09fe2c1ba754..501c0e15b4d2 100644
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 ARM64_XPAK="17.0.2_p8" # musl bootstrap install
@@ -31,7 +31,7 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
 SRC_URI="
-	https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
@@ -41,7 +41,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
@@ -148,14 +148,14 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version dev-java/openjdk:${SLOT}; then
 		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 	elif use !system-bootstrap ; then
 		local xpakvar="${ARCH^^}_XPAK"
 		export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -214,7 +214,7 @@ src_configure() {
 	)
 
 	if use javafx; then
-		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
 		else
@@ -249,7 +249,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/jdk || die
 
@@ -277,7 +277,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.322_p06.ebuild b/dev-java/openjdk/openjdk-8.322_p06.ebuild
index 3d08d57546ea..5af7952e09b3 100644
--- a/dev-java/openjdk/openjdk-8.322_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.322_p06.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="