gentoo resync : 17.08.2021

15 files changed, 82 insertions, 174 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3c913da90059..1b055b31f87f 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 59eee9975898..03f961debda8 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,6 +1,5 @@
 AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
-EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B a7976c7b606455b2c9254f068ced7b172b3c61ef0849ae89053f6cb04db9b6433acb807c08e918b303037d5277529fe2c31284b06780eb332ac174b623040519 SHA512 0c71b88d20078f1be6fe0e5b45d7868ebd070ee019236363400db24c3330b7f4cea034e82dbf3e365dea1cb60c47bbcb04406dbe8e5d35993c65f48cd6338999
-EBUILD poezio-0.13.1-r2.ebuild 1413 BLAKE2B df4598dbc7901d42f3c05aac396bb8f9648157788ce831625a3d1b005e008c162bc7cf5614636c870d2f07aeaa5f88f164a4621d733f125470bcb0e9023f1086 SHA512 8101f429724b49eb448bf195f70e90d82d6bc5d2fb1298b319f045ab30c2b0a1e951caa7ac2a32d25907168d6fe4be1c2fab867cece022c5a5a624a6e6c8e99d
+EBUILD poezio-0.13.1-r2.ebuild 1412 BLAKE2B cc4c82be986be3adcbdd51617585c3a4b36212332ae12f70225494b7ef564b5acf548a24c3ec0aa8cc458f0c3220ed4b71f32e6c4e238e71988c7647948c6da3 SHA512 56158c6f8958ccc150b3d2c2b46d1aa781e389647c735b1296521c8b5bcbeb6a015b44025c4eeaffa5e64870edc75b5e80336a7cc8239c54e4a6522c32d19847
 EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7
 MISC metadata.xml 427 BLAKE2B c73646308afc13732dd104f4123e42f0906fdd14fd635dc64b8ec30519f4295e2577452a2c6a595f31b6ce91e0ffbee53a6b16e7a1938d5d072b7a24412ecec4 SHA512 ef402902e54cacbe357137c8f64bfbe081c151e39c7c1bbf715ad6e7d7acc0a7cabaf5e184184b0034973368b2fb70ad5787074d3570bc8cfd0caf0635119c71
