gentoo resync : 03.03.2021

3 files changed, 99 insertions, 0 deletions

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 7be188b16dd9..3241f829c78f 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,6 +1,11 @@
 AUX signal-cli-bin-0.7.4-use-working-java-version.patch 1063 BLAKE2B 0564e3013bddf7bf8c8b350d7d0a2100256ba6c2be6752aa36acc1d7969149a5323c6eb1dee0cf3f92daaf391589442dfdf90a67c187542f900d1b23e62b4b15 SHA512 f71d5d0947bf4d5f94ebd77582868d6c9a097ffe63d7343467ae89815e0ee24136e84403c5867fa4f7827627271373c8e669d022e96cc16eb40fd164f8f0056a
+AUX signal-cli-bin-0.8.0-use-working-java-version.patch 1042 BLAKE2B 9ddc7a89f9f1e321c21afdd90af55be996ea9a0c2bb830ba3a14e49dc998e6195a57a648f2d212ea1622e63636eb803637a17a4f79ee6658984556f3af4b8bb1 SHA512 e040160fc989ec8ed9982b3e349de118487bf3380eec40cef89cc925074bfbe8ddfea010dfc0186529aa797191477c073cfaf751f8e3c07e86f7819078ece275
 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
 EBUILD signal-cli-bin-0.7.4.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
+EBUILD signal-cli-bin-0.8.0.ebuild 1675 BLAKE2B 2b199c6094f562de3e26b4f719bd2b5ca53f757eb61a9bb9153e201b6ff582602872a19ad2f04b8315d86a8c89e5beefdc504246ec97acdf9f245b64835363fb SHA512 72d08d761b0b95b3e354386c1eb15af43e43a7e21404085e7d11990b5d7d59d96ab696d58e19502c9cc6a97686af559ec39100c77941f7e3af884e268d569eda
 MISC metadata.xml 367 BLAKE2B 054ee8cf6ee573867495108fafe6931527427200833256fa96e7d8a7b9aacc9286d49bf12b6ac605862ec49b3b9760a98af1e24bd8441bf87ba549de27016974 SHA512 4d04a934e70460c817900d05ac9809c794cf44b13662eaf0f3b23999d7ba88561fe8ffcf60d5adf3f6c2d8ec06a50e34f92f642b9916fc411182a4f6323e2e4c
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 000000000000..5d9bd2909968
--- /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 <martin.dummer@gmx.net>
+
+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 000000000000..39268d6e891f
--- /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"
+}