gentoo resync : 24.07.2021

7 files changed, 54 insertions, 29 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index c0789bfe34bd..cd5632282593 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 8cc7e478ba09..e29cf6f742cf 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
-EBUILD pidgin-sipe-1.25.0-r1.ebuild 1367 BLAKE2B 1a7ceb9d5e281d41b9f4240d62c79050abd8577f105963fc2710e78f6f4e37475dcf8e5bca1e1509a4b908d6c57ff4d0fc39838f6127113c88f5dd1e7d15ca37 SHA512 0981b15c4ffc12d268629976b5c2c84528f7cc8fb846ca7afaeb5aac5cf59dd65e48e16f0bcb34c61e4315524649df6e373ce85162e8bde94144b5399f922478
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1366 BLAKE2B 0167ab57a1fb8e372b1db35f6e3b4a6d42653457dd93c057b82b7b6f8080276b95c94208d0ea54a9f464bf9c4367e5ad71edc60b3979035215c39c5f3809bf58 SHA512 d204faf98046a446260bec28df6986af207377ec4bcfdac7d0def55b4dea8366e6335d998fb346b679e232e91b7dfb2b8350aa81c85bce0ed1790ce8014696b1
 MISC metadata.xml 778 BLAKE2B 8128c3886d6f8ab54d3636954904e30fe4da25bf4bd7268fad499842cadd4a2c5104617b32fedcaaceb93c3a44691bb0815cf8d451e0c26a3380b5a4a2953b54 SHA512 e0d5228e0585c317f635838a2905a0354ecc3af1311e817fbdd0ba1703a13e9d4070a9f9db31891bcb819ac03dc93b2764e2f73bacdffb8318c599612b0cb21f
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index 2e14f7d593d8..6d8c1c1b9068 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 6913bc74f7f2..19ff27495dcf 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,3 +1,5 @@
 DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e
+DIST telegram-purple_1.4.7.orig.tar.gz 498573 BLAKE2B 37f741f1e2106db55eaadab70e2bf226609ebd85fa3df28a60b686e207c341f7279ea36ef87137d465b5bedac63e6ec0388714171dd5a594fb28ae02f66bebc4 SHA512 ae3032b33bd2a20b58b2d66c83fbc405f43c38c0e93b00394ad3165b0bc5d5aba02a8e1946872e4bd082894679737fa20f3e1991e9bb16c3c3aba4c7abbbf7d8
 EBUILD pidgin-telegram-1.4.6.ebuild 1125 BLAKE2B 64491aa941b08a2160d497225b07d1fede1657995a6ff625f6072de0706ce19ee3ce6ed99e51f1830ed3fff5c7c1296c3bc5e8e33517ba4c4dc126ac4660a24f SHA512 31d2b45f61c0eb9038321650263780d5b1c8108aef7c75c66812eed87606966ab1eaa29ee032b676aeb43f4ea009ef1753ddbf061165e2ed58b21dca1b241822
+EBUILD pidgin-telegram-1.4.7.ebuild 1127 BLAKE2B beb36d76a67dfae6d6af348f31fd2fe8326bb0e4d7c147b804cebcb6ff9de0e503d820603b0dddcf5fb5711b9d74f896e530ad9e11846ea62121a46e5bf41768 SHA512 31cd4b48505938ea495a69ed6004ab750359b16345eb759ab81c8112586a81993b9d1cd3ca41a3b573aa0985069d4052ff23577c093ca5758a037d4e674ad05d
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
new file mode 100644
index 000000000000..5cb4ffba69c3
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+S="${WORKDIR}/telegram-purple"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt +nls +png +webp"
+
+RDEPEND="
+	net-im/pidgin
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	!gcrypt? ( dev-libs/openssl:0= )
+	png? ( media-libs/libpng:0= )
+	webp? ( media-libs/libwebp:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' to make it compile
+	find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gcrypt)
+		$(use_enable nls translation)
+		$(use_enable png libpng)
+		$(use_enable webp libwebp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index ccf0bb4ff3d7..01fd28dd5e39 100644
--- a/x11-plugins/pidgin-window_merge/Manifest
+++ b/x11-plugins/pidgin-window_merge/Manifest
@@ -1,4 +1,3 @@
 DIST window_merge-0.3.tar.gz 328953 BLAKE2B 2277f2c5cb83d98ed34b4e0961281b7c8ebf8209b31471447bf64e9405c9cd0c2e0edc0388f64904f377d77a9916c411cecbc9c6cf235f2127685cf553906c69 SHA512 6863c58b3054aac51ed109ca8fff5e02459220648e6afa700c7231e259e71893ec7ca237263c230632a512d470c6907d3e8cfc9516cb752c1e78bbfdb05a50d3
 EBUILD pidgin-window_merge-0.3-r1.ebuild 774 BLAKE2B d9dadf3a1574d3fff4a4aa31e02f1a23b2bb9a61578acd93092a1bae48cdd496cd8fb20b6508f40c23fb6ce7fa18a41a9d94e6b50e500b66d00ca9677cd05f8a SHA512 5f12a0ac477e1032f40a0ddfd4f24e548c31016d22d4565ccbe86d42a3af32ff4e0193dce771a480ab570b99d01577e3595ae0058105fc8a8d1dbb7d60a13ac1
-EBUILD pidgin-window_merge-0.3.ebuild 703 BLAKE2B 3a58c80676252168eaa458902ce2dcf2cb18d5e6052778994ecaa7c1cb2b088774d53216258f3f65658c92c6786a199f35391520b3970fc3b0834ad871deda36 SHA512 d21a89d2586ba066c074d34445d3d9b570b8b9c3c2529f1865c1576f286289f31ea6be1a669f84a8943faaf37ae8b85f9268fc2748ffeab18187202e6d60b4f0
 MISC metadata.xml 333 BLAKE2B 254ce7c009bb5e0034835e975d04ff077bbe0e24e6d226c0381a91a087ce16fcd815cd411db181a8b34463f903fc4afd624a7531c340c083ffe1982c20b6cd33 SHA512 9865a245036486f3b8a82077de63f67f7c37d73fc13c3b385103166610bd45e1d284d96b0358ca1fb84d7aaf15b111e12a59e6fdf3984ae9d0fb145b5e89871c
diff --git a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild b/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
deleted file mode 100644
index 9927a83926b6..000000000000
--- a/x11-plugins/pidgin-window_merge/pidgin-window_merge-0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Pidgin plugin that merges the Buddy List window with a conversation window"
-HOMEPAGE="https://github.com/dm0-/window_merge"
-SRC_URI="https://github.com/downloads/dm0-/${PN#pidgin-}/${P#pidgin-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	net-im/pidgin:0=[gtk]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P#pidgin-}
-
-pkg_postinst() {
-	ewarn "This plugin and infopane plugin (purple-plugin_pack) activated"
-	ewarn "at the same time cause a segfault in pidgin"
-	ewarn "see https://github.com/dm0-/window_merge/issues/4"
-}