From 4b3d130bba421453247b7191bbc9b28b6f4afed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 26 Nov 2023 12:16:49 -0300 Subject: [PATCH 1/3] openjdk11: fix alternatives --- srcpkgs/openjdk11/template | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index b5dd94241a0c8..f8df2a88ac782 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -77,7 +77,6 @@ alternatives=" jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc jdk:/usr/bin/jar:/${_jdk_home}/bin/jar jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner - jdk:/usr/bin/java:/${_jdk_home}/bin/java jdk:/usr/bin/javac:/${_jdk_home}/bin/javac jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc jdk:/usr/bin/javap:/${_jdk_home}/bin/javap @@ -86,10 +85,10 @@ alternatives=" jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps + jdk:/usr/bin/jfr:/${_jdk_home}/bin/jfr jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo - jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod @@ -99,13 +98,8 @@ alternatives=" jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd - jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool - jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200 jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic - jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid - jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver - jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200 " post_extract() { From e5bb43a0668319493448be8cc1522b69a9ec8274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 26 Nov 2023 12:16:54 -0300 Subject: [PATCH 2/3] openjdk17: fix alternatives --- srcpkgs/openjdk17/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index bb72701f360e6..4c2d46db656a4 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -86,7 +86,6 @@ fi alternatives=" jdk:/usr/bin/jar:/${_jdk_home}/bin/jar jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner - jdk:/usr/bin/java:/${_jdk_home}/bin/java jdk:/usr/bin/javac:/${_jdk_home}/bin/javac jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc jdk:/usr/bin/javap:/${_jdk_home}/bin/javap @@ -95,7 +94,6 @@ alternatives=" jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps - jdk:/usr/bin/jfr:/${_jdk_home}/bin/jfr jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo @@ -109,8 +107,6 @@ alternatives=" jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd - jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool - jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver " From 0db66ce05b6a0a9d8e241755bb5343f956aa573b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 26 Nov 2023 12:17:21 -0300 Subject: [PATCH 3/3] jmol: depend on java-runtime instead of java-environment --- srcpkgs/jmol/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template index 7217fdfaeb90d..4a61160eb454a 100644 --- a/srcpkgs/jmol/template +++ b/srcpkgs/jmol/template @@ -2,7 +2,7 @@ pkgname=jmol version=16.1.9 revision=1 -depends="virtual?java-environment" +depends="virtual?java-runtime" short_desc="Open-source Java/JavaScript-based molecule viewer" maintainer="Brenton Horne " license="LGPL-2.1-or-later"