[gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2022-10-15 10:52 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2022-10-15 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     54f31ba0cffa4166280cd40c710dd13883953b4b
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Oct 15 10:47:36 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 10:52:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f31ba0

net-im/signal-cli-bin: add 0.11.3

Closes: https://bugs.gentoo.org/877177
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  3 ++
 ...-cli-bin-0.11.3-use-working-java-version.patch} |  0
 net-im/signal-cli-bin/signal-cli-bin-0.11.3.ebuild | 54 ++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 570dbe52032d..4cbc342d2f76 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,6 +1,9 @@
 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.11.3.README.md 5826 BLAKE2B 332d4bff484c470b2e02df28a8666958d72fd2d7a6ee97ae6df8eaadd082bf348ba54a2e1f223a70038eb7521626d3e1dddfb65e049b82769c2d8b5a031b5c89 SHA512 cd3da3ffe8e57c51dd03bbd16f73f3e61a415585e59bc686d13fbb8628ed8e74503ef7e2abd1734a6d5d03db051ee357628724d1906274726c4c3d27dd9fc47a
+DIST signal-cli-bin-0.11.3.signal-cli.1.adoc 21488 BLAKE2B 1ce485a6e49335bf723ffdac83658c0805fdc001cd4e722a50704e5ae34c1123af69519d72b38abb6da237bfd7dcf272f7891ecb5a3ff798a98d2e03daae8ff7 SHA512 2880a89959d18db0204d2505bd15d853cce0991f48ccf6a417c002f2b32d123f3008a994677132a72411125554125dd7a3a559a461d5bfb97122b6e63408ac14
+DIST signal-cli-bin-0.11.3.tar.gz 38793761 BLAKE2B 23f879b41125538430f633958c4e9929b50f96a2152a72bbf4ba91dc6c653c8a014ba00a1fcf3327cb88e661d494cc3dcd88c30373de232bb36835936d24541a SHA512 5834fa15ec93738b98db6f11bf8ee04d7f1b4a3bcd594b9c943a2669e9b8ac1dc28c4b0c328caa1cb740de8add1b61e7e4e9d5155a3c1b747877333a28342bf5
 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.11.3-use-working-java-version.patch
similarity index 100%
rename from net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch
rename to net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch

diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.11.3.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.11.3.ebuild
new file mode 100644
index 000000000000..29710caad87a
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.11.3.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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2024-04-29  8:41 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2024-04-29  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b4aa0d48e61765cb00a4e83e1514f01d81c20ab8
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Thu Apr 25 16:42:22 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 08:41:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4aa0d48

net-im/signal-cli-bin: drop 0.12.7

drop stable version necessary,
signal messenger servers need client version >=13

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  3 --
 ...l-cli-bin-0.11.3-use-working-java-version.patch | 33 -------------
 net-im/signal-cli-bin/signal-cli-bin-0.12.7.ebuild | 54 ----------------------
 3 files changed, 90 deletions(-)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 4f0bd3a1a471..e00539abdbd2 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,6 +1,3 @@
