gentoo resync : 25.08.2020

16 files changed, 20 insertions, 442 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 60b3fd6ca2d5..7766c5e374db 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 99bbac2d79d4..1b5d4b20b78a 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,12 +1,8 @@
 AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
-DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
-DIST enigmail-2.1.6.tar.gz 2838221 BLAKE2B e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c SHA512 72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919
 DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
-EBUILD enigmail-2.1.5.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
-EBUILD enigmail-2.1.6.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3
 EBUILD enigmail-2.1.7.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
 EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.1.5.ebuild b/x11-plugins/enigmail/enigmail-2.1.5.ebuild
deleted file mode 100644
index 53f90a93be8c..000000000000
--- a/x11-plugins/enigmail/enigmail-2.1.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
-	( >=app-crypt/gnupg-2.0
-		|| (
-			app-crypt/pinentry[gtk(-)]
-			app-crypt/pinentry[qt5(-)]
-		)
-	)
-	!<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
-}
-
-src_install() {
-	local build_dir=build-tb
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins ${build_dir}/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins ${build_dir}/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.1.6.ebuild b/x11-plugins/enigmail/enigmail-2.1.6.ebuild
deleted file mode 100644
index 665dd902895c..000000000000
--- a/x11-plugins/enigmail/enigmail-2.1.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
-	( >=app-crypt/gnupg-2.0
-		|| (
-			app-crypt/pinentry[gtk(-)]
-			app-crypt/pinentry[qt5(-)]
-		)
-	)
-	!<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
-}
-
-src_install() {
-	local build_dir=build-tb
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins ${build_dir}/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins ${build_dir}/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/pidgin-opensteamworks/Manifest b/x11-plugins/pidgin-opensteamworks/Manifest
index aadf8e7ead1c..b4074ea31c6d 100644
--- a/x11-plugins/pidgin-opensteamworks/Manifest
+++ b/x11-plugins/pidgin-opensteamworks/Manifest
@@ -1,6 +1,3 @@
-AUX pidgin-opensteamworks-1.3-Makefile 760 BLAKE2B 9af0f207bf79d4596dd4b2d061b2b5bea64f7e3575ce7ab22b5670bb57fc3cde982784995cf9277ca099bea47d5a772d965c148584f292c4650fd7c075fa8b5a SHA512 fba48067f726ebb9bfd5dba8074b4314d5c15999cf6b4bfa57ddc2a64eb2fc0f5694d1164f7670b2e60de6492e403cb63915ccf3f6c91c380c1df570bbdd0901
-DIST pidgin-opensteamworks-1.6.1.tar.gz 750495 BLAKE2B 890e1765eda10c31e927be320a8bf8af0da4c9e01b8cea31810c0ff7a0c27d1a8f54b213b323132a6c1087dd853937a0b5cce93eeef308412a505cd1696eb5f4 SHA512 9f025538460dda01d769501326cf7ac597e069bdef3437eea89f392bede7e620e854a8c0b0659315a0834c8f2f60a38680f1f1bdccdb65d3b13f64f7981ee55b
 DIST pidgin-opensteamworks-1.7.tar.gz 236181 BLAKE2B 738285b566558ecbdbaf4960e2cead6bb57721dec901e656c6a78f3e5e16aecfa0f88045dd8fe78decef013866dcf255b82873021fb4ac9c484ed3bed8d0c655 SHA512 6369d8fb49fca3c8ad760d379c413da0be8bf58cbfdc5a4bb41ea6d803493110da8b0e1e3743c81b5068799b3a0ba6f57a90ba6208a5b112eb58434d134b1ba6
-EBUILD pidgin-opensteamworks-1.6.1.ebuild 1121 BLAKE2B 5cfcf799df0e39f9624c1344e442e832f7c15f9cd33399dae4148f7744c204a9bde0e08b1413d60013ce1fb3985fe67045ab696141e8894ab0d1dfdaaacc1a57 SHA512 d50918ab876ba934023cf02fbad71b0793f599419c094c4a72e3c69d1f929eba9a7f75e65539ff5b22f0f515c06d42c9c817a80ded4f7bc39225f6f09076f1d2
-EBUILD pidgin-opensteamworks-1.7.ebuild 985 BLAKE2B 7a6052ec27076e8865dcc403f59894af485e4c3042decd9bdd31354b5173f844537a41263f14b4d5fa75e610a537ff0c8f579958a0bd4345063517d9d01370e1 SHA512 b19a54e0c33f68478ebc93229083ff5f0a309b9a1ad5de882eef434481df51cb5c7f3a825472057d0a7e5f4692b9d74b8fce6dc8f63f24e244a78682d7120b44
+EBUILD pidgin-opensteamworks-1.7.ebuild 983 BLAKE2B 4844b751f610cec2c15be970c1a643f626b1523e1aab40b290b61334be7386947d08f807109c1462fbc90293574b9cbe09dc0516bf8c66067ea287a1a99bf038 SHA512 577ccd31bc723aaed05de8e123e761ebfbe25d65433a80e08313d6066a0f6310bb8d64db4c1c1c33fb7c06ab69fea5378d03ee7c053467d3904c614dd369b2ff
 MISC metadata.xml 453 BLAKE2B efbaec17f3323688a2a60f7ec27d279a6169d2e8bae3a544149e24344bcee36fd586f9065618d11602a2d9be30de965bb857731f94d33faad372bfb74a919811 SHA512 ebfb6e3364b44a8727015c856eb4ae213cc8ae88fe7b520e2968d0e7cbe6d0aae15ab0408c58158c469da5e77b70478d7c8da4f290792081fe4c7c4502a7e8f8
diff --git a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile
deleted file mode 100644
index a71ece054234..000000000000
--- a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.3-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-CC ?= gcc
-PKG_CONFIG ?= pkg-config
-INSTALL = install
-INSTALL_PROGRAM = $(INSTALL) -Dm755
-
-PLUGINDIR ?= $(shell $(PKG_CONFIG) --variable=plugindir purple)
-
-CFLAGS ?= -O2 -pipe
-CFLAGS += -Wall -fPIC
-LDFLAGS += -shared
-CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
-LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 json-glib-1.0 purple nss)
-
-TARGET = libsteam.so
-
-OBJS = libsteam.o steam_connection.o
-
-%.o: %.c %.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-
-install: $(TARGET)
-	$(INSTALL_PROGRAM) $(TARGET) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
-uninstall:
-	rm -f "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
-clean:
-	rm -f $(OBJS) $(TARGET)
-
-.PHONY: uninstall clean
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
deleted file mode 100644
index 4cbbdc43091c..000000000000
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/nss
-	gnome-base/libgnome-keyring
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_prepare() {
-	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
-	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/${P}/steam-mobile/Makefile || die
-	unzip "${S}"/${P}/steam-mobile/releases/icons.zip || die
-}
-
-src_compile() {
-	pushd ${P}/steam-mobile || die
-	default
-	popd || die
-}
-
-src_install() {
-	pushd ${P}/steam-mobile || die
-	default
-	popd || die
-	insinto /usr/share/pixmaps/pidgin/protocols
-	doins -r "${WORKDIR}"/{16,48}
-	dodoc ${P}/README.md
-}
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
index 713d7108b752..bc8f30a4b43b 100644
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
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)
 	)
 
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index f234c07a168e..172ac8b827e7 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,9 +1,6 @@
 AUX purple-hangouts-0_p20181202-makefile.patch 3436 BLAKE2B 6b572ff61aa158ebd7531df35e14a94947b5d6a90e284094f4a260828aa02b6a5afdf1fe7c52b725331b73952f0c902110285f88f4b2a3deb243f0c6aa4de45b SHA512 439c25f456ee7415b92d9ed82fec25fa4500299c77eaad20e0f1b9f8dcce5d7f466971da9a2b9f6966d366ddfb75cb4e19433015e7519eb97d17ea11dd4767d7
