commit: e76d4407d049879afd737694c7c276b1ce3d86c1 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Thu May 26 07:21:23 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu May 26 13:12:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76d4407
net-im/signal-cli-bin: version bump to 0.10.6 new EAPI8, now depends on virtual/jre:17 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/25637 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-im/signal-cli-bin/Manifest | 3 ++ ...l-cli-bin-0.10.6-use-working-java-version.patch | 33 +++++++++++++ net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild | 54 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 5080764d631c..570dbe52032d 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,3 +1,6 @@ +DIST signal-cli-bin-0.10.6.README.md 5916 BLAKE2B e7fc8646b1bcafe5145fec9d14450dcc235380d8f1e776f30432b3235a2ed87043a55ba4da48c058f83b04750e0e1dcd97ee5e50ce079e7bb906f04f9e77fb38 SHA512 a7347ea5134982fa76442702b9d7892b1bbdbf5f36b1823461e14c320cf38cdf3f2379178c7864ef21285f8f3a0c26d4e2fb9ea9546b2fb4d1271d552bf7c37e +DIST signal-cli-bin-0.10.6.signal-cli.1.adoc 19971 BLAKE2B 1642c6e463d0c536abfba4fa2e5c91f5fbb7c9d9817684924be82a43c7fbca7b92f07718507582721c63c32d1844c5c016f02dfb7b03b8ae7494f090ffdb7d00 SHA512 361098a70d3ee7f114a8f0f95794c24380363f782b4778d70a1cb2cc8bfee107e9b0f88c4cdd236f51960a14bcf18d60cb9920d4abac09fe58c0df9f5d4a5551 +DIST signal-cli-bin-0.10.6.tar.gz 34191841 BLAKE2B 3a0d4ae9c938aaadb59803550d56d4ae17cb8c0d3ea1f2874654207423679ca42ab42d1aa7894b897794298f94b2f57eac84120b7fbf7a0e4d6e0153a9565681 SHA512 4a7d5381bbcdde516d25e6a580854213ba5b144aa942d3cdea48b3e587d9db9e448c1bcf8c91a7632157747d00c5da4a4dbf1c366ae5a332f922c6d9a6ad33d1 DIST signal-cli-bin-0.8.5.README.md 5626 BLAKE2B e8a70135622a7eeaa9b4c965f75f001e641745c60a10d61ab96a014194034a1daf2ec077cb7798bf32c5f9218af6103dc9de7bbb2811b9a4aa162f55697f2232 SHA512 feed6673b56c4ac812d5038157f08bef36b48725211ad06a146a0f349c20213527eec814a5e940aacc0de0fdf7d74931fcd12a0d764df82340025a71a7f22a35 DIST signal-cli-bin-0.8.5.signal-cli.1.adoc 15222 BLAKE2B d5075011c82bb79f2de7f7b2f2cbf060428281b0f1d054e1cba09632e6e2b7dd472e8dfa3f0d7863acd9d8e93cfa51af1e241153baeb4d5f2e0e8698a158e6a1 SHA512 cd076fde6cdeca70734bb385d7dbf574fa859da9b2ba01c5dfbd8fde0f3457c400be41d790cd7cdc05932731693f4114e4708b7d42e405bf8dd6f982309c0ca2 DIST signal-cli-bin-0.8.5.tar.gz 17563403 BLAKE2B d400285d513c893475c74cbbfa7cb01391545d88e5e1504d9a5175428b31e7308cfc1c9526dc8cef4aab9a75e916a1b596f7939eeeaf5544ffb351c7dfcb3b59 SHA512 1d1931a568d9f95e020ee21dbf2d594b0d43d59e4621a7ef1ff21ab2e3cd4ea00da363bd5d86e12745015c643e4ebde4f58bec4a51be807e401ebb127430fa70 diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch new file mode 100644 index 000000000000..02b77bc54dd4 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch @@ -0,0 +1,33 @@ +This patch searches the jre 17 binary in the gentoo specific directories. + +Signed-off-by: Martin Dummer <martin.dum...@gmx.net> + +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -118,13 +118,19 @@ + + + # Determine the Java command to use to start the JVM. +-if [ -n "$JAVA_HOME" ] ; then +- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +- # IBM's JDK on AIX uses strange locations for the executables +- JAVACMD=$JAVA_HOME/jre/sh/java +- else +- JAVACMD=$JAVA_HOME/bin/java +- fi ++# This package needs Java 17, ++# so we must search for matching java binaries ++for I in /usr/lib*/openjdk-17 /opt/openjdk-bin-17 /opt/openjdk-jre-bin-17; do ++ J_TRY="$I/bin/java" ++ if [ -x "$J_TRY" ] ; then ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." ++ if [ $? -eq 0 ] ; then ++ JAVACMD="$J_TRY" ++ break ++ fi ++ fi ++done ++if [ -n "$JAVACMD" ] ; then + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild new file mode 100644 index 000000000000..29710caad87a --- /dev/null +++ b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="signal-cli-${PV}" +DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface" +HOMEPAGE="https://github.com/AsamK/signal-cli/wiki"; +SRC_URI=" + https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}-Linux.tar.gz -> ${P}.tar.gz + https://github.com/AsamK/signal-cli/raw/v${PV}/README.md -> ${P}.README.md + https://github.com/AsamK/signal-cli/raw/v${PV}/man/signal-cli.1.adoc -> ${P}.signal-cli.1.adoc +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + || ( virtual/jdk:17 virtual/jre:17 ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-text/asciidoc +" + +PATCHES=( + "${FILESDIR}/${P}-use-working-java-version.patch" +) + +src_unpack() { + default + cp "${DISTDIR}/${P}.signal-cli.1.adoc" signal-cli.1.adoc || die +} + +src_compile() { + default + a2x --no-xmllint --doctype manpage --format manpage "${WORKDIR}/signal-cli.1.adoc" || die +} + +src_install() { + insinto /usr + doins -r lib + dobin bin/signal-cli + newdoc "${DISTDIR}/${P}.README.md" README.md + doman "${WORKDIR}/signal-cli.1" +} + +pkg_postinst() { + elog "Please read /usr/share/doc/${PF}/README.md.bz2" + elog "how to register signal-cli with the signal service and how to send" + elog "and receive messages" +}
