gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /net-im
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
83 files changed, 1714 insertions, 497 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index eb37582f2b93..ae2fcca0da9a 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 4a38215b1a94..3c486de8eb01 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,4 +1,6 @@
 DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4
+DIST bitlbee-facebook-1.2.1.tar.gz 71957 BLAKE2B 4694d5ea3df0a52b8dd7506d270f8257ec6950c35b90ed659fe65fa4a82128b3608733227fd1a1bc36c200879067ed3df5fd937efa1fb5932ad660b50cab5122 SHA512 6424931a93695c41816304177f13d3c02c1e7e352f8548a18a1245cc90b151123d31d354147851d56f6b42946c30c43eaefb6d2f296a8078067eb5c65c0da1d5
 EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
+EBUILD bitlbee-facebook-1.2.1.ebuild 753 BLAKE2B d02f8b416dd17f4346f3022df61931b8966273e5b067219e4abed63344f8468a06dd7422e586c103e8e53945f3f811b7de8c6943306e95eddf782259415711ab SHA512 c75e557dafcc05f8b1e8f4c7b64a6cc42f4cf89b4a8f4ba2d653992d0a83e8793c25ba16995670669206b198c0760367aa9fc92783f86b3da4726653ab31847e
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
 MISC metadata.xml 635 BLAKE2B 81b252965440d5101d24114b1e971510c7f0322ef53d8a6ce65f79864eedcf8211e378eb224dbc5a83903c7ce263faf96787cc7e9340cd8d1bb8fa788564b72b SHA512 45a602ed7b8cc33f7e1165f2d22baed143cf38de06fc3f1064b847e47aff991a1102eda241f8350b4d95f355d41227d1335083f0433ec7c68c47337fe273c354
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild
new file mode 100644
index 000000000000..9e788483c50f
--- /dev/null
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Facebook protocol plugin for BitlBee"
+HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit	git-r3
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
+else
+	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	>=net-im/bitlbee-3[plugins]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 0097871d3639..19a4009f65c8 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,3 +1,3 @@
 DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
-EBUILD choqok-1.7.0.ebuild 2209 BLAKE2B 69bb8ba8cdc7f0404cdd141a2f4165bba705ad72365cfca447028214b5e330b7c1296ec63521f58055498a83a66b1730792e93d1563ed8ca47cd1b899e085489 SHA512 dbcca756a8293db4d7fd4ea12c56c2e4dfe1c0b5e062e494eb28c0e9ef75f48670740d68d2a5b61c200098be4a30e2ae91e80521e7bdb208b9f8bb30e2295126
-MISC metadata.xml 634 BLAKE2B 30e3ee2973d1de819dba64ce8f5029627248786d73d13a6203d24c9714cd160481b7170c04a4d7e78c2e1d9a2061b4b952938be2df31b3883fabe2323a2a9154 SHA512 fae64251578632ac8f3f74f2a75b30b2e470aaab9103a5a92978681f8194ecd65f8d2162800ede82b7f2574bb1a5142de8bd68db2e383342ec1ac958e39dd599
+EBUILD choqok-1.7.0.ebuild 1990 BLAKE2B ffebbd4ba2ab75fd024365aa9361d7d76087d2a785d3bd5224800f791564fd3146c5844fbccde010085f4ad5ae582652d7100bde91dc89a6aa52a32941452188 SHA512 a82077fe1a9545459b449f91d68bbd65a16d0633284017135707e583541e9f2150894cec754b4e8f90a4d5b63ef7765af2c2645932cdbce34b00a54e7f82c26a
+MISC metadata.xml 572 BLAKE2B 9f192d2e98ec5a886914183fb9ff188d10bf59e763c4690967dad40d034494195ee5ba1a9b1818e524e9099c3812710b59f8c7400bcc678e044ed91b3cfc281b SHA512 d8b1d5324d346d05e61d1bc67a4e6d843c08b20fd07b2c7f86458904b53a9abb54315c43237b35aee5890af82c569ea14f8cf0c3f26521693893dcec88983764
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0.ebuild
index dc005d25d769..d71b59812c22 100644
--- a/net-im/choqok/choqok-1.7.0.ebuild
+++ b/net-im/choqok/choqok-1.7.0.ebuild
@@ -9,8 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/
-https://kde.org/applications/internet/org.kde.choqok"
+HOMEPAGE="https://choqok.kde.org/ https://apps.kde.org/en/choqok"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
@@ -19,7 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-IUSE="attica konqueror share telepathy"
+IUSE="attica share telepathy"
 
 DEPEND="
 	app-crypt/qca[qt5(+)]
@@ -47,11 +46,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
-	konqueror? (
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-	)
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
 "
@@ -68,8 +62,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package attica KF5Attica)
-		$(cmake_use_find_package konqueror KF5Parts)
-		$(cmake_use_find_package konqueror KF5WebKit)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5WebKit=ON
 		$(cmake_use_find_package share KF5Purpose)
 		$(cmake_use_find_package telepathy TelepathyQt5)
 	)
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index 7606fdaab74d..625636c5e6fd 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="attica">Build Open Collaboration Services plugin using <pkg>kde-frameworks/attica</pkg></flag>
-		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 861e2d1630cc..30b271fa2cc2 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,4 +1,6 @@
 DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fdaf07eb5327e7abf614ac4adc130fd8f2d9465d6cb248ecfe4b809e022a69c72df5879d98719d24635771b33 SHA512 b63bf87dbf7f728f038f22d0dba34770a06d7eb1be2ec249293ff876e16c151165add895ff3cb20a3216c3581d20e10634d454ee8b024b895012efb34f9d7de8
+DIST dino-0.2.0.tar.gz 514257 BLAKE2B a4536372a806fa60e157a6492381b0204f33041b113dc26dfd4d494c86c96e5b94e928c400fde3198e481aecbfc79d0358979d4a20c550e35f762b3520e2f7c0 SHA512 296576f91d45a4dd8c548a7ca5b47bcaf847f6ff0f8e5dbafaa4eb49a2d4f1ed7e2bbfac94f1b32e22f5ec61b23748ac76b12bb4ceb710889aff166953ca7a2e
 EBUILD dino-0.1.0.ebuild 1597 BLAKE2B ddcce77114ef37406b2c31eec69eb8d38a7cd476c150f0c9305aabcb9afd2e5c6f46d6310a78a8811d0c04f98b154638982cc354eb03d1667d136bbb7bc782c9 SHA512 c67877d9465cd93175f6d591fde849cc6667c84ba0000848f5a40a1233583c1d59afbb90f82584d478e85a2b2a30788898062af77cd6dbaa3b5ff960b08120c5
-EBUILD dino-9999.ebuild 1583 BLAKE2B 864709c4e4a9b34c6b444e1ae40a07b4697f3417be7641f229096bc7309c5e422953aca09d688afb410c4c921bd19457b6366c039f30d22d3357df17578e4686 SHA512 37c77529cae35d8e6ce438cb14fd970734c0cd900e4c0e55013c8996f4e759cdefb7d89890d28cbebf586307e1c1947561ed3ad543d835b504321d4473b46ffe
-MISC metadata.xml 573 BLAKE2B cf7a2731750afde53919e6a41541c0829df4ffa6da202c179092de0640a8ac044445b258350704822d02f302c601738f38f05fc2ab938d6f0ea55bead77b0eae SHA512 7023554fe0c67fd41d9134315500a7206653f34a192673db9bd741af22e05f0a00e431fa96c109c94bab6dbdb31334729bc272a07773dd7b905dd0422ce8532f
+EBUILD dino-0.2.0.ebuild 1817 BLAKE2B b7ad5c532f0903cf7d10bcd074fd21d03d53e45fc9e6bbc451043b72ac94e1b5bfdfa9673abe2f476ef9ba68ee053f36036d30528ad84178b79a797b18a57122 SHA512 7776ff0776e00efa5a343a324246ab7d734cd99a34656608d56d3091bb6796955a042e489de6182f8d516891e4177d5007b24718d57230f192516f6cb6b852dc
+EBUILD dino-9999.ebuild 1817 BLAKE2B b7ad5c532f0903cf7d10bcd074fd21d03d53e45fc9e6bbc451043b72ac94e1b5bfdfa9673abe2f476ef9ba68ee053f36036d30528ad84178b79a797b18a57122 SHA512 7776ff0776e00efa5a343a324246ab7d734cd99a34656608d56d3091bb6796955a042e489de6182f8d516891e4177d5007b24718d57230f192516f6cb6b852dc
+MISC metadata.xml 641 BLAKE2B 31f6c748c2bfe6279a574bf88b94caf476e1769159bdefc2fe4c35095d4e46cb30d6ad232f84cc614f83d1d319004398947fe65f0f9d1fc80dbdeef9497942de SHA512 a1b16eca16c3b7df169db8c7f8a2670cf97fab0c2913dad3ece312aa4e90429944148438b9d2bfd01661912ecffd950104b8324e83b691243841f810e6105ad5
diff --git a/net-im/dino/dino-0.2.0.ebuild b/net-im/dino/dino-0.2.0.ebuild
new file mode 100644
index 000000000000..87038c75d2fd
--- /dev/null
+++ b/net-im/dino/dino-0.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+VALA_MIN_API_VERSION="0.34"
+inherit cmake-utils gnome2-utils vala xdg-utils
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +omemo +notification-sound"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="${MY_REPO_URI}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libgee:0.8
+	net-libs/glib-networking
+	net-libs/libsignal-protocol-c
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	gpg? ( app-crypt/gpgme:1 )
+	http? ( net-libs/libsoup:2.4 )
+	omemo? (
+		dev-libs/libgcrypt:0
+		media-gfx/qrencode
+	)
+	notification-sound? ( media-libs/libcanberra:0[sound] )
+"
+DEPEND="
+	$(vala_depend)
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local disabled_plugins=(
+		$(usex gpg "" "openpgp")
+		$(usex omemo "" "omemo")
+		$(usex http  "" "http-files")
+	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
+	local mycmakeargs+=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+		"-DVALA_EXECUTABLE=${VALAC}"
+	)
+
+	if has test ${FEATURES}; then
+		mycmakeargs+=("-DBUILD_TESTS=yes")
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/xmpp-vala-test || die
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 937678aeb91c..87038c75d2fd 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -11,14 +11,14 @@ DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+gpg +http +omemo"
+IUSE="+gpg +http +omemo +notification-sound"
 
 MY_REPO_URI="https://github.com/dino/dino"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
 fi
 
@@ -39,6 +39,7 @@ RDEPEND="
 		dev-libs/libgcrypt:0
 		media-gfx/qrencode
 	)
+	notification-sound? ( media-libs/libcanberra:0[sound] )
 "
 DEPEND="
 	$(vala_depend)
@@ -57,7 +58,11 @@ src_configure() {
 		$(usex omemo "" "omemo")
 		$(usex http  "" "http-files")
 	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
 	local mycmakeargs+=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
 		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
 		"-DVALA_EXECUTABLE=${VALAC}"
 	)
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
index 05d64fd0a3f9..65da392eaa06 100644
--- a/net-im/dino/metadata.xml
+++ b/net-im/dino/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name="gpg">Enable OpenPGP encryption plugin</flag>
 		<flag name="http">Enable HTTP file upload plugin</flag>
 		<flag name="omemo">Enable OMEMO encryption plugin</flag>
+		<flag name="notification-sound">notification sounds plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 485584d46e27..d0074839e923 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -6,5 +6,7 @@ AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e6
 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
+DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c SHA512 d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
 EBUILD ejabberd-20.04.ebuild 9042 BLAKE2B fd60d71520f2290636b148fadc2887d684a1d3e9b2da49bfb266c4324218b4dc97c3bf4ac9c8e813f8245179990931c1d33cfba5a7dbf7d84bb7e2b4fe0f7746 SHA512 ab06eaf9afbb94c8da956fa892e649cd094c108cc1c96df708543a3558671226d871b1d766196f783e4519e3d1b80212b2dd1193837b0e66d96475448e892534
