gentoo resync : 09.07.2022

6 files changed, 6 insertions, 29 deletions

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 0058f9cff8f7..3c8cb25ce0b1 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,6 +1,5 @@
-AUX openjdk-bin-11.env.sh 503 BLAKE2B 7f7dcdb561612501020b6fa922ad43bab7635796ea2004812f0dbb245d182d9501ec4d4d7497c31728501887168d598aac4561a37f86d4111666fc5a5b4bb1ea SHA512 83a893610b636d0e9f8e13aa5727bddcef1257b37388392945cd137b1efcfd03a325b7b7e5e1437daa27fc373abd0ac675a77e406461818225c66a047e4acf97
-AUX openjdk-bin-17.env.sh 503 BLAKE2B 82823ed5e794188b43bff8bbd644c7796a621275051fd9f68e22b435c75ffb68602af82a8b79d2d76ffb8cd2f77380ecc70e38963ebc8e0e31c2fadcc0f10ce3 SHA512 79a89625c51d4d7f1eb9d976de678347055bbe025b32f76420c8b7fdd7a9f09bc7b57d5d54ee8db9e36be5f7d784cbadd2f1c26b3557936f85ef1d48d6e78c51
-AUX openjdk-bin-8.env.sh 712 BLAKE2B 0b59c28312a5c90e88445c300ae066cc4ed82035837cf47960f481e412848db6e109c87c5e7bd5282a945542f68fbfbe1135730f402768691bded10382acf55a SHA512 831c8993298141679e1aee567e40bebdde65c488279dc8f36565a108c8536a4817420a9721868fb610710dfb58a10b811d7e094ee07e88cfa033d9a347f99367
+AUX openjdk-bin-8.env.sh 607 BLAKE2B 447575fc213003930ba6d6bbbd7cda0d53f53b16e3679fcb13d219cccf3525c7dfda755c79826b4d3c7b238502ed5ecaf4c8514971e576c756f4fc168fd9a0d2 SHA512 4cfbe2dddc89408824621bbd2036afa2966d550e6e189a8835f78b46fe91305221d8fa46219e9c53c83c9f73d83cdb1208bc78a46b9115041511b97b70abbf1b
+AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125cd52f5c930cd67b95b7d1744362cbefe436e4f4115f0b7600860200d8f134b241b6b60ffae6b807b476b SHA512 2c2f753a05154d17a7c324e61d3e4513119050f44d2a8d0aea5c6e2542e9989a955689a97d47fc1d5c710a056f2ccc7b239e3eed3b2d516df6b2aa7450c44613
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
@@ -19,7 +18,7 @@ DIST OpenJDK8U-jdk_arm_linux_hotspot_8u332b09.tar.gz 98261468 BLAKE2B 7fe2b5c617
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
-EBUILD openjdk-bin-11.0.15_p10.ebuild 3182 BLAKE2B 7a69eea6d0fe18d082089da07e380642b1a96ee24d880359add46f561ceba1d09bc5832a83c608151b9532d79b527692fb40885644f82d3dbd3ec2c2fc5114c1 SHA512 9c81f9719bf9ad90e0c4def9268366b8a4b047737d2fd7b20e3e11ccbf2c7cbb23a35b49856798d16ce2b58eb7b051bc4cf9269fc8c3892a1d8fea2eaf2c570c
-EBUILD openjdk-bin-17.0.3_p7.ebuild 3242 BLAKE2B 61c0fb7383d50fce196696510825ee9f351220b559a485b11662b19db3180e1861db96afee6d4205ed5444147fb546263b8bcac49669c05055419e4281b4564f SHA512 ebdcbcf5a3592397cec79eb66ac1c2c1ae68d18e402c274ee861d2c5c69c4ac1ad64d3114efabab6f54e6e6f76f18d981a5f9a179802e56685ef4f6f4a96cbfb
+EBUILD openjdk-bin-11.0.15_p10.ebuild 3174 BLAKE2B 0b8853c57d4526e116d72e690c0d6e0e9187a8230a64ab03f3e6c4a92b629bae8072bee50f78fd2061d7e49624e140fd3ff1c3230486c5e510dc2ae7203d2f39 SHA512 2558eb3aba44ee55dc3594352ef9236b4c2d31ffd06e6202551a3ab012481a5277bdf5c3dbea9069a2cbc57bfc415c3200f7855c74533b98d93ac1ff105bec23
+EBUILD openjdk-bin-17.0.3_p7.ebuild 3234 BLAKE2B 33af600b0c89a48e6d230ac33f8638592b21884f1fe43084c5accb962846d7e8fde3d726892a7316521c96777563008f4247996053afd72148c0f1b50ecd4d82 SHA512 9bfb031cb553df1ec7d685c427c45d41c0370da05523a969f2e37f4f9ef015aec144361e3e1a7f9d05e82d32ffd66fdd9d7b4033c85fa2698fe61851ed0b76ba
 EBUILD openjdk-bin-8.332_p09.ebuild 3033 BLAKE2B 80676ac6890b24143dd2cdd49f0f308921dcfaed61b4ac89fad69125aa7e3c51b73400bd32411d62805a170ab494511e35e444e30608cc726ac602a4404010b1 SHA512 6555e6b3dd707622012f14bf96576d493e150ea8a2f9c0eb75bd90d1f4d4319e8d9e4ebde6b0f785be538c1fac85a76fd11d24dd9b3debbb353e8decfffd5636
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
deleted file mode 100644
index f6d25d57c4a1..000000000000
--- a/dev-java/openjdk-bin/files/openjdk-bin-17.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Eclipse Temurin JDK ${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/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
index fe1b484edfa1..9bb340ba4db4 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JDK ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
index 073e66f7ee9c..64619f60c7c5 100644
--- a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
+++ b/dev-java/openjdk-bin/files/openjdk-bin.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
 VERSION="Eclipse Temurin JDK ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index 1bb314be9d5d..eb2458b279a2 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -124,7 +124,7 @@ src_install() {
 	# provide stable symlink
 	dosym "${P}" "/opt/${PN}-${SLOT}"
 
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index 1ad02aaacb18..bba49ad388a3 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -125,7 +125,7 @@ src_install() {
 	# provide stable symlink
 	dosym "${P}" "/opt/${PN}-${SLOT}"
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter