dev-java/openjdk: bump latest 17.x, restore version strings, remove gentoo-vm flag

gentoo-vm no longer needed
version strings were reporting incorrect values, this should be fixed
now

Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

3 files changed, 11 insertions, 10 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index ef2994b225e4..79aa1cf45ea3 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -3,8 +3,8 @@ DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e
 DIST openjdk-11.0.16.1_p1.tar.gz 123134756 BLAKE2B 727294bb9d07193bb74b01a3e3e35f491b54be4cf3b6230e59df56ea7a9166b0b138f82b3d3c302c32b21efa8e9ac71437ca430a68a9ad8b69a7755d289bde17 SHA512 c694a8e6b0ff664b2c6a43ef3445d98e3b4ddf59c7fe94a21390b2d7756870ea7c7e34cb99d40bd66708ecaee93ffeb4dfc9ab7e2162bd6fc19479f23963560d
 DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445
 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
-DIST openjdk-17.0.4.1.tar.gz 104917916 BLAKE2B f01101aa5c1fa17ab92134d2d238df266a734ad0d523e0030853b4386c9e021364e1a98644a8f6fd075f42dff1ff2b0d2a0b958c6d99c10c4250043bee36f6a3 SHA512 5b134a93addf17bb9c91e7ea69e25a9db4dbdc27760de3a128e48b20bbfb004722851c27cea4f9d83e3fdab929e89af09cf7879b1d87334cffe600b12ee53150
-DIST openjdk-17.0.5_pre5.tar.gz 105040319 BLAKE2B 658df2630e1938d7787031e498474c347a10770a133d4d8234cb7450777264c07441ca56a1b09f368b837a182627d3a104848aa5e521d95b1b58e1f21f4645b1 SHA512 19b2466339db697a8564e44423878b5c5ed310478bf56aa7ace90d34458912c5f544fcea2c31eaba559c2fff33f818745e8160376eae8f6c3c694090aed7de09
+DIST openjdk-17.0.4.1_p1.tar.gz 104892822 BLAKE2B e5c4ae7e59b7f078c3927ca74cdff4fe1f378da874eca45a7655fa7419c9abac6b9f81632c104614b7f1d6c20fbc5ee7f4b0a8e2aaef39a66f31377543e926de SHA512 33396f9d8101db605aac0b064d518a800194421b211f0d903d681968beab58540367e53293fa26d4751e4bd1f459a0d07bb08b2010ac64ea5438717ea1517f76
+DIST openjdk-17.0.5_p5.tar.gz 105040319 BLAKE2B 658df2630e1938d7787031e498474c347a10770a133d4d8234cb7450777264c07441ca56a1b09f368b837a182627d3a104848aa5e521d95b1b58e1f21f4645b1 SHA512 19b2466339db697a8564e44423878b5c5ed310478bf56aa7ace90d34458912c5f544fcea2c31eaba559c2fff33f818745e8160376eae8f6c3c694090aed7de09
 DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
 DIST openjdk-8.345_p01.tar.gz 88173976 BLAKE2B f0eca11f4fcb532a8fd156a74ff6629ea2d948c5d29d9b9638b526c57598618f5c3782ace26654be61f8d9ab229f44aa46112234c2d2e8a9bdc367c1071b6e53 SHA512 bb01156f751a0ba25290d1337356f9dd78121373220e2e2df07a4536e2ab31390865ab63d628901de7983d1679dd6dfd4bc3c6304911e6c76fe4c616bdf07eab
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
diff --git a/dev-java/openjdk/openjdk-17.0.4.1.ebuild b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
index 5219b95c61ad..36683911df51 100644
--- a/dev-java/openjdk/openjdk-17.0.4.1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
@@ -26,7 +26,8 @@ bootstrap_uri() {
 	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
 }
 
-MY_PV="${PV//_pre/+}-ga"
+MY_PV="${PV//_p/+}"
+
 SLOT="$(ver_cut 1)"
 
 DESCRIPTION="Open source implementation of the Java programming language"
@@ -46,7 +47,7 @@ SRC_URI="
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
-IUSE="alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
@@ -212,7 +213,7 @@ src_configure() {
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
 		--with-version-string="${PV%_p*}"
-		--with-version-build="${SLOT}"
+		--with-version-build="${PV#*_p}"
 		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
@@ -293,7 +294,7 @@ src_install() {
 	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
 	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
diff --git a/dev-java/openjdk/openjdk-17.0.5_pre5.ebuild b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
index daf4447e9d86..ce1e101e1c8d 100644
--- a/dev-java/openjdk/openjdk-17.0.5_pre5.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
@@ -26,7 +26,7 @@ bootstrap_uri() {
 	echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
 }
 
-MY_PV="${PV//_pre/+}"
+MY_PV="${PV//_p/+}"
 SLOT="$(ver_cut 1)"
 
 DESCRIPTION="Open source implementation of the Java programming language"
@@ -46,7 +46,7 @@ SRC_URI="
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
-IUSE="alsa big-endian cups debug doc examples +gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
@@ -210,7 +210,7 @@ src_configure() {
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
 		--with-version-string="${PV%_p*}"
-		--with-version-build="${SLOT}"
+		--with-version-build="${PV#*_p}"
 		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
@@ -291,7 +291,7 @@ src_install() {
 	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
 	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
 
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter