commit: 700957a349743de2688e614d6cf9f2927f5670a1 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri May 13 06:56:41 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri May 13 06:57:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700957a3
dev-java/openjdk-bin: use SLOT=$(ver_cut 1) everywhere Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild | 2 +- dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild index 2a69b6b5e04c..1bb314be9d5d 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild @@ -27,7 +27,7 @@ abi_uri() { } MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri arm) diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild index 81cd7dd0c1fe..27efa4384f29 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild @@ -27,7 +27,7 @@ abi_uri() { } MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri arm) diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild index 69156e432327..f5637ac0f050 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild @@ -27,7 +27,7 @@ abi_uri() { } MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild index ebe4afd00a4e..fba323d4c666 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild @@ -27,7 +27,7 @@ abi_uri() { } MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild index 1c0861a84f55..aad1888ca56b 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild @@ -21,7 +21,7 @@ abi_uri() { # https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" +SLOT=$(ver_cut 1) DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" HOMEPAGE="https://adoptium.net" diff --git a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild index 03a1e6a2e354..7834a4a17075 100644 --- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild @@ -21,7 +21,7 @@ abi_uri() { # https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) -SLOT="$(ver_cut 1)" +SLOT=$(ver_cut 1) DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" HOMEPAGE="https://adoptium.net"