From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DED211581E7 for ; Mon, 29 Apr 2024 08:41:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EED7AE29AC; Mon, 29 Apr 2024 08:41:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFD65E29AC for ; Mon, 29 Apr 2024 08:41:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE38A34302C for ; Mon, 29 Apr 2024 08:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BD091763 for ; Mon, 29 Apr 2024 08:41:08 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1714380065.ddba3bf5e1adcb0fc1f332cf813b72037989b485.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild X-VCS-Directories: net-im/signal-cli-bin/ net-im/signal-cli-bin/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: ddba3bf5e1adcb0fc1f332cf813b72037989b485 X-VCS-Branch: master Date: Mon, 29 Apr 2024 08:41:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 36a75742-b500-442f-ad39-ab1207b48ec3 X-Archives-Hash: 4a2f35254453da67edf973d113d3d124 commit: ddba3bf5e1adcb0fc1f332cf813b72037989b485 Author: Martin Dummer gmx net> AuthorDate: Thu Apr 25 16:45:21 2024 +0000 Commit: Joonas Niilola gentoo 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 gmx.net> Closes: https://github.com/gentoo/gentoo/pull/36423 Signed-off-by: Joonas Niilola 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 +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="