*/openjdk*: revert pkgver provides

this prevents installing more than one java version

13 files changed, 65 insertions, 52 deletions

diff --git a/community/openjdk10/APKBUILD b/community/openjdk10/APKBUILD
index 86dcb9bd9de..3fd3b9b466f 100644
--- a/community/openjdk10/APKBUILD
+++ b/community/openjdk10/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk10
 pkgver=10.0.2_p13
 _pkgver=${pkgver/_p/+}
-pkgrel=4
+pkgrel=5
 pkgdesc="Oracle OpenJDK 10"
+provider_priority=10
 url="https://hg.openjdk.java.net/jdk-updates/jdk10u"
 # oracle dropped support for 32 bit
 # riscv64 blocked by openjdk9
@@ -217,7 +218,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 10 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -243,7 +244,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 10 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -286,7 +287,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 10 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD
index e3334359e71..427e657a880 100644
--- a/community/openjdk11/APKBUILD
+++ b/community/openjdk11/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk11
 pkgver=11.0.17_p8
 _pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle OpenJDK 11"
+provider_priority=11
 url="https://github.com/openjdk/jdk11u"
 # oracle dropped support for 32 bit
 # riscv64 blocked by openjdk10
@@ -341,7 +342,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 11 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -367,7 +368,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 11 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -415,7 +416,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 11 (JDK)"
 	depends="$pkgname-jre $pkgname-jmods"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk12/APKBUILD b/community/openjdk12/APKBUILD
index 60f30341fef..31796f3de96 100644
--- a/community/openjdk12/APKBUILD
+++ b/community/openjdk12/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk12
 pkgver=12.0.2_p10
 _pkgver=${pkgver/_p10/-ga}
-pkgrel=4
+pkgrel=5
 pkgdesc="Oracle OpenJDK 12"
+provider_priority=12
 url="https://hg.openjdk.java.net/jdk-updates/jdk12u"
 # x86, armhf and armv7 are not supported by Oracle due to being 32-bit
 # riscv64 blocked by openjdk11
@@ -221,7 +222,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 12 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -247,7 +248,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 12 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -284,7 +285,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 12 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk13/APKBUILD b/community/openjdk13/APKBUILD
index c6e5eece785..9cb6ba9e25c 100644
--- a/community/openjdk13/APKBUILD
+++ b/community/openjdk13/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk13
 pkgver=13.0.12_p4
 _pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle OpenJDK 13"
+provider_priority=13
 url="https://github.com/openjdk/jdk13u"
 # riscv64 blocked by openjdk12
 # x86, armhf and armv7 blocked by dropped 32-bit support upstream
@@ -246,7 +247,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 13 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -272,7 +273,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 13 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -309,7 +310,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 13 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk14/APKBUILD b/community/openjdk14/APKBUILD
index a9373d6bee3..956fe418c42 100644
--- a/community/openjdk14/APKBUILD
+++ b/community/openjdk14/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk14
 pkgver=14.0.2_p12
 _pkgver=${pkgver%_p*}-ga
-pkgrel=3
+pkgrel=4
 pkgdesc="Oracle OpenJDK 14"
+provider_priority=14
 url="https://hg.openjdk.java.net/jdk-updates/jdk14u"
 # x86, armhf and armv7 are not supported by Oracle due to being 32-bit
 # riscv64 blocked by openjdk13
@@ -218,7 +219,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 14 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -244,7 +245,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 14 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -279,7 +280,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 14 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk15/APKBUILD b/community/openjdk15/APKBUILD
index 9e93691004c..b2ac19abbfb 100644
--- a/community/openjdk15/APKBUILD
+++ b/community/openjdk15/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk15
 pkgver=15.0.8_p4
 _pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle OpenJDK 15"
+provider_priority=15
 url="https://github.com/openjdk/jdk15u"
 # x86, armhf and armv7 are not supported by Oracle due to being 32-bit
 # riscv64 blocked by openjdk14
@@ -247,7 +248,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 15 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -273,7 +274,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 15 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -309,7 +310,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 15 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk16/APKBUILD b/community/openjdk16/APKBUILD
index 55d371a1eac..9e58f5ef7c6 100644
--- a/community/openjdk16/APKBUILD
+++ b/community/openjdk16/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk16
 pkgver=16.0.2_p7
 _pkgver=${pkgver%_p*}-ga
-pkgrel=3
+pkgrel=4
 pkgdesc="Oracle OpenJDK 16"
+provider_priority=16
 url="https://github.com/openjdk/jdk16u"
 # x86, armhf and armv7 are not supported by Oracle due to being 32-bit
 # riscv64 blocked by openjdk15
@@ -215,7 +216,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 16 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -241,7 +242,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 16 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -277,7 +278,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 16 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk17/APKBUILD b/community/openjdk17/APKBUILD
index a28bb0945b2..f8a2db8ceaf 100644
--- a/community/openjdk17/APKBUILD
+++ b/community/openjdk17/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk17
 pkgver=17.0.5_p8
 _pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle OpenJDK 17"
+provider_priority=17
 url="https://github.com/openjdk/jdk17u"
 # s390x: no openjdk11
 arch="all !s390x !x86 !armhf !armv7 !riscv64" # oracle dropped support for 32 bit
@@ -254,7 +255,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 17 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -280,7 +281,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 17 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -319,7 +320,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 17 (JDK)"
 	depends="$pkgname-jre $pkgname-jmods"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 28005fa3493..78524f73f46 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -7,8 +7,9 @@ _icedteaversrc=$_icedteaver
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
 pkgver=7.321.$_icedteaver
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenJDK 7 via IcedTea"
+provider_priority=7
 url="https://icedtea.classpath.org/"
 # riscv64 blocked by java-gcj-compat
 arch="all !riscv64"
