aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Reva <denis7774@gmail.com>2020-04-14 18:33:11 +0500
committerDenis Reva <denis7774@gmail.com>2020-04-14 18:33:11 +0500
commit9f13d91c2e7473a716f34276664bb0608ebadd07 (patch)
treee89ad2a6f660d9be46e4fd968c28aa34a86fe9da /dev-java
parentdev-java/openjdk-sts-bin: (diff)
downloadguru-9f13d91c2e7473a716f34276664bb0608ebadd07.tar.gz
guru-9f13d91c2e7473a716f34276664bb0608ebadd07.tar.bz2
guru-9f13d91c2e7473a716f34276664bb0608ebadd07.zip
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@gmail.com>
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openjdk-sts-bin/openjdk-sts-bin-13.0.2_p8.ebuild6
-rw-r--r--dev-java/openjdk-sts-bin/openjdk-sts-bin-14_p36.ebuild6
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 4dbf0ddf9..4f2b101c5 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 4dbf0ddf9..4f2b101c5 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