| 1 |
commit: 700957a349743de2688e614d6cf9f2927f5670a1 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 13 06:56:41 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 06:57:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700957a3 |
| 7 |
|
| 8 |
dev-java/openjdk-bin: use SLOT=$(ver_cut 1) everywhere |
| 9 |
|
| 10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild | 2 +- |
| 13 |
dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild | 2 +- |
| 14 |
dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild | 2 +- |
| 15 |
dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild | 2 +- |
| 16 |
dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild | 2 +- |
| 17 |
dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild | 2 +- |
| 18 |
6 files changed, 6 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index 2a69b6b5e04c..1bb314be9d5d 100644 |
| 22 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild |
| 23 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild |
| 24 |
@@ -27,7 +27,7 @@ abi_uri() { |
| 25 |
} |
| 26 |
|
| 27 |
MY_PV=${PV/_p/+} |
| 28 |
-SLOT=${MY_PV%%[.+]*} |
| 29 |
+SLOT=$(ver_cut 1) |
| 30 |
|
| 31 |
SRC_URI=" |
| 32 |
$(abi_uri arm) |
| 33 |
|
| 34 |
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 |
| 35 |
index 81cd7dd0c1fe..27efa4384f29 100644 |
| 36 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild |
| 37 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild |
| 38 |
@@ -27,7 +27,7 @@ abi_uri() { |
| 39 |
} |
| 40 |
|
| 41 |
MY_PV=${PV/_p/+} |
| 42 |
-SLOT=${MY_PV%%[.+]*} |
| 43 |
+SLOT=$(ver_cut 1) |
| 44 |
|
| 45 |
SRC_URI=" |
| 46 |
$(abi_uri arm) |
| 47 |
|
| 48 |
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 |
| 49 |
index 69156e432327..f5637ac0f050 100644 |
| 50 |
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild |
| 51 |
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild |
| 52 |
@@ -27,7 +27,7 @@ abi_uri() { |
| 53 |
} |
| 54 |
|
| 55 |
MY_PV=${PV/_p/+} |
| 56 |
-SLOT=${MY_PV%%[.+]*} |
| 57 |
+SLOT=$(ver_cut 1) |
| 58 |
|
| 59 |
SRC_URI=" |
| 60 |
$(abi_uri aarch64 arm64) |
| 61 |
|
| 62 |
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 |
| 63 |
index ebe4afd00a4e..fba323d4c666 100644 |
| 64 |
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild |
| 65 |
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild |
| 66 |
@@ -27,7 +27,7 @@ abi_uri() { |
| 67 |
} |
| 68 |
|
| 69 |
MY_PV=${PV/_p/+} |
| 70 |
-SLOT=${MY_PV%%[.+]*} |
| 71 |
+SLOT=$(ver_cut 1) |
| 72 |
|
| 73 |
SRC_URI=" |
| 74 |
$(abi_uri aarch64 arm64) |
| 75 |
|
| 76 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild |
| 77 |
index 1c0861a84f55..aad1888ca56b 100644 |
| 78 |
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild |
| 79 |
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild |
| 80 |
@@ -21,7 +21,7 @@ abi_uri() { |
| 81 |
# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz |
| 82 |
|
| 83 |
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
| 84 |
-SLOT="$(ver_cut 1)" |
| 85 |
+SLOT=$(ver_cut 1) |
| 86 |
|
| 87 |
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" |
| 88 |
HOMEPAGE="https://adoptium.net" |
| 89 |
|
| 90 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild |
| 91 |
index 03a1e6a2e354..7834a4a17075 100644 |
| 92 |
--- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild |
| 93 |
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild |
| 94 |
@@ -21,7 +21,7 @@ abi_uri() { |
| 95 |
# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz |
| 96 |
|
| 97 |
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b}) |
| 98 |
-SLOT="$(ver_cut 1)" |
| 99 |
+SLOT=$(ver_cut 1) |
| 100 |
|
| 101 |
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" |
| 102 |
HOMEPAGE="https://adoptium.net" |
Archives