From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B43AC158F57 for ; Mon, 16 Aug 2021 20:48:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41D99E0DB8; Mon, 16 Aug 2021 06:58:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECEACE0DAC for ; Mon, 16 Aug 2021 06:58:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF2F83462C7 for ; Mon, 16 Aug 2021 06:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C0A187B for ; Mon, 16 Aug 2021 06:58:35 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1629097105.55358e41a75853971db10f4bb4bdf8b36f88f52e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/, net-im/signal-cli-bin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/signal-cli-bin/Manifest net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild X-VCS-Directories: net-im/signal-cli-bin/ net-im/signal-cli-bin/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 55358e41a75853971db10f4bb4bdf8b36f88f52e X-VCS-Branch: master Date: Mon, 16 Aug 2021 06:58:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd02892b-f29b-419b-a53f-68a12631effe X-Archives-Hash: 2c1579f878dd36645863ecd8255d0087 commit: 55358e41a75853971db10f4bb4bdf8b36f88f52e Author: Martin Dummer gmx net> AuthorDate: Thu Aug 12 10:38:08 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Aug 16 06:58:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55358e41 net-im/signal-cli-bin: remove old versions Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Martin Dummer gmx.net> Signed-off-by: Joonas Niilola gentoo.org> net-im/signal-cli-bin/Manifest | 6 --- ...al-cli-bin-0.7.4-use-working-java-version.patch | 31 ----------- ...al-cli-bin-0.8.0-use-working-java-version.patch | 33 ------------ net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild | 61 ---------------------- net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild | 61 ---------------------- 5 files changed, 192 deletions(-) diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 4681021f940..7a21ab019ca 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,9 +1,3 @@ -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 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 diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch deleted file mode 100644 index 4aa458fd744..00000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur a/bin/signal-cli b/bin/signal-cli ---- a/bin/signal-cli 2020-10-14 18:39:40.000000000 +0200 -+++ b/bin/signal-cli 2020-11-04 09:20:25.397469784 +0100 -@@ -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/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 deleted file mode 100644 index 5d9bd290996..00000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch +++ /dev/null @@ -1,33 +0,0 @@ -Signed-off-by: Martin Dummer - -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.7.4.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild deleted file mode 100644 index e49d162dba0..00000000000 --- a/net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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" -} 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 deleted file mode 100644 index 39268d6e891..00000000000 --- a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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" -}