From 169eaae1c2b5705d433c1fbf260d7c933e871b6a Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Fri, 22 Oct 2021 16:53:42 -0400
Subject: dev-java/openj9-openjdk*: re-switch to eapi7-ver
---
.../openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild | 8 ++++----
.../openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'dev-java/openj9-openjdk-bin')
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild
index 2473ff0..f9a41b7 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit java-vm-2 toolchain-funcs versionator
+inherit eapi7-ver java-vm-2 toolchain-funcs
abi_uri() {
echo "${2-$1}? (
@@ -14,9 +14,9 @@ abi_uri() {
)"
}
-JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4)
-DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7)
-SLOT=$(get_major_version)
+JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
+DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri aarch64 arm64)
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild
index 79ccca2..f146d1f 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit java-vm-2 toolchain-funcs versionator
+inherit eapi7-ver java-vm-2 toolchain-funcs
abi_uri() {
echo "${2-$1}? (
@@ -14,9 +14,9 @@ abi_uri() {
)"
}
-JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4)
-DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7)
-SLOT=$(get_major_version)
+JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
+DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri ppc64le ppc64)
--
cgit v1.2.3-70-g09d2