+EBUILD ejabberd-20.07.ebuild 9046 BLAKE2B 6e40cae0dad03ed5b45dfe10dcd973aec3ad6d24bcd337191c07177bd3450ecd62f4f49729fea8f6051b1a46d72e05fab99d01042db3282127570337d2bf5317 SHA512 749a69800e102eb052b58ef1bae313179640ca0d097c9c6ba055ef2ad2237c5e96574f937f4630c4a9065058c73000cb9611dffdfd397afc5620e41fec9570e1
 MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671
diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild b/net-im/ejabberd/ejabberd-20.07.ebuild
new file mode 100644
index 000000000000..ed5c06d61f11
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.07.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd tmpfiles
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+	roster-gw sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.25
+	>=dev-erlang/eimp-1.0.17
+	>=dev-erlang/fast_tls-1.1.8
+	>=dev-erlang/fast_xml-1.1.43
+	>=dev-erlang/fast_yaml-1.0.27
+	>=dev-erlang/yconf-1.0.7
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.7
+	>=dev-erlang/p1_utils-1.0.20
+	>=dev-erlang/stringprep-1.0.22
+	>=dev-erlang/xmpp-1.4.9
+	>=dev-erlang/pkix-1.0.6
+	>=dev-erlang/mqtree-1.0.10
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/p1_acme-1.0.8
+	>=dev-erlang/base64url-1.0
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.16 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.9 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.10 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.37 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.8 )
+	stun? ( >=dev-erlang/stun-1.0.37 )
+	zlib? ( >=dev-erlang/ezlib-1.0.8 )"
+RDEPEND="${DEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+	sed -re 's/^#\s+(certfiles)/\1/' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if we are missing a default certificate.
+ejabberd_cert_missing() {
+	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
+		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
+			# default certificate is present in config and exists - not installing
+			return 1
+		else
+			# default certificate is present in config
+			# but doesn't exist - need to install one
+			return 0
+		fi
+	fi
+	# no default certificate in config - not installing
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(User|Group)=(.*)!\1=jabber!' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+	sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
+		-i configure.ac || die "Failed to write correct version to configure"
+	# eautoreconf # required in case of download from github
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		--disable-system-deps \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/lock/ejabberdctl
+	rm -rf "${ED%/}/var/log" || die
+	rm -rf "${ED%/}/var/spool" || die
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	fi
+	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
+		ewarn If you are updating from an older version like 17.x
+		ewarn you may need to add an access_rules section to your
+		ewarn ejabberd.yml config file.
+		ewarn Otherwise authentication will be broken and users
+		ewarn will not be able to log in.
+		echo
+	fi
+
+	if ejabberd_cert_missing; then
+		ejabberd_cert_install
+	fi
+}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 8fb0f252c42b..40b065faebbc 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-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
+DIST element-desktop_1.7.9_amd64.deb 67635220 BLAKE2B c339638a00562d17258d7a311f51662e2eedc548c5131103186a3af312041e324891393c9f4228fe09c7f672aaa4c73a027a571cae89192d193d9c07e4028c03 SHA512 4011b91657f8fd7c39257c1ebbe0a92ad0d58729044ef4db569c0d72fcaf42250853c4c75aec7ea7dca756add2d3e0c2bab24c5ddd2ad4c884c6546372297a72
+EBUILD element-desktop-bin-1.7.9.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.7.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.9.ebuild
index 1322035d30ac..78456abd5728 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.7.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.9.ebuild
@@ -74,6 +74,8 @@ src_install() {
 	for f in ${QA_PREBUILT}; do
 		fperms +x "${f}"
 	done
+	fperms u+s /opt/Element/chrome-sandbox
+
 	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
 	dosym ${MY_PN} /usr/bin/riot-desktop
 }
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 11401b6406eb..e06710367332 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,5 @@
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
 DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
 EBUILD gajim-1.2.1.ebuild 2356 BLAKE2B 6f3ffb655c1945e7c00b95579acb87075e98e9122a01294a94d917d3318756fec5536ce77250bd972d3e63b075d8e298a57769535a214713fc46571b7501c686 SHA512 3d449b3f14fe84981afce8d310ac64afd9fe642e7619d29768ba63f982b41e1a5097d10f7564e355e3bf62b40c155090be17f874fa619800405c1ed8022b2a07
-EBUILD gajim-1.2.2.ebuild 2360 BLAKE2B 1edc40a383758eb41bfed434ddf491d33adbb1d0c888f9e6d83de581d2c1c7f6923cb867f438bae3581e3fbec82117ca950ea6b7c4e7a621b8e49a6b420fbeb0 SHA512 0b053dd513c843ddb200ca2ce44c6ee2b314cc5754d453500b61d090ee23db15d01e99fb7277af94bad9a4a5dc1eb0bd9e94455807f80be835f09e0baf828569
+EBUILD gajim-1.2.2.ebuild 2358 BLAKE2B 8b1dc8dbd2a10424db33e30b2474dfebaa001c87e975b4709de94a238cb21eb5015f9edf654ea7305f514a8f6e48f6bc2f9c496efbcf51b37210a1688ad3ad26 SHA512 d05c8a1c3613ad37b3536273dad2bc75e3a4d3fb9f78a16861731857825bcaa33c65f9ab4be5bdb3164c42784070e69acdc19efa5526f77e73158f34c1c09e73
 MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
diff --git a/net-im/gajim/gajim-1.2.2.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
index 60719dd066e4..4ad812f2c904 100644
--- a/net-im/gajim/gajim-1.2.2.ebuild
+++ b/net-im/gajim/gajim-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
 
 COMMON_DEPEND="
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index a25541d522d0..fa0347c14c5f 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1523 BLAKE2B 5a6b5e838f60306102b7ad4f9670397b0d793cbd3e3061c0b5516007f5ae0fc35afed8909f8d1d3e79e68be80af2989547c610fe4618bd17a63df8f954c741d9 SHA512 b6adbf729cb5e49080c07994cd729c357d91b2571b2d025246793c14256811d6643be53b8f6f6e9fba22196bb12913e810bd2590f3fc0ae01bff1fd0c53c0a4a
-MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
+EBUILD jabber-base-0.01-r2.ebuild 1244 BLAKE2B eecbd938e95afac047211d66f526324f03ac7accd0ce8e5b37910b6589de020c86b263df2ac44b684fad82898001d057c1f387182bba319b2ab84568b4ced960 SHA512 297eedfc04deddd5427e562b9eaac0afea64daf5cd73dff4a5e401330ba164e13dd969322ba532b953a478b4196637b12e82a51c9f644e729f3df606e39f09dc
+MISC metadata.xml 432 BLAKE2B b9284f76265de518e5ed2d8430da8501f61ff7b66f55db68f0136df7794e92dd9055bd5655d02c7110b5f0d21da2a319a846d89386c11d71911b886920d3674c SHA512 23c78c4f115f8871ccdc279aa0c62dd723945894fd14dd42c1e09654d4e8762a9d703c29015d3ca4539485b6eb63fb884e9034f037d5c492450bc64943148b92
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
deleted file mode 100644
index ea75b4d57216..000000000000
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Jabber servers and transports layout package"
-SRC_URI=""
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-#Info for people working in jabber related packages
-
-#/etc/jabber/ for configuration files
-#/var/run/jabber/ for the pid files
-#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
-#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
-#the directory is not there, even if they have permissions to creat it)
-#/var/log/jabber/ for the log files
-
-#for the python based transports with no install script:
-#they must inherit python and be installed in:
-#$(python_get_sitedir)/$package-name
-
-#the user should be the one created here username=group=jabber
-
-src_install() {
-	keepdir /etc/jabber
-	keepdir /var/run/jabber
-	keepdir /var/spool/jabber
-	keepdir /var/log/jabber
-}
-
-pkg_postinst() {
-	# Users should not be created in src_install see bug #124680
-	# Add our default jabber group and user
-	enewgroup jabber
-	enewuser jabber -1 -1 -1 jabber
-	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
-	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-}
diff --git a/net-im/jabber-base/jabber-base-0.01-r2.ebuild b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
new file mode 100644
index 000000000000..e054f2b5b47c
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Base layout package for various jabber services"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	acct-group/jabber
+	acct-user/jabber
+"
+
+# This package provides the base layout for all jabber related services.
+# Each service should use the user 'jabber' and the group 'jabber.
+#
+# The base layout contains of the following directories:
+# '/etc/jabber/'	: All main configuration, by jabber services used, is stored here.
+# '(/var)/run/jabber'	: All pid files, used by jabber services, are stored here.
+#			: Please note, that this directory should be
+#			: created dynamically by each jabber service during startup.
+# '/var/log/jabber/'	: All log files, used by jabber services, are stored here.
+# '/var/spool/jabber'	: All (flat) database files, used by jabber services, are stored here.
+
+src_install() {
+	local paths=(
+		"/etc/jabber"
+		"/var/log/jabber"
+		"/var/spool/jabber"
+	)
+
+	for path in ${paths[@]}; do
+		keepdir "${path}"
+		fowners "jabber:jabber" "${path}"
+		fperms 770 "${path}"
+	done
+}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 1eebfe0ed7d2..3052e573aa4c 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -2,10 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
-		Package that creats the users and directory's for jabber
-		related packages. See ebuild for more info.
+		This package creates the base layout,
+		which is used by several jabber services.
+		See ebuild for more information.
 	</longdescription>
 </pkgmetadata>
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 145ef1fd13ec..83296ae87067 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,7 +1,8 @@
+AUX kadu-4.3-compilation.patch 1149 BLAKE2B d5dd28cb8413f5880c839dda594ca650680e5665fae5ce75930a02cca4cd6aa6fc710f29a424db5781301d59b14e86aa049441fe85d97655c06bbce17772fb97 SHA512 d844930c008ec12a2ebd1e746b4167da7bb6417720aa9c5742edd3209400bfc595f03e0f4e9a772c66e80ed8ad4238c7fce000d6f1d0ccb4cd6912f71d1a5a2f
 AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b
 AUX kadu-4.3-find-x11-with-newer-cmake-modules.patch 2155 BLAKE2B 0709979d6c2e30a40f5e6de7f83c7ae1e991e639d85b30c0b012a736f6c4bf30b0b5f6e6f4f5ffdbf380bbff109709a8b2671a8f0237634c9809856d206e9a87 SHA512 861a5718990df106ec7edc408b29215b2bca0597bf1505fac49cddd3059da6228df82e98da752ce436e174f702d8996d5454ecf4a67fc1e05b6b284d4f341369
 AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952
 AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982
 DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
-EBUILD kadu-4.3-r2.ebuild 2677 BLAKE2B c435e136f1b9a12f3fec00d6a5fc1240303cca3fa95551d39da69063378b95f7d9c0b8fc9eed43cf4a45b6fb8e5e1b1cf6be933f2c7c4d182514f19f720819f2 SHA512 b23070791c9e6c4abca2d06a47473597a26783e62ed52b007d89ffe946a0d8a6008a365760c143f6ff149b468f2299b1347003b20314c0c0a961652ef1db0d87
+EBUILD kadu-4.3-r2.ebuild 2743 BLAKE2B 596bf99004d8435affddb5051f4f2c1536daf9bac35a4e052e1410b5cbf1581a8ee617614fc9c34eff8ba8bebeea0781af9b2edcecb0f00e4b8b9662054c6b2b SHA512 b167fc71bfc8777a8ed88f194f587de7bfacaa66041911e3de9f869ede3bdbe01bb803b2b21393eeeb781c039c56b6e43473763d6c807400641d47ae8aada11d
 MISC metadata.xml 578 BLAKE2B c6454fd583cf3ee9d55963cc482349eb236a46420d956ed7fe199721c81177e4f32c133279a49c71f5a5f64541efdb3ff8933753b3de868562b74a48eb7093c7 SHA512 23b011af6a0bcc235ca6685aeb1ec01cd9ef1e529fb5970860aab059fc1063d39d36446e3b86542ce303becc991e6250d58ec599aeddef6343382956c55a6c89
