gentoo resync : 16.09.2020

54 files changed, 386 insertions, 1683 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 16115556c9d8..7020cd8839bb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 9fdeb5e71da1..4a38215b1a94 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,4 +1,4 @@
 DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4
 EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
-MISC metadata.xml 772 BLAKE2B a9465736a151d872629d24e5343ccc597fc42a4683e6047ed4a7dbddc7e352456c33fb641fe44816cf02f9cc9b0ef094fbc0b895ff12e52ac094bcfef8a4e67c SHA512 a9d4c404c7668a04156077af1a7e25f7df068a424060ca69a98a46bd8fc104a1f13c51c8891534429449c3ed036980443a36e9bc52d3c6cb21e8ef3a4f7f877b
+MISC metadata.xml 635 BLAKE2B 81b252965440d5101d24114b1e971510c7f0322ef53d8a6ce65f79864eedcf8211e378eb224dbc5a83903c7ce263faf96787cc7e9340cd8d1bb8fa788564b72b SHA512 45a602ed7b8cc33f7e1165f2d22baed143cf38de06fc3f1064b847e47aff991a1102eda241f8350b4d95f355d41227d1335083f0433ec7c68c47337fe273c354
diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml
index 6aab9ecf858d..539082abbbed 100644
--- a/net-im/bitlbee-facebook/metadata.xml
+++ b/net-im/bitlbee-facebook/metadata.xml
@@ -9,10 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		The Facebook protocol plugin for bitlbee. This plugin uses the Facebook
-		Mobile API.
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>jgeboski@gmail.com</email>
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 753ffa7b2e42..24d077ea9cb3 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,14 +1,9 @@
 AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f3124c197422acf3332c1fe579fb34ffd63e2fc377a6eea93cbe14a91129d22884eae7760fb6e8090afa8245c9f958f2a SHA512 25ea4be83cce5d2ccc1a5e6655e468678a26b570a3efb7b19429ee379987efce54d32864508ed36644bbcf351cc1b5e4b750a2824b7a0b7e7df711262bbf5e2c
 AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
-AUX bitlbee-3.5-verbose-build.patch 5790 BLAKE2B d5ad371938cb7b8a2f9e0925633602ebc6a9a774dc0dfae6ba30350597840c4472411a1eced122b9f33afc3d36b221b8d9176c0d39e375bcbb100a7ae211dcde SHA512 0bb4d1e4d954ca4812f1968a3c83ae6d7ea1d812066e963b00471aa516b1ac0ca041c8574bfb4a1e91236b2e1ad3c9edf3041b7467a84bf22cc120b4e7e69faa
-AUX bitlbee.confd-r1 291 BLAKE2B bf576c629a6554127a8ae54a54d9ac03cc68accdf226376620727f0f77eab60610ad096b084e7b1568366376b8c7aacd180f2dbd276369af4389c8cd4791cbb1 SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
-AUX bitlbee.initd-r1 675 BLAKE2B fb9c803301bb73b1bb6a92d059ca85fbee119849cd27d92c9bf995e6e4dddffbc73960784b4102dea0c0f7b92990364426163c3c0291097303727fd47cf7acfd SHA512 5c65b85e72a2013454becceaab0d08e5e69bb9072c6081f1c4cd3cef87104b2413bcc432a1db0a761e91e42cf72df2344101fb0f886b88fe60882e26d597f921
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
-DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.5.1.ebuild 3716 BLAKE2B f465235f3dd0d458a491812e1a8c7804ec640a6341950f8608c75e1275770efc464d22d15f3529de0d1c93d4d1a1ffee7d33960b5a3a265913aca36a34605495 SHA512 4f7eeaa54b88178ca786e1f6114aa01efabd7eb86b47775a0da04890b7892d06e9747c6e1ea70dde7876a63afc75939947f24fb0ad0ad4d3b9ca4669dc993a70
-EBUILD bitlbee-3.6-r1.ebuild 3335 BLAKE2B 4a14dcc62688fff75ea04b31ac78b31165a5707da2a98550d9e5c1e2197ec7b567f615b95fbf54f11a6cd93974c6532546a0a918caf9a016fef6e4bc147b4199 SHA512 129910dc9f06a9eb3801b07665de7dfe623365bb6fbc08a126b8960a908a114343f1325dde27902ab23c6188c56aadc891503b48a2e20e31c509dade9624af9e
+EBUILD bitlbee-3.6-r1.ebuild 3334 BLAKE2B 35bf6b203fd23c39eeb53c2441cdfaac35f15d928c2f77bd3d34a75a6bec0889b3bb17e61b0f025bc729326fbd34b1a0756cd432fb71cddf165c9832e2c6bfbe SHA512 01c304a6d7f341500f63bbc4c198fc1745ae577211e8bf597115b9ca1d60dea9ae0a3ee13ed81fa69b8fcc384baa58459601e706be1932ecb179d5c6549bbf91
 EBUILD bitlbee-9999.ebuild 3257 BLAKE2B 9761b738113d5eb9761954e48982eb718a122c7bf908ee108e90d7c910a84fc4fb4a31fd40411262bb28aa93f4fa18dde1dd86b155df9829e7d197a2a24daa98 SHA512 19ef30fd8a7a96ab527eb9c42e8649ebdfa2ea50d4b5bcd5fed06a4186e3c8a64fffcf827ccf1b126d9e77d9a15bd44214eddc2216fe3041992c222d7075bf86
 MISC metadata.xml 1138 BLAKE2B ec881562587832981f817dc9601f094e987ee3e1a5d92f310f4bac1fbdac70b434e8c5d06b59be149e5c955e4027865c6bf72de1903b584d638440f51c7cca0c SHA512 01da5fed1649b6d59837e8dd89ee65c1f9bc3763303a66c0959f0b5d14941f38fc1dcfb3bf22d5041d7a4d99f2e9b8a38983154f3f5d7e0c7a7308ad8a3a3f95
diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild
deleted file mode 100644
index 5bae1f674e26..000000000000
--- a/net-im/bitlbee/bitlbee-3.5.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
-	inherit git-r3
-else
-	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="https://www.bitlbee.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
-IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd
-	${IUSE_PROTOCOLS}"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
-	test? ( plugins )
-"
-
-COMMON_DEPEND="
-	acct-group/bitlbee
-	acct-user/bitlbee
-	>=dev-libs/glib-2.16
-	purple? ( net-im/pidgin )
-	libevent? ( dev-libs/libevent:= )
-	otr? ( >=net-libs/libotr-4 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	selinux? ( sec-policy/selinux-bitlbee )
-	test? ( dev-libs/check )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	xinetd? ( sys-apps/xinetd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
-	"${FILESDIR}"/${PN}-3.5-verbose-build.patch
-	"${FILESDIR}"/${PN}-3.5-libcheck.patch
-	"${FILESDIR}"/${PN}-3.5-libevent.patch
-)
-
-src_configure() {
-	local myconf
-
-	# setup plugins, protocol, ipv6 and debug
-	myconf+=( --jabber=$(usex xmpp 1 0) )
-	for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
-		myconf+=( --${flag}=$(usex ${flag} 1 0) )
-	done
-
-	# set otr
-	if use otr && use plugins ; then
-		myconf+=( --otr=plugin )
-	else
-		if use otr ; then
-			ewarn "OTR support has been disabled automatically because it"
-			ewarn "requires the plugins USE flag."
-		fi
-		myconf+=( --otr=0 )
-	fi
-
-	# setup ssl use flags
-	if use gnutls ; then
-		myconf+=( --ssl=gnutls )
-		einfo "Using gnutls for SSL support"
-	else
-		ewarn "Only gnutls is officially supported by upstream."
-		if use nss ; then
-			myconf+=( --ssl=nss )
-			einfo "Using nss for SSL support"
-		else
-			myconf+=( --ssl=openssl )
-			einfo "Using openssl for SSL support"
-		fi
-	fi
-
-	# set event handler
-	if use libevent ; then
-		myconf+=( --events=libevent )
-	else
-		myconf+=( --events=glib )
-	fi
-
-	# not autotools-based
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share/bitlbee \
-		--etcdir=/etc/bitlbee \
-		--plugindir=/usr/$(get_libdir)/bitlbee \
-		--pcdir=/usr/$(get_libdir)/pkgconfig \
-		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--doc=1 \
-		--strip=0 \
-		--verbose=1 \
-		"${myconf[@]}" || die
-
-	sed -i \
-		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
-		Makefile.settings || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
-
-	keepdir /var/lib/bitlbee
-	fperms 700 /var/lib/bitlbee
-	fowners bitlbee:bitlbee /var/lib/bitlbee
-
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins doc/bitlbee.xinetd bitlbee
-	fi
-
-	newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
-	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
-
-	exeinto /usr/share/bitlbee
-	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo
-		elog "The bitlbee init script will now attempt to stop all processes owned by the"
-		elog "bitlbee user, including per-client forks."
-		elog
-		elog "Tell the init script not to touch anything besides the main bitlbee process"
-		elog "by changing the BITLBEE_STOP_ALL variable in"
-		elog "	/etc/conf.d/bitlbee"
-		einfo
-	fi
-}
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 72ae3bbaf198..6d32273ed732 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
deleted file mode 100644
index 7501963cb5de..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-Add a --verbose configure flag to enable verbose build output.
-
---- bitlbee-3.5/configure
-+++ bitlbee-3.5/configure
-@@ -38,6 +38,7 @@
- twitter=1
- purple=0
- 
-+verbose=0
- doc=1
- debug=0
- strip=0
-@@ -125,6 +126,8 @@
- --pidfile=...						$pidfile
- --config=...						$config
- 
-+--verbose=0/1	Disable/enable verbose build	$verbose
-+
- --msn=0/1	Disable/enable MSN part			$msn
- --jabber=0/1	Disable/enable Jabber part		$jabber
- --oscar=0/1	Disable/enable Oscar part (ICQ, AIM)	$oscar
-@@ -282,6 +285,12 @@
- 	debug=1
- fi
- 
-+if [ "$verbose" = "0" ]; then
-+	echo 'VERBOSE=@' >> Makefile.settings
-+else
-+	echo 'VERBOSE=' >> Makefile.settings
-+fi
-+
- if [ "$debug" = "1" ]; then
- 	echo 'DEBUG=1' >> Makefile.settings
- 	CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
---- bitlbee-3.5/lib/Makefile
-+++ bitlbee-3.5/lib/Makefile
-@@ -35,12 +35,12 @@
- 
- lib.o: $(objects) $(subdirs)
- 	@echo '*' Linking lib.o
--	@$(LD) $(LFLAGS) $(objects) -o lib.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- -include .depend/*.d
---- bitlbee-3.5/Makefile
-+++ bitlbee-3.5/Makefile
-@@ -162,28 +162,28 @@
- 	tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x
- 
- $(subdirs):
--	@$(MAKE) -C $@ $(MAKECMDGOALS)
-+	$(MAKE) -C $@ $(MAKECMDGOALS)
- 
- $(OTR_PI): %.so: $(_SRCDIR_)%.c
- 	@echo '*' Building plugin $@
--	@$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
-+	$(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
- 
- $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c
- 	@echo '*' Building plugin skype
--	@$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
-+	$(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- $(objects): Makefile Makefile.settings config.h
- 
- $(OUTFILE): $(objects) $(subdirs)
- 	@echo '*' Linking $(OUTFILE)
--	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
-+	$(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
- ifneq ($(firstword $(STRIP)), \#)
- 	@echo '*' Stripping $(OUTFILE)
--	@-$(STRIP) $(OUTFILE)
-+	$(VERBOSE) -$(STRIP) $(OUTFILE)
- endif
- 
- ctags: 
---- bitlbee-3.5/protocols/jabber/Makefile
-+++ bitlbee-3.5/protocols/jabber/Makefile
-@@ -37,10 +37,10 @@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- jabber_mod.o: $(objects)
- 	@echo '*' Linking jabber_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o
- 
- -include .depend/*.d
---- bitlbee-3.5/protocols/Makefile
-+++ bitlbee-3.5/protocols/Makefile
-@@ -42,18 +42,18 @@
- 	rm -rf .depend
- 
- $(subdirs):
--	@$(MAKE) -C $@ $(MAKECMDGOALS)
-+	$(MAKE) -C $@ $(MAKECMDGOALS)
- 
- ### MAIN PROGRAM
- 
- protocols.o: $(objects) $(subdirs)
- 	@echo '*' Linking protocols.o
--	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- -include .depend/*.d
---- bitlbee-3.5/protocols/msn/Makefile
-+++ bitlbee-3.5/protocols/msn/Makefile
-@@ -37,10 +37,10 @@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- msn_mod.o: $(objects)
- 	@echo '*' Linking msn_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o
- 
- -include .depend/*.d
---- bitlbee-3.5/protocols/oscar/Makefile
-+++ bitlbee-3.5/protocols/oscar/Makefile
-@@ -38,10 +38,10 @@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- oscar_mod.o: $(objects)
- 	@echo '*' Linking oscar_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o
- 
- -include .depend/*.d
---- bitlbee-3.5/protocols/purple/Makefile
-+++ bitlbee-3.5/protocols/purple/Makefile
-@@ -38,10 +38,10 @@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- purple_mod.o: $(objects)
- 	@echo '*' Linking purple_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o purple_mod.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o
- 
- -include .depend/*.d
---- bitlbee-3.5/protocols/twitter/Makefile
-+++ bitlbee-3.5/protocols/twitter/Makefile
-@@ -37,10 +37,10 @@
- 
- $(objects): %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
- 
- twitter_mod.o: $(objects)
- 	@echo '*' Linking twitter_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
-+	$(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
- 	
- -include .depend/*.d
---- bitlbee-3.5/tests/Makefile
-+++ bitlbee-3.5/tests/Makefile
-@@ -20,8 +20,8 @@
- 
- check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
- 	@echo '*' Linking $@
--	@$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
-+	$(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
- 
- %.o: $(_SRCDIR_)%.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@
diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1
deleted file mode 100644
index d581222f9fb9..000000000000
--- a/net-im/bitlbee/files/bitlbee.confd-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bitlbee options (see /usr/sbin/bitlbee -h)
-BITLBEE_OPTS="-F"
-
-# By default, the bitlbee init script will attempt to stop
-# all bitlbee-owned processes, including per-client forks.
-# Setting this to "no" tells the init script to only
-# stop the main bitlbee process.
-BITLBEE_STOP_ALL="yes"
diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1
deleted file mode 100644
index 413bd45735ed..000000000000
--- a/net-im/bitlbee/files/bitlbee.initd-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or
-# later
-
-DAEMON=/usr/sbin/bitlbee
-PIDFILE=/var/run/bitlbee/bitlbee.pid
-
-depend() {
-	need logger net
-}
-
-start () {
-	ebegin "Starting bitlbee"
-	checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE})
-	start-stop-daemon --start --quiet \
-		-u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \
-		-- -P ${PIDFILE} ${BITLBEE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bitlbee"
-	local pidfile=
-	yesno ${BITLBEE_STOP_ALL:-YES} ||
-		pidfile="--pidfile ${PIDFILE}"
-	start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee
-	eend $?
-}
-
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 1de291084007..72bac6859161 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.11.deb 68328574 BLAKE2B 5a4bba82168056fffee2a2e495be7f5c8d8a02b890fd45645eb800a17c976db4a35719082ae469615f13ce45cadeb73ab7937ad8aac4850264275a479a8eb2c4 SHA512 26f408c3332e9083c448b3b8914fed80918a7d3ab3dd9c2a02b2cea7225ac53dea743fa899bdeeb2f210cda90493b7f35b8075a967e70d1fd6dffb1de1e8b102
-EBUILD discord-bin-0.0.11.ebuild 2001 BLAKE2B 28f81eb0fad820d2a97e81ef259ae4e09b3717009161be632f9ddef1dc8abcd204ea659691a16e7001cc49086bd0d981510033f220ecab857b69359749b8e3c5 SHA512 b3cb62ee6246f35c6c91e006682675f9bcd4adc9d26590e8c673d038aef7f24595c1d8f08c3255267ba2b2cffe7fb39392a5c3b7848b31ac30636355dd24ec53
+DIST discord-0.0.12.deb 68328818 BLAKE2B 3416f7f49e4894fbf03bbe61a225d79df934456205776755b77a6d3c385e379021d5af679270012e0f134850964d993165ca25bf6c33980477e0dfe7112e6b6b SHA512 79c4bc0667b1f7ee693c14356d18be36f5597c1d7740a99abdf31139d54fa2237bb0d6602511d6ba78e2e94871506758728ac43b5b301581561ae463a19229b5
+EBUILD discord-bin-0.0.12.ebuild 1814 BLAKE2B 9b62aa30b52d11acbd00a65194de6fc63ed426cdbd141d9b0051f1d7bf450b1f1d757abfaade997be2a0c2fa3262e08d924a3cae3828ab571d6829b12f60d34f SHA512 9c3ba2ab7b8706c65c50595c1cbe24add40cec00ff7ccdece77dc72ee1731b8cfe1d2b754ef047de09fa09b6426cd517087aebdd0c4e3c857b74510a986a0c10
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/net-im/discord-bin/discord-bin-0.0.11.ebuild b/net-im/discord-bin/discord-bin-0.0.12.ebuild
index 4ceb97f74dc0..b9bcb204ab0e 100644
--- a/net-im/discord-bin/discord-bin-0.0.11.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.12.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=${PN/-bin/}
 MY_BIN="D${MY_PN/d/}"
 
-inherit desktop pax-utils unpacker xdg-utils
+inherit desktop linux-info pax-utils unpacker xdg
 
 DESCRIPTION="All-in-one voice and text chat for gamers"
 HOMEPAGE="https://discordapp.com"
@@ -31,7 +31,6 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
-	sys-libs/libcxx
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
@@ -50,7 +49,7 @@ RDEPEND="
 	x11-libs/pango
 "
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 QA_PREBUILT="
 	opt/discord/${MY_BIN}
@@ -64,6 +63,8 @@ QA_PREBUILT="
 	opt/discord/libffmpeg.so
 "
 
+CONFIG_CHECK="~USER_NS"
+
 src_prepare() {
 	default
 
@@ -83,15 +84,3 @@ src_install() {
 
 	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 0055bfaff21d..8fb0f252c42b 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.4_amd64.deb 65882876 BLAKE2B 8e850a6552074107307e7dea6d3200ff8213c8ea6b00c67363a2fb33aa88fc651491b1e6c05d7f9cfde9f297b3238d74dbc00800cbbf49386fea1edb21854c90 SHA512 ca9e468bfa80280bba34f119bd03a42287bddef2a8f4732db9e750a03385d9b4bd685ea45bd410182d909bd343cd7f221c734e0968e17d97e739d036ae276aed
-EBUILD element-desktop-bin-1.7.4.ebuild 1715 BLAKE2B f20abec762fcaf961702f24e8f20ed3345af3c1a5a04d87d603df356ba8c2f91d705ff7a76bf94168aa8a32b29f461ed540154b425acdd0f0398dab10f101e4f SHA512 6b57e351a46f82756215ccd32b012380e1e994c9cd850533f492bdb90ba39cfa62186cb0490554de8ce45c5c5c4da4085c80188877a2797e9ca3c8a00ecd7ef3
+DIST element-desktop_1.7.7_amd64.deb 66109742 BLAKE2B 06cbdad72862584158caa3a0998e87d69c0bb9caae805dfd9c628170eeafaca7d932fc788493fcc617a917558260c6643f725729a7d9618a072eca7b7a30655a SHA512 2f271163b48b88071e05613b407a56700508ca6b495b75b824b2cfe4170bf06825287fa42dd4df36f3de0bb4f22051f8396d032b8ce59b57b2335e28db0bfef2
+EBUILD element-desktop-bin-1.7.7.ebuild 1715 BLAKE2B f20abec762fcaf961702f24e8f20ed3345af3c1a5a04d87d603df356ba8c2f91d705ff7a76bf94168aa8a32b29f461ed540154b425acdd0f0398dab10f101e4f SHA512 6b57e351a46f82756215ccd32b012380e1e994c9cd850533f492bdb90ba39cfa62186cb0490554de8ce45c5c5c4da4085c80188877a2797e9ca3c8a00ecd7ef3
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.4.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.7.ebuild
index 1322035d30ac..1322035d30ac 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.4.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.7.ebuild
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index d1d24cb612f3..11401b6406eb 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,8 +1,5 @@
-DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-DIST gajim-1.2.0.tar.gz 9605006 BLAKE2B b68e801fedf89d14e8831a52f952fa3937b8f8ed0423a0289d5c665b50244db8db9d91dd24203e446d691e26843dd75dbf0de2b1b183cc0a8fb178bc7632c500 SHA512 e73802dd1172c1fa38be10e6fb5d605109dacf0491516b15111ccd05389309af217e8af68440a1333b8a636c9ff425dec6d4461296ba47f1bb6dbb3000b02fd0
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
-EBUILD gajim-1.1.3-r1.ebuild 2457 BLAKE2B ffdea9fa425f2ae97e718ccc58cc13c95a908b0ff8019df5fc9b82b0b4be522d872b83ada56c1070165f81e20cb0a26df5b70abf0ca54c202cb0796f6c9d5986 SHA512 025c1ff713a2e975dd4c2c334d033fac30d0e4de9d778eeff0dc071d70a871777d5798497394963e49277fc9c529fc3c15e3b14a6f946daa39650c9e88d15125
-EBUILD gajim-1.1.3-r2.ebuild 2222 BLAKE2B 62d8baa9c3fb0fbb76b665244d692d10f4be65468cd9c2e5f5ff8abd5a04b72142f4b6bb3f39498c8d7f4685d084208ca1a5a3d84977d8ce1873e0427222bade SHA512 57e2256a177a3238bd4a21634ee30b43559c9b2326905d97740b0408070a950c098fb715d8ae453860279900a5f9ad368af069b9437678d7d96b16153fc1077e
-EBUILD gajim-1.2.0.ebuild 2289 BLAKE2B 697f393348f18c9a48155a0fe42ee87bc19cf4c8277c8c0c3652765329f9f3cee8846afd6f4252d5e52db5bc21e710284bd18140bc9d3c50ecd6cd7467dc9f9f SHA512 50d2408e1af48557666e5f0389e55376c7fe9ff91aba795727f4e6934b47eee1ef37d72280fa21b36b86a0494d769dd8002d2581d99b2a252d30692724e7a00a
+DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
 EBUILD gajim-1.2.1.ebuild 2356 BLAKE2B 6f3ffb655c1945e7c00b95579acb87075e98e9122a01294a94d917d3318756fec5536ce77250bd972d3e63b075d8e298a57769535a214713fc46571b7501c686 SHA512 3d449b3f14fe84981afce8d310ac64afd9fe642e7619d29768ba63f982b41e1a5097d10f7564e355e3bf62b40c155090be17f874fa619800405c1ed8022b2a07
-MISC metadata.xml 985 BLAKE2B ef02d7f96bcdc15c013e15ee79e3bb4dc591dd9697139f7331ca0bc065d2adfb2e6c2808f8c32d16dee433a1b03d4639f371a69e1d0870d498db55443ff3f713 SHA512 de8eba51dc79776b19e4122d6da16073c577c70dbe5b05dcbf7aa32a4c0b109c5b9cf222313aada405227f27ba8014c38baa73acfb0951691fbbcad1503801f5
+EBUILD gajim-1.2.2.ebuild 2360 BLAKE2B 1edc40a383758eb41bfed434ddf491d33adbb1d0c888f9e6d83de581d2c1c7f6923cb867f438bae3581e3fbec82117ca950ea6b7c4e7a621b8e49a6b420fbeb0 SHA512 0b053dd513c843ddb200ca2ce44c6ee2b314cc5754d453500b61d090ee23db15d01e99fb7277af94bad9a4a5dc1eb0bd9e94455807f80be835f09e0baf828569
+MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
deleted file mode 100644
index 5f4b1383a6cb..000000000000
--- a/net-im/gajim/gajim-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,88 +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} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_MULTI_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_MULTI_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssutils-1.0.2[${PYTHON_MULTI_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		networkmanager? ( net-misc/networkmanager[introspection] )
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-RESTRICT="test"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.1.3-r2.ebuild b/net-im/gajim/gajim-1.1.3-r2.ebuild
deleted file mode 100644
index 12ae00b4857c..000000000000
--- a/net-im/gajim/gajim-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,83 +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} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.2.0.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
index 9dd5e08d83cc..60719dd066e4 100644
--- a/net-im/gajim/gajim-1.2.0.ebuild
+++ b/net-im/gajim/gajim-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -36,13 +36,15 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-1.0.2[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
 		dev-python/keyring[${PYTHON_USEDEP}]
 		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
 		dev-python/css-parser[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
 		crypt? (
 			dev-python/pycryptodome[${PYTHON_USEDEP}]
 			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index bd95a0793560..d4e7cc8f23d5 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -4,14 +4,10 @@
   <maintainer type="person">
     <email>hanno@gentoo.org</email>
   </maintainer>
-  <longdescription>
-    A fully featured and easy to use GTK+ Jabber client written in PyGTK.
-  </longdescription>
   <use>
     <flag name="crypt">End to end encryption and GPG encryption</flag>
     <flag name="geolocation">Sharing your location</flag>
     <flag name="jingle">Audio and video calls</flag>
-    <flag name="networkmanager">Network lose detection using NetworkManager</flag>
     <flag name="remote">Controling Gajim instance from command line with gajim-remote</flag>
     <flag name="rst">Generating XHTML output from RST code</flag>
     <flag name="spell">Spellchecking of composed messages</flag>
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6e448f6d1e7e..69e0e94fe3cd 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,18 +1,11 @@
-AUX pidgin-2.10.0-gold.patch 1003 BLAKE2B d03b7da2ec9c6901129b103d39b5491f4aedab6bfeafa8d2e8c070e9909510d1324dbaf24bd2ba001881a74ce157f658e5750ec025fba4a7710477779421d022 SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984
 AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc0079930bee84d87e4a0252ae750f996542d9407fe44bfdb8e820451c88c0dfd6a1d9a3e75d457de32e6c6e5c69ba77a8d7571834a83 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0
 AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
-AUX pidgin-2.13.0-fix-build-against-nm-1.0.patch 1772 BLAKE2B 2d6c23ca93375bc7b495866f0a0dfb72ac900203358241307abf97bdb9a9bd564cd1f7813209b28c548d729f6d67f35f92da4ec461f307dbf1999ecc58276553 SHA512 8df00a481022b51047fd94b0b8dfced7ce79a5622a31fceeb2ed3c04e6debf13abb7fe7bb4e95d6542d40b7bbabbaf0e8994d35b658c60b4caf1bbdc5aa194dd
-AUX pidgin-2.13.0-gnutls_sni_support.patch 1298 BLAKE2B 1bf2be33e4328d5e52256ced4ee53a4ba7b4a294e7a8f47833950019dfae654c37f1b7dc63d6fe4b1d3f7b4e35fe3a1fc8d527a72660f43b9f16f2f218d491ee SHA512 ebdc088aeec3064e98e5f033f67eefa6c5a38cd074aa04d1bbd1db2738e932326a2abcddb27bd4b4a92bfde84811fec3517d4965cb215bd035762c4f1d006d8a
 AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0687eec5c3022b007a3519ff7974bb18d7f3aa17abddfa516e1a546282e33b56714a2c2e6d64c2f2e15e696c05144a SHA512 6276d11f408dd26f6749f8ee11a1842eb0d60b8f79f01ba7054f4521e26f2e330ded50e8177368491b76d02a12a2694db3b7c6760193b7da4c52a36df55343ce
-AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f0662823888a7f844fc1f6f7b498755c447ee78cffc9bbafb7f7c531710d3045795517825257f2786f0c999829656d469bd835adb SHA512 3ae82355321c59b0c4afa916e5c27ff0d2df95951ba363c67fada5634bf5673c2ded01515a3b927f1c6020c5f56d19279e6a7e9715ce766013ad763c4e61652b
 AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80e3d56ac235b766f8fdb7a926bd97769f4723871cb32672123ae84d04cee4c9936e39cff9430d087de9601362c SHA512 f754357cceb88053af2ee074e5926e0fb11613ba42a375a38aaec1b11172f55f9b1b99fca651a3f4af2c16326c5ae0f871b70df28b08f384917a97acc312579e
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.13.0-r7.ebuild 7863 BLAKE2B c3a5835561479c42c0b870de3b2996d3b05eaeb564df4133f7f24c2ed3e559bba7ae510f049233c25c54b5662b27b17abed953310566048a990e420f83df08b4 SHA512 daa3adc3cba97abb26047c46ffcb7ec2e3771948c9b6722061c74a50926ed81b4a95392649b69e796ea54e415858dc3f59501f48e214c172e3f4c61419162d35
-EBUILD pidgin-2.13.0-r8.ebuild 8096 BLAKE2B cadd7ac7dabdf8f0a4039c4a201b58b1c455d8a9eb5d45da14c3e8ef44b3dcfa97590e7d9789ef880e92e9e17b9cc857403f48d7afacbc1b664aac52c64893cd SHA512 e346b3c5bd2682bb4c1d9ea31a9dc9eca995983d98b80c3d3a7749e9ff19aefe4541bcdeefcb0fb8de45d8b17a603877be633790bd0c4a1b30300e92166f0d22
-EBUILD pidgin-2.14.1.ebuild 7949 BLAKE2B 03b2fce3c11b320e63e26a099e2b933386d5107f08af79dddf309e347a66f9f84f32b5a1b5cb35e6691afd16d75c3f7a4d54eab1cf6a0b6a526f7148237fc988 SHA512 f9b056d33f82c196306ee15c7455039213b20603d02a7241bb1e8598245252435d88bb6eabdeb91a1aaae66e6667850e98afdf715fc183341fe9c8223558e517
+EBUILD pidgin-2.14.1.ebuild 7948 BLAKE2B 051d5ec657df62dad67b223c3c825d37a69d47ccfcf84c0e188e7febbc71f8f1daca5b35ded6ea9281f2471550a93f6165908f531ffaa56a2712a867a1d47b2f SHA512 7802fd4fdc0543187bbe1b1d3c1e18d934d45de254a5b835414d8bcb50144b06683db315cca932e2982db7d3fba58826907748544a501d84c32c39baa50c6cd3
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
deleted file mode 100644
index 819bfdc5c6bf..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.0-gold.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- pidgin/Makefile.am |    2 +-
- pidgin/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
-index b6a5bd4..96d207d 100644
---- a/pidgin/Makefile.am
-+++ b/pidgin/Makefile.am
-@@ -158,7 +158,7 @@ pidgin_LDADD = \
- 	$(GTKSPELL_LIBS) \
- 	$(LIBXML_LIBS) \
- 	$(GTK_LIBS) \
--	$(top_builddir)/libpurple/libpurple.la
-+	$(top_builddir)/libpurple/libpurple.la -lm
- 
- if USE_INTERNAL_LIBGADU
- INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
-diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
-index 615c196..0293e5c 100644
---- a/pidgin/Makefile.in
-+++ b/pidgin/Makefile.in
-@@ -607,7 +607,7 @@ EXTRA_DIST = \
- @ENABLE_GTK_TRUE@	$(GTKSPELL_LIBS) \
- @ENABLE_GTK_TRUE@	$(LIBXML_LIBS) \
- @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
--@ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
-+@ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la -lm
- 
- @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
- @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
diff --git a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
deleted file mode 100644
index d9d27930439c..000000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://src.fedoraproject.org/rpms/pidgin/raw/master/f/pidgin-2.13.0-fix-build-against-nm-1.0.patch
-
-diff --git a/configure.ac b/configure.ac
-index 04836fa..0a2d451 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1423,18 +1423,24 @@ fi
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
- 		], [
--			enable_nm=no
--			if test "x$force_deps" = "xyes" ; then
--				AC_MSG_ERROR([
-+			PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+				AC_SUBST(NETWORKMANAGER_CFLAGS)
-+				AC_SUBST(NETWORKMANAGER_LIBS)
-+				AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
-+			], [
-+				enable_nm=no
-+				if test "x$force_deps" = "xyes" ; then
-+					AC_MSG_ERROR([
- NetworkManager development headers not found.
- Use --disable-nm if you do not need NetworkManager support.
- ])
--			fi])
-+				fi])
-+		])
- 	fi
- else
- 	enable_nm=no
-diff --git a/libpurple/network.c b/libpurple/network.c
-index c43e3c7..b17e439 100644
---- a/libpurple/network.c
-+++ b/libpurple/network.c
-@@ -939,8 +939,13 @@ nm_update_state(NMState state)
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(1,0,0)
-+			if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
deleted file mode 100644
index df6b8e5cd030..000000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Mihai Moldovan <ionic@ionic.de>
-# Date 1576498301 -3600
-# Branch release-2.x.y
-# Node ID 6dba8046e1b120c506e1d911c6aa8757d7774c57
-# Parent  7a975763d3b64bdd8dd5371d711a4add647ed726
-Implement SNI support for the gnutls SSL plugin.
-
-Note that gnutls is picky in regard to what it accepts as the server name - it
-MUST be a domain name. IP addresses are not supported according to the
-documentation.
-
-Hence, filter out IP addresses and hope that whatever is not recognized as
-such an address is actually a domain name. This will probably fail for more
-exotic addresses (especially in IPv6 realm), but wiring up a full-blown parser
-is too much effort and SSL plugins are not part of purple-3 anyway.
-
-Fixes #17300
-
-diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
---- a/libpurple/plugins/ssl/ssl-gnutls.c
-+++ b/libpurple/plugins/ssl/ssl-gnutls.c
-@@ -403,6 +403,10 @@
- 
- 	gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd));
- 
-+	/* SNI support. */
-+	if (gsc->host && !g_hostname_is_ip_address(gsc->host))
-+		gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host));
-+
- 	gnutls_data->handshake_handler = purple_input_add(gsc->fd,
- 		PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);
- 
diff --git a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch b/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch
deleted file mode 100644
index 19ece4a9a223..000000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# HG changeset patch
-# User John Bailey <rekkanoryo@rekkanoryo.org>
-# Date 1527918187 14400
-#      Sat Jun 02 01:43:07 2018 -0400
-# Branch upstream-fedora-patches
-# Node ID ab3a54cf9afbd2a1cb6736c7ee424d8fc82e7b14
-# Parent  de18cefddad5ffe593a192f3a20f6f91165ab516
-Modified Jan Synacek's purple-remote python3 compatibility patch to make it
-compatible with both python2 and python3.
-
-diff --git a/COPYRIGHT b/COPYRIGHT
---- a/COPYRIGHT
-+++ b/COPYRIGHT
-@@ -544,6 +544,7 @@
- Sun Microsystems
- Marcus Sundberg
- Mårten Svantesson (fursten)
-+Jan Synacek <jsynacek@redhat.com>
- Amir Szekely (kichik)
- Gábor Szuromi (kukkerman)
- Jakub Szypulka
-diff --git a/libpurple/purple-remote b/libpurple/purple-remote
---- a/libpurple/purple-remote
-+++ b/libpurple/purple-remote
-@@ -14,7 +14,11 @@
- import xml.dom.minidom 
- 
- sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
--sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
-+
-+if(sys.version_info > (3,0)):
-+    sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach());
-+else:
-+    sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
- 
- xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
- 
diff --git a/net-im/pidgin/pidgin-2.13.0-r7.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
deleted file mode 100644
index 4875939166f5..000000000000
--- a/net-im/pidgin/pidgin-2.13.0-r7.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf" # mono
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( || (
-		>=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
-		>=net-libs/libgadu-1.11.0[-ssl]
-	) )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( <net-misc/networkmanager-1.19 )
-	idn? ( net-dns/libidn:= )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
-	"${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=( --enable-nss=no --enable-gnutls=yes )
-		myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
-		myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=( --enable-gnutls=no --enable-nss=yes )
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python=${PYTHON} )
-	else
-		myconf+=( --without-python )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python && use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/pidgin/pidgin-2.13.0-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
deleted file mode 100644
index f3f3b6b1f4e3..000000000000
--- a/net-im/pidgin/pidgin-2.13.0-r8.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( || (
-		>=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
-		>=net-libs/libgadu-1.11.0[-ssl]
-	) )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
-	"${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
-	"${FILESDIR}/${PN}-2.13.0-fix-build-against-nm-1.0.patch"
-	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python=${PYTHON} )
-	else
-		myconf+=( --without-python )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python && use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index b883d1001115..107090103e03 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 1e4cfbdb8f2f..fe786d9f0158 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,5 +1,7 @@
 DIST profanity-0.6.0.tar.gz 741812 BLAKE2B ba6cff070ee0e8a83b52677f6551c1d7397cd25993982d6b5390590a4924d902050504cb8803ee2741262b1409e4d75e9f223397f87f39d7dc86fcc56a0e5df6 SHA512 c7d8e74b764276f59fccfa029d45271032db315cdbf6e00deccbd611f202983a0930fed99021202333047acee9f3f0d7779cd9bb3628d2e5c4757e3de8c3629e
 DIST profanity-0.7.1.tar.gz 788754 BLAKE2B 447c761233ce6989081d3ed7a585d90713f4266dfc22ff816aea7c014f642f57989f7f767d8cf40cdd36c3152f45c6700f3905e0d12b864533aac61ac4dc7aaa SHA512 a6e159a5452ebb193dcff74dc8673de5dbc4bc5b2f2b8abc129641fc1b4b370aee9617dc0b26cfcc6aae58a1a900fda29356e61cdc17ee7ba69c879d6ccc2339
+DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
 EBUILD profanity-0.6.0.ebuild 809 BLAKE2B f9033748c2fd6e2a7bfd6bd68d45a6c99308c81d35ccf267c2fc87db204fdfdd9c8eb5f6d87ec5e7d9d162a1a270264c630cd85faf93c303113d2a6461258811 SHA512 817942d90d40c46e04ce07783156233541b998af069732f582c067d07b240c8690b2986160038142c8b6889c481895d81d40f12ca1a3db27b6948291017b1eb1
 EBUILD profanity-0.7.1.ebuild 925 BLAKE2B 5fbc49f9089c2a173693fbb2046485624c625deecd2960056789cc472d5c33ab0d41d9c15b5688af58e411ce77632aca9a20d20868831653fe86cc31ff3a41ed SHA512 a6b0905bfd08d4e2004806a5a78f401ef0f47eb07be1ee12342a7ffc0ecfdfcbe27946e731d5eb9fb778459127e8b19b9a165127077f038bbb15d40ab0c34fe8
+EBUILD profanity-0.9.5.ebuild 1033 BLAKE2B 392f756ca8d03bd43796056763abcf46574d0e2a616bd0c419434d9adea101c6e22c1bf47d03effa81dc83892155400856fa5ec0769067ea487d6c6ab976ccce SHA512 bdac99a2c6da4c723587a769cdba2d14a6f8804d6e5db09d28e5d11197ba501546c8989893b96d2ca0cd9d8b3b171619b77aecba1a2b086e13b604f96e3fffcb
 MISC metadata.xml 605 BLAKE2B d26bea42cbf668507f197cc43a131cebc4a2569806e2789f608c68d41ff3b8b679ed1ad9cdd9df706e539cea71150f8b13157c1750aa313e1b1067f968b8eb3f SHA512 bf7004fa94e5515e3e54da31797e52d13096483a1d7f356fcccb0ceff1d3ae4c157929aadd4ccf24d54078070ba8ba94e3d6e641f85fa5c30cbd113cd487eae8
