gentoo resync : 26.08.2021

4 files changed, 2 insertions, 54 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6f1627d5c040..d9bfe90cb196 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 19ff27495dcf..0381d5513dae 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD pidgin-telegram-1.4.7.ebuild 1125 BLAKE2B 64491aa941b08a2160d497225b07d1fede1657995a6ff625f6072de0706ce19ee3ce6ed99e51f1830ed3fff5c7c1296c3bc5e8e33517ba4c4dc126ac4660a24f SHA512 31d2b45f61c0eb9038321650263780d5b1c8108aef7c75c66812eed87606966ab1eaa29ee032b676aeb43f4ea009ef1753ddbf061165e2ed58b21dca1b241822
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild
deleted file mode 100644
index 7dac50fdb5bd..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-telegram/pidgin-telegram-1.4.7.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
index 5cb4ffba69c3..7dac50fdb5bd 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegr
 S="${WORKDIR}/telegram-purple"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="gcrypt +nls +png +webp"