diff --git a/net-im/kadu/files/kadu-4.3-compilation.patch b/net-im/kadu/files/kadu-4.3-compilation.patch
new file mode 100644
index 000000000000..b9cd0c582889
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-compilation.patch
@@ -0,0 +1,23 @@
+diff -ruN kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp kadu-my/kadu-core/gui/widgets/avatar-painter.cpp
+--- kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp	2017-01-24 22:36:21.000000000 +0100
++++ kadu-my/kadu-core/gui/widgets/avatar-painter.cpp	2020-10-22 23:57:41.486490926 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <QtCore/QModelIndex>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPixmapCache>
+ #include <QtWidgets/QStyleOptionViewItem>
+diff -ruN kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp kadu-my/kadu-core/plugin/state/plugin-state.test.cpp
+--- kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp	2017-01-24 22:36:21.000000000 +0100
++++ kadu-my/kadu-core/plugin/state/plugin-state.test.cpp	2020-10-23 00:06:51.167189202 +0200
+@@ -34,7 +34,7 @@
+ 
+ void PluginStateTest::newTest()
+ {
+-	QCOMPARE(pluginStateToString(PluginState::New), {});
++	QCOMPARE(pluginStateToString(PluginState::New), QString{});
+ 	QCOMPARE(stringToPluginState(""), PluginState::New);
+ 	QCOMPARE(stringToPluginState("New"), PluginState::New);
+ 	QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index 4b1cc6ce54b2..d2e585826dd9 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
 	>=app-arch/libarchive-2.6[lzma]
 	>=dev-libs/injeqt-1.1.0
+	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
@@ -104,6 +105,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
 	"${FILESDIR}/${PN}-4.3-gcc7.patch"
 	"${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
+	"${FILESDIR}/${PN}-4.3-compilation.patch"
 )
 
 src_configure() {
diff --git a/net-im/librvp/Manifest b/net-im/librvp/Manifest
index 1f79e3d6dfb1..c5191046e3a6 100644
--- a/net-im/librvp/Manifest
+++ b/net-im/librvp/Manifest
@@ -1,3 +1,3 @@
 DIST librvp-0.9.7.tar.gz 478014 BLAKE2B 5e57bb7899037084f7e1f9a1f5816f199efb200a62b3e56e400ac5850fc2cb9fcffc9248c61b4ccbc73a67cf628ae06af36d443047ffc67f351c795320f58132 SHA512 dd097f3b845288771be33b553cfc0da90a87350e2021f9fe706e6b7479abc3bb1c7d08a9f38f9376fee235a5491c30bb65e7bd968901626ddf0499aa5ca1580c
-EBUILD librvp-0.9.7.ebuild 587 BLAKE2B 91caeaa9f1c056042eda7d6ee0cd7a46ec39a66fec1aed8fd07bc2f420f1a6a2154999b55d9e3556275d19d1cdc394c20ff7c12e749bcc4fdfdefbff0eadd543 SHA512 bed14c82e6dffb87657dc93055dcdb21682122bfbdc510a6ffc7f27635a3245aeb9874d1869447b8a3395dfb4838fd2816db064f621ca3fafc50cfaec7fcdb39
+EBUILD librvp-0.9.7.ebuild 674 BLAKE2B 5a3b0360136c3fc632263b645f69d0b6197a224f595cdbd034916318f94ba4d10916ee57cf6b81196b71b0df7cb20c32dd5bd10289a0c9f60fe39c3e448b7d26 SHA512 8821159618a061d881f93dfd5521400959b7b9ea8d713659bb015e5ecbeffbadfd7f8f07bafb5618c89325f1b164c9f25a4625f537eca949d3f4336e1fee9389
 MISC metadata.xml 404 BLAKE2B 64a654e99fa075b23bb464da322da0cf55383264f5fa5322784a1db4c22924db63b127c901b26047e5e6af7902115e3c6a262b381e4b3c7d15723b8a6e381b7e SHA512 c8a45182953464dc9ebc337a7757f44acf247343d9ea58ace3bf356723402de0134020a44f00acd9016c8fc1ac89f239c124ad381abc497fae110c051b69792f
diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild
index 69563f1ad40e..b87866183e5c 100644
--- a/net-im/librvp/librvp-0.9.7.ebuild
+++ b/net-im/librvp/librvp-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,13 +10,19 @@ SRC_URI="https://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 src_configure() {
-	econf --with-gaim-plugin-dir="${EPREFIX}"/usr/$(get_libdir)/pidgin \
-		--with-gaim-data-dir="${EPREFIX}"/usr/share/pixmaps/pidgin
+	econf \
+		--with-gaim-plugin-dir="${EPREFIX}"/usr/$(get_libdir)/pidgin \
+		--with-gaim-data-dir="${EPREFIX}"/usr/share/pixmaps/pidgin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 838121650de5..7d04f9ab9720 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,7 +1,9 @@
 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-9999.ebuild 2354 BLAKE2B a4480dfa03929abe20a103d2575552d30427816eefb5e625204328ff3d9c5df118ba1edfe449e4d7aa1b3ff75e567b40da365e250daa48a2c71d97853889a088 SHA512 df018b04d78b4d35bfbdc42165357970dda4d26f7ba23517b33373d69f204388aa2f553653436da29a2f3ba28d969a7d638f737933b84f5af75217bab0f99552
+EBUILD mcabber-1.1.2.ebuild 2339 BLAKE2B 9854fe8ee70c79059f5fca115d5fced77ab9719d9f8916950241994e69e4501a7b8035ca115df23c3140c01d08e15358049373522aea5cb75701f7df1f3c49c4 SHA512 b2069a6f873ed5b5df98c917e871d0ac33d1bbc8d9d3eba3d414350f90cc48b36c2abc4f7bd9e6aaff241d94633e7799f89a95ad1f285e68b1c2da6acc67b7fc
+EBUILD mcabber-9999.ebuild 2341 BLAKE2B 98e6851f3ee8dc80ad2e8a45c37867eba3c5577eefc0fbd086ea30f6a1133e1bedb4c70feb7528b894b5490d448b118d192247e65da5d879b98a02f0cfa7cf6a SHA512 01184bea498e4adf608862a3d2f9dd97d15950f6d6154b654cc93e879e4e8effcd15736c33f4ea4cf109c8f776c2ec802ee084dd7e3cc10e3025ebc40084d2eb
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/mcabber-1.1.2.ebuild b/net-im/mcabber/mcabber-1.1.2.ebuild
new file mode 100644
index 000000000000..ef916f750572
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.1.2.ebuild
@@ -0,0 +1,99 @@
+# 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://mcabber.com/hg/"
+	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-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 266ed8c59e89..0b84efe65300 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://mcabber.com/"
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/McKael/mcabber"
+	EHG_REPO_URI="https://mcabber.com/hg/"
 	EHG_CHECKOUT_DIR="${WORKDIR}"
 	EHG_BOOTSTRAP="autogen.sh"
 	S="${WORKDIR}/${PN}"
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index d0605767ee89..cb7ad7f55231 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,6 +1,7 @@
 DIST poezio-0.12.tar.gz 585750 BLAKE2B d79cab965b39a9ea191c763e1560bedbf46e3107e1b301a651103caf8f9e63b8465925ea01ac4e2e6b747b66cf5d4be8cabd8be80a069fe4eafcf331c7daada8 SHA512 6249daf23c6f4c1b25a9de686abaa62076e1eac7566da0a174ae3a82e3a53b7f2a86145d20d587a7ee43c8b679d90cb381d5afbfc7860459c5a497e97af32ff4
 DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
 EBUILD poezio-0.12.ebuild 1153 BLAKE2B 0720504412ee0fad379247625cc32805f856c6094e644d15038ef6bfe58384c6275594942da07f72b4f40f0af0d087b20dfd03965cec31fa0e9583af4886d082 SHA512 579f39195c6178f5e15979ecdb4b6264422d2e75c336831291ced8c9dff27d34384b9a235bc7206ad30958da27d06d2b638e21e0a8ff3ae7bca704ff10c03f8d
+EBUILD poezio-0.13.1-r1.ebuild 1161 BLAKE2B 5c42e0e85f21fa5f5ab39cbfaca6f21aaf9de4ac61e09bd343663a263d0c0a9ff37a27f8a0a6962fa7173f78fdfb628d67d4a8581353df2b81cf28b4a0d35cf4 SHA512 a6625b4fedefb3413c5b465909aef2ecc367f67129c010cf9f862222b74df3beabb42aa024ab0f536efb63cece51b5dda02e237f82b7858e36dcc6889cd69d42
 EBUILD poezio-0.13.1.ebuild 1128 BLAKE2B 131412633aeb89905e905d262862b4a9f65afb3f80f8e7106fccabe9dd26c82f8376f124b921df216191969e705173b0fdf972d7604f1b906aa846abe020cc10 SHA512 695f47cbdf6b889bf7ef6587f12cf7c06288a880f338d82fdf3a2de76637a7a5c5345a74f3ca0a505b2c0d48f5bafc4d75b2baddc1a28e48227295136baa968f
-EBUILD poezio-9999.ebuild 1128 BLAKE2B 75eaacdb00ee15c4bd4a9dce465b512cfcace63ecdabc94e8c1e9b5f8032a8b4c1af14f52caaff419f02bbf822dc162251510ad833f5878c450506beb7ded9ad SHA512 71fa612dfe17c2c6a390269391b9761753899154d38b7534f8dae4d8c9b0d5621cb425d580e6baec3ec45c3e3f7254625d2fc1686e613e696edb2537d1019781
+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
new file mode 100644
index 000000000000..12c7dd0d6ee6
--- /dev/null
+++ b/net-im/poezio/poezio-0.13.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DOC_CONTENTS="
+Install these optional runtime dependencies for additional features.
+* dev-python/pyinotify for screen autoaway plugin support.
+"
+DISABLE_AUTOFORMATTING=true
+
+src_prepare() {
+	default
+	# Delete unmaintained plugin which requires an excessive external dep
+	rm plugins/mpd_client.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 89a6ccb69f4d..f39bc56b1eb6 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 readme.gentoo-r1
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index fe786d9f0158..d6eb36e6552c 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -3,5 +3,5 @@ DIST profanity-0.7.1.tar.gz 788754 BLAKE2B 447c761233ce6989081d3ed7a585d90713f42
 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
+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.9.5.ebuild b/net-im/profanity/profanity-0.9.5.ebuild
index 691c34a82497..9b0fc0ae5fdd 100644
--- a/net-im/profanity/profanity-0.9.5.ebuild
+++ b/net-im/profanity/profanity-0.9.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://profanity-im.github.io/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="libnotify omemo otr gpg test xscreensaver"
 RESTRICT="!test? ( test )"
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
new file mode 100644
index 000000000000..2dafac5441af
--- /dev/null
+++ b/net-im/prosody-modules/Manifest
@@ -0,0 +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
+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/metadata.xml b/net-im/prosody-modules/metadata.xml
new file mode 100644
index 000000000000..fdabf81a3e5f
--- /dev/null
+++ b/net-im/prosody-modules/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Prosody can be customized extensively using modules (plugins) to change
+		its default behaviour and to add new features and functionality.
+
+		Please note that each module is in a different state of development.
+		Some are proof-of-concept, others are quite stable and ready for production use.
+		Be sure to read the documentation page of any module before installing it on your server.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
new file mode 100644
index 000000000000..46bb27cbada4
--- /dev/null
+++ b/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig
+
+DESCRIPTION="A collection of community-maintained modules for Prosody"
+HOMEPAGE="https://modules.prosody.im"
+SRC_URI="https://dev.gentoo.org/~conikost/distfiles/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="net-im/prosody"
+
+src_prepare() {
+	default
+
+	# Exclude 'misc' folder from install, since it does not provide any modules.
+	echo "# Remove all modules from this list, which you don't want to install." > prosody-modules.conf || die
+	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
+
+	use savedconfig && restore_config prosody-modules.conf
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/prosody/community-modules"
+	while read prosody_module; do
+		if ! [[ "${prosody_module}" = \#* ]]; then
+			if [[ -f "${prosody_module}/README.markdown" ]]; then
+				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
+				rm "${prosody_module}/README.markdown" || die
+			fi
+
+			doins -r "${prosody_module}"
+		fi
+	done <prosody-modules.conf
+
+	save_config prosody-modules.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	einfo "In order to use the community modules on an existing instance, you have to add"
+	einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'"
+	einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'"
+	einfo ""
+	einfo "Example: plugin_paths = { /usr/$(get_libdir)/prosody/community-modules };"
+}
diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild b/net-im/prosody-modules/prosody-modules-9999.ebuild
new file mode 100644
index 000000000000..5759297af384
--- /dev/null
+++ b/net-im/prosody-modules/prosody-modules-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mercurial savedconfig
+
+EHG_REPO_URI="https://hg.prosody.im/${PN}/"
+
+DESCRIPTION="A collection of community-maintained modules for Prosody"
+HOMEPAGE="https://modules.prosody.im"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="net-im/prosody"
+
+src_prepare() {
+	default
+
+	# Exclude 'misc' folder from install, since it does not provide any modules.
+	echo "# Remove all modules from this list, which you don't want to install." > prosody-modules.conf || die
+	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
+
+	use savedconfig && restore_config prosody-modules.conf
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/prosody/community-modules"
+	while read prosody_module; do
+		if ! [[ "${prosody_module}" = \#* ]]; then
+			if [[ -f "${prosody_module}/README.markdown" ]]; then
+				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
+				rm "${prosody_module}/README.markdown" || die
+			fi
+
+			doins -r "${prosody_module}"
+		fi
+	done <prosody-modules.conf
+
+	save_config prosody-modules.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	einfo "In order to use the community modules on an existing instance, you have to add"
+	einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'"
+	einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'"
+	einfo ""
+	einfo "Example: plugin_paths = { /usr/$(get_libdir)/prosody/community-modules };"
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 534435906d86..f584250e93e6 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,7 +1,14 @@
+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_cfg-0.11.2-r1.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
+AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 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 399 BLAKE2B 01895e1bb6fb8aea8167fe0a060f38524b62d8a6fddd82e22997ca2c81cb4f9c1273d442577028a806cba765feac1c9934a840473097a88bbc027dc5315c7353 SHA512 da3f21781934c83f3971fc36cab54e6179571e79a330c18ef1ab00556f962f7cd1032d2c3355f1d8225d39ea6e9d5d48afa8e90698d6320216eea71bcada8d22
+DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
+EBUILD prosody-0.11.5-r1.ebuild 2085 BLAKE2B 635d42bd9df55770be24797e63666c07e6c16f240be5a641164f29de52bbb3dd8e070f9cf708a947482267d592c27adc92f2dc64903d8cdbff7fc90be504420b SHA512 6b0fdfc3901f2227007408108e7f647218dbe5ea06aae3ffeb197b92837cdded1841f39a1bb990235149c7c7ae9784002e60b5fca1bc540f8ce27886a4514761
+EBUILD prosody-0.11.7-r2.ebuild 2255 BLAKE2B 3cf800b91388298466fab32cbfc1b641057e4c2ae1f70881c798eac63e6b14587503568ddfec8126281427a1685eb7c69125a63f3c4e1fd95942975b1360b747 SHA512 1c16147d722315050c6077e4886a7394eac85bf21ac51aa43a97de1818376356cd0e9d0b48cafe387dd8bdc3204b4e564c89545da045665e8af7edd288537ef4
+MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
diff --git a/net-im/prosody/files/prosody_cfg-0.11.2-r1.patch b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
index 94423a834ae1..94423a834ae1 100644
--- a/net-im/prosody/files/prosody_cfg-0.11.2-r1.patch
+++ b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
diff --git a/net-im/prosody/files/prosody-0.11.7-bit32.patch b/net-im/prosody/files/prosody-0.11.7-bit32.patch
new file mode 100644
index 000000000000..fb7b55f6bbef
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-bit32.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Kim Alvefur <zash@zash.se>
+# Date 1601928749 -7200
+# Node ID e17b98feb0b7cad6539ee25c5cc7728911349a6d
+# Parent  c3eefb517b7b934dbf4f78244c18f7e91b852846
+util.dependencies: Check for bitop library same way as net.websocket.frames (fixes #1594)
+
+diff -r c3eefb517b7b -r e17b98feb0b7 util/dependencies.lua
+--- a/util/dependencies.lua
++++ b/util/dependencies.lua
+@@ -90,7 +90,7 @@
+ 			}, "SSL/TLS support will not be available");
+ 	end
+ 
+-	local bit = _G.bit32 or softreq"bit";
++	local bit = softreq"bit" or softreq"bit32";
+ 
+ 	if not bit then
+ 		missingdep("lua-bitops", {
+
diff --git a/net-im/prosody/files/prosody-0.11.7-gentoo.patch b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
new file mode 100644
index 000000000000..e571066874b7
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.11.7-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -17,6 +17,15 @@
+ -- Settings in this section apply to the whole server and are the default settings
+ -- for any virtual hosts
+ 
++-- Prosody will use this user and group for launching the service.
++-- Gentoo uses by default jabber:jabber (uid:gid) for all Jabber related services.
++prosody_user = "jabber"
++prosody_group = "jabber"
++
++-- Prosody will create this pid file after it has been successfully started.
++-- Please don't change that path, as it's being used by the Gentoo init scripts.
++pidfile = "/run/jabber/prosody.pid"
++
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see https://prosody.im/doc/creating_accounts for info)
+@@ -30,7 +39,9 @@
+ -- Prosody will always look in its source directory for modules, but
+ -- this option allows you to specify additional locations where Prosody
+ -- will look for modules first. For community modules, see https://modules.prosody.im/
+---plugin_paths = {}
++-- The default included path is for the optional net-im/prosody-modules package,
++-- which provides additional community maintained modules.
++plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/community-modules" };
+ 
+ -- 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.
diff --git a/net-im/prosody/files/prosody.initd-r4 b/net-im/prosody/files/prosody.initd-r4
new file mode 100644
index 000000000000..1282e9dc4561
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r4
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Prosody XMPP server"
+extra_started_commands="reload"
+jabber_pid="/run/jabber"
+jabber_logs="/var/log/jabber"
+pidfile="${jabber_pid}/prosody.pid"
+prosody_config="/etc/jabber/prosody.cfg.lua"
+
+command="/usr/bin/prosody"
+command_group="jabber"
+command_user="jabber"
+
+checkconfig() {
+	if [ ! -f "${prosody_config}" ]; then
+		eerror "Please create ${prosody_config} before starting Prosody!"
+		return 1
+	fi
+
+	luac -p "${prosody_config}"
+	return $?
+}
+
+depend() {
+	need net
+	provide jabber-server
+	use dns postgresql
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_logs}"
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_pid}"
+}
diff --git a/net-im/prosody/files/prosody.service-r2 b/net-im/prosody/files/prosody.service-r2
new file mode 100644
index 000000000000..81408beefe53
--- /dev/null
+++ b/net-im/prosody/files/prosody.service-r2
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prosody XMPP server
+After=network.target
+
+[Service]
+Group=jabber
+PIDFile=/run/jabber/prosody.pid
+ExecStart=/usr/bin/prosody
+ExecReload=/bin/kill -HUP $MAINPID
+User=jabber
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd-r1 b/net-im/prosody/files/prosody.tmpfilesd-r1
new file mode 100644
index 000000000000..7fcdd539decc
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd-r1
@@ -0,0 +1 @@
+d /run/jabber 750 jabber jabber - -
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index 469f03f567b7..d73f165dd534 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="libevent">Use libevent for event handling</flag>
-    <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
-    <flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
-  </use>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		Prosody is a modern XMPP communication server.
+		It aims to be easy to set up and configure,
+		and efficient with system resources.
+		Additionally, for developers it aims to be easy to extend
+		and give a flexible system on which to rapidly develop
+		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.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild
index 77ea1552347c..6ffc3bd7b489 100644
--- a/net-im/prosody/prosody-0.11.5.ebuild
+++ b/net-im/prosody/prosody-0.11.5-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${BASE_DEPEND}
 		test? ( dev-lua/busted )"
 
 RDEPEND="${BASE_DEPEND}
-		>=dev-lua/luaexpat-1.3.0
+		~dev-lua/luaexpat-1.3.0
 		dev-lua/luafilesystem
 		!ipv6? ( dev-lua/luasocket )
 		ipv6? ( >=dev-lua/luasocket-3 )
@@ -38,7 +38,7 @@ RDEPEND="${BASE_DEPEND}
 		ssl? ( dev-lua/luasec )
 		zlib? ( dev-lua/lua-zlib )"
 
-PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch")
+PATCHES=( "${FILESDIR}/${PN}-0.11.2-r1-gentoo.patch" )
 
 JABBER_ETC="/etc/jabber"
 JABBER_SPOOL="/var/spool/jabber"
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild
new file mode 100644
index 000000000000..9453002bf47b
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.7-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
+IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	|| (
+		>=dev-lang/lua-5.2:*
+		dev-lua/lua-bit32
+	)
+	net-dns/libidn
+	net-im/jabber-base
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-lua/busted )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lua/luaexpat
+	dev-lua/luafilesystem
+	dev-lua/luasocket
+	libevent? ( dev-lua/luaevent )
+	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.7-bit32.patch"
+	"${FILESDIR}/${PN}-0.11.7-gentoo.patch"
+)
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/spool/jabber"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="$(usex luajit luajit lua)"
+		--sysconfdir="${EPREFIX}/etc/jabber"
+		--with-lua-include="${EPREFIX}/usr/include"
+		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/prosody.initd-r4 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
+
+	keepdir /var/spool/jabber
+}
+
+pkg_postinst() {
+	tmpfiles_process prosody.conf
+}
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 05d2792f03a5..099479e7b310 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080 SHA512 c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
-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
+EBUILD psi-1.5.ebuild 2946 BLAKE2B eaba933f26ff8216eed3c04245ed446b3c277e211ecd35e4fd4bc8726ac0c1eabeded074ad51a786fdb594ced70b39d48f969351e3674989cb66c2151b4775d1 SHA512 7d27fb44e3332f4ea1a6a92f3ae2202b12aadc83f25b7dfe1892c4deaccfa79112b472f53b7ab857e328ec4a295aa18e524f6259f6db2e6214ac09597fa2ed8b
+EBUILD psi-9999.ebuild 4039 BLAKE2B f8d7f76e5459644ec3992f6b9bb26d6fbec8b00b4535393eac87ec3a07f0ec58e2bce342340dd3864ffa1f93bfcd8c9520f7fbcf98ea3bf0b74b5856bb195773 SHA512 27d3611f303698947bab443f1f413954e98a5d14643f2710e0153c4b689875e04b80ecf6da54ba607ac962427a3a52e963179504b4d8707828102dbc69ab8762
+MISC metadata.xml 1493 BLAKE2B 2b7be89dd49725208783dbfdbea4311212d1c9c2cc336fd204b2e3573b7bfb3aefc7dc8a459ed39b2adf09fafef12cfa36e637efa66587d2642190add9c1627a SHA512 467e544a68b3044636db1f45ff159167252ac6a3d4ceb83c520caa09d61ef430141f2719773e9c7021a36e57c8871412d6585b9c1d0834a57f576c774819f597
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index d1fdaf8e1f54..41be813c050b 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag>
 		<flag name="keyring">Enable storing password in system keyring manager</flag>
 		<flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag>
-		<flag name="webkit">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebkit</pkg></flag>
 		<flag name="whiteboarding">Enable experimental interactive SVG drawing</flag>
 		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
 	</use>
diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5.ebuild
index 1d1ed507d805..1d81d0bf29dd 100644
--- a/net-im/psi/psi-1.5.ebuild
+++ b/net-im/psi/psi-1.5.ebuild
@@ -16,11 +16,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
-	webengine? ( !webkit )
 "
 
 BDEPEND="
@@ -50,7 +49,6 @@ DEPEND="
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 "
@@ -72,11 +70,11 @@ src_configure() {
 		$(use_enable hunspell)
 		$(use_enable xscreensaver xss)
 		$(use_enable whiteboarding)
+		$(use_enable webengine webkit)
+		$(use_with webengine webkit qtwebengine)
 	)
 
 	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
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index cd78ecbc4995..045b0c6e1837 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -20,7 +20,7 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine webkit xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
@@ -47,6 +47,7 @@ DEPEND="
 	dev-qt/qtxml:5
 	net-dns/libidn:0
 	net-libs/http-parser:=
+	net-libs/usrsctp
 	sys-libs/zlib[minizip]
 	x11-libs/libX11
 	x11-libs/libxcb
@@ -60,7 +61,6 @@ DEPEND="
 		dev-qt/qtwebengine:5[widgets]
 		net-libs/http-parser
 	)
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="${DEPEND}
 	dev-qt/qtimageformats
@@ -113,10 +113,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local chattype=basic
-	use webengine && chattype=webengine
-	use webkit && chattype=webkit
-
 	local mycmakeargs=(
 		-DPRODUCTION=OFF
 		-DUSE_ASPELL=$(usex aspell)
@@ -125,7 +121,7 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DINSTALL_PLUGINS_SDK=1
 		-DUSE_KEYCHAIN=$(usex keyring)
-		-DCHAT_TYPE=$chattype
+		-DCHAT_TYPE=$(usex webengine webengine basic)
 		-DUSE_XSS=$(usex xscreensaver)
 		-DPSI_PLUS=$(usex extras)
 	)
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 08e725639527..e2473cd61172 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.36.2_amd64.deb 108652236 BLAKE2B 60447e0783ed52839c996b364972433a992de9fee45861cfafb5e6509283364eaa0628227754acea7d1f93a21289abfe9bb9bb62d7c4e32f7104fa8c97fe20b5 SHA512 581e904d37b17c6179e7bd677cc716f2ad48b6d210a2117a94a30066334f601159a73245bff91b503e3819b083364292aca34329d40287bd7655ccadb166792f
-EBUILD signal-desktop-bin-1.36.2.ebuild 3402 BLAKE2B 1f16761c27b8c9bedacad015bcbf6025e40ae715cec5392cf52d9b59f6f79836faa31389affb62bc28764ccd3eef8276f3971e44eb8f9bec73f3cf407222ef06 SHA512 c3d8d2019e506b57f74c2d933a9c0dc77c0ceb1808327ac97279a56cbcf1b92e477ec0a172715f633c1d49b380a7f863c2b1f9f6f0843bea56f6aa242309ca97
+DIST signal-desktop_1.38.2_amd64.deb 109679066 BLAKE2B ca78200c1eda68ba7749b463fd8d286d25dca5c2032e4127f57462858f5b6724d27ef2e0e5c3d116840b3afa504c087eda78cd14247042f6574187b4642fc0e0 SHA512 42bf7c954a26b47c0753411d75fb9d8aba059be57f070f7f0e8ffadd2411b513ebcf5a82dbcf9afa5ec159ab508d425c61d681e930aba0872d764ee47b5a3a7e
+EBUILD signal-desktop-bin-1.38.2.ebuild 3661 BLAKE2B 85f803142cb67f6fd72bc2d98acff194349eade2bc14edbe18eab59de139da99524b3c283f789b99818483d5af425233a5a79e3128457149d62c4cd8509cab85 SHA512 e7ebfdcc567683b70b9856161963cbc6c884407ed26239abfcacd7d85bcd90b9a63dbec9771db5c60e19ace9f758e30f88e365f15648e5fec616a991f5f95bb0
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.38.2.ebuild
index 7a50112a339f..0735309452cc 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.38.2.ebuild
@@ -15,6 +15,7 @@ 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="+sound"
 
 BDEPEND="app-admin/chrpath"
 RDEPEND="
@@ -45,6 +46,12 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	sound? (
+		|| (
+			media-sound/pulseaudio
+			media-sound/apulse
+		)
+	)
 "
 
 QA_PREBUILT="opt/Signal/signal-desktop
@@ -57,7 +64,7 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	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/@journeyapps/sqlcipher/lib/binding/electron-v8.5-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
@@ -86,6 +93,11 @@ src_install() {
 	dodoc changelog
 	doins -r opt
 	insinto /usr/share
+
+	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
+		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop
+	fi
+
 	doins -r usr/share/applications
 	doins -r usr/share/icons
 	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index caec6f45d83d..f3efcf429294 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-DIST skypeforlinux_8.64.0.81-1.x86_64.rpm 114748914 BLAKE2B 918687dc7ba5c1b357f4a9551ee710834a59410b14c6a23e8ef5972dacc1f1c08a040e534e798f63100bca7b5f98e34732f3e8e172c16edd4caaa18a171305ef SHA512 2a5e7a206741421f52c60a2775e1c51011118e49a06d90e72fe6af14a833384ed1bc8f44b26ef3de0e2891cc22dcfc7e3fbec7dc3ad46d9e75a4ac5cd330183f
-DIST skypeforlinux_8.65.0.76-1.x86_64.rpm 115113199 BLAKE2B b5f0fbb70849d3e6ec866b502b11d3b843ce25a27455e86a410c563f7de3b4961c843d461087b613581ebcecd0c79232552c4150684f6eb92eca779b4ffbad28 SHA512 6df1d3d98221ae9636a3f62d6acf0cb68376fce4b8abccbdf5d881092be91f337cc32323d263b708509e6f63bcfe4d0f4c9674ae106419de07acaf36e41434f2
-EBUILD skypeforlinux-8.64.0.81.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
-EBUILD skypeforlinux-8.65.0.76.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+DIST skypeforlinux_8.66.0.74-1.x86_64.rpm 115074997 BLAKE2B 84b1ff85d3be0279879bd0d53eec4ead09170806f726c1dd81c91a9348d9d4c72486f50b3917b263814c0215411f9a9ee1fd3eb356a930e29d1ee550d811eb24 SHA512 db10e658f977b6293150252cd0018baaf17ed1d64978f3b7b171309921928de0cef275cec15819e38a9c3be47101067070695311ef63fa5fa47cf9ba95e9af45
+EBUILD skypeforlinux-8.66.0.74.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild b/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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/skypeforlinux/skypeforlinux-8.64.0.81.ebuild b/net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild
index c2755ee5b06c..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.64.0.81.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index cc2b344310c8..daad845c9f50 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,5 +3,6 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
+EBUILD swift-4.0.2-r100.ebuild 5049 BLAKE2B b07dd02728d4fb65737389776fae9baa58b794d99321743c7a297c75ecd4948939434ced0936b33f83c44d7910b42957d1ef26f2551a2de900d5d8c6aba901ef SHA512 2408c703ec8fee9af7da03a67e7420bce2f3de7548858d5031393b27e1d43e6ce4ba25864f32fc523d956169273e188891eb2ee0477d7808d809cd34671d076c
 EBUILD swift-4.0.2-r4.ebuild 4657 BLAKE2B 2b81d9a5b8e7e86a7ead9c154e59f79ccfc63c202ba17dfc567ef3b4e6ee551fa7011ff6d5c5cda21fcdb137736baf0dd16e6544645ed646abc31227474077c0 SHA512 cfd5adc4c6e8252cce2f526afacedb3725223be6dedada6c6e8a89f08143294538036119700ba769977afdbb8944b6e24cb83149432b69a1c78cb886789852bd
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r100.ebuild b/net-im/swift/swift-4.0.2-r100.ebuild
new file mode 100644
index 000000000000..c41fea304bf0
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r100.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit lua-single python-any-r1 scons-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="
+	https://swift.im/downloads/releases/${P}/${P}.tar.gz
+	https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
+REQUIRED_USE="
+	|| ( icu idn )
+	gconf? ( client )
+	lua? ( ${LUA_REQUIRED_USE} )
+	spell? ( client )
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp
+	net-libs/miniupnpc:=
+	sys-libs/zlib
+	client? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+		net-dns/avahi
+	)
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gconf? ( gnome-base/gconf:2 )
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	lua? ( ${LUA_DEPS} )
+	spell? ( app-text/hunspell:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/scons-3.0.1-r3
+	client? ( dev-qt/linguist-tools:5 )
+	test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+	"DEVELOPMENT.md"
+	"README.md"
+	"Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
+	"${WORKDIR}"/${P}-python3-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.15-compatibility.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Don't include '/usr/lib*' in the link command line for `swiften-config`
+	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
+	# Use correct LIBDIR for Lua
+	sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die
+
+	# Hack for finding Qt system libs
+	mkdir "${T}"/qt || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
+
+	# Remove parts of Swift, which a user don't want to compile
+	if ! use client; then rm -fr Swift Slimber || die; fi
+	if ! use lua; then rm -fr Sluift || die; fi
+	if ! use zeroconf; then
+		rm -fr Limber || die
+		if use client; then rm -fr Slimber || die; fi
+	fi
+
+	# Remove '3rdParty', as the system libs should be used
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="no"
+		experimental_ft="yes"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		lua_includedir="$(lua_get_include_dir)"
+		lua_libdir="${EPREFIX}/usr/$(get_libdir)"
+		lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && xdg_icon_cache_update
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index cbca05e60e6f..664c6f29d586 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,3 @@
-DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4
-EBUILD teams-1.3.00.16851-r2.ebuild 2764 BLAKE2B 7b85ba3edb7dde83b06a3e3680138b773d17f0284f556ce5f768bfa7969c46a51f2d1f9caa37131f86fc918ffb9d0ec516bc594344ac1c3ff1143608c43e22b4 SHA512 119bde21b42d0369e4144ff4d085f9979b3ee394842336c6d3e7b635b311697b0fbab861440b196c8a190cd34dd0fe17ca2deac11fdf44e5f77e8fb5e6615517
-MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
+DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
+EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
+MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml
index 80a71f597854..a141f350b4fe 100644
--- a/net-im/teams/metadata.xml
+++ b/net-im/teams/metadata.xml
@@ -5,4 +5,8 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <use>
+    <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
+    <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-im/teams/teams-1.3.00.16851-r2.ebuild b/net-im/teams/teams-1.3.00.25560.ebuild
index 66e5820e6c66..6f18946cc3f1 100644
--- a/net-im/teams/teams-1.3.00.16851-r2.ebuild
+++ b/net-im/teams/teams-1.3.00.25560.ebuild
@@ -13,7 +13,7 @@ LICENSE="ms-teams-pre"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror splitdebug test"
-IUSE=""
+IUSE="system-ffmpeg system-mesa"
 
 QA_PREBUILT="*"
 
@@ -30,11 +30,8 @@ RDEPEND="
 	dev-libs/glib
 	dev-libs/nspr
 	dev-libs/nss
-	gnome-base/libgnome-keyring
 	media-libs/alsa-lib
 	media-libs/fontconfig
-	media-libs/mesa
-	<media-video/ffmpeg-4.3[chromium]
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
@@ -56,6 +53,8 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/libxkbfile
 	x11-libs/pango
+	system-mesa? ( media-libs/mesa )
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
 "
 
 S="${WORKDIR}"
@@ -67,19 +66,25 @@ src_install() {
 	fperms +x /usr/bin/teams
 	fperms +x /usr/share/teams/teams
 
-	# use system ffmpeg
-	rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+	if use system-ffmpeg ; then
+		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
 
-	cat > 99teams <<-EOF
+		cat > 99teams <<-EOF
 		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
-	EOF
-	doenvd 99teams
-
-	# use system mesa
-	rm -f "${D}"/usr/share/teams/libEGL.so || die
-	rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-	rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-	rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		EOF
+		doenvd 99teams
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if use system-mesa ; then
+		rm -f "${D}"/usr/share/teams/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		elog "Using system mesa. This is experimental and may lead to crashes."
+	fi
+
+	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
 
 	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
 	domenu usr/share/applications/teams.desktop
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index e0c4e304bf2c..61b42a87d1e0 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,17 +1,12 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-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
-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
+DIST tdesktop-2.4.4.tar.gz 14641222 BLAKE2B 3b2d0eb7f0ec5736bb386fe4802c0885f55b0fa8b18eea7762e7dd6bc7a82435cc58509c3112591f68d991adafab68d5bf7bbef7207e1b883e28ab64c24db8ef SHA512 578c36323e12eeaa51e32eb85fb19f8e8941f3cce7feb51765770b57e9d173c14c6aab02252cb0d2e6e9379039ce4e39649d1bd1379cfff88b687092a6a0c042
+DIST tdesktop-2.4.5.tar.gz 14776247 BLAKE2B 029b50bfb4d2b4d62b93fe8dddbbf31965050844fa7b027f21b061e4fc8a7b8dc7068f35ec8b24c4eefc566d0be90f1b2f688b629e1345d23ea3339cecf04f4e SHA512 5439e177ff2e64697c537f92fd15382a61e52cbca00d610983497bbded3464cb95b591d323bb65238f0ce8b996e7d7cedfe13157f16d963ec3cb5e507c492f30
+DIST tdesktop-2.4.7.tar.gz 14777737 BLAKE2B 44d251e621c4e092c876c3fbc47c222ef9af1d3af5d098d3928bc0a0efdc079b78daf82cab7ed2e970a9c3b021ec105638f5ac1bf7c4246e4fa534546ea12547 SHA512 50d887f8074dc9bedc2a1fa13e6d8719eb5c3da42935a34ffd3b5877b1bffca9f902a65ca715bd63c17bbe13b482194f96367f7cac69c2ba26d166b82d144625
+DIST tsetup.2.4.4.tar.xz 34298876 BLAKE2B aa52d4a95ec2467581437f99c4c423e62ed9d86f069f43eba152bd11344bd8015838e56e2692d068964f468fee1adbf110c17a4a456e5861ec5c211097cf018c SHA512 c883529b36bb45ac6d47261bb2ece356798e740935aafcb0dae0062d157fbdec8d5f7416ff2e78e7ca56cc6ebec1d58d3b2a514341d1b8b6e2d86e3712644fcb
+DIST tsetup.2.4.5.tar.xz 34592508 BLAKE2B f7694f618f34689026c3a03dff394ca06d623868c8a257c3451eed63a871f4f6a57a457cd1d2293f0367058bfffe77df2a6fb02d11cd5bd79e3205aa65870245 SHA512 9dfc2663bdc50a1eed14060f37c0b267c456ff298f7189e1066b8b5c3624821ab772176f4442122ab442b6ee14b0a8d26219f3f9782d34459308de4db42bee70
+DIST tsetup.2.4.7.tar.xz 34591504 BLAKE2B 339b582090ef39a2ddeb634cfa2522e4d642dc73574dd44f93f2930daec4f15ae691bb0fd3394306c67341d6019d05da4ff4827907746c1f6ed7f08b22301873 SHA512 200719748e74bc5fe85c77a23d53c989f3b08bf7f059e832f470d1db3f75f0ed243d329445ed933048634ed3bdb2f97538381c46698578f25bb477aac03dd685
+DIST tsetup32.2.4.4.tar.xz 37623572 BLAKE2B 2d6c442a6eb435eded64c124ddf99eead32f00a09d681895abbe0f4c3d51844d6cdbf685ef5b6cffcc782c8867e93bf608e9d3f2721be1c067b57c4ec15833d0 SHA512 d3bb1e8e4bbb86a7b6ba56ae8b7a83e6376ad2372be58f5d707caef04a6c0019146237e570711a7bc287b4642134ad82cc04e0a32aff6b10e93788dfe60b9803
+EBUILD telegram-desktop-bin-2.4.4.ebuild 1386 BLAKE2B 394d7c70cf6a4875b920ce20be9c5317c08df7ff4ee8f76f0351776b4ae5f3d9415f00ff8936b30f3446849b9acdc4a6176986a061390a576522074676e7f2a0 SHA512 9f2c49973d6382d07a2aa68bcff3fa653afb850889113301d9202f428bb3ccd2ff8c0901059515ac8f1e08ef51919452ee37d70e4f6d5836af46862b82df4be5
+EBUILD telegram-desktop-bin-2.4.5.ebuild 1311 BLAKE2B 3033023ae4f274c42090d6dd04d7d2b30a6cfda2734b3b9d5e75d998274e5865c33d931da42003f3109f5cfedc530e3038ef52392875b3412ef7df43d579cf5e SHA512 600e7d2d45af2337a7d2568389a1634f1177d2ec71924a70f65e25e74a7e20ed648794c75839401b1ff8b04c9ed3e4a86c2480d61f8a627518d8f6de1f212a6a
+EBUILD telegram-desktop-bin-2.4.7.ebuild 1311 BLAKE2B 3033023ae4f274c42090d6dd04d7d2b30a6cfda2734b3b9d5e75d998274e5865c33d931da42003f3109f5cfedc530e3038ef52392875b3412ef7df43d579cf5e SHA512 600e7d2d45af2337a7d2568389a1634f1177d2ec71924a70f65e25e74a7e20ed648794c75839401b1ff8b04c9ed3e4a86c2480d61f8a627518d8f6de1f212a6a
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
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
deleted file mode 100644
index cdd1942be0a2..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.4.ebuild
index cdd1942be0a2..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.4.4.ebuild
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.4.5.ebuild
index 592ac45f0c41..f45d03b0f491 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.5.ebuild
@@ -9,7 +9,7 @@ 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
-	https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
 "
 
 LICENSE="GPL-3-with-openssl-exception"
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.4.7.ebuild
index cdd1942be0a2..f45d03b0f491 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.3.2.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.7.ebuild
@@ -10,12 +10,11 @@ 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"
+KEYWORDS="-* ~amd64"
 
 QA_PREBUILT="usr/lib/${PN}/Telegram"
 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 93faf6a570c9..4c65e9de7d4f 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,5 +1,6 @@
-DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
-DIST tdesktop-2.2.0-full.tar.gz 36612169 BLAKE2B dcc9d81da5d99552bea3139d595c7f1aca75464a19be34c880a93d27ddd8a58a01510efe8fde31104b13d50e34e944b05406e21bc96995e85cb95283ff8de08a SHA512 2aeca83be7bc385bd7537d56ecf66996facedd0af588e743fedbb08c3158fc76436d6cf3b1fb5dd7c8d37b4471f739872ca54ba300aa1d0e0202e87c005703fd
-EBUILD telegram-desktop-2.1.13.ebuild 3887 BLAKE2B e69436b8a7bd74f12886266745d9caf82e6a826812c10017aac43c0093a01c87177e159bd134a611e8625c935d36a89b0208b5f95febcf4c5ab15366438b805f SHA512 86789ea69657cb77596bb183bc6a2cfcf032bba02ae3c286966d56c4a9caeff37a8d37057bbdbce541d5c7d641a503cefdd05a264aa3e32778be48a05ca19944
-EBUILD telegram-desktop-2.2.0-r1.ebuild 4210 BLAKE2B 87b1389b88a0692c1b571f9faa73ccc727d5d6ae3cf749a841bfc060f25903158ffde32c554cc2f982c64eaf1822f1b5ba045d60e67e3642cdc6de83f18abf75 SHA512 a69630212397dfdaa7dfe404b3e49a827e78b71417893f366af798b72ecfccb62961cd0dafb03d5e58d025130e3651a64b056c231e1652161bab1cd774ce0ef9
-MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
+AUX no-webrtc-build.patch 3656 BLAKE2B b8a8da9e4e6762b2901c2e3307a0289eb32447bc8439c4a6e0aac8c11a4636f7b3de5d14aa98ea806003d6856058f4aefb7bbeae67d5235437b3f0918ae4de4c SHA512 26893ffa97538dfd060373dd052637513c6805c1e6b149a63f1c329a0da4f541f7457832d54397f19d5a3d54e1fbe39628697648f170801ed459fa4d84cb75f4
+DIST tdesktop-2.4.11-full.tar.gz 36405312 BLAKE2B 7c4239d4a2193c910aeb918f40d4c196702bffb4236f7702a5573840b8d4a1a9183e3c91fd97c5d9e4ab5950d96e99b427746ffb18ed5bbef16b240dfc873e2e SHA512 b6452c39ea1b1b794c61ec2fc700356c9ee314250d73b895d297ad66602a93676d3cf74d695ac53965719ddb54da9e290f4f638bbf2e0fb21fec8995b6788a1c
+DIST tdesktop-2.4.7-full.tar.gz 36355613 BLAKE2B 5b60bddd81d5472aaa303817be280604d5dcb4a5f7260c6b6fbd7ca075a46972adb4439e58e2f5b7877c10b3cb6420a7bc95ffe36ab0b3cf531a46758046f7c1 SHA512 712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993
+EBUILD telegram-desktop-2.4.11.ebuild 4958 BLAKE2B 2c28fe9a6e28f5eaac308e27dbff4a80ccb68419418c2786070e77ca020f11e6a4c6ea9188be4ac68247fcc39f9246f00ff367b55a1f97b791e2af47a98bc22a SHA512 0fd7bd8e2394ad123ca6d67125d6dd44a8ca575fc1109450e4d883ad8c0d777de603c7d3ae606e1d8681afc741b6d31c85446f2e37e600eda009b55f10f0f278
+EBUILD telegram-desktop-2.4.7-r1.ebuild 4879 BLAKE2B 424614c2d79701c27eaa4c4d384511467567a5540bc5bbe46155f9eef2ef8003f5b8436e6dd2bab7b66ea3baa9993675caf1d1b551436bcd4a76f6ea66ba95bc SHA512 8b2d9207c431c98aef31703a2f20364249a8d274e2240255463a72238ab78ba0de4a9b33b0edfadb3477d65118b1997445e63c0f8e1f20d9bb3789ce76b0a2e0
+MISC metadata.xml 601 BLAKE2B 75c42198ceb24840124f7073da7a3bc1a41107fe3a66850213f3015ac6197fcc98a23a2fefb9b7cfa4744ab19a7a3f1e13f0a32e5f0add9967e3018c0938103d SHA512 3df5604a16b0ab69d89e7e3667c603393ee5bfb41f8394072c681f6e4f5599d5d4e88bf2a0b3ea6bfbda7ffb3dd0551baa2ef33a1d3d4637d24fd2bb720d0a5f
diff --git a/net-im/telegram-desktop/files/no-webrtc-build.patch b/net-im/telegram-desktop/files/no-webrtc-build.patch
new file mode 100644
index 000000000000..8ae4113f4406
--- /dev/null
+++ b/net-im/telegram-desktop/files/no-webrtc-build.patch
@@ -0,0 +1,96 @@
+diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
+index e99958109..bb7678d3c 100644
+--- a/Telegram/SourceFiles/calls/calls_instance.cpp
++++ b/Telegram/SourceFiles/calls/calls_instance.cpp
+@@ -350,8 +350,11 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture() {
+ 		return result;
+ 	}
+ 	auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>(
++		#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
+ 		tgcalls::VideoCaptureInterface::Create(
+-			Core::App().settings().callVideoInputDeviceId().toStdString()));
++			Core::App().settings().callVideoInputDeviceId().toStdString())
++		#endif
++		);
+ 	_videoCapture = result;
+ 	return result;
+ }
+diff --git Telegram/lib_webrtc/CMakeLists.txt b/CMakeLists.txt
+index 47796f1..1f54c21 100644
+--- a/Telegram/lib_webrtc/CMakeLists.txt
++++ b/Telegram/lib_webrtc/CMakeLists.txt
+@@ -14,8 +14,10 @@ target_precompile_headers(lib_webrtc PRIVATE ${src_loc}/webrtc/webrtc_pch.h)
+ nice_target_sources(lib_webrtc ${src_loc}
+ PRIVATE
+     webrtc/webrtc_audio_input_tester.cpp
++    webrtc/webrtc_audio_input_tester_dummy.cpp
+     webrtc/webrtc_audio_input_tester.h
+     webrtc/webrtc_media_devices.cpp
++    webrtc/webrtc_media_devices_dummy.cpp
+     webrtc/webrtc_media_devices.h
+     webrtc/webrtc_video_track.cpp
+     webrtc/webrtc_video_track.h
+@@ -40,10 +42,14 @@ PUBLIC
+ if (DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION)
+     remove_target_sources(lib_webrtc ${src_loc}
+         webrtc/webrtc_video_track.cpp
++	webrtc/webrtc_media_devices.cpp
++	webrtc/webrtc_audio_input_tester.cpp
+     )
+ else()
+     remove_target_sources(lib_webrtc ${src_loc}
+         webrtc/webrtc_video_track_dummy.cpp
++	webrtc/webrtc_media_devices_dummy.cpp
++	webrtc/webrtc_audio_input_tester_dummy.cpp
+     )
+     target_link_libraries(lib_webrtc
+     PRIVATE
+diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h b/webrtc/webrtc_audio_input_tester.h
+index 1ae8d30..008df7e 100644
+--- a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
++++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
+@@ -20,11 +20,13 @@ public:
+ 	[[nodiscard]] float getAndResetLevel();
+ 
+ private:
++#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
+ 	class Impl;
+-
++#endif
+ 	std::shared_ptr<std::atomic<int>> _maxSample;
++#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
+ 	crl::object_on_thread<Impl> _impl;
+-
++#endif
+ };
+ 
+ } // namespace Webrtc
+diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp b/webrtc/webrtc_audio_input_tester_dummy.cpp
+new file mode 100644
+index 0000000..4e47eaa
+--- a//dev/null
++++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp
+@@ -0,0 +1,11 @@
++#include "webrtc/webrtc_audio_input_tester.h"
++
++namespace Webrtc {
++AudioInputTester::AudioInputTester(const QString &deviceId)
++: _maxSample(std::make_shared<std::atomic<int>>(0)) {}
++AudioInputTester::~AudioInputTester() {}
++void AudioInputTester::setDeviceId(const QString &deviceId) {};
++float AudioInputTester::getAndResetLevel() {
++	return _maxSample->exchange(0) / float(INT16_MAX);\
++}
++}
+diff --git Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp b/webrtc/webrtc_media_devices_dummy.cpp
+new file mode 100644
+index 0000000..8d5d245
+--- a/dev/null
++++ b/Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp
+@@ -0,0 +1,6 @@
++#include "webrtc/webrtc_media_devices.h"
++namespace Webrtc {
++std::vector<VideoInput> GetVideoInputList() { return std::vector<VideoInput>(); };
++std::vector<AudioInput> GetAudioInputList() { return std::vector<AudioInput>(); };
++std::vector<AudioOutput> GetAudioOutputList() { return std::vector<AudioOutput>(); };
++}
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 5eb4b12ceaa6..a4e65f12defb 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -8,5 +8,7 @@
 	<use>
 		<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
+		<flag name="lto">Enable Link Time Optimization (LTO / IPO)</flag>
+		<flag name="webrtc">WebRTC based audio/video call support ( via <pkg>media-libs/tg_owt</pkg> )</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild
index fdbdccb40dcb..7f66f02025aa 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+inherit cmake desktop flag-o-matic ninja-utils python-any-r1 xdg-utils
 
 MY_P="tdesktop-${PV}-full"
 
@@ -13,10 +13,10 @@ DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
 
-LICENSE="GPL-3-with-openssl-exception"
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell wayland +webrtc +X"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
@@ -26,27 +26,39 @@ RDEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	dev-libs/xxhash
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
 	dev-qt/qtimageformats:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png,X(-)?]
 	media-fonts/open-sans