diff --git a/net-im/poezio/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild
deleted file mode 100644
index a080438c959f..000000000000
--- a/net-im/poezio/poezio-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
-HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
-
-src_prepare() {
-	default
-	# Delete unmaintained plugin which requires an excessive external dep
-	rm plugins/mpd_client.py || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild
index df3051da179c..a43f1e0504f7 100644
--- a/net-im/poezio/poezio-0.13.1-r2.ebuild
+++ b/net-im/poezio/poezio-0.13.1-r2.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BDEPEND="dev-python/sphinx"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 49c8cbe91876..5ff73a0995c0 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,16 +1,11 @@
-AUX signal-cli-bin-0.7.4-use-working-java-version.patch 1063 BLAKE2B 0564e3013bddf7bf8c8b350d7d0a2100256ba6c2be6752aa36acc1d7969149a5323c6eb1dee0cf3f92daaf391589442dfdf90a67c187542f900d1b23e62b4b15 SHA512 f71d5d0947bf4d5f94ebd77582868d6c9a097ffe63d7343467ae89815e0ee24136e84403c5867fa4f7827627271373c8e669d022e96cc16eb40fd164f8f0056a
-AUX signal-cli-bin-0.8.0-use-working-java-version.patch 1042 BLAKE2B 9ddc7a89f9f1e321c21afdd90af55be996ea9a0c2bb830ba3a14e49dc998e6195a57a648f2d212ea1622e63636eb803637a17a4f79ee6658984556f3af4b8bb1 SHA512 e040160fc989ec8ed9982b3e349de118487bf3380eec40cef89cc925074bfbe8ddfea010dfc0186529aa797191477c073cfaf751f8e3c07e86f7819078ece275
-AUX signal-cli-bin-0.8.1-use-working-java-version.patch 1071 BLAKE2B b8e10d5445b5c631d0f53516a7a8da5c60c421794bac36a4fa2368adb424d038c6ebf4ec1714169654ffc73082af02977084db0c0486c3679057f4bfd342a016 SHA512 104f24f2d8acec0f62bce1504a7cfcbd242cd8faf78c35e2fa2ad91461c91b98b47309d9810cb71677fb5a0e02b404f3dd9fd4c4a469232f23ac14b73f1181c5
-DIST signal-cli-bin-0.7.4.README.md 4403 BLAKE2B 77b75170e18b302d8808a73297221d524b69ccd4fb66456086c7a9288ec2e023ed78de5baadd154c9ff508ba91c58abcdfa327931f559243d1b6f3efe99426c3 SHA512 7530e4a36ddc9d77e0cb7c8cec23aaaf3b7b7d1488ef86f675d7fb8b3debae1314d49ca23e1a68ff78ecfc58d9e00b28ff09f378fc7e9bc4bfc9e0ef883aa13f
-DIST signal-cli-bin-0.7.4.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
-DIST signal-cli-bin-0.7.4.tar.gz 16408829 BLAKE2B 169e9e7b5eafb8308c248d976326fbd11f3044f2a73d32af8c62d5f6fd88929ac90ab331a188cf8376818102e59b5d0a11457494f3fca07ba830b5288aaa41cd SHA512 b7e2f1da17c2ebcb1174739cf9c287dd335fa70c1c9417137a07bcaf16cdd121cccfdd9ba345130bccdfe877e16d6dba9bf3ef1cb12d301fd3f674617233fcd5
-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
+AUX signal-cli-bin-0.8.1-use-working-java-version.patch 984 BLAKE2B 3aacac42e6eb8a21da23c6d2036f8c0c13a185284c547225b2705cd069c7c2f676c49cbc36d73c3ebfd4aeb7190075c5861442d79c63f23ce73a8374ea031693 SHA512 52b1b94ebd140d3d24cb70a0f84a83b49850791e2566b258e90b5f0f44b56274f97b4bad8ab5e75de12cbae683d4e3ebcc1b8aa3e6b5a06fc09ce71b8c26ea55
+AUX signal-cli-bin-0.8.5-use-working-java-version.patch 985 BLAKE2B bb4d609753259033da89971aa297c9ed1a0371564bcfa4743df3169190c02450ea30a3667d9fec30b1ccf818e0ed26791d8c2863ea7a5674fbe9c4ecca9bdd35 SHA512 1c93e8b856a6b10aff56a15e14025588a907b1b599bf16a1d4ebc012d19636a2ee8679a8456f0989feeca743093cc83267454060797c68489512b32569782bcd
 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
-EBUILD signal-cli-bin-0.7.4.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
-EBUILD signal-cli-bin-0.8.0.ebuild 1675 BLAKE2B 2b199c6094f562de3e26b4f719bd2b5ca53f757eb61a9bb9153e201b6ff582602872a19ad2f04b8315d86a8c89e5beefdc504246ec97acdf9f245b64835363fb SHA512 72d08d761b0b95b3e354386c1eb15af43e43a7e21404085e7d11990b5d7d59d96ab696d58e19502c9cc6a97686af559ec39100c77941f7e3af884e268d569eda
-EBUILD signal-cli-bin-0.8.1.ebuild 1675 BLAKE2B 2b199c6094f562de3e26b4f719bd2b5ca53f757eb61a9bb9153e201b6ff582602872a19ad2f04b8315d86a8c89e5beefdc504246ec97acdf9f245b64835363fb SHA512 72d08d761b0b95b3e354386c1eb15af43e43a7e21404085e7d11990b5d7d59d96ab696d58e19502c9cc6a97686af559ec39100c77941f7e3af884e268d569eda
+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
+EBUILD signal-cli-bin-0.8.1-r1.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
+EBUILD signal-cli-bin-0.8.5.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
 MISC metadata.xml 397 BLAKE2B 085e3a2bbb0db2ab42db784c18f8c1871f32a3e135226163d8a1ca3f612baf1efe6977a3dd8407fe850de154cb64de26520e3ba4ed5b3dd143cd422eefe5c750 SHA512 7b013dd022005f5b76a6e6dad9422565f4018736f013da5f4870bf2b51c0fd9f1f6c1127e0c31282125507e05011469e43f2efe48714ec0b2481f1e0da164657
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch
deleted file mode 100644
index 4aa458fd7444..000000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur a/bin/signal-cli b/bin/signal-cli
---- a/bin/signal-cli	2020-10-14 18:39:40.000000000 +0200
-+++ b/bin/signal-cli	2020-11-04 09:20:25.397469784 +0100
-@@ -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/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
index 4a550e410bfb..b39745214944 100644
--- 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
@@ -1,7 +1,7 @@
 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 @@
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -84,13 +84,19 @@
  
  
  # Determine the Java command to use to start the JVM.
@@ -14,8 +14,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
 -    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
++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."
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
index 5d9bd2909968..840c249b976f 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
@@ -1,11 +1,10 @@
 Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
 
-diff -Naur a/bin/signal-cli b/bin/signal-cli
 --- a/bin/signal-cli
 +++ b/bin/signal-cli
-@@ -84,13 +84,20 @@
-
-
+@@ -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
@@ -16,8 +15,7 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli
 -    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
++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."
@@ -30,4 +28,4 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli
 +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.7.4.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
index e49d162dba04..e49d162dba04 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
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
deleted file mode 100644
index 39268d6e891f..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.1.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}/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"
-}
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
index 39268d6e891f..e49d162dba04 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/signal-cli-bin-${PV}-use-working-java-version.patch"
+	"${FILESDIR}/${P}-use-working-java-version.patch"
 )
 
 src_unpack() {
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 12914f87dbb3..d09187d28050 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.12.1_amd64.deb 111868722 BLAKE2B 73142c7011305db13b982d9875210bfa149db94cfeaaf5550d1d8f831977bb38201757e8e16e1565fcd3ba6f49ba4620d767440937d6c9a5818c7b71fc259dcc SHA512 e60d8c32685daf423f57aa557554241f4f76dad4b428363145c0cced35b302a032d117f291e9ead954fd4d87a0982dcefc863eb7f50c19d57c956396d3e0cf8c
-EBUILD signal-desktop-bin-5.12.1.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
+DIST signal-desktop_5.13.0_amd64.deb 111639354 BLAKE2B d3dc689cfaa13c9c38e9d626ad8c50742abc835604cb81b045291077b983c76b081997825628b683fbca43635de5c73f9da218b1d9a6f5d0983bac1928d59416 SHA512 23caafbd9c48f45b9576a0d01548d9d5a1bfdb8e142e909ca1ec5e297d93d57b20aef5d21be592aef6dc4e3b37a43b3442180c48c96b0a30630a9d9713ba3acc
+EBUILD signal-desktop-bin-5.13.0.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.12.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.13.0.ebuild
index 0cbadc9286be..0cbadc9286be 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.12.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.13.0.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index c8dc7886b527..fa4dc1e5b75f 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,11 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 DIST tdesktop-2.8.10.tar.gz 15383960 BLAKE2B 1849cce36d8b339087b84855b05318b0af143ae04fd0016811082b98073ed9560945590b7aeec4cd04751a9debe8211f78b958364f0f24419c028f0198f306b1 SHA512 e0986b932de4f4618c8dd1cc669eb5bd2bca0b3ca47856f911da0606781c86abab3ac1eeecf49bb077a6a4f09b2807bdc512496928666b175f4659c13d6f075b
 DIST tdesktop-2.9.0.tar.gz 15021044 BLAKE2B e958999080bd44c07170fa6898d774184323e6c689f3dc07a30ddd8c237f49f741717e4dd8b54ab69ef52ec60848a1b91cd2d039f828e8cbdd2778a045cbd642 SHA512 6c139de3c36f124e62dbb22306add6dbb2b2b11003150f3d41bf750e321bfc38205690d927fc7c217618236bf5574fdfc85723689e098511f789f8de1793ea0a
+DIST tdesktop-2.9.2.tar.gz 15021694 BLAKE2B 4b68ca1129529fc3834121b3c7de0f4f7a790ea0af4eb47c3778cfe11c3a5cac7dd591af0f22f887852674705371aea33809c4b3228a416764771b392dac28d5 SHA512 45993a463d0f2fd5c694e5c28ff6b85c6db5026522b10ca26fe1b8bb57ae9ad4fe0e09e3a1eee6079653aa460f613ffe6eee41810a82d9bc4e19ddbc6d236df8
 DIST tsetup.2.8.10.tar.xz 38712292 BLAKE2B 6e9337fd7bc30d21ef28e21ada0e560d795c6de9638a614b563838dcbafeed0790295795512ddf5ef8cd5a2a2a5cb498a263531066c4078529c947494fcc537b SHA512 cd9d7bded6c8ebe44e09ee9f8029f96802d20a0ba25167240e45a400c71bdc6df217721f64ed6fbc7a79b50d342107e2573c671bf31b1f0b0960a81334c3b140
 DIST tsetup.2.9.0.tar.xz 38751860 BLAKE2B 4123faca33e858d43896181a740e70c585f96e9265e2c4e1e5f03bdd1e4b7eafd774180334773dc22fcddd0c52a222a592baa802b46f476990a1b475fca5cb8b SHA512 48a2cd83cf4bfe6709317192307435664fc61828c40771415098e407582f3288ef6afe372c349d28e6b1092252332db2f4bf89ee9b6a11a2e970d105aad4ca42
+DIST tsetup.2.9.2.tar.xz 38859712 BLAKE2B c1fd3852dd22afbbfaef57971dd084f7d2f4ed59a0c7a879dae63f68936d23a9ceb51ba29fe06cdaf82095058288c56be1be25c13f3af08b07e1c2ea9567f852 SHA512 5937d8e4107d58631e47e82a316b7ea0b2d61beab1bebf85268222a14088ab199cf8c64030e8852674add15f8d733c91e162b6b5504217058ecfa7c786649189
 EBUILD telegram-desktop-bin-2.8.10.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
 EBUILD telegram-desktop-bin-2.9.0.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
+EBUILD telegram-desktop-bin-2.9.2.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.2.ebuild
new file mode 100644
index 000000000000..5d9bb593c191
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}