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 <[email protected]> + +--- 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>[email protected]</email> - <name>Martin Dummer</name> - </maintainer> <maintainer type="person" proxied="yes"> <email>[email protected]</email> <name>Julien Roy</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>[email protected]</email> + <name>Martin Dummer</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>[email protected]</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" +}