+	media-libs/alsa-lib
 	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
+	~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=]
+	media-libs/openal[alsa]
 	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	media-video/ffmpeg:=[alsa,opus]
 	sys-libs/zlib[minizip]
 	virtual/libiconv
-	x11-libs/gtk+:3
+	x11-libs/libxcb:=
 	dbus? (
 		dev-qt/qtdbus:5
 		dev-libs/libdbusmenu-qt[qt5(+)]
 	)
 	enchant? ( app-text/enchant:= )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2[jpeg]
+		x11-libs/gtk+:3[X?]
+		x11-libs/libX11
+	)
 	hunspell? ( >=app-text/hunspell-1.7:= )
+	!pulseaudio? ( media-sound/apulse[sdk] )
 	pulseaudio? ( media-sound/pulseaudio )
+	webrtc? (
+		media-libs/libjpeg-turbo:=
+		~media-libs/tg_owt-0_pre20201112[pulseaudio=]
+	)
 "
 
 DEPEND="
@@ -59,14 +71,14 @@ DEPEND="
 BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
 "
 
 REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
 	spell? (
 		^^ ( enchant hunspell )
 	)
+	webrtc? ( !libressl )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -81,11 +93,23 @@ pkg_pretend() {
 	fi
 }
 
+src_prepare() {
+	# conditional patching is bad, but we want vanilla telegram with webrtc.
+	use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
+
+	# no explicit toggle #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycxxflags=(
 		-Wno-deprecated-declarations
 		-Wno-error=deprecated-declarations
 		-Wno-switch
+		-Wno-unknown-warning-option
 	)
 
 	append-cxxflags "${mycxxflags[@]}"
