diff options
Diffstat (limited to 'net-im/signal-cli-bin')
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch | 2 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild) | 2 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.13.2.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 <julien@jroy.ca> +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 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 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=" |