diff --git a/net-im/profanity/profanity-0.9.5.ebuild b/net-im/profanity/profanity-0.9.5.ebuild
new file mode 100644
index 000000000000..691c34a82497
--- /dev/null
+++ b/net-im/profanity/profanity-0.9.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="https://profanity-im.github.io/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="libnotify omemo otr gpg test xscreensaver"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libstrophe:=
+	dev-libs/openssl:0=
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/ncurses:=[unicode]
+	gpg? ( app-crypt/gpgme:= )
+	libnotify? ( x11-libs/libnotify )
+	omemo? (
+		net-libs/libsignal-protocol-c
+		dev-libs/libgcrypt
+	)
+	otr? ( net-libs/libotr )
+	xscreensaver? (
+		x11-libs/libXScrnSaver
+		x11-libs/libX11 )
+	"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notifications) \
+		$(use_enable omemo) \
+		$(use_enable otr) \
+		$(use_enable gpg pgp) \
+		$(use_with xscreensaver)
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 1ec021e00109..534435906d86 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -4,4 +4,4 @@ AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72
 AUX prosody_cfg-0.11.2-r1.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
 DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 EBUILD prosody-0.11.5.ebuild 2083 BLAKE2B 98e9e34bbc9b8a46991f4baf8602b2d9ceda94fbd25122f344f816ad82c1032b1cdd8298ee017726ebb2b142bcf0240ed02fc0157aca9e5e2e5b141780c814b3 SHA512 007c3fc6a4ac1a8aff92cafccb6b3943195d37d10dd7924676827ef78bf5264f4ffec167205292106ae83959208205ffe74226303641ebb1ccd013b2117338aa
