gentoo resync : 08.01.2021

4 files changed, 3 insertions, 98 deletions

diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index db0010476b8a..398c77ed3824 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,7 +1,4 @@
-AUX pidgin-telegram-1.4.3-change-metadata-location.patch 1749 BLAKE2B ad5dd197f162223d31d802259c183e4285921ee3270010bc2d6070048d625a4ca5e0c0457c26a65396aba1fb9dbbea5bf87ef21513782a06ad3d69dd4018b47e SHA512 fc42f57d033a5f5192a104fb1c364b44a54a54059613989c147fdb741ebcb3eb1b4870a5325260e8b6f4b328ad0d74f1e236c5540f5ff837054ff99c6c9f4b14
 AUX pidgin-telegram-1.4.3-clang.patch 3674 BLAKE2B c1fb52b984168afcd576b429ab97f92b44a04bdbe39af9f98c71a76bb0a18c9b82a0b7e16a5dd0c70cbd0d743a3a597b2cae9eea9ee04cb98674699452b0fea2 SHA512 f855a52582dc05266e3ac1410af668f6ce6e7f9a074d514b07c5d7c39b317f338967c41732f56db427bd3ab33b91af67d0df354ae1d43663abc45fd4edacfd02
-DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
 DIST telegram-purple_1.4.4.orig.tar.gz 495386 BLAKE2B 7ecac3a334f88f3d9c0367c5910d3de03b1e6749f18628a58f90c0ae3602dd04d0a1bec79b1016af236375bfe3eb7d4c40437c31fbbee0e9648e5425e40bb43d SHA512 9907da48b978294749f0697313cc7dbf26358535d6528190d8b61cdce5e478af8e756528a212af806025eb75b7f7ec90054ee763eea327f101ef469d0f4fd43e
-EBUILD pidgin-telegram-1.4.3.ebuild 1287 BLAKE2B 62c3af492fe528b4628836c27ef4fd98cccd4259713313bd71ede962aad93faab48eddc66ef579450c24cb573645805259a638e3939cb5f1925307fcb5f42427 SHA512 420a1b1e1476bdcaab4d74add52033dfa57c97b4f6e3d3dddff4957d736eda3931080d0ca205070f1d68049b9ac53fddf4f2ee0d59a73bff0c524f614d66dda5
-EBUILD pidgin-telegram-1.4.4.ebuild 1244 BLAKE2B cd472efad5a0a1567b6d0916ca34c626645e3efc09bb8bf22a53db7d290200a7aa043d724fbaa6721c9677678e2ee5db8bad80828a307919a3473f78d1175d39 SHA512 1e1d81fcee22b0605ed63433246084bc6fc61734487c2a751ff1a6f387f2144adccf0cfd80f0d22c670add666ff3ef709717ba51127711648b668665e3da3900
+EBUILD pidgin-telegram-1.4.4.ebuild 1242 BLAKE2B 2981f5225498ee1b2cd78d2891e59fea80bac0bfc903f297b3e56e74f6f7bb402020089a00ec918ddce67c17b7cba40a286325f7f51afb7c6d61c3471c0d3b29 SHA512 35e07021eb2f97d931fc2805d30c9ae4911b7d6c990d7de7cdb6ca733993df9de53843049fe90e716b62d2a4bc8c71b0d356722e6ddd03205d37cdbaa2c6727a
 MISC metadata.xml 722 BLAKE2B fb8498a592b6da08fda5cb1961fd84ea2a4e839233719330625166f487f2d01e8000860d2383488ea1c377105f8d74aae928871f349ed08efda1dd7c0420db10 SHA512 6b7e5121c5662de9943b7b7d30e6acf6c2df04b5c9d19b3ce942b6e403e62023f1a07076c4023d899ccb97f7fd2a29b331f9bf76391cb5db1c477d5bfce088c8
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
deleted file mode 100644
index 6971fb8d5075..000000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d18d4c7a46539c37eec30fdbdbb7b56b08469f12 Mon Sep 17 00:00:00 2001
-From: mirabilos <tg@debian.org>
-Date: Sat, 25 Apr 2020 19:29:28 +0200
-Subject: [PATCH] Use newer AppStream metadata location
-
----
- Makefile.in | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 48bfae92..bbaed9df 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -216,15 +216,16 @@ install: noicon_install
- 	install -m $(FILE_PERM) imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
- 	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48
- 	install -m $(FILE_PERM) imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
--	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata
--	install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
-+	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/metainfo
-+	install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml
- 
- .PHONY: uninstall
- uninstall: noicon_uninstall
- 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
- 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
- 	rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
--	rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
-+	rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml # old location
-+	rm -f $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml # new location
- 
- 
- ### == The local_{,un}install targets, in case you're not root. == ###
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
deleted file mode 100644
index 2683ce2015f4..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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 +png +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	png? ( media-libs/libpng: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" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-change-metadata-location.patch"
-	"${FILESDIR}/${P}-clang.patch"
-)
-
-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.4.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
index 653d01bdc92e..3687b6477ca2 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ 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 +png +webp"