-DIST purple-hangouts-0_p20181024.tar.gz 150600 BLAKE2B 4dc9b689642b73d242d89f780188d581aac2524665048ef2c35606b2d15a852e6ef111238d1f7a3c65895555d8169c96a7158767ec2a6fa5fb6645fc3f5260eb SHA512 e1200845e64f20aef1b75bd8d7a128fa6b1fe2b731c7d83db876900e2bac988007f04d59996c86c78190770186210401af5a51e0ed490c0027a0933445ce125b
-DIST purple-hangouts-0_p20181108.tar.gz 150585 BLAKE2B faf357ed7f6e58fab49d18dce65b181b5462cfb2c60f074d4a3a9bdfe7fcf0df179e842d7ec4053c323902b214e299b4be7c336bb1fa65257c95babecef1940f SHA512 eb7c522eb51fe82607a643d2b9f817ec5671e4b98a727de8ba73863cda213b8744dd601875febc9cd24eaf6b7213c22034d23d9f6093c542c29524a430ffe464
 DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227
-EBUILD purple-hangouts-0_p20181024.ebuild 1008 BLAKE2B 3af6f001904d98317e37f11d861225faae819134a5756f591feb2d77a5ccc0cd94be0243bf3bfb9f46322983f541992b475230474d659d42311dcc636594e82c SHA512 63bac60236a9c49da137b07f471d962ee46f1d0d74921d11c53809769b56f15639ab7b3b2b442e28a3636523df5faa758998d235f030d1dfdebfd2b817dd85b4
-EBUILD purple-hangouts-0_p20181108.ebuild 1017 BLAKE2B 9ed371441c3f3fda88345e5edd03b8d6186797723b832cdce46ad7f82321adb6777bcdbc18e194d2fce90b967e95e813c4e324653f00d70613bd9a3a46d34aa1 SHA512 ad3307e6f952b04d7cd792bc29e7024f1f0789ba4eb85928feb3cf9ff65a5cf087a1b6fbb5862a60f8a403f57af8443d49cc76c613a49a7a23b1d45ee13d8614
+DIST purple-hangouts-0_p20200710.tar.gz 153541 BLAKE2B 7a71cb5fdb7ca0636b4eb3d4245347e057e879a6b855451b9330f33cec6ba1a15da071e916a3e3d38094700cd61178947e5aa749e6182d3d0488e01c673568f5 SHA512 ce650c1ee1052803576e163905e906bb6202ce04ea380b52ae7524ec896ad785c1a89a5bc713242e3ad5df2d3ae677e0bd5323c7533daedaf6ac333d8e2f5b34
 EBUILD purple-hangouts-0_p20181202.ebuild 954 BLAKE2B bf961017bd39d5480d9788ed9091b4166b0d9797c23b0ca54e171976328a8b9a5553d70dc0e19d298ea88f25754551a39200845f727ea14146028306e9c241e6 SHA512 0537b1f5d438fb72bf28cec5f1ebb551852e7ed50c642cab0985f5b0fd9486aceb493f0aba67acdaf642b1c9c65e34c0d370c3eca066f9d25de03bd57c927c27
