gentoo resync : 08.01.2021

33 files changed, 185 insertions, 499 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index bd82821f8621..04728b7d45e8 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
index 328c4d4eb908..857e3bba379a 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1,3 +1,5 @@
 DIST libcommuni-3.5.0_p20200711.tar.gz 471839 BLAKE2B 37a02c473496a0fe9394a8b019678afa96b07b9272556fd538d42d9ec296b34ad4c76b3110ff96732bccbed59f2faeedf80bd7782e7a6e395252c6430cb88fa7 SHA512 578e2f70bdfa0e62eb3acac4e8deb2f6f0c1cd5f0a5e559dae79d2a808b27d3cf63ede146a65026e156d988097a5b7903793acadcd7e9ac567f65c59e6738ed3
+DIST libcommuni-3.6.0.tar.gz 472634 BLAKE2B 0d3d68e27f75cd59ebd61532261e2d3d2c0c2d61d6e08e5b4ed2b21bbf75572f4ce1763fbc4f66c8d5f7c8f9859240ddff5daceeb548d82e2efe936a265031b7 SHA512 cf872d0cdc281a452129a05f5a903eeec3661a4d0d56bdc61bdf95ea969c7b1bcb68534d3d8999fb85ef2b81f17c067b5cd3437351d4635efae3c714567518c0
 EBUILD libcommuni-3.5.0_p20200711.ebuild 2172 BLAKE2B d1a3f1511e296fb7d16374b83acf3126e46bf58afc939f29809445b098d72b42e27f608fed49d323402cd4f23c33bbb90ce386f44e54503284d69afc131ebd94 SHA512 291f0e0486da2b005962a24650982951016c7326a19a8bf04d655f650f735833ab0e8ead5a4e247148d1d501904738aaab7fad3fe50edf9eae5b7a6743c2e49e
+EBUILD libcommuni-3.6.0.ebuild 2073 BLAKE2B 6dcebcdac49c2c456745f92051abafd5b3fb872decae6b5476c5ddf45ec63c60bd580726eb87a9e91cf077cc040345982be255641bd0aeeaac79bc27b2fac9c0 SHA512 a7554ffb26a7d439bd70abca6264266d225c1d148641fc00ab5606b16bb34e4b56328d43e0e43d21291e0c29c6f883a13cd7936626d672c69c17abb2e4bc5ee0
 MISC metadata.xml 678 BLAKE2B febd32dfdcd5f0513d47d2ada5600344bde61be84b436910a984d6bffe83b76e211bb1e58412a93e54a1e3ca63e226991a8ea89a68b9c0ff0902c416c9193159 SHA512 20b149d2d59a8b8b119d8144f80d28b5d02797b3b3bb6ab09412085b7aafffe9bb6fb46bd79d0951ab5c7fca8987dc3b6fd973e57179c3cac162da9601eb631b
diff --git a/net-im/libcommuni/libcommuni-3.6.0.ebuild b/net-im/libcommuni/libcommuni-3.6.0.ebuild
new file mode 100644
index 000000000000..2b9e4f1c6d9d
--- /dev/null
+++ b/net-im/libcommuni/libcommuni-3.6.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="A cross-platform IRC framework written with Qt"
+HOMEPAGE="https://communi.github.io/"
+SRC_URI="https://github.com/communi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples qml test +uchardet"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	examples? ( || (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	) )
+	uchardet? ( app-i18n/uchardet )
+	!uchardet? ( dev-libs/icu:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local myqmakeargs=( libcommuni.pro
+		# Disables compile run-time benchmarks, as they don't make any sense
+		-config no_benchmarks
+		# Is needed for fixing the QA Notice: The following files contain insecure RUNPATHs
+		-config no_rpath
+		# Compile libcommuni always in Release mode, as Debug seems to do nothing
+		-config release
+		# Don't silence all compile messages
+		-config verbose
+		-config $(usex examples '' 'no_')examples
+		-config $(usex qml '' 'no_')qml
+		-config $(usex test '' 'no_')tests
+		-config $(usex uchardet 'no_' '')icu
+		-config $(usex uchardet '' 'no_')uchardet )
+
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	# This is a hack to delete the existing LD_LIBRARY_PATH and set a new one,
+	# otherwise a test will fail, because it uses the system installed lib instead of the new compiled lib.
+	# The test will fail, when libcommuni is emerged with USE="uchardet" and
+	# libcommuni is already installed with USE="-uchardat", or the other way around.
+	find "${S}" -type f -name 'target_wrapper.sh' -exec sed -i -e "/.*LD_LIBRARY_PATH.*/d" {} \; || die
+	local -x LD_LIBRARY_PATH="${S}/lib"
+
+	default
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use examples; then
+		local examples=( "bot" "client" "minimal" "qmlbot" "quick" )
+		for example in ${examples[@]}; do
+			newbin examples/"${example}"/"${example}" libcommuni."${example}"
+		done
+	fi
+
+	einstalldocs
+}
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 7d04f9ab9720..360da091cb60 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,9 +1,5 @@
 AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31
-DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
-DIST mcabber-1.1.0_bug699972.patch 1385 BLAKE2B f63316f93347b24f27e5f9a5c26de6ae1af199819efbf390915b06ba70c86ec35759c4529c20e3a7c4d8c84081bca008e90ceba8401032ba884d269355940e22 SHA512 d29acca9e710011a8f30dca1c0e281976d409d4072823527078e5f54e98fea4b637c9e52c998bc26a7a4c445d08acd3eea3a244441dac479c398dac0e786535a
 DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106
-EBUILD mcabber-1.1.0-r1.ebuild 2365 BLAKE2B f4849c02ae754dbd863bb71e09dd8c16fa482d853d1a80d2dd31539ad5f2cb366caa0bd2b730c7f3423046241fe64ac908ba9f1fc00cb2021fb3d9f60f264df4 SHA512 154c4cb818bc2f1da7213cb70e6f632c2fcad49cbeb2246322601a7c8d82862d05025f3130b6ebdb86e95a3ec1f1f2422c603cdcf877861a1499bbe2865e6af3
-EBUILD mcabber-1.1.0-r2.ebuild 2580 BLAKE2B f5f8d6ed2091ae3462e91cbb1355e349f6689d883d7078efa3ae15c69efe152cd20bd630cfb55562e09b95659da4173c396cfa3e10487edead86946429d4ef24 SHA512 22db79a6369bdcf6907c192b51a436dde79d41030e2dd4fa75000e80ad809757539639c7e57ddfe55fa4c6108362da7730bff1df407d70b42ba3f4eee863ad4c
-EBUILD mcabber-1.1.2.ebuild 2339 BLAKE2B 9854fe8ee70c79059f5fca115d5fced77ab9719d9f8916950241994e69e4501a7b8035ca115df23c3140c01d08e15358049373522aea5cb75701f7df1f3c49c4 SHA512 b2069a6f873ed5b5df98c917e871d0ac33d1bbc8d9d3eba3d414350f90cc48b36c2abc4f7bd9e6aaff241d94633e7799f89a95ad1f285e68b1c2da6acc67b7fc
-EBUILD mcabber-9999.ebuild 2341 BLAKE2B 98e6851f3ee8dc80ad2e8a45c37867eba3c5577eefc0fbd086ea30f6a1133e1bedb4c70feb7528b894b5490d448b118d192247e65da5d879b98a02f0cfa7cf6a SHA512 01184bea498e4adf608862a3d2f9dd97d15950f6d6154b654cc93e879e4e8effcd15736c33f4ea4cf109c8f776c2ec802ee084dd7e3cc10e3025ebc40084d2eb
+EBUILD mcabber-1.1.2.ebuild 2328 BLAKE2B ac140a7e0aeec7782fd551fb879b06c56ac74d18aa6e29904b4bfcc61f7fe6592bb564a61170ec900d57e051b7e3189296f866186e6e3e80bff864b28ef49b27 SHA512 0f312dfa7996e7f59c5bb2e8e8fdccf2c60217de74237c82192bba58cc333b87b92cdfff421efd8c71d286d0793db32ea427ea25fe0991fe6c9d975babb9d6ae
+EBUILD mcabber-9999.ebuild 2330 BLAKE2B cc46066f8e037e5b34591ab09892db38b5857c2788d58c95be2f39fecf0816f002e0d16fc8900243ede12cb8fa05ccc3a285c1fd1203016ef27c903ae48a029f SHA512 091256c469fc17d782713a96177b7cb4480e5b7b1591c27161afe7ed931a3f5a6446f3bda6033202b907637e22dd4619af0a776c7b278b005ad23454cc94855c
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/mcabber-1.1.0-r1.ebuild b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
deleted file mode 100644
index 304bdd5ce2c6..000000000000
--- a/net-im/mcabber/mcabber-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
-HOMEPAGE="http://mcabber.com/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
-	EHG_CHECKOUT_DIR="${WORKDIR}"
-	EHG_BOOTSTRAP="autogen.sh"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="aspell crypt idn otr spell ssl vim-syntax"
-
-LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when L10N var is set
-for i in ${LANGS}; do
-	IUSE="${IUSE} l10n_${i}"
-done;
-
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	aspell? ( app-text/aspell )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	idn? ( net-dns/libidn:= )
-	spell? ( app-text/enchant:0 )
-	dev-libs/glib:2
-	net-libs/libnsl:0=
-	sys-libs/ncurses:0=
-	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
-
-pkg_setup() {
-	if use aspell && use spell; then
-		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-modules \
-		$(use_enable crypt gpgme) \
-		$(use_enable otr) \
-		$(use_enable aspell) \
-		$(use_enable spell enchant) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	default
-
-	# clean unneeded language documentation
-	for i in ${LANGS}; do
-		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
-	done
-
-	# contrib themes
-	insinto /usr/share/${PN}/themes
-	doins "${S}"/contrib/themes/*
-
-	# contrib generic scripts
-	exeinto /usr/share/${PN}/scripts
-	doexe "${S}"/contrib/*.{pl,py}
-
-	# contrib event scripts
-	exeinto /usr/share/${PN}/scripts/events
-	doexe "${S}"/contrib/events/*
-
-	if use vim-syntax; then
-		cd contrib/vim/ || die
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins mcabber_log-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins mcabber_log-ftdetect.vim
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/mcabber/mcabber-1.1.0-r2.ebuild b/net-im/mcabber/mcabber-1.1.0-r2.ebuild
deleted file mode 100644
index 4cc9ca700fbe..000000000000
--- a/net-im/mcabber/mcabber-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
-HOMEPAGE="http://mcabber.com/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
-	EHG_CHECKOUT_DIR="${WORKDIR}"
-	EHG_BOOTSTRAP="autogen.sh"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}_bug699972.patch"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="aspell crypt idn otr spell ssl vim-syntax"
-
-LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when L10N var is set
-for i in ${LANGS}; do
-	IUSE="${IUSE} l10n_${i}"
-done;
-
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	aspell? ( app-text/aspell )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	idn? ( net-dns/libidn:= )
-	spell? ( app-text/enchant:0 )
-	dev-libs/glib:2
-	net-libs/libnsl:0=
-	sys-libs/ncurses:0=
-	>=net-libs/loudmouth-1.4.3-r1[ssl?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# only for patching 1.1.0 release, don't port to later ebuilds
-DEPEND+=" sys-devel/automake:1.14"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
-
-PATCHES=(
-	"${DISTDIR}/${P}_bug699972.patch"
-)
-
-pkg_setup() {
-	if use aspell && use spell; then
-		ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-modules \
-		$(use_enable crypt gpgme) \
-		$(use_enable otr) \
-		$(use_enable aspell) \
-		$(use_enable spell enchant) \
-		$(use_with idn libidn)
-}
-
-src_install() {
-	default
-
-	# clean unneeded language documentation
-	for i in ${LANGS}; do
-		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
-	done
-
-	# contrib themes
-	insinto /usr/share/${PN}/themes
-	doins "${S}"/contrib/themes/*
-
-	# contrib generic scripts
-	exeinto /usr/share/${PN}/scripts
-	doexe "${S}"/contrib/*.{pl,py}
-
-	# contrib event scripts
-	exeinto /usr/share/${PN}/scripts/events
-	doexe "${S}"/contrib/events/*
-
-	if use vim-syntax; then
-		cd contrib/vim/ || die
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins mcabber_log-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins mcabber_log-ftdetect.vim
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-im/mcabber/mcabber-1.1.2.ebuild b/net-im/mcabber/mcabber-1.1.2.ebuild
index ef916f750572..616c5e554f8a 100644
--- a/net-im/mcabber/mcabber-1.1.2.ebuild
+++ b/net-im/mcabber/mcabber-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 0b84efe65300..9e0a12b1fef1 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
new file mode 100644
index 000000000000..a4f6dd3185ff
--- /dev/null
+++ b/net-im/neochat/Manifest
@@ -0,0 +1,3 @@
+DIST neochat-1.0.tar.xz 162484 BLAKE2B 849e3b606975f24be219ea0a73b56134103e38576394d8f9be483f240d21bc60ddf5f7e1e99cadfd0cfd5a5d58afbc37518dcbac01d0c6fde4ba1cf1ef5f5989 SHA512 6c2c944a958c22dac6605c8ea0abfc70d88434bc77ab7c6ae2f1cf5e24e5ebb4c4c120a09dd41d2becf24f312dc5a5ad56352f3f46b42931acb09668f8acd1d8
+EBUILD neochat-1.0.ebuild 1167 BLAKE2B e986092b069bd2c0aaa14be21ad62bdc28c0e26b4fcb81eace7af2829dc923c838349dbdc7259af6451f86979b23c68f96309d9f04040b8119e4708c719ca938 SHA512 c82b9427de8d795c03e197746a3c10a993ddc58057b4662aa16787f9c1e27a5fb89bb8bd5357a13e826161633a0bc06fd8fee661d15df8e17b0d095099fffb89
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-im/neochat/metadata.xml b/net-im/neochat/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-im/neochat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-im/neochat/neochat-1.0.ebuild b/net-im/neochat/neochat-1.0.ebuild
new file mode 100644
index 000000000000..a0220e2f6541
--- /dev/null
+++ b/net-im/neochat/neochat-1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.77.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Client for Matrix, the decentralized communication protocol"
+HOMEPAGE="https://apps.kde.org/en/neochat"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	app-text/cmark:=
+	dev-libs/qtkeychain:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	media-libs/kquickimageeditor:5
+	net-libs/libquotient
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 93334b13deb6..5ebe23d83ed5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 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.14.1.ebuild 7889 BLAKE2B 6e1c1101a93d0175a18601a4d7cf7f3e23b3597d1e42d4afcbee08802f278ee7a8323c12d6bd8bf5c2c665ff9ea6b21a77e3b0c064964283374e6c8e3c63ce1d SHA512 c39343d6269c58d141359dc550f8cf7c5bb532461e9a246152bde49b4ecc650748b905664ee90a5001fdb9464150a68df8a82577e7b5166b0eef9aaf57d07157
+EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B ab3f467c020ee8c11a5e6666f0d308389ada7dc2b00a254f251870c22504f8039e59c5e6161b55ef77cd0c4cd669cf26adfdd6f4f551ce1db2abdbfe5ccb4009 SHA512 773603a9dc7069307b2ad8268cb50be747b02b301bb700a127b3f5e8bd1da40c88325ad15e10664115856b90487d7c325faf7412d0e48a859450b6710c6dadce
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index b162dd029552..50f9e296d49e 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 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/poezio/Manifest b/net-im/poezio/Manifest
index e138534718b2..18c1d25ae2e8 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,4 +1,4 @@
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
-EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B 5c42e0e85f21fa5f5ab39cbfaca6f21aaf9de4ac61e09bd343663a263d0c0a9ff37a27f8a0a6962fa7173f78fdfb628d67d4a8581353df2b81cf28b4a0d35cf4 SHA512 a6625b4fedefb3413c5b465909aef2ecc367f67129c010cf9f862222b74df3beabb42aa024ab0f536efb63cece51b5dda02e237f82b7858e36dcc6889cd69d42
+EBUILD poezio-0.13.1-r1.ebuild 1160 BLAKE2B 34b4dd398b936f9c3adbbe6c3a89a954a1749d92089541612288e6063c34035c3017218fc518c5aff71df67b368fb233ee818acb55aa499e79475c2d4a9ebc56 SHA512 2248557d7659952914bd24c0f03f8847177b2f7e0a46c88f6654dd7a584ec1b0317a8269abf94e2731c91382026063ee54cb062ecfeb18ba399f7441e8cb28e1
 EBUILD poezio-9999.ebuild 1161 BLAKE2B f0d80d98f10e133038c23578d3ba37d0b5a7b2f489413767554181fc52f709796e9c9d3df1e91c2a176a8a0e15ec0899a23586a193528890547cccd78973e354 SHA512 a61e2738d03662435d88bcb643b5537d3e96f4ca2d50a95fb27004f5e4e110304fe771ed5127f0fc35da029a0a4dcf15a4fd7730bc7638b11603c6bdba4a07b5
 MISC metadata.xml 320 BLAKE2B 38b85fd661f7ca7a79c83a1070753f1049b7de9049f2d233f32d77ddd2a8cf72cfc8e3b7b27065a5583d6c631a6af0aa3ca70b907ca9c2a2e92f85471da542b2 SHA512 874c300be76a1b931ddebfb8867563696884267891a09e0879e1ceb0f581536ab9acacccb104e9609aef5c61c55e05ebd87d867d332141be9d52cea246dad09c
diff --git a/net-im/poezio/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild
index 12c7dd0d6ee6..ae4c009726e2 100644
--- a/net-im/poezio/poezio-0.13.1-r1.ebuild
+++ b/net-im/poezio/poezio-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index d6eb36e6552c..9a52e6545836 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,7 +1,3 @@
-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 1032 BLAKE2B b33c741b25c04ed7e9b70f24612aff0ce7cda6e62b5a9c2b54b0b966bd0c6cedf3f41338dde60a9750b42901339b4eb655abb7c5394f75551172f3bf49ffdc17 SHA512 04cec15cf7803d180e21d412b19fca734a01f8fb16e3c3b8552f1aa77d9b695fc445f66ed7e81b7ca0f611ea77d81a5c35cc3f8be76c054c89beb87413355417
 MISC metadata.xml 605 BLAKE2B d26bea42cbf668507f197cc43a131cebc4a2569806e2789f608c68d41ff3b8b679ed1ad9cdd9df706e539cea71150f8b13157c1750aa313e1b1067f968b8eb3f SHA512 bf7004fa94e5515e3e54da31797e52d13096483a1d7f356fcccb0ceff1d3ae4c157929aadd4ccf24d54078070ba8ba94e3d6e641f85fa5c30cbd113cd487eae8
diff --git a/net-im/profanity/profanity-0.6.0.ebuild b/net-im/profanity/profanity-0.6.0.ebuild
deleted file mode 100644
index 402ca75c0859..000000000000
--- a/net-im/profanity/profanity-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 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="http://www.profanity.im/"
-SRC_URI="http://www.profanity.im/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="libnotify otr gpg xscreensaver"
-
-DEPEND="
-	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 )
-	otr? ( net-libs/libotr )
-	xscreensaver? (
-		x11-libs/libXScrnSaver
-		x11-libs/libX11 )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable libnotify notifications) \
-		$(use_enable otr) \
-		$(use_enable gpg pgp) \
-		$(use_with xscreensaver)
-}
diff --git a/net-im/profanity/profanity-0.7.1.ebuild b/net-im/profanity/profanity-0.7.1.ebuild
deleted file mode 100644
index faaf4beb3402..000000000000
--- a/net-im/profanity/profanity-0.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="libnotify omemo otr gpg xscreensaver"
-
-DEPEND="
-	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 )
-	"
-RDEPEND="${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-modules/Manifest b/net-im/prosody-modules/Manifest
index 2dafac5441af..b96f8fc1ddaf 100644
--- a/net-im/prosody-modules/Manifest
+++ b/net-im/prosody-modules/Manifest
@@ -1,4 +1,4 @@
-DIST prosody-modules-0_pre20201004.tar.xz 1152400 BLAKE2B 66170cbeea156d8843aad2ace62294a40b6168170cd3da3b59cf660aa9d6aab743a7bfe1a5d313e83a69336ef7165a4a45ac27da9afa239a7f97413f275883fe SHA512 b4201c108b6ba5ed2404d65efa3fbb50ca1493e204b6cfe55893c19fe22a01bcb23244fa35f2c03cf52ecabdac1354aa388740fc62b5516cb2a85fdd753e9efc
-EBUILD prosody-modules-0_pre20201004.ebuild 1588 BLAKE2B 8fc929f586b39e979e771148132131446dc11cb74a79081c8d9fa14c6274d2663357ad72cfd5520803a732a23770706f1f28311c28a54d32dafbfce0ec181958 SHA512 a7e787072b56ad1938ec6e06e23aa73793e7e3fc7d8cb0ced07233f7a7fdd082e76b2df793ff2ffb6d614ac884db61cb9a1c57775a076b5898e1c77628e156bc
+DIST prosody-modules-0_pre20210105.tar.xz 1166992 BLAKE2B 02bf4ea4521194db51716c2716370e1b38e747da000dc8d27ce93b5f81d53b9e0367e96f3e18aee74c858ae86474bcaccb0ef944325f508337882acf3cd9e960 SHA512 c0739a309b66c958e205989988c6e7118c0385156d7ebc2a4825646af366fe5665ff6e7e98aab24cf3cc5530fe40c8e9a3440afff196a96624242c00861a308e
+EBUILD prosody-modules-0_pre20210105.ebuild 1593 BLAKE2B 409d787720cb007af2cfe29fc887a14e2602dc9bfd97b1416fde9189364c4f52bde6756e2dea85aa2123d11aa4495eda05fb55760694f627f9546bc5b8c8c0b5 SHA512 d0e8a227ae25decc837ea75667cb3b2449e404cbc3e65bfdccce1a39675b5c00c9ee74b6a0fba1b82704793332afae7d35b1e59e6b34efb25d47d662990c9395
 EBUILD prosody-modules-9999.ebuild 1534 BLAKE2B d859dca64341ca45808a93d18cb9b18d3f1fb29f459c3f003760968bd3efcaa6264361f0fbbbe9c45c63467f15181bb3eb15a0a8f67c34f6b7ccd4a684e02495 SHA512 17a9817ac3417890b5646faa13018c55c30486992a80c0174ec5031386128ca65c8073fdf3f60775ca2dad4ed114a51af7b58c65a784168b951570927faee625
 MISC metadata.xml 677 BLAKE2B 1ca81a4aae2efe7b7b156c56a891ba580da0ff0ba3fb4f0d8226cbf9eacf429c06a2e866fb57bcf1601afa403c220e66d6621d280c8bbeb453da35f04700e356 SHA512 adda5fea0bca9ea8a32414bcb3c2f006ea5d8634dfb8f65600acc741bb663fa60b2d3a79d53f58311d6ec1593b8a2d7e5fb9b49cfcdfe12e2a0a60e13db9ddda
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20210105.ebuild
index 46bb27cbada4..ff13c951991f 100644
--- a/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
+++ b/net-im/prosody-modules/prosody-modules-0_pre20210105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 7868c05f46a9..ea972a6b0c45 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,15 +1,9 @@
-AUX prosody-0.11.2-r1-gentoo.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
 AUX prosody-0.11.7-bit32.patch 599 BLAKE2B 880d11d8730f77322372efbfdb80c64a523844a47aae60a0f04b831262dc2e61c141247902b0872ff73fa02497dbfc75e3fc0cdbf9396c124c6c080bbbe181cd SHA512 e1783fceaca93acde37a3fffc5052eb9799faff59ce13e394358a21f24513e193ffa498218766b87718bac55f6425694106494abf05080203c5af01a52c03edb
 AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3
-AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da
 AUX prosody.initd-r4 955 BLAKE2B 4d9a7e9cda70a901478734a7ba81480374e9a4db069a91920f03fa2de35b85f3d6f62c7e85ee622646d77c660f039370217e968e5a3d6d88c6e9ab20e6362ea3 SHA512 a0e92aaba052c50748911caf0005b154eb14c6af142a36492c938da04633c5ac397f1baebe133f366b7fc9547e360265ade75ab58bcaf7bffeca7c84f98547b6
-AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
-AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
-DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
-EBUILD prosody-0.11.5-r1.ebuild 2077 BLAKE2B 9a9d47dfac9398016f1dc4eeb2ff6b2d7add27b473780ea24c5a0b2f16b8fd7dbcbdce2c99080a0b4ffed755851963aa83d4f4dd3dc63e39fc94e8d53ccf9274 SHA512 17fc6249e43a5ea35e3819a40e6816fb1677efc5b2a6818a12ae04f7686a8583bb11338e0bb584a97a3ace1340186e2fa79ff6e5d416b989ed810e617f40250b
 EBUILD prosody-0.11.7-r100.ebuild 2909 BLAKE2B 4184d057091d5700914ea7a62d8261e763c35bf52dbc5b6e7cd76f5ab86c7de9826a191c3517e6625dc4558deff2612c2cf5ffa032adc4041b39714584fcd2cc SHA512 8f21e646a7e8d09bdef52363f08ad8fbcac10575cb67eab4bf90c0b2455e25af87414bee88bab025102099edcbefb3489720020a91dc26b94aef29e968b7feb7
-EBUILD prosody-0.11.7-r2.ebuild 2270 BLAKE2B 4436848267a4244a1b596d25381974510d654e06e9c011ddd12ccacf801ee1746165f30835e0edfe80c20a2df8ae76dc0daa0d443c0ae92c0ec6a88a78bbbeda SHA512 688bb5480ce3ecbc23e41bce8242fb713ac9ebe924a6d51fa16f40cc7be88088b9e653581b45653a3ac072ad23167eec895a9e8be944c1c21876ee1f498b115d
-MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
+EBUILD prosody-0.11.7-r2.ebuild 2269 BLAKE2B 343142e98d2ff712ba2f4a7c531551f3f9ba5372a099a97701bfb8b532931a9eea0037ce449f5f125c6bab118c59cdb605c20becc3ebb122a2ec4ab15b4752c5 SHA512 b1b62067d1b546bd7657c0432e84628e229acb4527abb520971aa7d686b731468764ef333bdf34755f20edb470c09c3f86b94abb0d7550d476e68a0c6f484e7a
+MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710
diff --git a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
deleted file mode 100644
index 94423a834ae1..000000000000
--- a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/prosody.cfg.lua.dist	2019-03-19 15:11:16.355743969 +0100
-+++ b/prosody.cfg.lua.dist	2019-03-19 15:14:42.810995725 +0100
-@@ -32,6 +32,13 @@
- -- will look for modules first. For community modules, see https://modules.prosody.im/
- --plugin_paths = {}
- 
-+-- Gentoo uses the jabber:jabber uid/gid for all Jabber-related services
-+prosody_user = "jabber"
-+prosody_group = "jabber"
-+
-+-- Make sure prosodyctl checks in the right spot for the PID file
-+pidfile = "/run/jabber/prosody.pid"
-+
- -- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
- -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
diff --git a/net-im/prosody/files/prosody.initd-r2 b/net-im/prosody/files/prosody.initd-r2
deleted file mode 100644
index a6b623dd6225..000000000000
--- a/net-im/prosody/files/prosody.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prosody is a server for Jabber/XMPP written in Lua."
-description_reload="Reload configuration and reopen log files."
-extra_started_commands="reload"
-pidfile="/var/run/jabber/prosody.pid"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
-		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
-		return 1
-	fi
-	luac -p /etc/jabber/prosody.cfg.lua
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
-	checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
-	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
-	ebegin "Starting Prosody XMPP Server"
-	prosodyctl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Prosody XMPP Server"
-	prosodyctl stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration of Prosody XMPP Server"
-	prosodyctl reload
-	eend $?
-}
diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
deleted file mode 100644
index 5c5ea87bd542..000000000000
--- a/net-im/prosody/files/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP (Jabber) server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecReload=/usr/bin/prosodyctl reload
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd b/net-im/prosody/files/prosody.tmpfilesd
deleted file mode 100644
index 924ba434659c..000000000000
--- a/net-im/prosody/files/prosody.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/jabber   710 jabber jabber
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index d73f165dd534..c67f0b41b88d 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -14,7 +14,6 @@
 		added functionality, or prototype new protocols.
 	</longdescription>
 	<use>
-		<flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
 		<flag name="libevent">Use libevent for event handling</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/prosody/prosody-0.11.5-r1.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild
deleted file mode 100644
index 2e89c9c96e9e..000000000000
--- a/net-im/prosody/prosody-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
-RESTRICT="!test? ( test )"
-
-BASE_DEPEND="
-	net-im/jabber-base
-	dev-lua/LuaBitOp
-	!jit? ( >=dev-lang/lua-5.1:0 )
-	jit? ( dev-lang/luajit:2 )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:= )
-	>=net-dns/libidn-1.1:=
-"
-
-DEPEND="
-	${BASE_DEPEND}
-	test? ( dev-lua/busted )
-"
-
-RDEPEND="
-	${BASE_DEPEND}
-	~dev-lua/luaexpat-1.3.0
-	dev-lua/luafilesystem
-	!ipv6? ( dev-lua/luasocket )
-	ipv6? ( >=dev-lua/luasocket-3 )
-	libevent? ( >=dev-lua/luaevent-0.4.3 )
-	mysql? ( dev-lua/luadbi[mysql] )
-	postgres? ( dev-lua/luadbi[postgres] )
-	sqlite? ( dev-lua/luadbi[sqlite] )
-	ssl? ( dev-lua/luasec )
-	zlib? ( dev-lua/lua-zlib )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	./configure \
-		--ostype=linux \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysconfdir="${EPREFIX}${JABBER_ETC}" \
-		--datadir="${EPREFIX}${JABBER_SPOOL}" \
-		--with-lua-include="${EPREFIX}/usr/include" \
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
-		--runwith=lua"$(usev jit)" \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" || die "configure failed"
-
-	rm makefile && mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild
index 1cd89e0f987e..e39395687019 100644
--- a/net-im/prosody/prosody-0.11.7-r2.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index b595ba760514..3f88336a2e81 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,5 +1,5 @@
 DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
 DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
-EBUILD teams-1.3.00.30857.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
+EBUILD teams-1.3.00.30857-r1.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/teams-1.3.00.30857.ebuild b/net-im/teams/teams-1.3.00.30857-r1.ebuild
index 6f18946cc3f1..93fe30a5e8b7 100644
--- a/net-im/teams/teams-1.3.00.30857.ebuild
+++ b/net-im/teams/teams-1.3.00.30857-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop unpacker xdg-utils
+inherit desktop unpacker xdg-utils chromium-2
 
 DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
 HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
@@ -59,6 +59,15 @@ RDEPEND="
 
 S="${WORKDIR}"
 
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
 src_install() {
 	rm _gpgorigin || die
 	doins -r .
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 66a1a3083963..e76c9d16951f 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,5 +1,5 @@
 DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
-EBUILD toxic-0.10.0.ebuild 2714 BLAKE2B 0685e3ea4a07e997e0edaece1d501729e6b5115b977f3832090e3813ceb7a62681bf80d45454cb35527a442211732750120bf4e7fdc73db4b8543f846034e437 SHA512 5de95f99b126e168b918bb16df1291399497303dd82388dcbc33f9b72553f3d485b5e1f29240cb1ec0f9558a36eb8fe8e31dade347caa736a602d171ba0d56a8
-EBUILD toxic-0.8.3-r1.ebuild 1817 BLAKE2B 0c16129cba030501dc47a7cf52c2ff9c2b2830c66848928e03a7b1a26c4d4df1536f8b0b14db8def8222f2f585cc8f35724923cc7e076e2826debb64c2beb26b SHA512 146194a704913ac6e795d0eaa9b09c9bb33cda236791979a5d9c8b05d240f0112f4ecfaddbbbc55578af05a493df30fdddb84d17fa1a7b20d17d1feb18a0cf01
+EBUILD toxic-0.10.0-r1.ebuild 2716 BLAKE2B b2d1faffc39f9ee86c05620ef345fe7640bdd5104847da5ded92038ea721fafa7248f7fec9944e11ddb5b6aed564e0c32e7b648bac677d4928351d810b3e6697 SHA512 b642892b4ad64b7e0be132a7c123920b681e60c93af2b9827c4575175fefe1706601c8846b186973467bc72173713672eda4fcbd4310fff363e22d0a2f48d950
+EBUILD toxic-0.8.3-r2.ebuild 1819 BLAKE2B fd9637a2a3d0575d12ecb56a105d10ef1c03c385140b4cecaac872d1ebfa64baf1177185bbb111bbdc3012dc4c6c38662bd05bb3761dbd1af1300762fd089304 SHA512 398fc255f9630a783a5f8bcb97854e1ebbedc45911677a80af339f4d7031d5ed5bcd576492f71f8ec3c7e06b5f1e92c59c7f77ae627ef832865aa3acd8e26255
 MISC metadata.xml 1124 BLAKE2B 5cc7843b51d7cb901334bf831ccff7dd43bc383b54dffc5977c8dc70c39c4064f03f12c6b03a4b2936cfedfe3079e90615dc27c74ad22bce4089c49e07d0b303 SHA512 ab9281381e6364cf9a9c38bed9d78d9b6c0dc6c45c83275dba6f727a9c60d7cec35f9944ce12d4202fa75909c80da32ab0c105cf98776d0d557925f3787ef3c0
diff --git a/net-im/toxic/toxic-0.10.0.ebuild b/net-im/toxic/toxic-0.10.0-r1.ebuild
index eec33667d60a..904924719e8f 100644
--- a/net-im/toxic/toxic-0.10.0.ebuild
+++ b/net-im/toxic/toxic-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,11 @@ IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	video? ( sound X ) "
 
-BDEPEND="dev-libs/libconfig"
-
-RDEPEND="net-libs/tox
+RDEPEND="
+	dev-libs/libconfig:=
+	net-libs/tox:=
 	net-misc/curl
-	sys-libs/ncurses:*
+	sys-libs/ncurses:=
 	audio-notify? (
 		media-libs/freealut
 		media-libs/openal
@@ -31,12 +31,12 @@ RDEPEND="net-libs/tox
 	debug? ( llvm? ( sys-devel/llvm:* ) )
 	python? ( ${PYTHON_DEPS} )
 	qrcode? (
-		media-gfx/qrencode
+		media-gfx/qrencode:=
 		png? ( media-libs/libpng )
 	)
 	sound? (
 		media-libs/openal
-		net-libs/tox[av]
+		net-libs/tox:=[av]
 	)
 	X? (
 		x11-base/xorg-proto
@@ -102,6 +102,6 @@ src_configure() {
 src_install() {
 	default
 	if ! use audio-notify; then
-		rm -r ${ED}/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
 	fi
 }
diff --git a/net-im/toxic/toxic-0.8.3-r1.ebuild b/net-im/toxic/toxic-0.8.3-r2.ebuild
index 03ec7dfb0153..7dae366dc14e 100644
--- a/net-im/toxic/toxic-0.8.3-r1.ebuild
+++ b/net-im/toxic/toxic-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,22 +17,22 @@ KEYWORDS="amd64 x86"
 IUSE="notification python qrcode +sound +video +X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-BDEPEND="dev-libs/libconfig"
-
-RDEPEND=">=net-libs/tox-0.2.8:*
+RDEPEND="
+	dev-libs/libconfig:=
+	>=net-libs/tox-0.2.8:=
 	net-misc/curl
-	sys-libs/ncurses:*
+	sys-libs/ncurses:=
 	notification? ( x11-libs/libnotify )
 	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode )
+	qrcode? ( media-gfx/qrencode:= )
 	sound? (
 		media-libs/freealut
 		media-libs/openal
-		net-libs/tox[av]
+		net-libs/tox:=[av]
 	)
 	video? (
-		media-libs/libvpx
-		net-libs/tox[av]
+		media-libs/libvpx:=
+		net-libs/tox:=[av]
 		x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}"