-DIST signal-cli-bin-0.12.7.README.md 5634 BLAKE2B 18cc55c1e00c3011921633d41c7510b20420cb74f874d811c802f523b0095afd31941a3151411bf232d8e17e6c9f6294ea4d340afdc9e7a2275a9e7e935949b7 SHA512 4df477726ed1f06dcc4079ac1d5931ed0fc73c6f18a46bb96fc7ce0efbc8441b7c615c3dcdc9eec6ef64e1b02e1545a23bbfbf6f26e3b1af7f9bd1b27f586102
-DIST signal-cli-bin-0.12.7.gh.tar.gz 52233248 BLAKE2B 0f4279a80740c6d9c8a803a99c2365d6ecd2e0e9b6304f3dfd44d8209b469d4353d3d93512fb818b96a3ddd8fe2d3b0f03d2dd57ea33a6697f4f63cf04460f55 SHA512 a241c489ed7993a4a26002bed2a0539295567548c6286fe1f2e102eeadabdfc3f49a72634ddd7c91eabd3dfe489f042d1c5105d31074368282dabecca1e48053
-DIST signal-cli-bin-0.12.7.signal-cli.1.adoc 25618 BLAKE2B e971d8752c57a0b49677d84cbdbd21e2303c3fdac36dfbecc1ab1d4141c89b27dc563be06d7df472682c3fce684b9c9b572e10d155af266b7ac516edeed0b282 SHA512 ad9fd60e164ec1649ea9abddd3de51bb8b055d183e0e690e33ccca92f5a7afb2b35bf6c982fe21375d38eb8ed400da38b886e742cb63562ef0dcde0d14f07266
 DIST signal-cli-bin-0.13.1.README.md 5538 BLAKE2B 9cef6c3db846dada9e855e445d2a0465b1ba6495e27cf4366bdf34e5c505ec5bf76c8d898a1d36a564e4a983eefd401cc94ab71804c6bd30367c84af065504d4 SHA512 575d355a7969dd748958c945c7d3c92de77882a63bf7111062d417127e465b1975e55a13853b83ccecf1307c0baf9eb1057c48363bd78a729b6f1c9e19ab134d
 DIST signal-cli-bin-0.13.1.gh.tar.gz 51796574 BLAKE2B dad3d4c3b1ac450b14edbdedd42abc62ece2941ea57d11239adb8cbf5bd82781b714260a62f7552a3879bfdfd2dd7b63dcb9d3ea33c65499c5aa4783a4bc253f SHA512 c82a1dadfbc37cc316fefb663a07d5e2366d31fa49a7a207fb3b2f1d68f55b41074f01704bada55b528bf60a3177a7ab74b612bc644ae57f8cb4a8115138d825
 DIST signal-cli-bin-0.13.1.signal-cli.1.adoc 28070 BLAKE2B 6530cefd79ca26673f8dda7b6e19574ed057aa92a2b940f55e951487254629d1f7c6ac03d30b682e7afc638ac859c31c1f3ac0542183316e1ba56c6dcd0e7d4c SHA512 8f98357f2ee2fb0102c847fb9ff91f0475386fb58708d9e37871ccb351fae7ab852c73eac5c3eedf154dc4bd4038c1d0f53f9024d1c0e0cb45bbd145f7dd09f9

diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch
deleted file mode 100644
index 02b77bc54dd4..000000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch searches the jre 17 binary in the gentoo specific directories.
-
-Signed-off-by: Martin Dummer <martin.dummer@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.12.7.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.12.7.ebuild
deleted file mode 100644
index 3898a8985c79..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.12.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021-2024 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}.tar.gz -> ${P}.gh.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}/${PN}-0.11.3-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"
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2024-04-29  8:41 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2024-04-29  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     ddba3bf5e1adcb0fc1f332cf813b72037989b485
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Thu Apr 25 16:45:21 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 08:41:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddba3bf5

net-im/signal-cli-bin: fix start script

fix start script behavior with dev-java/openjdk-jre-bin:21
change java dependency - thanks to @vaukai for pointing that out

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/36423
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/signal-cli-bin-0.13.1-use-working-java-version.patch          | 2 +-
 .../{signal-cli-bin-0.13.1.ebuild => signal-cli-bin-0.13.1-r1.ebuild}   | 2 +-
 .../{signal-cli-bin-0.13.2.ebuild => signal-cli-bin-0.13.2-r1.ebuild}   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch
index 452435a6751c..366ca18e19ed 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch
@@ -20,7 +20,7 @@ Signed-off-by: Julien Roy <julien@jroy.ca>
 +for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; do
 +	J_TRY="$I/bin/java"
 +	if [ -x "$J_TRY" ] ; then
-+		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17."
++		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "21."
 +		if [ $? -eq 0 ] ; then
 +			JAVACMD="$J_TRY"
 +			break

diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild
similarity index 97%
rename from net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild
rename to net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild
index 134539b98724..200ffb194879 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	|| ( virtual/jdk:21 virtual/jre:21 )
+	virtual/jre:21
 "
 RDEPEND="${DEPEND}"
 BDEPEND="

diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild
similarity index 97%
rename from net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild
rename to net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild
index 134539b98724..200ffb194879 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	|| ( virtual/jdk:21 virtual/jre:21 )
+	virtual/jre:21
 "
 RDEPEND="${DEPEND}"
 BDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2024-03-03  1:13 Yixun Lan
  0 siblings, 0 replies; 9+ messages in thread
From: Yixun Lan @ 2024-03-03  1:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b06898afb1f89c31e2855f030e5323f322271314
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Mar  2 17:13:05 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 01:12:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b06898af

net-im/signal-cli-bin: add 0.13.1

Signed-off-by: Julien Roy <julien <AT> jroy.ca>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  3 ++
 ...l-cli-bin-0.13.1-use-working-java-version.patch | 33 +++++++++++++
 net-im/signal-cli-bin/metadata.xml                 | 11 +++--
 net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild | 57 ++++++++++++++++++++++
 4 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index e5f9214ead1b..e165a64dd9d6 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -4,3 +4,6 @@ DIST signal-cli-bin-0.11.5.1.tar.gz 38945062 BLAKE2B c03cbb96236e2dc6c1f87f1afec
 DIST signal-cli-bin-0.12.7.README.md 5634 BLAKE2B 18cc55c1e00c3011921633d41c7510b20420cb74f874d811c802f523b0095afd31941a3151411bf232d8e17e6c9f6294ea4d340afdc9e7a2275a9e7e935949b7 SHA512 4df477726ed1f06dcc4079ac1d5931ed0fc73c6f18a46bb96fc7ce0efbc8441b7c615c3dcdc9eec6ef64e1b02e1545a23bbfbf6f26e3b1af7f9bd1b27f586102
 DIST signal-cli-bin-0.12.7.gh.tar.gz 52233248 BLAKE2B 0f4279a80740c6d9c8a803a99c2365d6ecd2e0e9b6304f3dfd44d8209b469d4353d3d93512fb818b96a3ddd8fe2d3b0f03d2dd57ea33a6697f4f63cf04460f55 SHA512 a241c489ed7993a4a26002bed2a0539295567548c6286fe1f2e102eeadabdfc3f49a72634ddd7c91eabd3dfe489f042d1c5105d31074368282dabecca1e48053
 DIST signal-cli-bin-0.12.7.signal-cli.1.adoc 25618 BLAKE2B e971d8752c57a0b49677d84cbdbd21e2303c3fdac36dfbecc1ab1d4141c89b27dc563be06d7df472682c3fce684b9c9b572e10d155af266b7ac516edeed0b282 SHA512 ad9fd60e164ec1649ea9abddd3de51bb8b055d183e0e690e33ccca92f5a7afb2b35bf6c982fe21375d38eb8ed400da38b886e742cb63562ef0dcde0d14f07266
