[gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/, net-im/signal-cli-bin/files/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     05304bfc02bfb62b66733ee8df4089ce4285299c
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Thu Aug 12 10:36:53 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 06:58:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05304bfc

net-im/signal-cli-bin: enhance java binary search

Implement a suggestion to search more directories for the java11 binary
see https://github.com/gentoo/gentoo/pull/18719#discussion_r687230129

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/signal-cli-bin-0.8.1-use-working-java-version.patch    | 9 ++++-----
 ...ignal-cli-bin-0.8.1.ebuild => signal-cli-bin-0.8.1-r1.ebuild} | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
index 4a550e410bf..b3974521494 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
@@ -1,7 +1,7 @@
 Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
---- a/bin/signal-cli	2021-03-02 20:56:06.000000000 +0100
-+++ b/bin/signal-cli	2021-05-03 12:05:45.406811750 +0200
-@@ -84,13 +84,20 @@
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -84,13 +84,19 @@
  
  
  # Determine the Java command to use to start the JVM.
@@ -14,8 +14,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
 -    fi
 +# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system
 +# so we must search for matching java binaries
-+JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11"
-+for I in $JAVA_DIRS ; do
++for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; do
 +	J_TRY="$I/bin/java"
 +	if [ -x "$J_TRY" ] ; then
 +		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."

diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
similarity index 96%
rename from net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild
rename to net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
index 39268d6e891..e49d162dba0 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/signal-cli-bin-${PV}-use-working-java-version.patch"
+	"${FILESDIR}/${P}-use-working-java-version.patch"
 )
 
 src_unpack() {