diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-10-22 16:53:42 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-10-22 16:53:42 -0400 |
| commit | 169eaae1c2b5705d433c1fbf260d7c933e871b6a (patch) | |
| tree | 09294067472fcc42558254ea02b9625fd57f2515 | |
| parent | 4f7a7ef89048396ef1991acabcdd7f0eeff7ae07 (diff) | |
| download | gentoo-overlay-169eaae1c2b5705d433c1fbf260d7c933e871b6a.tar.xz gentoo-overlay-169eaae1c2b5705d433c1fbf260d7c933e871b6a.zip | |
dev-java/openj9-openjdk*: re-switch to eapi7-ver
4 files changed, 16 insertions, 16 deletions
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) diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild index e11f22e..110e015 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-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}? ( @@ -11,9 +11,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-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild index e76ddfd..b27afba 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-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}? ( @@ -11,9 +11,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) |