diff options
Diffstat (limited to 'net-im/signal-cli-bin')
| -rw-r--r-- | net-im/signal-cli-bin/Manifest | 12 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch (renamed from net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch) | 18 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch | 30 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/metadata.xml | 10 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild) | 24 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild) | 24 |
6 files changed, 46 insertions, 72 deletions
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index bcc9ea47788c..e00539abdbd2 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,6 +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 +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 +DIST signal-cli-bin-0.13.2.README.md 5538 BLAKE2B 9cef6c3db846dada9e855e445d2a0465b1ba6495e27cf4366bdf34e5c505ec5bf76c8d898a1d36a564e4a983eefd401cc94ab71804c6bd30367c84af065504d4 SHA512 575d355a7969dd748958c945c7d3c92de77882a63bf7111062d417127e465b1975e55a13853b83ccecf1307c0baf9eb1057c48363bd78a729b6f1c9e19ab134d +DIST signal-cli-bin-0.13.2.gh.tar.gz 57251017 BLAKE2B a9a34e8e4bcab9e0825a4c037cc9b69255d46aaefbe8185eeb9b7d56fe7cd40e5a2f65a3873b72c6e1dbbd1251d6ff1b9206c68dc7db09df72be200dd77a48cc SHA512 472a558038a21e323c4f56c7698b31a2901ffcf318844fa787bb2b611621b7ae34a883bb3465cebf3495fa4b5b450b9ef5a6c9298f44996628cc4f517d79bd25 +DIST signal-cli-bin-0.13.2.signal-cli.1.adoc 28146 BLAKE2B a8bb25ccaed0cb3bf8583985f103b628b344646e5eb3aa62171b2e97a2f5131da3026891abc6e98ebae9107e55ad0846a0f9ce4f8e5d5e072e00f85b8d372ee6 SHA512 df82d33c0f53bbb641cb5fc4c85182b5f937ad30c0784ef2d183c91bf2ae23367960169a05bbf2e1d2f72aa76e26cd1d14c72ddf7ea369d5cefc0bed28607561 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.13.1-use-working-java-version.patch index 840c249b976f..366ca18e19ed 100644 --- 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.13.1-use-working-java-version.patch @@ -1,26 +1,28 @@ -Signed-off-by: Martin Dummer <martin.dummer@gmx.net> +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 -@@ -84,13 +84,19 @@ +@@ -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" +- JAVACMD=$JAVA_HOME/jre/sh/java - else -- JAVACMD="$JAVA_HOME/bin/java" +- JAVACMD=$JAVA_HOME/bin/java - fi -+# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system ++# This package needs Java 21, +# 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 ++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 "11." ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "21." + if [ $? -eq 0 ] ; then -+ JAVACMD="$J_TRY" ++ JAVACMD="$J_TRY" + break + fi + fi 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 deleted file mode 100644 index b39745214944..000000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch +++ /dev/null @@ -1,30 +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/metadata.xml b/net-im/signal-cli-bin/metadata.xml index f16c98dc3065..4ccd37ebb6e5 100644 --- a/net-im/signal-cli-bin/metadata.xml +++ b/net-im/signal-cli-bin/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <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> @@ -9,4 +13,10 @@ <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.8.1-r1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild index e49d162dba04..200ffb194879 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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" +HOMEPAGE="https://github.com/AsamK/signal-cli" 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/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 " @@ -17,15 +17,8 @@ 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 ) + virtual/jre:21 " RDEPEND="${DEPEND}" BDEPEND=" @@ -33,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.13.1-use-working-java-version.patch" ) src_unpack() { @@ -47,9 +40,12 @@ src_compile() { } src_install() { - insinto /usr + 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" } 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.13.2-r1.ebuild index e49d162dba04..200ffb194879 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.2-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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" +HOMEPAGE="https://github.com/AsamK/signal-cli" 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/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 " @@ -17,15 +17,8 @@ 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 ) + virtual/jre:21 " RDEPEND="${DEPEND}" BDEPEND=" @@ -33,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.13.1-use-working-java-version.patch" ) src_unpack() { @@ -47,9 +40,12 @@ src_compile() { } src_install() { - insinto /usr + 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" } |