From ddba3bf5e1adcb0fc1f332cf813b72037989b485 Mon Sep 17 00:00:00 2001 From: Martin Dummer Date: Thu, 25 Apr 2024 18:45:21 +0200 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/36423 Signed-off-by: Joonas Niilola --- ...l-cli-bin-0.13.1-use-working-java-version.patch | 2 +- .../signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild | 57 ++++++++++++++++++++++ net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild | 57 ---------------------- .../signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild | 57 ++++++++++++++++++++++ net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild | 57 ---------------------- 5 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild delete mode 100644 net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild create mode 100644 net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild delete mode 100644 net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild (limited to 'net-im') 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 +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-r1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild new file mode 100644 index 000000000000..200ffb194879 --- /dev/null +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.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/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" +} 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 deleted file mode 100644 index 134539b98724..000000000000 --- a/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild +++ /dev/null @@ -1,57 +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" -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" -} diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild new file mode 100644 index 000000000000..200ffb194879 --- /dev/null +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.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/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" +} 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.ebuild deleted file mode 100644 index 134539b98724..000000000000 --- a/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild +++ /dev/null @@ -1,57 +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" -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" -} -- cgit v1.2.3-65-gdbad