@@ -283,7 +284,7 @@ build() {
 }
 
 package() {
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	mkdir -p "$pkgdir"/$_install_base
 	cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$_install_base
 	rm "$pkgdir"/$_install_base/src.zip
@@ -311,7 +312,7 @@ jrelib() {
 jrebase() {
 	pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
 	depends="$pkgname-jre-lib java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 
 	mkdir -p "$subpkgdir"/$_install_base/bin
 
@@ -328,7 +329,7 @@ jre() {
 	pkgdesc="OpenJDK 7 Java Runtime"
 	# manually depend to avoid clash with libgcj's libjvm.so
 	depends="so:openjdk7:libjvm.so=0"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 
 	mkdir -p "$subpkgdir"
 	local a; for a in jre/bin/policytool \
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 609b0d38476..622492d4536 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -6,8 +6,9 @@ _icedteaver=3.24.0
 # pkgver is <JDK version>.<JDK update>.<JDK build>
 # Check https://icedtea.classpath.org/wiki/Main_Page when updating!
 pkgver=8.345.01
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenJDK 8 provided by IcedTea"
+provider_priority=8
 url="https://icedtea.classpath.org/"
 # riscv64 blocked by openjdk7
 arch="all !riscv64"
@@ -316,7 +317,7 @@ check() {
 }
 
 package() {
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	mkdir -p "$pkgdir"/$_java_home
 
 	cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
@@ -356,7 +357,7 @@ jrelib() {
 jre() {
 	pkgdesc="OpenJDK 8 Java Runtime"
 	depends="ttf-dejavu"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	local file dir
 
 	mkdir -p "$subpkgdir"
@@ -378,7 +379,7 @@ jre() {
 jrebase() {
 	pkgdesc="OpenJDK 8 Java Runtime (no GUI support)"
 	depends="$pkgname-jre-lib java-common java-cacerts nss"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 
 	mkdir -p "$subpkgdir"/$_java_home/bin \
 		"$subpkgdir"/$_java_home/lib/$_jarch
diff --git a/community/openjdk9/APKBUILD b/community/openjdk9/APKBUILD
index 435145ee06c..cf88f41812a 100644
--- a/community/openjdk9/APKBUILD
+++ b/community/openjdk9/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk9
 pkgver=9.0.4_p12
 _pkgver=${pkgver/_p/+}
-pkgrel=5
+pkgrel=6
 pkgdesc="Oracle OpenJDK 9"
+provider_priority=9
 url="https://hg.openjdk.java.net/jdk-updates/jdk9u"
 # oracle dropped support for 32 bit
 # riscv64 blocked by openjdk8
@@ -241,7 +242,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 9 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -268,7 +269,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 9 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -311,7 +312,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 9 (JDK)"
 	depends="$pkgname-jre"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/testing/openjdk18/APKBUILD b/testing/openjdk18/APKBUILD
index a761bad59cf..6325c7447ff 100644
--- a/testing/openjdk18/APKBUILD
+++ b/testing/openjdk18/APKBUILD
@@ -3,8 +3,9 @@
 pkgname=openjdk18
 pkgver=18.0.2_p9
 _pkgver=${pkgver%_p*}-ga
-pkgrel=2
+pkgrel=3
 pkgdesc="Oracle OpenJDK 18"
+provider_priority=18
 url="https://github.com/openjdk/jdk18u"
 # s390x: no openjdk11
 arch="all !s390x !x86 !armhf !armv7 !riscv64" # oracle dropped support for 32 bit
@@ -208,7 +209,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 18 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -234,7 +235,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 18 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -274,7 +275,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 18 (JDK)"
 	depends="$pkgname-jre $pkgname-jmods"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
diff --git a/testing/openjdk19/APKBUILD b/testing/openjdk19/APKBUILD
index d91c19ac083..f9b6de74210 100644
--- a/testing/openjdk19/APKBUILD
+++ b/testing/openjdk19/APKBUILD
@@ -4,8 +4,9 @@ pkgname=openjdk19
 pkgver=19.0.0_p36
 #_pkgver=${pkgver%_p*}-ga
 _pkgver=19+36
-pkgrel=1
+pkgrel=2
 pkgdesc="Oracle OpenJDK 19"
+provider_priority=19
 url="https://github.com/openjdk/jdk19u"
 # s390x: no openjdk11
 arch="all !s390x !x86 !armhf !armv7 !riscv64" # oracle dropped support for 32 bit
@@ -201,7 +202,7 @@ _doc() {
 _jre() {
 	pkgdesc="Oracle OpenJDK 19 (JRE)"
 	depends="$pkgname-jre-headless"
-	provides="java-jre=$pkgver-r$pkgrel"
+	provides=java-jre
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -227,7 +228,7 @@ _src() {
 _jre_headless() {
 	pkgdesc="Oracle OpenJDK 19 (JRE headless)"
 	depends="java-common java-cacerts"
-	provides="java-jre-headless=$pkgver-r$pkgrel"
+	provides=java-jre-headless
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"
 
@@ -267,7 +268,7 @@ _jre_headless() {
 _jdk() {
 	pkgdesc="Oracle OpenJDK 19 (JDK)"
 	depends="$pkgname-jre $pkgname-jmods"
-	provides="java-jdk=$pkgver-r$pkgrel"
+	provides=java-jdk
 	_fromroot="$pkgdir/$_java_home"
 	_toroot="$subpkgdir/$_java_home"