diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild
index 4dbf0ddf9b..4f2b101c5b 100644
--- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild
+++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-vm-2 toolchain-funcs
+inherit java-vm-2 toolchain-funcs eapi7-ver
 
 abi_uri() {
 	echo "${2-$1}? (
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT="$(ver_cut 1)"
 
 SRC_URI="
 	$(abi_uri arm)
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Sup
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups examples +gentoo-vm headless-awt source"
+IUSE="alsa cups examples -gentoo-vm headless-awt source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild
index 4dbf0ddf9b..4f2b101c5b 100644
--- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild
+++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-vm-2 toolchain-funcs
+inherit java-vm-2 toolchain-funcs eapi7-ver
 
 abi_uri() {
 	echo "${2-$1}? (
@@ -12,7 +12,7 @@ abi_uri() {
 }
 
 MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT="$(ver_cut 1)"
 
 SRC_URI="
 	$(abi_uri arm)
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Sup
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups examples +gentoo-vm headless-awt source"
+IUSE="alsa cups examples -gentoo-vm headless-awt source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0