commit: ddba3bf5e1adcb0fc1f332cf813b72037989b485 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Thu Apr 25 16:45:21 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Apr 29 08:41:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddba3bf5
net-im/signal-cli-bin: fix start script fix start script behavior with dev-java/openjdk-jre-bin:21 change java dependency - thanks to @vaukai for pointing that out Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/36423 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/signal-cli-bin-0.13.1-use-working-java-version.patch | 2 +- .../{signal-cli-bin-0.13.1.ebuild => signal-cli-bin-0.13.1-r1.ebuild} | 2 +- .../{signal-cli-bin-0.13.2.ebuild => signal-cli-bin-0.13.2-r1.ebuild} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch index 452435a6751c..366ca18e19ed 100644 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch @@ -20,7 +20,7 @@ Signed-off-by: Julien Roy <[email protected]> +for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; do + J_TRY="$I/bin/java" + if [ -x "$J_TRY" ] ; then -+ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "21." + if [ $? -eq 0 ] ; then + JAVACMD="$J_TRY" + break diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild similarity index 97% rename from net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild rename to net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild index 134539b98724..200ffb194879 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - || ( virtual/jdk:21 virtual/jre:21 ) + virtual/jre:21 " RDEPEND="${DEPEND}" BDEPEND=" diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild similarity index 97% rename from net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild rename to net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild index 134539b98724..200ffb194879 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - || ( virtual/jdk:21 virtual/jre:21 ) + virtual/jre:21 " RDEPEND="${DEPEND}" BDEPEND="