-MISC metadata.xml 454 BLAKE2B af4163bc7e18ffbab51ee4373985dea8db37408f8ef0982e7bef772ee4317d64018a1f2342adadf77005e120f17d4a706c7920763a8541dd983335f5d1379bd1 SHA512 8830635b65f87575b79745a8116b069e88f9b4a0de359199d6599acf369a60890b6e8cbf67703046ab751164e0b66a25d6f187aee8d9f75943c416c40dce3c24
+MISC metadata.xml 399 BLAKE2B 01895e1bb6fb8aea8167fe0a060f38524b62d8a6fddd82e22997ca2c81cb4f9c1273d442577028a806cba765feac1c9934a840473097a88bbc027dc5315c7353 SHA512 da3f21781934c83f3971fc36cab54e6179571e79a330c18ef1ab00556f962f7cd1032d2c3355f1d8225d39ea6e9d5d48afa8e90698d6320216eea71bcada8d22
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index 93caf7b71d75..469f03f567b7 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>klausman@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="libevent">Use libevent for event handling</flag>
     <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index ffbafca9ad41..0167e986890f 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,8 @@
 DIST psi-1.4.tar.xz 2119840 BLAKE2B 28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8 SHA512 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
+DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080 SHA512 c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea SHA512 ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
+DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
 EBUILD psi-1.4.ebuild 3044 BLAKE2B 8806290884b2fba05e96e1a62871ce5725ac3d98fab8911f1ca8cff417782e7e0d1ec17ce526057ae7e531960235a6f6e720f627b0d3b5e86ccd96b63fe242a6 SHA512 e2074aa6e9f7add4eb7c4114cb48d987c2ae8e54e258a84ee08c2db15faf9189bafb099a3d3c4648294fdca8b7f35e3ba91830d34d6756a3910f9b9ef8f34f95
+EBUILD psi-1.5.ebuild 3070 BLAKE2B b9a79fea1b390579b1edb7e5304bc08c28057df69ec70b4183d432c4a75e396fd162af130e9e9dbebee215161c28bf5f8f8ab9471fbba6efa4ed15e89659583a SHA512 52d62019d941442b57af126039bb96fb04beb6606ace9357635bb61a18bd721b1247317fdb6daba8a886bcb0b29f17d29aea6962a12606cdc49241b34c36d863
 EBUILD psi-9999.ebuild 4126 BLAKE2B d8342dad5b50dd199738d485d2feacaf5662e43751e0bb8c1f1ecd2f05f6dbf9aaf560a7657510b220f534f325c3aa64b166193302fe3b48ba9a9f516f26e54d SHA512 ecf5fc1c5728e5e3c2d13a5c6ca399c7928f4303113423a20df81a265e37de191d33ba495f20ad0f4061aab88996513f5d0f2a5730f582590d8dba388508fa42
 MISC metadata.xml 1590 BLAKE2B 62e74a8df75bc595d981c86b88e40344d76bddb46aff04aeb02f22207c8061e7b8c19d3794b6019e61790ea0aeaebed8c5dcd09a7070a7c6269f406eebaddea1 SHA512 4cac19074bd1080d9af4105adf61abfd25a7f07cc4d1581683a716bf2546450eda90347e9da0e11d012b148cec2ff35b32906a469000960e1465cb9c167855b8
diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5.ebuild
new file mode 100644
index 000000000000..1d1ed507d805
--- /dev/null
+++ b/net-im/psi/psi-1.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils xdg
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="https://psi-im.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit whiteboarding xscreensaver"
+
+REQUIRED_USE="
+	?? ( aspell enchant hunspell )
+	webengine? ( !webkit )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	app-crypt/qca:2[ssl]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn:0
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	dbus? ( dev-qt/qtdbus:5 )
+	enchant? ( app-text/enchant:2 )
+	hunspell? ( app-text/hunspell:= )
+	webengine? (
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+	)
+	webkit? ( dev-qt/qtwebkit:5 )
+	whiteboarding? ( dev-qt/qtsvg:5 )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtimageformats
+"
+
+RESTRICT="test"
+
+src_configure() {
+	CONF=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--no-separate-debug-info
+		--qtdir="$(qt5_get_bindir)/.."
+		$(use_enable aspell)
+		$(use_enable dbus qdbus)
+		$(use_enable enchant)
+		$(use_enable hunspell)
+		$(use_enable xscreensaver xss)
+		$(use_enable whiteboarding)
+	)
+
+	use debug && CONF+=("--debug")
+	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+	# This may generate warnings if passed option already matches with default.
+	# Just ignore them. It's how qconf-based configure works and will be fixed in
+	# future qconf versions.
+	./configure "${CONF[@]}" || die "configure failed"
+
+	eqmake5 psi.pro
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc api_public
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README
+
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	cd "${WORKDIR}/psi-l10n-${PV}" || die
+	insinto /usr/share/psi
+	install_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+		doins "translations/${PN}_${1}.qm"
+	}
+	l10n_for_each_locale_do install_locale
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE flag."
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 78ce29dc6450..d91779f6d6b5 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.34.5_amd64.deb 99729074 BLAKE2B b81bcea84d6473ea638bd3b5e11f00ddf7aff2d51ee41e68534fe3d49b156d74c0d06ecc998d92573cf37f666ac94ba544776744093c2dfc99ca9b5ac94b8941 SHA512 5fd7a6366a246caf704fae15f031772678c935921af5b6b9add2b55c2fb4e146185970a3e223648989ad1089db5992601ef8e224b1ab648299911bccfd65eb07
-EBUILD signal-desktop-bin-1.34.5.ebuild 2914 BLAKE2B 253d9b06f73a403e1aaf082845b73c93d3a9af800a081ecf8035a19db87bb7c3b9206bed5c6167780ff3652fdb072574abf5d20777facd644bae4bdd2a1f91d8 SHA512 5ff7282b2c930fc612bb9dfd0ce211ab165edb2709ff7000a6efac3d5ff776e005dde9fbbe7ae2810db26a1ee89065d09f9b4acbf64feea69e7a172bd5c57e28
+DIST signal-desktop_1.35.1_amd64.deb 108460812 BLAKE2B 83a8a4f5cfe9143d8b6c202a15cec37533f598d9b26e61b5a10685faa7c009ceffb2e63640e25959bf7e0536580066148deb39a231138d5ac325eafdc415b96d SHA512 27558b08f137f2262231e99737fb9b0e35265186ff6db64c5ab3a502f8c41ed802d925c5f2d836aee94e36a09b3fb50043391afca1c7c059a25be419303520b0
+EBUILD signal-desktop-bin-1.35.1.ebuild 3402 BLAKE2B 1f16761c27b8c9bedacad015bcbf6025e40ae715cec5392cf52d9b59f6f79836faa31389affb62bc28764ccd3eef8276f3971e44eb8f9bec73f3cf407222ef06 SHA512 c3d8d2019e506b57f74c2d933a9c0dc77c0ceb1808327ac97279a56cbcf1b92e477ec0a172715f633c1d49b380a7f863c2b1f9f6f0843bea56f6aa242309ca97
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.5.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.35.1.ebuild
index 97dd2fe513f0..7a50112a339f 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.5.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.35.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="${PN/-bin/}"
 
-inherit eutils pax-utils unpacker xdg-utils
+inherit optfeature pax-utils unpacker xdg
 
 DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
 HOMEPAGE="https://signal.org/
