diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/Manifest.gz | bin | 9406 -> 9403 bytes | |||
| -rw-r--r-- | net-im/signal-cli-bin/Manifest | 11 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch | 33 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/metadata.xml | 11 | ||||
| -rw-r--r-- | net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.11.5.1.ebuild) | 15 |
5 files changed, 55 insertions, 15 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex 3f0d1f952ef2..9e7799e3fa79 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 87c3f896419e..dd6487e931dd 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,10 +1,11 @@ AUX signal-cli-bin-0.11.3-use-working-java-version.patch 981 BLAKE2B 73aadb2cb82278eb93837e09341b49170b5e0424f536091ec1513d37e2f466b4d8ad3d8e4c9f36b8de435e8fe1a19f452caed48f24d4b257a42d576d763da8b2 SHA512 dd27a600234c7e83ca2aef7ccb6d053731308745658b75d991ab4c5fbd5f60d4f3cfe85375be40e1a80d56a0c3577ba1bf28dd15f8c40e5137f2ce1b06462004 -DIST signal-cli-bin-0.11.5.1.README.md 5825 BLAKE2B f365bffd62c2b07bded1f94cd522131f5ab7fabbf904ca0d676d5990588bd82bb41eec87a469728742da499666459e06b428e0e3e0fc7259b635dd46d6f40948 SHA512 2c575c6670add7a5a700ba4d370862b4bdb2ebeed39a30bbc6526c08d4fa97c29cc673c06c35761955bbc6fd16be55c0031eb4244af7e1bb6d085ab00b22e985 -DIST signal-cli-bin-0.11.5.1.signal-cli.1.adoc 22747 BLAKE2B 30ba81b6f3df7b404d2612362eb434bdab668abf2f93a7fddc730f1b815376ca7b3e96344e68d7b3c8e7ca210924fecebd97e6e8f885d31540c372a8f2c3c7fb SHA512 c0b889c181e1894e009bbcaf908fc28d9d957ee5d6d3a9cdd0d33121b4714a5bc6d45ec88e6e3b03cc3bd3906eb9f940daa03b5c066d749ec79941f8a420bbd1 -DIST signal-cli-bin-0.11.5.1.tar.gz 38945062 BLAKE2B c03cbb96236e2dc6c1f87f1afec0d96f753c2231735501f49299efc52ff50e8041db9d01fb5d541f791f16796b9322041d099feaaca55a19a04037f5aea3510f SHA512 297a8955465e5ee6f5277d2c8ac08467a10c7a7a4638497b82b7d24e6331ce1acade974877e8dad06fa9ca7f46a7bf815a4368b4c78887db735911b03bbd2408 +AUX signal-cli-bin-0.13.1-use-working-java-version.patch 971 BLAKE2B 6df93835b2d39f11d92a2943f7c087682c9a5ddb7d059054e49b12b90230df377437951e46e310f0cbb99a04938efad8b818d14892c5c2c495f2997b37033c63 SHA512 ab5b9d57c8e906ede2797be546e389212b4297788b831ad79d73868e9dd8737aee43de067e5e8a838cf671eb6a4cbbf5f2acc87991b51143bc2a5f1d744aceb9 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 -EBUILD signal-cli-bin-0.11.5.1.ebuild 1339 BLAKE2B 7af78311445de8fcd09a73ffa6e067815eb560621a7ad1ebbf84440c59af3753382b82c3e68b6906d28701ec00dde0f48dff460f425e896d6ad00512f7d4482f SHA512 952c749bbb6ce2c1a6969b3eace722b4afd4bd19ba1320cd482f3471f61559ed1b3d61e2ca7b75d765e32b4ddb04d0ff0bba224a3526418c004b948b5df9f9da +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 EBUILD signal-cli-bin-0.12.7.ebuild 1335 BLAKE2B 57d767871ceab33969dad4998d945a5d1ef1d47e0582a261b15c2fa2de521c94936e840684a2e7ce3b51804993fde143fa775c4a4e03ff1daa4df6a8f0be60e7 SHA512 eb8f65c765083687ee4bafb10a04b61b9b05beb8d7a06b6a5f6ba6e3a978403ca4884d655e84109d5b7bb98539bf57b277857401caf9634e6ba1ca8979c31a4f -MISC metadata.xml 594 BLAKE2B 1599daed7483e073f660dd83ce6edabd962a27b6606547c7573b12f33a59d82edf2abf81acc0f6f4981de2bbc427d081f74d0a2b959a4c28a57f7d85c2fef869 SHA512 6e0c4a829af1be3df9bc4b1bf2791a56b9386f7cc82d22a027f03e476a1e5d8b288d7a87dc5561ced844db17483376d754ceb3b273a09fd42950a8577bf7ecba +EBUILD signal-cli-bin-0.13.1.ebuild 1458 BLAKE2B 67003f891cce53ba612ba3ac72a26e1c48abd01ee776d853e00a8c50aebd39818cb5d7abca02f01710385e0b5d15294db7a2f3810aac4d277be28d75c4590cae SHA512 b92cb817d3903ec0d49c303b5a9c97e50e36e6375a8d85d52c024090e6ac4accafd0605556a628fb454c73f511b09fab7624e3ca1379247d52116421e56d5bc0 +MISC metadata.xml 782 BLAKE2B d4404858543d7ccb94a2f89f4fb1d09fe37d78cd28566ae65e326ddbd42dc4efbd5a776d787113d18117982aab4a64147b3346c0c8d6f1b4316eec8d76b06c76 SHA512 9eb16f42073151266e11bfcddd27a3e2823894daf68b975b5ef106914bda97bc91eb05920544adce69b381ea5b9656d1bc32040fff1c01340dccd71155109fcd 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 @@ -2,18 +2,21 @@ <!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.11.5.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild index dc6a8d1a157e..134539b98724 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.11.5.1.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021-2022 Gentoo Authors +# 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" +HOMEPAGE="https://github.com/AsamK/signal-cli" 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/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 " @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - || ( virtual/jdk:17 virtual/jre:17 ) + || ( virtual/jdk:21 virtual/jre:21 ) " RDEPEND="${DEPEND}" BDEPEND=" @@ -26,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-0.11.3-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.13.1-use-working-java-version.patch" ) src_unpack() { @@ -40,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" } |