-EBUILD purple-hangouts-9999.ebuild 843 BLAKE2B de3d55cdecbbb1475b8383c5723aa7096bcda4df9c8dbc07a217951589d3f83e7b6f52ae19c37d0e1c52ab690c56b040d5b00d14afcb6e913ca5c1c1918e5501 SHA512 4f3b2ae2a0c102983e1d0535680833d1a6651830aaf749bce0a1386a5b1098d3b87f42a93b12455479b3e889ac75a1b8b83117328335af5059280773b17d7064
-MISC metadata.xml 339 BLAKE2B 99cf77f54d6ccecb2a0b8792a4135ddbc83b1619483a5b9927902157d67848c543c35a57699fb16e221a0774c212695ca73b1a8ffaee07ed88d71bcc62147983 SHA512 c010de05f66a72af7129f39c92120ac5da93fc6e842e8481e018ed21416bf36f04ced2242d5fb24d6e3a6d6566d5f89703b45e3d8496df83f28afcbee4855bdb
+EBUILD purple-hangouts-0_p20200710.ebuild 908 BLAKE2B 1f24fc2c710cc98e272b131e04c60c968cb2184e47f8ed5deb2d064e83ed0bf776c9b1768afa3dcc1b176877bfec654f9e8b5c7fb824b777ddb3148acc43da7a SHA512 c8de10160b87cda29d542990ad1f4c7186158fc7145adb174b595f17936ad45652d783184b7d44979ec7ba608e9b6281a28c1d984704edaba75107a93842b66c
+MISC metadata.xml 336 BLAKE2B 5acd264f165ca35cc0ff34bdf72623f106d8655f3c1559c090dc9e05fb2a00e42146c71e554b75f8e698883bf278e3bc0da646e5a34b940e619bf5f68d15bdec SHA512 0718f5a79b5ee3e3a5f65883784e97bc3548889d2f8240c78d3a576527c1a437c6c6a98aa91d40df77ce1ae22eb25a0af826d61358daa3b9f7f5a0fc4205f046
diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml
index 5c70dfb3acd4..2dfa6a602a4a 100644
--- a/x11-plugins/purple-hangouts/metadata.xml
+++ b/x11-plugins/purple-hangouts/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Stefan Strogin</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
+		<remote-id type="github">EionRobb/purple-hangouts</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
deleted file mode 100644
index 3954afa7a3b2..000000000000
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hangouts Plugin for libpurple"
-HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
-else
-	COMMIT_ID="a044363c1883"
-	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/protobuf-c:=
-	net-im/pidgin
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Does not respect CFLAGS
-	sed -i Makefile -e 's/-g -ggdb//g' || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		DESTDIR="${ED}" \
-		install
-
-	einstalldocs
-}
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild
deleted file mode 100644
index 71e7284503d2..000000000000
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181108.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hangouts Plugin for libpurple"
-HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
-else
-	COMMIT_ID="cd38fcd6082d"
-	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/protobuf-c:=
-	net-im/pidgin
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Does not respect CFLAGS
-	sed -i Makefile -e 's/-g -ggdb//g' || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		DESTDIR="${ED}" \
-		install
-
-	einstalldocs
-}
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild
index df8116adca8c..f461413cc277 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs mercurial
+inherit toolchain-funcs
 
 DESCRIPTION="Hangouts Plugin for libpurple"
-HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+HOMEPAGE="https://github.com/EionRobb/purple-hangouts"
+
+COMMIT_ID="efa7a53e2db4087a1590850423aa16b380bfbbd5"
+SRC_URI="https://github.com/EionRobb/purple-hangouts/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS="~amd64"
 
-RDEPEND="
-	dev-libs/glib:2
+RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib
 	dev-libs/protobuf-c:=
 	net-im/pidgin
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
-
 src_prepare() {
 	default