commit: d98694c6b7fff63ab51e0f4081f6ce06220407e4 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Mon Feb 22 22:34:12 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Feb 24 08:30:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98694c6
net-im/signal-cli-bin: version bump to 0.8.0 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/19605 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-im/signal-cli-bin/Manifest | 3 ++ ...al-cli-bin-0.8.0-use-working-java-version.patch | 33 ++++++++++++ net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild | 61 ++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 30d040b7927..6a062e2ff0d 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,3 +1,6 @@ DIST signal-cli-bin-0.7.4.README.md 4403 BLAKE2B 77b75170e18b302d8808a73297221d524b69ccd4fb66456086c7a9288ec2e023ed78de5baadd154c9ff508ba91c58abcdfa327931f559243d1b6f3efe99426c3 SHA512 7530e4a36ddc9d77e0cb7c8cec23aaaf3b7b7d1488ef86f675d7fb8b3debae1314d49ca23e1a68ff78ecfc58d9e00b28ff09f378fc7e9bc4bfc9e0ef883aa13f DIST signal-cli-bin-0.7.4.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2 DIST signal-cli-bin-0.7.4.tar.gz 16408829 BLAKE2B 169e9e7b5eafb8308c248d976326fbd11f3044f2a73d32af8c62d5f6fd88929ac90ab331a188cf8376818102e59b5d0a11457494f3fca07ba830b5288aaa41cd SHA512 b7e2f1da17c2ebcb1174739cf9c287dd335fa70c1c9417137a07bcaf16cdd121cccfdd9ba345130bccdfe877e16d6dba9bf3ef1cb12d301fd3f674617233fcd5 +DIST signal-cli-bin-0.8.0.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370 +DIST signal-cli-bin-0.8.0.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2 +DIST signal-cli-bin-0.8.0.tar.gz 16852501 BLAKE2B 2792935fa20bf6d31638157febfd771a254c2e962342236891cc0e8bc60a872af0f400852bd4b2cfc449a81e81dbdd34c19437a78df86d07a3648b748086fa85 SHA512 60029ff8b0013667743eb14340cb1367b527ebf2ba74a54fc2d1f70a21721fdb826c9af63a80d26f0dc951670172df7346a9bbea61a9e865e5625df10187c965 diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch new file mode 100644 index 00000000000..5d9bd290996 --- /dev/null +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch @@ -0,0 +1,33 @@ +Signed-off-by: Martin Dummer <[email protected]> + +diff -Naur a/bin/signal-cli b/bin/signal-cli +--- a/bin/signal-cli ++++ b/bin/signal-cli +@@ -84,13 +84,20 @@ + + + # 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 ++JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11" ++for I in $JAVA_DIRS ; 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.0.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild new file mode 100644 index 00000000000..39268d6e891 --- /dev/null +++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.0.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}/signal-cli-bin-${PV}-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" +}