@@ -93,17 +117,21 @@ src_configure() {
 	# TODO: unbundle header-only libs, ofc telegram uses git versions...
 	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
 	# EXPECTED VARIANT
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
 		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
 		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
 		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=ON
+		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)"
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
 		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION="$(usex wayland OFF ON)"
+		-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)"
 		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+		$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '')
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -136,6 +164,7 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
+	use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems"
 }
 
 pkg_postrm() {
diff --git a/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild
index 2db700903fcd..57c34aa583f0 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+inherit cmake desktop flag-o-matic ninja-utils python-any-r1 xdg-utils
 
 MY_P="tdesktop-${PV}-full"
 
@@ -13,10 +13,10 @@ DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
 
-LICENSE="GPL-3-with-openssl-exception"
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +gtk +hunspell libressl pulseaudio +spell +X"
+KEYWORDS="amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell +webrtc +X"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
@@ -32,11 +32,12 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png,X(-)?]
 	media-fonts/open-sans
+	media-libs/alsa-lib
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20200704[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
+	~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=]
+	media-libs/openal[alsa]
 	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	media-video/ffmpeg:=[alsa,opus]
 	sys-libs/zlib[minizip]
 	virtual/libiconv
 	x11-libs/libxcb:=
@@ -47,12 +48,17 @@ RDEPEND="
 	enchant? ( app-text/enchant:= )
 	gtk? (
 		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2[jpeg,X?]
+		x11-libs/gdk-pixbuf:2[jpeg]
 		x11-libs/gtk+:3[X?]
 		x11-libs/libX11
 	)
 	hunspell? ( >=app-text/hunspell-1.7:= )