@@ -15,7 +15,6 @@ SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${
 LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE=""
 
 BDEPEND="app-admin/chrpath"
 RDEPEND="
@@ -57,6 +56,12 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/libVkICD_mock_icd.so
 	opt/Signal/libvk_swiftshader.so
 	opt/Signal/swiftshader/libGLESv2.so
+	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/electron-v8.3-linux-x64/node_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
@@ -93,13 +98,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
+	xdg_pkg_postinst
 	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 4621d637c48d..e51e27ce8a39 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,7 @@
-DIST skypeforlinux_8.62.0.85-1.x86_64.rpm 112166071 BLAKE2B a5647e8e0c332787293438721a71f088ba0441f31a94a68d5fa079bd32687ac31c223ba2fded4448e6ed3a95a7b5660215e3137f272e620b3d4205bd11122068 SHA512 30283e7c31d692988cd6ccb350dfcdf3dfdc22d8ac40aa2910a612dc72e08aa0742b53e6876ebde4b7c3727c283ea78e87332f121d1260b8ea65615e378cbc24
 DIST skypeforlinux_8.63.0.76-1.x86_64.rpm 112410264 BLAKE2B 63d6c3c00003bf571cd94257002126c686028617a8de3cec832eb6a08f52db44672186309d39cd83c3d9a5eca05cecc7ce2afd4ab0b23d0101c6c0f00a0b9d9e SHA512 5dbed64ed3dbc3fc281e2a7366203452f15f92af55a415494d893042f2b85164e236e47b7ce20815af30a11ff98e949f4be57d9f1e9caa8160c6ea22397c2284
-EBUILD skypeforlinux-8.62.0.85.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+DIST skypeforlinux_8.64.0.67-1.x86_64.rpm 114732247 BLAKE2B 1007c49042d9bc28b802e3e295704c318a5cc14c183da25528fb92befe965c093f22aa5ecf87ab714ea82bde58dcf03aa04399c7a3ca8d8656408537770faf3c SHA512 8405e843d4a9144d986f4ee4bcb8bb360f35c8273f87a3beb25197cd6bc6526435cf366f10f32bbd661cf1d11b797a04c012b7d2b715bd6366e1c98f7f726715
+DIST skypeforlinux_8.64.0.80-1.x86_64.rpm 114749474 BLAKE2B 9df3db7310e63d39be9a71ff0666068b753639b1486ffc9e574c0b0ee2f972aa14024a95728498a79341d4cd9c42b2df4b6a72075a7b157da3ce361679e3f866 SHA512 53b4fedd4d2140eac54ad6261e3cc9e7da1ca632bf0118aa7a1927995fb3efd975c1e9c2e40e1dbb1c43e37886929ff925d629065d073b7b70b337819d5009e9
 EBUILD skypeforlinux-8.63.0.76.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.64.0.67.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.64.0.80.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.62.0.85.ebuild b/net-im/skypeforlinux/skypeforlinux-8.64.0.67.ebuild
index c2755ee5b06c..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.62.0.85.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.64.0.67.ebuild
diff --git a/net-im/skypeforlinux/skypeforlinux-8.64.0.80.ebuild b/net-im/skypeforlinux/skypeforlinux-8.64.0.80.ebuild
new file mode 100644
index 000000000000..c2755ee5b06c
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.64.0.80.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils rpm multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	app-crypt/libsecret[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libv4l[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-devel/gcc[cxx]
+	virtual/ttf-fonts
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	default
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux || die
+	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-e "/^OnlyShowIn=/d" \
+		-i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+	dodir /opt
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+	dobin usr/bin/skypeforlinux
+
+	dodoc usr/share/skypeforlinux/*.html
+	dodoc -r usr/share/doc/skypeforlinux/.
+	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
+	dosym ${PF} usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 2d9313c3a7c7..1144f8b3bb8b 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,7 +1,7 @@
 DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
 DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988
 DIST slack-desktop-4.4.3-amd64.deb 54827638 BLAKE2B 4847b2366b6039c41327884ffa5d74146c9d87e5e11cb6324cd8b13632c1cd94b14d72b09396e3bec321b21ff9756f1a6915b99fa3e89fa9daa544442272e7b8 SHA512 c2b9462738f6cbd8a29e75ebbac497b573676f7d95b69aca181320618a3bd1e34fd22c2b53426972cc425899afae50f4290a5754f0664b669ab6fdc1b28d1330
-EBUILD slack-4.3.2-r2.ebuild 3078 BLAKE2B 3180be30b3d979712bb69b0829449697839815ed47d471d156876850fa5718ccde0f9cc30498d407411d99cc22d5741c26b01046e47169fedf8cf3f1b0a7e886 SHA512 5ed2867def96a8d79336ca06b14e617aac5c5d1fd03aec749f8881f55c444660e16f2655180f4fe2c7c111c2f518a841ec22b3f816be05ea4159aca28a43bec7
-EBUILD slack-4.4.2.ebuild 3468 BLAKE2B 120bb01738b51095f90c997df248e0fa8cf91dee4dac0087e1bdecefff4155e57ddeef3f789dc6ca95f45a1e2aa475e84846a7ace08bff561fd853dced4117a1 SHA512 97578b2331e5345609c95ea35c64d1e143abd464d0f04617c4a39ea48c2ec6cb2e366d43b3cebfac573519ff878314869e01b6f41abead3334607a1a4f0565f0
-EBUILD slack-4.4.3.ebuild 3332 BLAKE2B 944440b6cf206b2571881aea0ebb4e6354c284a3c5ce68d8562870a2f68513eb868fd892c40ea3684c11ed6a15bdd72a513adf86216ad84be030d7b17c776735 SHA512 a5b6bf998c3efecb7ee20b950fa69c1cd671233a82049b95fc7d0de18dbdb52a4c159131ef64187e14b05077f20f31ce45a1071fda463e1ecc904bf7672c957b
+EBUILD slack-4.3.2-r2.ebuild 3082 BLAKE2B d2c44288972b768e51b6825010347ced0eedc55ab3205fdf5a5ced2281d3dbc432b7ef9a1c1245e717dbec13fb41bce90b07c82c1a34ca2bcb575506bba60824 SHA512 5f5335148426d983e597c920df47625b94a6b2331805f67d65cedf6cd416b317cd1b323e79d68a191ca35bf93afa9651dd63cdf73ee62e28461edbd8b5c84c98
+EBUILD slack-4.4.2.ebuild 3472 BLAKE2B 4824a79fd697889e56e232691f2fc30d552e21901259566479becfb80a0f57561ab21814085bdf472169b815e28e93c6afd7918ff98c22b9aa540b5592e157d4 SHA512 ae334d500b5cac4e20d97c3c990719251cb6a2938d4f8daf3af197b014afc4c41a809945e332a99268bda98c87e96a123d34e77aabc22547eb6c866dbc9464b3
+EBUILD slack-4.4.3.ebuild 3336 BLAKE2B 2accc46f29cd9999ba7e9024a90fae234b486cbc622978d66bb20efae3e6a705497bfbdc0a3f7c15f28c9ef9b70a065b5a8e9eb731ea661ca94fdeb000a6f1e3 SHA512 3a3ccea51349d83aa0d6527fa4d18fbc185007db21b32fdda556b88f5a306a3e94ce0a1f201e5f9fd7bc352baad4550cd03deaa50992b0901f42b274a972aea9
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.3.2-r2.ebuild
index 01c6e59c2cfb..144ff7317ced 100644
--- a/net-im/slack/slack-4.3.2-r2.ebuild
+++ b/net-im/slack/slack-4.3.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
+inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com/"
diff --git a/net-im/slack/slack-4.4.2.ebuild b/net-im/slack/slack-4.4.2.ebuild
index 48b3a778dd01..1c126432182f 100644
--- a/net-im/slack/slack-4.4.2.ebuild
+++ b/net-im/slack/slack-4.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
+inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com"
diff --git a/net-im/slack/slack-4.4.3.ebuild b/net-im/slack/slack-4.4.3.ebuild
index 1edd9339289f..8aa28b78c115 100644
--- a/net-im/slack/slack-4.4.3.ebuild
+++ b/net-im/slack/slack-4.4.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
+inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com"
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 1e6937975055..6832f24607bd 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,12 +1,8 @@
-AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
-AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
 AUX spectrum2-2.0.13-libpqxx-7-compatibility.patch 3455 BLAKE2B d67edbcc8454b4f193684464cfccb418e63c8dbe2ac8ee304bc9a40b9eae5e7764f0b7b48bbe737ae3f6f119100463c65c525b4b272991ae6fb3ed4f10e31fe5 SHA512 a0b407f5611493e690a4f024f53672547dcf240d131e0c2ce5ec217f6270cf370846a69b6869a399c963c3dff735b3dfdac5265e6e8bfc78bbad16d84f555acf
 AUX spectrum2-2.0.13-musl-compatibility.patch 2958 BLAKE2B 319138a33a94bbe0e2c6c8487a7ed05b0782ad841ddd6cf926e38569ba058dc48e6167f3c2e618f95e62b2e4e056e8a75b1b92a5ba63006fc7d54d2b70b20023 SHA512 c2f89a28afa8890d599ce9de74a296c0c8bd9a48109e8979ff8d86d6c16da1016f5ef8c59ce90ad78b3dfd1eae57787c9ea46786150ee7420d5d5606d1a50c97
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
-DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
-EBUILD spectrum2-2.0.12-r4.ebuild 2536 BLAKE2B a89ba62732e173101cb4b25c5f293e9a102fb9c1cecb4d16c2403b5cdc64a7142a0ffdd5edb2a3242a85d29e3eb35a00d377348dfddde25aa7b1c0c8d827222a SHA512 5cd211c7bb8dfc3adfc488ee85d803861fd337a508783af514d93a9180c861380800b2e679e304a92247de0dceb8fb7bebcbe10ad88313ab8d8398fe59612810
 EBUILD spectrum2-2.0.13-r2.ebuild 2423 BLAKE2B c680cd87fb51c861b76c03c41496d3004672a9e17b0645d45d6b3b239e2a0d9cf054e5043d0efa94600c2868935e1d60615b1193f96d471bf521be88e4d12370 SHA512 fd9750e822e413f0493370c10ee3be8a80fbdac7eb284464e584b40f28ce2111230848b8c59b427a30a71d262197bfe5be9c737a385c49955dba1bada184c49e
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
deleted file mode 100644
index b9a8adeee5a8..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <kostecki@his.de>
-Date: Thu, 14 May 2020 10:34:43 +0200
-Subject: [PATCH] Fix compilation with boost-1.73
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- include/transport/ThreadPool.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
-index 5902f965..ffd07c8e 100644
---- a/include/transport/ThreadPool.h
-+++ b/include/transport/ThreadPool.h
-@@ -1,5 +1,6 @@
- #pragma once 
- 
-+#include <boost/bind.hpp>
- #include <boost/thread.hpp>
- #include <boost/thread/mutex.hpp>
- #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
deleted file mode 100644
index ad13208b3e13..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <kostecki@his.de>
-Date: Wed, 13 May 2020 14:22:27 +0200
-Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
-
-Since GCC enables by default -fno-common,
-the compilation of dfrotz due multiple definitions will fail.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- backends/frotz/dfrotz/dumb/dumb_init.c   | 2 +-
- backends/frotz/dfrotz/dumb/dumb_input.c  | 2 +-
- backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
-index 4b9c6704..35295b74 100644
---- a/backends/frotz/dfrotz/dumb/dumb_init.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_init.c
-@@ -7,7 +7,7 @@
- 
- #include "dumb_frotz.h"
- 
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
- 
- #define INFORMATION "\
- An interpreter for all Infocom and other Z-Machine games.\n\
-diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
-index 4149b2b0..88fc8ae5 100644
---- a/backends/frotz/dfrotz/dumb/dumb_input.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_input.c
-@@ -5,7 +5,7 @@
-  */
- 
- #include "dumb_frotz.h"
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
- 
- static char runtime_usage[] =
-   "DUMB-FROTZ runtime help:\n"
-diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
-index 9e505167..6dc7db82 100644
---- a/backends/frotz/dfrotz/dumb/dumb_output.c
-+++ b/backends/frotz/dfrotz/dumb/dumb_output.c
-@@ -7,7 +7,7 @@
- 
- #include "dumb_frotz.h"
- 
--f_setup_t f_setup;
-+extern f_setup_t f_setup;
- 
- static bool show_line_numbers = FALSE;
- static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
deleted file mode 100644
index 3bbf840a5229..000000000000
--- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="An open source instant messaging transport"
-HOMEPAGE="https://www.spectrum.im"
-SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="
-	|| ( mysql postgres sqlite )
-	test? ( irc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/spectrum
-	acct-user/spectrum
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/libev:=
-	dev-libs/log4cxx
-	dev-libs/jsoncpp:=
-	dev-libs/openssl:0=
-	dev-libs/popt
-	dev-libs/protobuf:=
-	net-dns/libidn:0=
-	>=net-im/swift-4.0.2-r2:=
-	net-misc/curl
-	sys-libs/zlib:=
-	frotz? ( !games-engines/frotz )
-	irc? ( net-im/libcommuni )
-	mysql? (
-		|| (
-			dev-db/mariadb-connector-c
-			dev-db/mysql-connector-c
-		)
-	)
-	postgres? ( dev-libs/libpqxx:= )
-	purple? (
-		dev-libs/glib
-		net-im/pidgin:=
-	)
-	sms? ( app-mobilephone/smstools )
-	sqlite? ( dev-db/sqlite:3 )
-	twitter? ( net-misc/curl )
-	whatsapp? ( net-im/transwhat )"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (	dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-173-compatibility.patch"
-	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
-	"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
-	"${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch"
-)
-
-src_prepare() {
-	# Respect users LDFLAGS
-	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_FROTZ="$(usex frotz)"
-		-DENABLE_IRC="$(usex irc)"
-		-DENABLE_MYSQL="$(usex mysql)"
-		-DENABLE_PQXX="$(usex postgres)"
-		-DENABLE_PURPLE="$(usex purple)"
-		$(usex irc '-DENABLE_QT4=OFF' '')
-		-DENABLE_SMSTOOLS3="$(usex sms)"
-		-DENABLE_SQLITE3="$(usex sqlite)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_TWITTER="$(usex twitter)"
-		-DENABLE_XMPP="$(usex xmpp)"
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/tests/libtransport" || die
-	./libtransport_test || die
-}
-
-src_install() {
-	cmake_src_install
-
-	diropts -o spectrum -g spectrum
-	keepdir /var/log/spectrum2 /var/lib/spectrum2
-	diropts
-
-	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
-	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
-	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
-
-	einstalldocs
-}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index f2b1ab9b0a71..e0c4e304bf2c 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -2,12 +2,16 @@ AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab
 DIST tdesktop-2.1.13.tar.gz 14448009 BLAKE2B 3e9b067aefb72e688d12ceead86453285bcd4ed3345ff601220e282291fb92eb346072695bd1dbf97ce82a81ad97d33000cf7b52edc9ea2cd0aacd566fc17f39 SHA512 1166ec37043f4042130fcb1bb5464dc4fae69f6ac27dc877cd481400fed3be6d4ccbe8998619782786065ea308e774f7efd5a89a06e2f9059d3f2effc2b850c4
 DIST tdesktop-2.2.0.tar.gz 14514420 BLAKE2B 9ece8c3a251a0f6258d8292ecf6c71047c258c2ae4470c00b727f92ff4831c7eead397f9ac54a88c36c81a9b0cff0fce204281eefc9d16b89606043276448f65 SHA512 20d83ad589318e7120816770fb60d01c206deb8308b3304bca6fc043b732e29c7ae03334e484fd589cc1d698e1c6565d802d102072aa66498cf10ce1c60337e4
 DIST tdesktop-2.3.0.tar.gz 14576875 BLAKE2B 148693c8e4e6376c968ed3667092eaecd3295f59d289a0ec720c7be9d997610263a34ba34bf5350f49f45de7c076bd3c3dedc7ba261116ed6d1a8ed7023a582f SHA512 daa588936db2f17552a320d9412d6b0eb9d84d468defbc4929cc88d1a7ad3ce715be388dd7249d308cfc124c5af3152749c35f03b1f84dc89d37be067b9b9063
+DIST tdesktop-2.3.2.tar.gz 14590033 BLAKE2B 028960cfccd55c66cc61a88e6e33511adfd13e1615c56caaed13a54f2e786637af3b426809006f50927f0ec929d9d73ee7ea4fc423788ab6dedebea3de845863 SHA512 0117a2ae3e61775ca8f212f0ae4f4b3f069bf0f5186da56c23d1587c5e153d60073c2f85aa66b9a74e9a1cf65db149f5f383a3f34452b582f21953dc9abc07c6
 DIST tsetup.2.1.13.tar.xz 35692368 BLAKE2B b41023b8ad7178ab48c62657eefbf3962c956ecb42d0e448fb14fab147334c35f38eac98bc7038328c02f4c98d506217eddb27603127312663d056fd34635303 SHA512 028722700be37c04fb900ba7186990bdc35bcbed2320dd510f08694f39c81804a529b133134146e1c474c9aca398f870d901d6f4eb6d1bc207b21aa0eab688cd
 DIST tsetup.2.2.0.tar.xz 35848816 BLAKE2B 87b5fca2c3d68f7324b2cbff46fa94ed1dc26d101653da7654082453d8fd7858b7097b41a78ba4aa7b52f0f731ed9ec36957a0738465e365f927e79418cda5fd SHA512 8dd68c7778ef45cdc28bdfa5eb3646afe622b322c524db3a6e69cac6e4127f7a4f4df39ecd9860d4103414eb8b039a311eab3f6e97a2de44515ef0533fd8a100
 DIST tsetup.2.3.0.tar.xz 40156000 BLAKE2B 1055c1ca657eec7fd10bfcba1bdae5f84a9c753b6f3587354a6fb586dfbbeb24cff05fd053c97f7c768895626c9ddedfc379ae64960b98745c07f036811d747d SHA512 81f377abbea16dfbda38670f110436af5de22a3f5cff4a5450f5414024307d1612f75b871364155a3ffac10996a0591c58a528f60dca98862843d15a25994c71
+DIST tsetup.2.3.2.tar.xz 40061716 BLAKE2B d1db3f6eb4ae73a2533dbdffca32f46827aaad1003edbaa42c0355c0035f16c3473ebb7927bb8fcd16a86d62068d793f3594fd3f7f4541f6b5fbb2fe6bfe73c1 SHA512 1eb0e02c84628c106388e1941e7ee9b9ea4e3c4d569183a702ae918878055c45f3557a9d058eb9fe1b1590ee91a335ae5d127218d4931a3f76ec01a19037f717
 DIST tsetup32.2.1.13.tar.xz 38700276 BLAKE2B cf52737c1b7af3e3c07bcc78136c6cfb1169fc9727caa800c7eff0daed8680fcf9a82266311417d8ce6e88ca2d6ce6aafa805140facf2290eacd9c94504e50b0 SHA512 a5f9ff41e31ea0ab9b8873e78a94251a2c1e7fb61240b22bd613fa45d99079e3306c4147e58b64f9940fb90d587aa53e20d2ccb839fa03534d47b864736ccc8c
 DIST tsetup32.2.2.0.tar.xz 38942684 BLAKE2B ea73709134364ad4cf3ccdc25be6d7fe33ef729b486f91ff1a6271854ce1ef5189eb21312827eea37c791cd99f3f7ffbe0dbb609f25b82398b342f895c31acc7 SHA512 4a55b79a69bb90a1ac990ce3237e2c377967d96f41800a5526ca84d6c27d3dce6d0940b2ed35ba5f03df764bd55e14948dffcddda33a6529dcc72a3d3125768f
-EBUILD telegram-desktop-bin-2.1.13-r1.ebuild 1382 BLAKE2B 9da7b61ab660bda412f68172b8fa131e646b909d81e21dbbf3f00244d73c58b1ae67b9b24ab50d81aec5e654645a9715bbc4685392d6c412b1120961979e407c SHA512 e7677293c7d7cb1be7127ce7972b2a43806796ea62dc1d5cb8089ae819ded04002a5fd3b428b0c5ec7235fd390af2ae858f50747f53cd3ab87178a36d4b0ff13
-EBUILD telegram-desktop-bin-2.2.0.ebuild 1382 BLAKE2B 9da7b61ab660bda412f68172b8fa131e646b909d81e21dbbf3f00244d73c58b1ae67b9b24ab50d81aec5e654645a9715bbc4685392d6c412b1120961979e407c SHA512 e7677293c7d7cb1be7127ce7972b2a43806796ea62dc1d5cb8089ae819ded04002a5fd3b428b0c5ec7235fd390af2ae858f50747f53cd3ab87178a36d4b0ff13
-EBUILD telegram-desktop-bin-2.3.0.ebuild 1296 BLAKE2B f574ff55ecba012ba488119c27cf8630bfcf18ec4416ce366b58bbe1612a936f0c94bb8087865fc591a40692e9c4f472dc04b32889c15c281ae75d4877560996 SHA512 558184d65ae9ac8d80d7803878e4dfa889cd76500114976f8f95387e5bfd893917fa545869931cdb9e1002d4a7b329fcc0c2a24de5aba42ab20df885e3512658
+DIST tsetup32.2.3.2.tar.xz 43337372 BLAKE2B dc42a20297a44d4b40e9cc2d1ceb6f6611a76da6030be7e341d77db25d0a2910d8dbe5f73985423a3cb0c12493dbc960a983c68392206b56b5a61f976f35a397 SHA512 ede66b0852fbc97b629448ffe10010f50c40982a4bdd4782541acfe448ad09f9741909f46d26838ff0042d302791c2efebd88351607f73184fb565bdd22123f4
+EBUILD telegram-desktop-bin-2.1.13-r1.ebuild 1386 BLAKE2B 394d7c70cf6a4875b920ce20be9c5317c08df7ff4ee8f76f0351776b4ae5f3d9415f00ff8936b30f3446849b9acdc4a6176986a061390a576522074676e7f2a0 SHA512 9f2c49973d6382d07a2aa68bcff3fa653afb850889113301d9202f428bb3ccd2ff8c0901059515ac8f1e08ef51919452ee37d70e4f6d5836af46862b82df4be5
+EBUILD telegram-desktop-bin-2.2.0.ebuild 1386 BLAKE2B 394d7c70cf6a4875b920ce20be9c5317c08df7ff4ee8f76f0351776b4ae5f3d9415f00ff8936b30f3446849b9acdc4a6176986a061390a576522074676e7f2a0 SHA512 9f2c49973d6382d07a2aa68bcff3fa653afb850889113301d9202f428bb3ccd2ff8c0901059515ac8f1e08ef51919452ee37d70e4f6d5836af46862b82df4be5
+EBUILD telegram-desktop-bin-2.3.0.ebuild 1300 BLAKE2B efcf17c3d2f0d452632ba1b6bdf894a445ef1e473b68d49f21096bcc2705c51c68d65d614fade7353ab26a45d2b0ff59be21bab8a5dd0b090e118640e0516492 SHA512 2a80bfb7c69e5074e562387b168867c375c112109d00dc29c234973edcb2033426af40fc031a04afda2a5054e3ab73f1be52a4f8ae0ba52e7388fd01c194206f
+EBUILD telegram-desktop-bin-2.3.2.ebuild 1386 BLAKE2B 394d7c70cf6a4875b920ce20be9c5317c08df7ff4ee8f76f0351776b4ae5f3d9415f00ff8936b30f3446849b9acdc4a6176986a061390a576522074676e7f2a0 SHA512 9f2c49973d6382d07a2aa68bcff3fa653afb850889113301d9202f428bb3ccd2ff8c0901059515ac8f1e08ef51919452ee37d70e4f6d5836af46862b82df4be5
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
index 1da038a5f934..cdd1942be0a2 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg
+inherit desktop optfeature xdg
 
 DESCRIPTION="Official desktop client for Telegram (binary package)"
 HOMEPAGE="https://desktop.telegram.org"
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
index 1da038a5f934..cdd1942be0a2 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg
+inherit desktop optfeature xdg
 
 DESCRIPTION="Official desktop client for Telegram (binary package)"
 HOMEPAGE="https://desktop.telegram.org"
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
index ff1a4de67c4b..592ac45f0c41 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg
+inherit desktop optfeature xdg
 
 DESCRIPTION="Official desktop client for Telegram (binary package)"
 HOMEPAGE="https://desktop.telegram.org"
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild
new file mode 100644
index 000000000000..cdd1942be0a2
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 00beea3a39b6..0c450e3cc16b 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,6 +1,3 @@
-DIST toxic-0.8.2.tar.gz 1146526 BLAKE2B 0a1c80313963287e88aa489ecf4614365a3d94c770cdfb3b1f3afd0bf2b70639c35b9c5ce52408647abdaac9822c9529b603ec1883779f5486ff63001d98ff5e SHA512 258e873404315c9a1f59d67f524089afebad88d800116bd9e53c8bc35bd9dd6b66cfcd90db06181f01330ba0a302456510fac5c01fdbfde7d475aa5d6b1070aa
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
-DIST toxic_patches-0.8.2.tar.gz 3859 BLAKE2B 4a19226cea6c7ce60f599fbd4f74171f26b3812259f0f8997997526bde7beb6fe64b922f25fe77e0ac8f9b185db116d2e626cb889631a1508786b92f9bbc8927 SHA512 737cc53e814567e10ad8b7431be63ab8f99b76bb150490c31e03309c4e51ee34a798d141cbde446cbbc4b5c0145ca468f3456a2af4b966c80792cdccc6562b46
-EBUILD toxic-0.8.2.ebuild 2236 BLAKE2B 61874558ca08f229ab672be1df0915299865582e2f0e33a1f83da50bdc06ebe936b2adc04d75dce2c01449d502755e39e4f134ac7e8790afb6d1071a5dbd5d0d SHA512 d7de32e733f23b76b576e8d0e2327a179d0d4fb2deb06a696c7ef1e47bde1f0cc5148667567eb86231614810ca6bfa9f8c6aae3c2fcb1ba67b0e13ace08e476d
 EBUILD toxic-0.8.3-r1.ebuild 1819 BLAKE2B bcbb717c80f30e71a97698ab3cfcfd1eb74ba5405ae2c1d058025d61a4e42ab0f2fa9f0f04918a7ea76d3e9502a43bbc3e8e0737bb66cf94f4826e5bd4f79739 SHA512 0fd97f88c87bcaf7d50efbc009ba8490248d008a20082174cf1b1c2b288cd7ef5364567cc394a88ae85c34876d7a9a33119a8cd9ede9b36698bcc94a9e2bd409
 MISC metadata.xml 984 BLAKE2B e990138cd52d9a9933635ac1a093a22305dd02896082e38b5fbbe7044fc77a1cf134db1a5923985566e89b360f2e98b7cb948e273580857a10ef5856f33c48e0 SHA512 3211f2bb29f8755718fb0cd45e37c3331271500a6d6dd0c47acee7b8e6f0d550fb9e8910d5d0769cd7ea217e7abeb1998886246c4ede1fe24b23d722a0341865
diff --git a/net-im/toxic/toxic-0.8.2.ebuild b/net-im/toxic/toxic-0.8.2.ebuild
deleted file mode 100644
index b6312da26f72..000000000000
--- a/net-im/toxic/toxic-0.8.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/fx-carton/toxic_patches/archive/v${PV}.tar.gz -> ${PN}_patches-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+X +sound notification +python +qrcode +video"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not a typo; net-libs/tox only has a 'both or neither' option
-RDEPEND="
-	net-libs/tox:0/0.2
-	dev-libs/libconfig
-	net-misc/curl:0=
-	sys-libs/ncurses:0=
-	notification? ( x11-libs/libnotify )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode:= )
-	sound? (
-		media-libs/openal
-		media-libs/freealut
-		net-libs/tox:0/0.2[av]
-	)
-	video? (
-		media-libs/libvpx:=
-		net-libs/tox:0/0.2[av]
-		x11-libs/libX11
-	)
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${WORKDIR}/${PN}_patches-${PV}/${P}-make-qrencode-optional.patch"
-	)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} = 0.8.2 ]]; then
-		sed -i \
-			-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.2/' \
-			cfg/global_vars.mk || die
-	else
-		die "Remove stale version hack"
-	fi
-	sed -i '/^VIDEO = /s/DISABLE_AV/DISABLE_VI/g' cfg/checks/check_features.mk || die
-	find . '(' -name '*.mk' -o -name 'Makefile' ')' -exec sed -i 's/^\t@/\t/' {} + || die
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use sound; then
-		export DISABLE_AV=1
-		export DISABLE_SOUND_NOTIFY=1
-	fi
-	if ! use video; then
-		export DISABLE_VI=1
-	fi
-	if ! use X; then
-		export DISABLE_X11=1
-	fi
-	if ! use notification; then
-		export DISABLE_DESKTOP_NOTIFY=1
-	fi
-	if ! use qrcode; then
-		export DISABLE_QRCODE=1
-		export DISABLE_QRPNG=1
-	fi
-	if use python; then
-		export ENABLE_PYTHON=1
-	fi
-	sed -i \
-		-e "s,/usr/local,${EPREFIX}/usr,g" \
-		cfg/global_vars.mk || die "PREFIX sed failed"
-}
-
-src_install() {
-	default
-	if ! use sound; then
-		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 93cdde62a372..6b7e8832a7be 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-5.2.446620.0816_i686.tar.xz 39601408 BLAKE2B 0ee84298b705e7f066aec8825e6331785760ed521e992e66c18c74cfe7792a69c05f554eeed05a56ca5e8a891301df4d8f59b35bdb8920c87c748d016bf1bbf9 SHA512 1cbb60fed632ed3a71376f8dfa94ed21493c55e2eeb1c8341eaa5b91971d3eeb709baa6aaa4440bdbb6b381850835a72fc4282146b7711035a3ab1c057e4b647
-DIST zoom-5.2.446620.0816_x86_64.tar.xz 42281096 BLAKE2B e9a38668fef05ff49a7d78cbae94870175b167efd10d9969aec83ef1a3dda206a893a40326d013ed0bb334e7f38f212b5b0a348e1aef861a3e58d018e64812b0 SHA512 a31bf488670ac2d6af0cb75e5aa2ef4be02f18198e95b3fcbc58e0fc6dda20fc83ce4bbe6fc42a5d433c01625f9386424d2d7cde25d6615c679827355c068a83
 DIST zoom-5.2.454870.0831_i686.tar.xz 39596492 BLAKE2B 4b0e0ba01b7865a721b4a7e54196be781db5ec161cec40f30a2f39437ee58e6b1ebd02b08259390f4bf78f5f5a575d58cdacb018a3cf85ad2f20cb3bfa12ca04 SHA512 1dbc0c95b3d376dafa9020bb4f02ad7c64bcfdcf25ea9ee3393bc404731a9c19aa0073b81bfaca7eaa040afa6e3c5df116d45f337de1f776f32d8da31faf0271
 DIST zoom-5.2.454870.0831_x86_64.tar.xz 38984928 BLAKE2B 9cf4f6903287909d4aeaa3437e3a25eebd4e9ea1b4e7eb2f8ba7fdce174b25e570c8aa12d0e4555a43b94a3056506f1a09d45122090a3183d4a934935630fa5a SHA512 44f7fba85c991ac017a8bf61216a7b51d8ae526631be95a25611f6116e3e4b4e1257f8f72b88172539e1ad3d831d58bc87b9858d868a271d4f9ae64b4061d27e
-EBUILD zoom-5.2.446620.0816.ebuild 2939 BLAKE2B a8223b3ee77ba5532194c9a2310ab170a3aa11ea432487238a7e8d9222fc87ac19cdd7526a5f51cac765b29fa1cdb5209bf9d22cc4020fdd6418051e41f43d5d SHA512 67fc6c1c05e44385d81960f216d48a683877703bec25ff5ec27c0378bf68c84f4f2f4f1628d10cc8783a0a27f8c6c28d1d02d028883196ee8995e91b05643ba9
+DIST zoom-5.2.458699.0906_i686.tar.xz 39597652 BLAKE2B 594dde9f4246e3a1f52bdf0fe45df1557c476a64167f7aa879c8cee39b7a46f65d86265f7b4c18de8028f96b3c74d7e2d6af0d53e8ffea95dc8fc1e0a9e3d679 SHA512 d987913c1680f772eb13362d9b356ee3deb99c67f267a7d15c6907a8693901439e1309e4e6f9eaebd22b2480ca4fa6e68fea96c6e2642a0a7e717211dac90e22
+DIST zoom-5.2.458699.0906_x86_64.tar.xz 38982472 BLAKE2B 45645ffd3a105e2e3c801750490ba57a5b509748d7c6f12699bab540410e08b4dd677d3be3f581ea94a66a0e80348ad1dfd739eeb5c543d2d68d172ab6b85154 SHA512 c9f73bb58eaf591df0675c9518bf97bb1c0a7a902107411e6c6ba4d06e51081155abc50f950a0bf234bf1d1a234cc4476dfbf95d08ac8f7dc0b08abc40c7564c
 EBUILD zoom-5.2.454870.0831.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
+EBUILD zoom-5.2.458699.0906.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/zoom-5.2.446620.0816.ebuild b/net-im/zoom/zoom-5.2.458699.0906.ebuild
index a795b31a6ece..c11afe99432c 100644
--- a/net-im/zoom/zoom-5.2.446620.0816.ebuild
+++ b/net-im/zoom/zoom-5.2.458699.0906.ebuild
@@ -67,7 +67,6 @@ src_install() {
 	exeinto /opt/zoom
 	doins -r json sip timezones translations
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	use amd64 && doins icudtl.dat
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so