+DIST signal-cli-bin-0.13.1.README.md 5538 BLAKE2B 9cef6c3db846dada9e855e445d2a0465b1ba6495e27cf4366bdf34e5c505ec5bf76c8d898a1d36a564e4a983eefd401cc94ab71804c6bd30367c84af065504d4 SHA512 575d355a7969dd748958c945c7d3c92de77882a63bf7111062d417127e465b1975e55a13853b83ccecf1307c0baf9eb1057c48363bd78a729b6f1c9e19ab134d
+DIST signal-cli-bin-0.13.1.gh.tar.gz 51796574 BLAKE2B dad3d4c3b1ac450b14edbdedd42abc62ece2941ea57d11239adb8cbf5bd82781b714260a62f7552a3879bfdfd2dd7b63dcb9d3ea33c65499c5aa4783a4bc253f SHA512 c82a1dadfbc37cc316fefb663a07d5e2366d31fa49a7a207fb3b2f1d68f55b41074f01704bada55b528bf60a3177a7ab74b612bc644ae57f8cb4a8115138d825
+DIST signal-cli-bin-0.13.1.signal-cli.1.adoc 28070 BLAKE2B 6530cefd79ca26673f8dda7b6e19574ed057aa92a2b940f55e951487254629d1f7c6ac03d30b682e7afc638ac859c31c1f3ac0542183316e1ba56c6dcd0e7d4c SHA512 8f98357f2ee2fb0102c847fb9ff91f0475386fb58708d9e37871ccb351fae7ab852c73eac5c3eedf154dc4bd4038c1d0f53f9024d1c0e0cb45bbd145f7dd09f9

diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch
new file mode 100644
index 000000000000..452435a6751c
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch
@@ -0,0 +1,33 @@
+This patch searches the jre 21 binary in the gentoo specific directories.
+
+Signed-off-by: Julien Roy <julien@jroy.ca>
+
+--- 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 21,
++# so we must search for matching java binaries
++for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; 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/metadata.xml b/net-im/signal-cli-bin/metadata.xml
index b8322aed9263..4ccd37ebb6e5 100644
--- a/net-im/signal-cli-bin/metadata.xml
+++ b/net-im/signal-cli-bin/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>martin.dummer@gmx.net</email>
-		<name>Martin Dummer</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>julien@jroy.ca</email>
 		<name>Julien Roy</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/AsamK/signal-cli/issues</bugs-to>
+		<changelog>https://github.com/AsamK/signal-cli/releases</changelog>
+		<doc>https://github.com/AsamK/signal-cli/wiki</doc>
 		<remote-id type="github">AsamK/signal-cli</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild
new file mode 100644
index 000000000000..134539b98724
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021-2024 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"
+SRC_URI="
+	https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.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:21 virtual/jre:21 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/asciidoc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.13.1-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() {
+	dodir /opt/signal-cli/{lib,bin}
+	insinto /opt/signal-cli
+	doins -r lib
+	into /opt/signal-cli
+	dobin bin/signal-cli
+	dosym -r /opt/signal-cli/bin/signal-cli /usr/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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2022-10-15 10:52 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2022-10-15 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     83730edcd39d9a4c520d9fc8fbd01384dae27375
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Oct 15 10:48:28 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 10:52:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83730edc

net-im/signal-cli-bin: drop 0.8.5, 0.9.2, 0.10.6

Closes: https://github.com/gentoo/gentoo/pull/27787
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  9 ----
 ...al-cli-bin-0.8.5-use-working-java-version.patch | 31 -----------
 ...al-cli-bin-0.9.2-use-working-java-version.patch | 33 ------------
 net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild | 54 -------------------
 net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild  | 61 ----------------------
 net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild  | 61 ----------------------
 6 files changed, 249 deletions(-)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 4cbc342d2f76..8f0ff3a60eda 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,12 +1,3 @@
-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.11.3.README.md 5826 BLAKE2B 332d4bff484c470b2e02df28a8666958d72fd2d7a6ee97ae6df8eaadd082bf348ba54a2e1f223a70038eb7521626d3e1dddfb65e049b82769c2d8b5a031b5c89 SHA512 cd3da3ffe8e57c51dd03bbd16f73f3e61a415585e59bc686d13fbb8628ed8e74503ef7e2abd1734a6d5d03db051ee357628724d1906274726c4c3d27dd9fc47a
 DIST signal-cli-bin-0.11.3.signal-cli.1.adoc 21488 BLAKE2B 1ce485a6e49335bf723ffdac83658c0805fdc001cd4e722a50704e5ae34c1123af69519d72b38abb6da237bfd7dcf272f7891ecb5a3ff798a98d2e03daae8ff7 SHA512 2880a89959d18db0204d2505bd15d853cce0991f48ccf6a417c002f2b32d123f3008a994677132a72411125554125dd7a3a559a461d5bfb97122b6e63408ac14
 DIST signal-cli-bin-0.11.3.tar.gz 38793761 BLAKE2B 23f879b41125538430f633958c4e9929b50f96a2152a72bbf4ba91dc6c653c8a014ba00a1fcf3327cb88e661d494cc3dcd88c30373de232bb36835936d24541a SHA512 5834fa15ec93738b98db6f11bf8ee04d7f1b4a3bcd594b9c943a2669e9b8ac1dc28c4b0c328caa1cb740de8add1b61e7e4e9d5155a3c1b747877333a28342bf5
-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
-DIST signal-cli-bin-0.9.2.README.md 5715 BLAKE2B 17be982049fd2ecadf009f2d4e2988c1d58105b2c9cf43c733a9f4e573565861be1c9707d0fd23f2c7a09e1d149671b854b98ed23da96a3df18cf3ec51cf437b SHA512 ea0f89513b9a9180d8d59fafffbe7a2ec253e0907c5666d9d9a50bc853a8ab1ec270850ca73cf3eb4d66b3c40d101ca641a00520fdbe1190c3ce3f34b775908c
-DIST signal-cli-bin-0.9.2.signal-cli.1.adoc 16754 BLAKE2B 5bb5423496c84d450eba4039c45d23da9f927470a152b59d2e6b3cea3c8f3166237964588759d70a5e17086dfc69b0da3674bdb47a4eda0e2a258e87d1f5e6ff SHA512 2e3a8075b7c45901c762e410b9ec50ee9674439af861174aa116f74e8133e0804c9ddded9593e90bf916c50f5a74205edda2691204a320dcae1db291fe52dc20
-DIST signal-cli-bin-0.9.2.tar.gz 22875145 BLAKE2B d650629e5b7667f6d40f18e4bf364843d1e348019eb47d76e73a5a48652850c17e045667409e2b3c0adf2586dc69a7423a8a502ce18dc349a48f472f764012b3 SHA512 944d6ec443d17219feebd7712e783b238017cd1a74b7595a37ca865738a83b67f1a044eb3f7b2435687fb94d20ee94353866ed33a25d3abea3bb5aa79ef8fb77

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
deleted file mode 100644
index 840c249b976f..000000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- 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/files/signal-cli-bin-0.9.2-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
deleted file mode 100644
index b7ead7d0327a..000000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch searches the jre 11 binary in the gentoo specific directories.
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- a/bin/signal-cli	1970-01-02 01:00:00.000000000 +0100
-+++ b/bin/signal-cli	2021-12-08 20:43:30.490613238 +0100
-@@ -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 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.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
deleted file mode 100644
index 29710caad87a..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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"
-}

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
deleted file mode 100644
index e49d162dba04..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.5.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.9.2.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
deleted file mode 100644
index e49d162dba04..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.9.2.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"
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2022-05-26 13:12 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2022-05-26 13:12 UTC (permalink / raw
  To: gentoo-commits

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.dummer@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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2021-12-17 13:13 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-12-17 13:13 UTC (permalink / raw
  To: gentoo-commits

commit:     d6c947050d5003749556aa785c73f6044b0a2ce3
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Wed Dec  8 20:38:34 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 13:12:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c94705

net-im/signal-cli-bin: version bump to 0.9.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  3 ++
 ...al-cli-bin-0.9.2-use-working-java-version.patch | 33 ++++++++++++
 net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild  | 61 ++++++++++++++++++++++
 3 files changed, 97 insertions(+)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index bcc9ea47788c..09a76831ddde 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -4,3 +4,6 @@ DIST signal-cli-bin-0.8.1.tar.gz 16870784 BLAKE2B e08f740fef6da4e7b1e4751e5cc831
 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
+DIST signal-cli-bin-0.9.2.README.md 5715 BLAKE2B 17be982049fd2ecadf009f2d4e2988c1d58105b2c9cf43c733a9f4e573565861be1c9707d0fd23f2c7a09e1d149671b854b98ed23da96a3df18cf3ec51cf437b SHA512 ea0f89513b9a9180d8d59fafffbe7a2ec253e0907c5666d9d9a50bc853a8ab1ec270850ca73cf3eb4d66b3c40d101ca641a00520fdbe1190c3ce3f34b775908c
+DIST signal-cli-bin-0.9.2.signal-cli.1.adoc 16754 BLAKE2B 5bb5423496c84d450eba4039c45d23da9f927470a152b59d2e6b3cea3c8f3166237964588759d70a5e17086dfc69b0da3674bdb47a4eda0e2a258e87d1f5e6ff SHA512 2e3a8075b7c45901c762e410b9ec50ee9674439af861174aa116f74e8133e0804c9ddded9593e90bf916c50f5a74205edda2691204a320dcae1db291fe52dc20
+DIST signal-cli-bin-0.9.2.tar.gz 22875145 BLAKE2B d650629e5b7667f6d40f18e4bf364843d1e348019eb47d76e73a5a48652850c17e045667409e2b3c0adf2586dc69a7423a8a502ce18dc349a48f472f764012b3 SHA512 944d6ec443d17219feebd7712e783b238017cd1a74b7595a37ca865738a83b67f1a044eb3f7b2435687fb94d20ee94353866ed33a25d3abea3bb5aa79ef8fb77

diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
new file mode 100644
index 000000000000..b7ead7d0327a
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
@@ -0,0 +1,33 @@
+This patch searches the jre 11 binary in the gentoo specific directories.
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+--- a/bin/signal-cli	1970-01-02 01:00:00.000000000 +0100
++++ b/bin/signal-cli	2021-12-08 20:43:30.490613238 +0100
+@@ -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 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.9.2.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
new file mode 100644
index 000000000000..e49d162dba04
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.9.2.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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2021-08-16  6:58 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-08-16  6:58 UTC (permalink / raw
  To: gentoo-commits

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 <martin.dummer@gmx.net>
+
+--- 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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/
@ 2021-05-19  6:48 Joonas Niilola
  0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-05-19  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     5d409ca2803e725274367abf55795b8a306ab519
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Mon May  3 10:43:44 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 19 06:47:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d409ca2

net-im/signal-cli-bin: version bump to 0.8.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/20666
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/signal-cli-bin/Manifest                     |  3 ++
 ...al-cli-bin-0.8.1-use-working-java-version.patch | 31 +++++++++++
 net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild  | 61 ++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 6a062e2ff0d..4681021f940 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -4,3 +4,6 @@ DIST signal-cli-bin-0.7.4.tar.gz 16408829 BLAKE2B 169e9e7b5eafb8308c248d976326fb
 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.8.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
new file mode 100644
index 00000000000..4a550e410bf
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
@@ -0,0 +1,31 @@
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+--- a/bin/signal-cli	2021-03-02 20:56:06.000000000 +0100
++++ b/bin/signal-cli	2021-05-03 12:05:45.406811750 +0200
+@@ -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.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild
new file mode 100644
index 00000000000..39268d6e891
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.1.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"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-04-29  8:41 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-15 10:52 [gentoo-commits] repo/gentoo:master commit in: net-im/signal-cli-bin/files/, net-im/signal-cli-bin/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-04-29  8:41 Joonas Niilola
2024-04-29  8:41 Joonas Niilola
2024-03-03  1:13 Yixun Lan
2022-10-15 10:52 Joonas Niilola
2022-05-26 13:12 Joonas Niilola
2021-12-17 13:13 Joonas Niilola
2021-08-16  6:58 Joonas Niilola
2021-05-19  6:48 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox