gentoo resync : 25.08.2020

3 files changed, 5 insertions, 55 deletions

diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 56d7d48b6462..21fbb5ae9626 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,6 +1,4 @@
 AUX pidgin-telegram-1.4.3-change-metadata-location.patch 1749 BLAKE2B ad5dd197f162223d31d802259c183e4285921ee3270010bc2d6070048d625a4ca5e0c0457c26a65396aba1fb9dbbea5bf87ef21513782a06ad3d69dd4018b47e SHA512 fc42f57d033a5f5192a104fb1c364b44a54a54059613989c147fdb741ebcb3eb1b4870a5325260e8b6f4b328ad0d74f1e236c5540f5ff837054ff99c6c9f4b14
-DIST telegram-purple_1.4.2.orig.tar.gz 484790 BLAKE2B d198ce3d1a5f4d226d48b6ff1cdf6f0899a5a1b79ef74c8ac77afa613aae5ec1cf53c8de69cfbab6b2f70df896be0315a90470f2b0da34d1644103be8e7d96ad SHA512 f2f88de8dd4038adaa1a63f2fa3678dd45ddda051be700d6eca563f4bd5b7c8dcb61fdf60bffb01b3fce0ffd01f7b2524686d997bfe4ca8b191cc7b6ce7375a1
 DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
-EBUILD pidgin-telegram-1.4.2.ebuild 1125 BLAKE2B c3fdb7773f5f30992bbd0bb929158d837a0052d30d692cea7959b5bbdc5c3178517e29b0c99d46980435926c69307d7ff914ce20381ee64712ff07669354f205 SHA512 8826e13b35c34c2bccf52d0b7dcc756e44b2864f3fe3f8e64eee902f169f8f562cd8d033eb747463685c914a47329b48c1a969c972ac998455116b48f5701257
-EBUILD pidgin-telegram-1.4.3.ebuild 1189 BLAKE2B 04cac880ccb16b759f372b3838d5318d173aba1b350903519c83a127398b11f9ee89b4be3b54b1c4a16f7b3328c3d1602a85aac7c3d4b611665a92643e4f848c SHA512 d9382aa3c221e06b6322ca5839c772af0dcd4364454aeb525b067bacef6ad546efffa2e42e714df39990a77d00e04e5dcbbdae28ecb842ea30aa102376121ef6
+EBUILD pidgin-telegram-1.4.3.ebuild 1250 BLAKE2B 9d53fd821a4f85ec5d21abf7617812c2659eec182ad32c7721aac3c5bece03cae7b82694b6f9e4a709fb83c76493268bedf199ec549a2792f12d15ec5e4b5214 SHA512 311265d1515aa5d83e3be71374573984ee99f5e0738794df1d7ac447f919223cef795f72e3a9a044b53e5c2abbb62e1ba43fa1d106c07cafdfa0a2eed440020b
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
deleted file mode 100644
index 21c27ac8d19b..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 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"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="gcrypt libressl +nls +webp"
-
-RDEPEND="net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	webp? ( media-libs/libwebp:= )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/telegram-purple"
-
-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 webp libwebp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
index dbf8c2bf6f00..605769b62335 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
@@ -8,9 +8,9 @@ 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"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
-IUSE="gcrypt libressl +nls +webp"
+IUSE="gcrypt libressl +nls +png +webp"
 
 RDEPEND="
 	net-im/pidgin
@@ -20,6 +20,7 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )
 	)
+	png? ( media-libs/libpng:0= )
 	webp? ( media-libs/libwebp:= )
 "
 
@@ -47,6 +48,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable gcrypt)
 		$(use_enable nls translation)
+		$(use_enable png libpng)
 		$(use_enable webp libwebp)
 	)