[gentoo-commits] repo/proj/guru:dev commit in: dev-java/openjdk-sts-bin/

[Denis Reva]

commit:     9f13d91c2e7473a716f34276664bb0608ebadd07
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 14 13:33:11 2020 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Tue Apr 14 13:33:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f13d91c

dev-java/openjdk-sts-bin:

Attempting to fix SLOT
gentoo-vm use flag is not set by default

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild | 6 +++---
 dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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 4dbf0dd..4f2b101 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 4dbf0dd..4f2b101 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