+	!pulseaudio? ( media-sound/apulse[sdk] )
 	pulseaudio? ( media-sound/pulseaudio )
+	webrtc? (
+		media-libs/libjpeg-turbo:=
+		~media-libs/tg_owt-0_pre20201105[pulseaudio=]
+	)
 "
 
 DEPEND="
@@ -65,13 +71,14 @@ DEPEND="
 BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
 "
 
 REQUIRED_USE="
-	|| ( alsa pulseaudio )
 	spell? (
 		^^ ( enchant hunspell )
 	)
+	webrtc? ( !libressl )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -86,11 +93,23 @@ pkg_pretend() {
 	fi
 }
 
+src_prepare() {
+	# conditional patching is bad, but we want vanilla telegram with webrtc.
+	use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
+
+	# no explicit toggle #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycxxflags=(
 		-Wno-deprecated-declarations
 		-Wno-error=deprecated-declarations
 		-Wno-switch
+		-Wno-unknown-warning-option
 	)
 
 	append-cxxflags "${mycxxflags[@]}"
@@ -100,17 +119,18 @@ src_configure() {
 	# EXPECTED VARIANT
 	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
 		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
 		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
 		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=ON
 		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)"
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
 		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)"
 		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+		$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '')
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -143,7 +163,7 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	use gtk || einfo "enable \'gtk\' useflag if you have image copy-paste problems"
+	use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems"
 }
 
 pkg_postrm() {
diff --git a/net-im/transwhat/Manifest b/net-im/transwhat/Manifest
index f9ca124bc087..74a5ef5f0dae 100644
--- a/net-im/transwhat/Manifest
+++ b/net-im/transwhat/Manifest
@@ -1,3 +1,3 @@
 DIST transwhat-0.2.2_p20190426.tar.gz 38373 BLAKE2B 3addf2ae66d042eaf4a5f6b54015b9592fea68b69f4c542c5ec0d97040c0eb473d15b893af35f6d6cf83671417ed718c9c91b6268242e667fa34397fc230d2d5 SHA512 7079d1015bf5dfcd97e729219306320055ef86ac3203bb727bebb1e96abb60a26787882a12f9a8f4cce2ef45652bebfbd824a98d37d97ed72ebe0269004c1a71
-EBUILD transwhat-0.2.2_p20190426.ebuild 983 BLAKE2B 7acf2fcf62aa9f9a98d060a15b6ab9fbee7c73df66508c8eac7a77fd92aaf374f67c3630637143f7763a4231f9dc43965e6fb117a5c7c5bc9d4049f60b1b5046 SHA512 c9059e7d3849185798cb516357a3fb0a60a42fc0756999883e36383e17d32750c7b51f4cc7381ab7e94cfd1bfb51cbac9bf3c504029b3a0889581882a05a6a7c
+EBUILD transwhat-0.2.2_p20190426-r1.ebuild 983 BLAKE2B 5bcfad1f49c8f7fb4533174e280f50d5d3b4de86aeb15498645c4e0c9e0eeb1d16f57c55fc858af083fba52d9088f75a382b52a15082ce88902957819ded3ce9 SHA512 c23acc7f5a51ced3f9fc95aadef8c0b379fb78dcdd61ca8adb160571125b4482ee0696a330d7e2b4cba9fca3381dac372458e29e301be64bd48de09016c1c8ff
 MISC metadata.xml 587 BLAKE2B d9197ca259917c92a60ae23461425d3d750ceaa73ec0c69da54c9d23c72be3c48794e802ecca60522553178d23725833e17dd95c469a3bd344e09acbb05c47f3 SHA512 6a691a5f296d75e5423dbd761b546f616555d32164e5a4fe536fb01d2f844d8b11700f15c0fb38e7f37b55cf01cfb968582b79103695ead516388dd5689149c5
diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r1.ebuild
index 52606932153e..5a801e19e2e1 100644
--- a/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165"
 PYTHON_COMPAT=( python3_{6..9} )
 
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index 7fbfc494dcfa..f6b9fba757f1 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,4 +1,4 @@
 DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687
-EBUILD vacuum-1.3.0_pre20180105.ebuild 3159 BLAKE2B dc47da266dd7e6b06c6408ea9382c725bbf809a2a67ece99856a9ae93e77be21b5a659d02bc5956ff5f6140afa5ee59249cc61eebd72240c32b70f67b927cf47 SHA512 c39b634701714be6a22d8bcb75e3b69abe838ec868aea2a57ed2b975b5622471704c5b75af7e00139adc0ccdf4931b3a203e99d914e3780b39c9eb190271c93c
-EBUILD vacuum-9999.ebuild 3029 BLAKE2B 947282547137128870cc90d84c49bdc2477be954895ea4f45d8bd50ebcfc4a689774bb0daa19ef9557734d70a7e35e081d8d6e4ea9341bef1d6770ba2fecaf35 SHA512 1137af18c50195ae99ade4a43240b67616aec48f1518b472f410a66c88eab4baccc86ad5f9c5ed70fe79ea27bafd2b4fd32336c9d60ec9e5547fd671c242d7b4
-MISC metadata.xml 4465 BLAKE2B 0436dde685c7e32a95f148e922680220dd37c3ca612778c86c09340d108bbeb538f86ae7914ff6c3a16355831019b75cad986666964cd2def302cbe2346b52ae SHA512 9650379639d1e21d58c1012291a1f2c2727e1a93f57ddc5d13e95eff1fc1a440e292c91d3500d5ad108768005ca5104e6847895473233429bf32f999234aac6f
+EBUILD vacuum-1.3.0_pre20180105.ebuild 3114 BLAKE2B 2985d8610dd5c6131be1ee32c04a7d35cfc9816dde0cf7bd94eb351c25470287a263e90dc65e2d7efa1183649f731291e09e0eb6c7ad3949e03fd6ffa65e73c7 SHA512 51eff110897062bf05cdfa2ac080bc97e29b6416514a278bf7c110a5a8abac076f8944a126677c37f3d6c8edb21122fe58d2d6b07fe426467b85abab30a651c4
+EBUILD vacuum-9999.ebuild 2951 BLAKE2B c47d8203f106e137113fbaa085a4fb5965a27c63f004973cc4be603047978b6dd7528dbd95ee8caf0b7a83987757a7799ec8763d3f7eef1875c36b75773abec2 SHA512 779aa707585a3d42d4779d835669e4d85214bd82554b51cddc6d3190736b20760e0be8b3a91505d9bbf801e7c657287b00f5d47a2e3bad290463341262d89dd8
+MISC metadata.xml 4393 BLAKE2B 1e7ca7fd2e9a6d9280380a3a4b1d3c4eb779a248f3d50c2f8e0760fdd76d7d87ce9f113d29f3e2bdd4f5f8b8468907bbf306bb8485f76bf1e76376b23f019ef0 SHA512 446e38db0ce8ce1c7a62f2b9ee03a701d75a6df16e62f6e70dd829d1a6973bc601c51859f1e9929e3da430494ea47afbbe6fddde794d86850205159cd88d468d
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 69557bbd0f96..724d412c2613 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="adiummessagestyle">Use UI styles created for Adium</flag>
 		<flag name="annotations">Enable adding comments to the contacts in the roster</flag>
 		<flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
 		<flag name="avatars">Enable assigning and displaying avatars</flag>
diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
index cdb7af2a260d..7da48efb53a4 100644
--- a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
+++ b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="de es pl ru uk"
-
-inherit cmake-utils l10n
+inherit cmake l10n
 
 MY_PN="${PN}-im"
 MY_PV="${PV/_pre/.}-Alpha"
@@ -18,7 +17,7 @@ SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P
 LICENSE="GPL-3"
 SLOT="0/37" # subslot = libvacuumutils soname version
 KEYWORDS="~amd64 ~x86"
-PLUGINS=( adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
+PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
 SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
 IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
 
@@ -43,6 +42,9 @@ REQUIRED_USE="
 	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
 "
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -53,7 +55,6 @@ DEPEND="
 	net-dns/libidn
 	sys-libs/zlib[minizip]
 	x11-libs/libXScrnSaver
-	adiummessagestyle? ( dev-qt/qtwebkit:5 )
 	filemessagearchive? ( dev-qt/qtsql:5[sqlite] )
 	messagearchiver? ( dev-qt/qtsql:5[sqlite] )
 	spell? (
@@ -71,14 +72,13 @@ DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	cmake_src_prepare
+
 	# Force usage of system libraries
 	rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die
 
-	# Supress find thirdparty library in the system
-	sed -i -r -e "/find_library.+qxtglobalshortcut/d" \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
+	# Suppress find thirdparty library in the system
+	sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -100,5 +100,5 @@ src_configure() {
 		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
 	done
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index edcb05c884a1..a5e9347a9baf 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git"
+EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im"
 PLOCALES="de es pl ru uk"
-inherit cmake-utils git-r3 l10n
+inherit cmake git-r3 l10n
 
 DESCRIPTION="Qt Crossplatform Jabber client"
 HOMEPAGE="http://www.vacuum-im.org/"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.vacuum-im.org/"
 LICENSE="GPL-3"
 SLOT="0/37" # subslot = libvacuumutils soname version
 KEYWORDS=""
-PLUGINS=( adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
+PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries )
 SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
 IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
 
@@ -38,6 +38,9 @@ REQUIRED_USE="
 	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
 "
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -48,7 +51,6 @@ DEPEND="
 	net-dns/libidn
 	sys-libs/zlib[minizip]
 	x11-libs/libXScrnSaver
-	adiummessagestyle? ( dev-qt/qtwebkit:5 )
 	filemessagearchive? ( dev-qt/qtsql:5[sqlite] )
 	messagearchiver? ( dev-qt/qtsql:5[sqlite] )
 	spell? (
@@ -57,21 +59,18 @@ DEPEND="
 		hunspell? ( app-text/hunspell )
 	)
 "
-RDEPEND="${DEPEND}
-	!net-im/vacuum-spellchecker
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
 
 src_prepare() {
+	cmake_src_prepare
+
 	# Force usage of system libraries
 	rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die
 
-	# Supress find thirdparty library in the system
-	sed -i -r -e "/find_library.+qxtglobalshortcut/d" \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
+	# Suppress find thirdparty library in the system
+	sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -93,5 +92,5 @@ src_configure() {
 		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
 	done
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 4eba45999917..0248d4387df8 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,13 +1,12 @@
 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.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
-DIST zoom-5.3.465578.0920_i686.tar.xz 39756188 BLAKE2B c14efb485096af16dfcbd80bcbd643e48fcea784568d231a37e9dd7bf57337f0171981de209ebc1482518cc6f7216c425e43fcd36c43c30732b39928057ec7cc SHA512 cbdc35e8124a558a084e89483e0150cfb9585668f6e259e75b7d6f6323849c3dcdae75b1525c5e86eba5cf05867e8ce8a0cb2f4e8406a16fcb5a30673aa7102c
-DIST zoom-5.3.465578.0920_x86_64.tar.xz 40086928 BLAKE2B 78df8a807a951b2d82806a46a90f12ce0287adf77bfd31ead5bd11b642c24012b1692e1dd4bd8c83208c091581040d245b05f518318f9aa175046a0e000ff75b SHA512 b98e6783e5189c296857dd7b19708c70004fd38b1bc68f4ecf53d531b4209cdbce1348b8bdb601df78113d38bdc669271ccb267fc2ae1b2d7683abf8d95ad550
-DIST zoom-5.3.469451.0927_i686.tar.xz 39797144 BLAKE2B 74e7eb541e1ac4c304f5d1faae342078f7ede92e0af84efa2150b9be0db3d69bf78ead639225cba4017a684f94dc505e28aad481ccd0cbeacbfa30ac1aa38faa SHA512 8593d66e214df2c8b6038ce32e2561b035eab6408affcb6bf4ec1f61113a422ec2e710cb2c6ed178034500f96900685bdb10994bc7554462f2899561e54f2e47
-DIST zoom-5.3.469451.0927_x86_64.tar.xz 40206068 BLAKE2B 82a97ad9a908767edddb6ef3b5331b502e5644ce7116d6683ddd810b442080790a4745493e40d7dc82d63515373f3dc6af4cd1665622022f8a8e61d2f65891fc SHA512 922903e576325754b8d7814866c1a06a17e8bfcaee872b6e72f6645a3655832ff6e1f244b5635305ad9286f8472dc82168d3567e816c998981042de00acb574d
-EBUILD zoom-5.2.458699.0906.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
-EBUILD zoom-5.3.465578.0920-r1.ebuild 2921 BLAKE2B ce06deca03f557717e6b83e93afb80b67be000820cdeb05de5817facf7f929b795359f3d9e9f950a0446943c5e1a4881c0f6143d4adf694c4d169296fd6be482 SHA512 4b65221249b5da35388d240a546c0998a047517d877966e066fedb2f6450b65f7f2329f35f7d52c34df7721b88d89c64c81942ef5b7ddc52d2a9d5f115c8a649
-EBUILD zoom-5.3.469451.0927.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
-MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
+DIST zoom-5.3.472687.1012_i686.tar.xz 39774708 BLAKE2B 3cd80244168bfee3b92ffc5be1763eb9e205c6119cabc64d91dfdb9b22a3a5515c7f397a938982e0de80a51512ff0c47a9812ca4969619a0b403b99d0b385963 SHA512 d0fecb64a50594376b1a9747e9532153ffba8d541ef1b705a3e7ccd1acfd1611fbad6308ec576d2dad99fb4a26a730f283e0eda512afe8939c1f90e3c6636b6d
+DIST zoom-5.3.472687.1012_x86_64.tar.xz 40046644 BLAKE2B a05255bcefcf0a0f44055ef5f89797ef8c62082732fc7e1a68c9601b34ece01989216a8b68fb6d42ec51976159d9f2766de50f25db4dd53120a303c1b6bd26d0 SHA512 c355073ce73ae047bc4aad952432e85ab0464bc3bb68dc20c121243bc719b3bd3337382bd3a283a44724d68b28a6e64c7bd8eb0f6598c2ecb6d4ddcb7193eab0
+DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
+DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
+DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
+EBUILD zoom-5.3.472687.1012.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
+EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53
+EBUILD zoom-5.4.54779.1115-r1.ebuild 3900 BLAKE2B 33906c5a537a6ddb3c0e63f6870a3ea50bb044bc3f733f87c435d76d9c12f2637016bcfe2bbcff52fdbd7ef89e6450dbd27666b1cae9a8eb4f330cd2c9532c5b SHA512 624e27abc2ef8f2a3237216a7b8d5cc89f6f7dbc99b0265d3fd74b4f45afa0bdc8a250c0d9942c3a02943917cccaa25e4dcc3291c12b9528064cc3cdace67b98
+MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index df9fc1aee0d0..e6786c75fd45 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/metadata.xml
@@ -13,5 +13,7 @@
   <use>
     <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
       instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
+    <flag name="bundled-qt">Use bundled Qt and icu instead of
+      system-wide libs</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/zoom/zoom-5.2.458699.0906.ebuild b/net-im/zoom/zoom-5.2.458699.0906.ebuild
deleted file mode 100644
index c11afe99432c..000000000000
--- a/net-im/zoom/zoom-5.2.458699.0906.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative:5 )
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r json sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so.0.1.0
-		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
-	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
-	fi
-
-	make_wrapper zoom ./zoom /opt/zoom
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	# The tarball doesn't contain an icon, so take a generic camera icon
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.3.469451.0927.ebuild b/net-im/zoom/zoom-5.3.472687.1012.ebuild
index 58b926df6a20..58b926df6a20 100644
--- a/net-im/zoom/zoom-5.3.469451.0927.ebuild
+++ b/net-im/zoom/zoom-5.3.472687.1012.ebuild
diff --git a/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108.ebuild
index 63ad690a864c..b6642189422d 100644
--- a/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108.ebuild
@@ -23,11 +23,11 @@ RDEPEND="!games-engines/zoom
 	dev-libs/quazip
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative:5 )
+	dev-qt/qtdeclarative:5[widgets]
 	dev-qt/qtdiag:5
 	dev-qt/qtgraphicaleffects:5
 	dev-qt/qtgui:5
+	dev-qt/qtlocation:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtquickcontrols:5[widgets]
 	dev-qt/qtscript:5
@@ -66,7 +66,7 @@ src_prepare() {
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
-	doins -r json sip timezones translations
+	doins -r json ringtone sip timezones translations
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
diff --git a/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild
new file mode 100644
index 000000000000..388dc20478b1
--- /dev/null
+++ b/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eapi8-dosym readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	dev-libs/quazip
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json ringtone sip timezones translations
+	doins *.pcm *.sh Embedded.properties version.txt
+	doexe zoom zoom.sh zopen ZoomLauncher
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if use bundled-qt; then
+		doexe libicu*.so.56 libQt5*.so.5
+		doins qt.conf
+
+		local dirs="Qt* audio generic iconengines imageformats platform* \
+			wayland* xcbglintegrations"
+		doins -r ${dirs}
+		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+
+		(	# Remove libs and plugins with unresolved soname dependencies
+			cd "${ED}"/opt/zoom || die
+			rm -r Qt/labs/location QtQml/RemoteObjects QtQuick/Scene{2D,3D} \
+				platforms/libqeglfs.so || die
+			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
+				platforms/libqwayland*.so || die
+		)
+	fi
+
+	dosym8 -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
+	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+
+	if use bundled-libjpeg-turbo; then
+		ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a"
+		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
+		ewarn "bundled with the upstream package. Please report this problem"
+		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /net-im
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)