commit: 5e6dfa923a56824c1419acd97ac713bf0204a463 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Thu Aug 12 12:29:49 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=5e6dfa92
net-im/signal-cli-bin: version bump to 0.8.5 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/21958 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-im/signal-cli-bin/Manifest | 3 ++ ...al-cli-bin-0.8.5-use-working-java-version.patch | 31 +++++++++++ net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild | 61 ++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 7a21ab019ca..bcc9ea47788 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,3 +1,6 @@ DIST signal-cli-bin-0.8.1.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370 DIST signal-cli-bin-0.8.1.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2 DIST signal-cli-bin-0.8.1.tar.gz 16870784 BLAKE2B e08f740fef6da4e7b1e4751e5cc83130a260f637f6f8a56e54dc8f91f417df9f037b7ab2e5e416e89db2e211137091132631755a3af05658eb1f30e3ef20f4f7 SHA512 3507c14730ab4a77ebb8f403d0ab13f3e42e8e91aa94c6dfc066fe494f0acb2a92aed562c55a13a5b88c69addca96c5f2aacbe731e913bf39d33f2eae0e6d9f4 +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.8.5-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch new file mode 100644 index 00000000000..840c249b976 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch @@ -0,0 +1,31 @@ +Signed-off-by: Martin Dummer <[email protected]> + +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -84,13 +84,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 11, but Java 11 is currently not part of the gentoo eselect config system ++# so we must search for matching java binaries ++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." ++ 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.8.5.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild new file mode 100644 index 00000000000..e49d162dba0 --- /dev/null +++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild @@ -0,0 +1,61 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}.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" + +# signal-cli-bin depends on Java 11 +# +# virtual/jre:11 exists but it's masked with this message: +# Java 11 is not yet fully supported on Gentoo. Packages cannot depend +# on it so these virtuals are not yet required. If you wish to use +# Java 11 then install openjdk-(jdk|jre)-bin directly. + +DEPEND=" + || ( dev-java/openjdk-jre-bin:11 dev-java/openjdk:11 dev-java/openjdk-bin:11 ) +" +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" +}
