gentoo resync : 07.01.2022

15 files changed, 434 insertions, 82 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3d38c175e64c..32e172114adb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/sendxmpp-amm/Manifest b/net-im/sendxmpp-amm/Manifest
index 74663cf09d3e..822dc0ac25ed 100644
--- a/net-im/sendxmpp-amm/Manifest
+++ b/net-im/sendxmpp-amm/Manifest
@@ -1,4 +1,4 @@
 DIST sendxmpp-amm-1.1.1.tar.gz 14012 BLAKE2B 769f888ad5522a5566f4b6fa4478ebe9321850eb3c21c9677dd96b36244a62dd7bdcc70c7093f5cd27721c14cd056c58cb740e6b5f2469afb32130dabc34ca3f SHA512 64b813647e50ec1cb1c6d123ce93ad89abcb1d734a9bf2867d6be8e8b9eae1f315db18f7c5fde6504cfcaa31dd4aad619006c97c4ffc1fa54056287f3b194198
-EBUILD sendxmpp-amm-1.1.1.ebuild 719 BLAKE2B efe6ccbd59a8b11ae54fd7c0365f2e9fd285703ce34a1e9dc00eed695c54ebe10ba5d7c156d7f10ca4e90843e2ba1ff82e13b8b562a1badeb004e8d10bfeb420 SHA512 048e46bd3c1ce00ed6f74ba32b2d76aea4f3901cf076988b4a12794074366aa2d75d140209ddb0441adefb5fb684a63ec326e8e968bf9b450af19bbb0eaf7d40
+EBUILD sendxmpp-amm-1.1.1.ebuild 718 BLAKE2B 2475a5c62e217b99f32ba860af98f589c5b8fff161f8773e997a3f27ed2d4853d50cd77869109cf16b1ca47f6fed26062124ce772d2dffb704cab8b5b55ca368 SHA512 92f61c5c7ddc6f3acfb9cf41beba2df7fdaeb4a00b4441a2cd27fbbeb0d880214c34cd333f1d2c1dbaea2e2087bb6ae500f20c232ac5a14bde7511e02f504090
 EBUILD sendxmpp-amm-9999.ebuild 675 BLAKE2B c0111f9dc32ac76e82d187d0bce26de90f331179386f7fe3e1d4e3d536121e899f5f859885752ac9a16c567fd2df4df4b5af5acd579d9d64d33d43ea9152987b SHA512 cfad85bb2cbbe544bb243466a53d0834feac9546d2c32198f83ea0176ae2c199cd16106a5a8d914f6c61036179665340a49b2a11dfb8f4749feb383135dc4cc5
 MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
index 700d92138fdb..49c9aed88173 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	fi
 else
 	SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/${ORIG_PN}-${PV}"
 fi
 
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index b627b635f790..d126821d14a7 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,5 @@
 DIST signal-desktop_5.26.1_amd64.deb 127893190 BLAKE2B 0d7dedf5370c1010d204ad0e13e1ca46f886eef4e2e51af1fd6f3cf163c7d6bc464d21719018dbc168818b696550fbc709a1ce6dbc242125ea856d62b2a24a4f SHA512 dffd694e637528587b4bcfa6303e41129e2872022f9e97b338ad71b4a763fedc52650d5b94a5cd1282119163968df599cf3b8bb7639879dfc4132fdcedfe7b2f
+DIST signal-desktop_5.27.0_amd64.deb 125174322 BLAKE2B c340f2bba1e0e23f3b843a69fd23351e611d97562cd13f0e8f582e280e42a6c0430f365713ec2c51ca7532e8b20aa88125b2694248d8cbb4e5a7739d09b1de45 SHA512 b5e1cf883eae54e8697feacfbcac1ecf3adaa51d458c81ff025ac54148d395fd9a11bb5d842b7507395598b20fd93750459656be35b05cb78f84f7bb8096550b
 EBUILD signal-desktop-bin-5.26.1.ebuild 2450 BLAKE2B 6c8154c7125e07452a3088420667113cd30555968c894d1cacaf51880e1eee8cf53b4c5964aaa664a578c15b73656fee0e3dd41d4362d458b579c790e5132d68 SHA512 89e75598601c1b10ac82ca6ce23fda506ec8417ef13541897998d45559e24b08d546b080e54207d3027a9c1a08fc612789f0466d9585a2a6d9c7ebc5732df244
+EBUILD signal-desktop-bin-5.27.0.ebuild 2428 BLAKE2B 6bfeb2dadd272d73589a0926ae2cd2e68c6f84d5f5dd399b8cfa32721aeb084a76bbdfb4e8ec8256a1007ceee240db7aacf569db8625022821e92b767c4c2158 SHA512 fa474101f607d0f6db4f858222075e55d409ad015dac8fec417c23837077336453e3add2174417110184be78c17de61d3b4739084808665cfc3ff51bdb11b73e
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.27.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.27.0.ebuild
new file mode 100644
index 000000000000..47f9a77095de
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.27.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/signalapp/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+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"
+RESTRICT="splitdebug"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[X(+)]
+	net-print/cups
+	sys-apps/dbus[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/cairo
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+	sound? (
+		|| (
+			media-sound/pulseaudio
+			media-sound/apulse
+		)
+	)
+"
+
+QA_PREBUILT="
+	opt/Signal/chrome_crashpad_handler
+	opt/Signal/chrome-sandbox
+	opt/Signal/libEGL.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libffmpeg.so
+	opt/Signal/libvk_swiftshader.so
+	opt/Signal/libvulkan.so.1
+	opt/Signal/resources/app.asar.unpacked/node_modules/*
+	opt/Signal/signal-desktop
+	opt/Signal/swiftshader/libEGL.so
+	opt/Signal/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	sed -e 's| --no-sandbox||g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+}
+
+src_install() {
+	insinto /
+	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 || die
+	fi
+
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
+	fperms u+s /opt/Signal/chrome-sandbox
+	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "For using the tray icon on compatible desktop environments, start Signal with"
+	elog " '--start-in-tray' or '--use-tray-icon'."
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 5a980e816603..2415adb63de0 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,13 @@
 DIST tdesktop-3.2.2.tar.gz 16167652 BLAKE2B 0600905c0234b5aeef742311669223df4a165463e6f32b7cc40a2ce1eba5dcccc0599ab0a4a8f2d4c10aed5f5ed985873393c0606ecbdaac22885cbde11750fd SHA512 10c7ef1f18f8b6bf16e7ea2c68a04e537c231bc26d66b86c321d7d656216881df4ecd8a9eee456974e76924d2acc80ae89eef83ed31343dc403681ef1c6a1b59
 DIST tdesktop-3.2.4.tar.gz 16167130 BLAKE2B a00350f837f55a2bf0a9206e657260a906c8a970cf9cfa6fbfd3cbb83ccdf16f5d7589bc24f297e105f9e7b0ebc5141166c2dc3f5edd09144143d295a6e65a6c SHA512 0cd7d8eeac4933db62f9a7a1350d88bf9717a567a775027d7052d0ea4d4ca4a6f3c1367482e24522c188f4cd5ad5157b6387314f87a6010b58a9366ce1f8f384
 DIST tdesktop-3.3.0.tar.gz 16276886 BLAKE2B c75da01d8cfe440c8cbeb3cc580d49c7cb2494b776b48d9da1005ff7627fcffb0f7f7d6c43887d162cc0c8f261d1b67e3af6544dbf616732c8dbfd785cf9e8e3 SHA512 fd9eee472579edd902e9e31c1442f7a21ada86af3a59f1ab0310ec41134b9a345ddf7972e638b3551c0de1b95a3ffc36e7714e2657b95b25bd3436ebd507a7ef
+DIST tdesktop-3.4.3.tar.gz 16234851 BLAKE2B a94fcdbd5254858b8bb5e51ac8423d3c3e407892782b3773985f3f7f60cb8db0c95ffa2bc1c7bcbf56bcb26948d9c080c86606954284fcbe80ae8dbd1ec0ec9d SHA512 ce40e3c58f5d422de7c26fc105ca9888239069c24f42896ad38d30bb059b91e0e3556f62d0e6aa3b5a817f86409b090ab54ade1763a90cbca2043a4b3f744183
 DIST tsetup.3.2.2.tar.xz 40145920 BLAKE2B b1fa782af6678ae1d6511d1c066849c157a59597dc372dbf2db2a957388c8a3193dd6e8b01217fcddefac4d28c8df01a1c3791100aaef64cb4c9561cdc985dc6 SHA512 15b544563024bb7949d5527849db4c031947aba14ff1fb864261b3b02421ec20a5976232c2130ab30712b359366407959b6fc6b66e96cf1eebf0c2b14829b722
 DIST tsetup.3.2.4.tar.xz 40143108 BLAKE2B d1fd9fbcc6458e395db607c69eed4ac583d60ac57ad6370642d289719cc2dabd7ef3f13e3878f384590c4bd32d7f88d902be0871afe8219fc527af2e6eaa2225 SHA512 0c75f91afa2a71e0231a87ef4f6da82b63af3ce1de0c5ae6e5912714e5650a56b53201ef457f19acf4cd2a15daeba1ca7733858cad001fe8baf61d34144219b7
 DIST tsetup.3.3.0.tar.xz 41132564 BLAKE2B 7d3cc8de1cd56f21b988b7ae15ec96ec66fdba30cedb7f609a9c15d0a45b10cc5e0b94d5d9ed32e36c850e678e34835a44b527f7a62aac68376d2c1d09073f6e SHA512 665662f5a177475d32b49515600789374f989db1c3e7972fc5b9360c936f9d2a197e0bb0599bcb1d7b2707eb85f214e65fe7d6f9809aac3ae5c20a2c6f9dd04c
+DIST tsetup.3.4.3.tar.xz 41258788 BLAKE2B 5c5d5056807a92884a93ec1d27c57da2cc96e131df6856b2d41d1e7db28f93a9c63602a0e294dd0cc48dbc22156203e0d8d19da4916091ef40bb3550e779296e SHA512 92be9f69c7ad0e4f2bead886da636ed58e0ff63b1aeaa1ed0d9ee08b3964df4ff446d53b05de1fa9cbf1769463867158c7faadb0ae9e2c1fc71ebfecca507792
 EBUILD telegram-desktop-bin-3.2.2.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
 EBUILD telegram-desktop-bin-3.2.4.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
 EBUILD telegram-desktop-bin-3.3.0.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
+EBUILD telegram-desktop-bin-3.4.3.ebuild 1202 BLAKE2B 50ba9c204ac1d1906913070199971333b83a86a4200398b45d97778d0cc8f230c63cd8afd3f322cff1052b4bf75e5af93a3664ca9864bfb42a3b130ad4e2bbd7 SHA512 e16b970da1f753bd1884132017aa23def2e8e8f237c0fb5c773114d50074064b905d94b9382588d632b6c0286d4422a11317d879a7feccad0aa711dadb325c53
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild
new file mode 100644
index 000000000000..e9f44cea6d84
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/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/Manifest b/net-im/telegram-desktop/Manifest
index fc2235dd4045..0b45ebbccc68 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,7 +1,10 @@
 AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
+AUX tdesktop-3.3.0-fix-enchant.patch 819 BLAKE2B f827deca269c32648e438642a916383e6184ef3fbdb045c8950997b3a30c6231336fe54a3b39ae5b2b93e7c6c72d0080f00a535dcf6932bbe3740041ba79abc8 SHA512 2653dd30699633c55e590744ed1fb2104b473d43e6391ece791bf3543cac7de594a75d303dc66dd9c7b75face5e90615da261d10758e50e1c669ad0b4f27923f
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
 DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
+DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
 EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
-EBUILD telegram-desktop-3.3.0.ebuild 4575 BLAKE2B 62d7cd93ecdc12f9f322c69914b65ab21d8a5e93c03b5f05b441b50531aacdfb34edaf29d52526579fdd97666a1cccd94937f71b1552208a20d4c1a360adfe0c SHA512 bf3e7a3a1bef2eab3f76b3902e8603cdeafdc0826591bb0b326266362fdbf0fee43e35ca07814b90e3fd80c07aeeea7d88984773d02ca4739d312447ac2e6631
+EBUILD telegram-desktop-3.3.0.ebuild 4623 BLAKE2B 6380d63dd1b17ae0df2bd5baa7cd729feaae20a6f6c92dea66701aa72def4bba869d1c2d0a01039986cc24bc55a3a0c34bb1e763108ca226681ed5d5959bab73 SHA512 64a0fa5894fa5400ab3d95ce5892b9f16bb7f8bd1bca0e1e468f4278634ca31477b0567bfb984dd52eb51c54a6049a13eb736d040d4740f6298179e979d1ed99
+EBUILD telegram-desktop-3.4.3.ebuild 4752 BLAKE2B 4817101e22311ee0414d2065522ba83cbacc1a877217a9403d6b5e70b096ecc51f25376bb151d5d8c77cc9a9f305c7d3af3dfb4fda7178aedca0194a6cf5f06e SHA512 909d08dd26ed182f1700b98a7675be52d31a3978ef274afefbf310709c8d0b934729f62bb05746833ce0995fb24eb5160715da2d4f013aab0a9eafcf33d7eba2
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
new file mode 100644
index 000000000000..35781fda0ced
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
@@ -0,0 +1,20 @@
+--- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
++++ tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
+@@ -34,7 +34,7 @@
+ auto IsHebrew(const QString &word) {
+ 	// Words with mixed scripts will be automatically ignored,
+ 	// so this check should be fine.
+-	return ::Spellchecker::WordScript(&word) == QChar::Script_Hebrew;
++	return ::Spellchecker::WordScript(word) == QChar::Script_Hebrew;
+ }
+ 
+ class EnchantSpellChecker {
+@@ -154,7 +154,7 @@
+ }
+ 
+ auto EnchantSpellChecker::findSuggestions(const QString &word) {
+-	const auto wordScript = ::Spellchecker::WordScript(&word);
++	const auto wordScript = ::Spellchecker::WordScript(word);
+ 	auto w = word.toStdString();
+ 	std::vector<QString> result;
+ 	if (!_validators.size()) {
diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
index cedaf383018b..08ff83d0ea96 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -71,6 +71,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
 )
 
 pkg_pretend() {
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild
new file mode 100644
index 000000000000..21f0978de9d5
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/libdispatch
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20211129
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-cpp/glibmm:2
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	# fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
+	#  not sure if thanks to removing the -pie flag in the cmakelists...)
+	sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
+		cmake/external/jemalloc/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+		-DDESKTOP_APP_QT6=OFF
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	# Fix for RISCV, as well as any other platforms that might generate libatomic calls
+	# Upstreamed in >3.4.3
+	append-ldflags '-pthread'
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+	fi
+	optfeature_header
+	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
+}
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 16007ed11d12..0ae13818614d 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,10 +1,10 @@
 AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
 AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
-AUX toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch 1236 BLAKE2B ecbb048e6e34792c958a25fea05922ec5b82e24792566d8599b8fc355b7c8d5327735dc07b7fd707687647e19f79f1f5580643866eeaa3fb2cda17770086a383 SHA512 2c029f4e62a94a42649933658de7a85c220357a3c02035a2628202298341a729b7a26e81bbf3bc648ef1cd43d2eb52061185218af14bb63954771280a19daf42
+AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
 DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
-DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
+DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
 EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
 EBUILD toxic-0.11.1.ebuild 3025 BLAKE2B b081ad285865a067de261e4a3ea49f65c4a1777f5c7bac07978a2ab5c9a2b0b38fa32fa1b037916a7dc3defdc6860ef3549b9454b6fc36ca7e5e7ebc93832213 SHA512 e2d54f02e91f4de80a3f6d50701b4adacc785b411e6e5feee1303dc70634e16b7449d079b8427fa9b2140d1b8d1383e81613d3892d24f2611c98bcd7892a4983
-EBUILD toxic-0.8.3-r3.ebuild 2009 BLAKE2B 2d2888afcd59c4b087071182e3e7b612e608a0b733a064eb69f5e5317cd2146937e27bd1c757dff1ceecbbf9155c9b302135258f3beedf3f41babecfb4a66249 SHA512 63ae73ffea094e32a11f1a9d8bb1ab28f49e0eeafc7ce1c1b3cc6941fdbc109c447fc454d98148d2fa1320be77e4d5bccac8091b22390a3512d234215947c837
+EBUILD toxic-0.11.3.ebuild 3027 BLAKE2B cf907853a96a89ed1c5a59e2cdb328c796821bcb730da1670cd7d82d4933aef902deea0243b60476aedcc1a5e44ce503290807481cc3ed0c6229c835bff9b7e5 SHA512 fd34ee65ca8d421fbcacbb72b2bfce86236f878db42b250adb36b9107c9f96c67e1e8b541812220d796b70266a3710fd57ea56f6df08a29c64879c4ad1f1d91e
 MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
diff --git a/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..2101b64e3d9f
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,39 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c
++++ src/autocomplete.c
+@@ -29,6 +29,7 @@
+ #include <sys/dir.h>
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h
++++ src/file_transfers.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include "notify.h"
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h
++++ src/settings.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+ 
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 11dc43c6b778..000000000000
--- a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-07-26 10:43:37.453154392 -0400
-+++ src/autocomplete.c	2021-07-26 10:59:29.856460938 -0400
-@@ -27,8 +27,11 @@
- #ifdef __APPLE__
- #include <sys/types.h>
- #include <sys/dir.h>
--#else
-+//This include NAME_MAX
-+#include <sys/sysinfo.h>
-+#elif __linux__
- #include <dirent.h>
-+#include <linux/limits.h>//This includes NAME_MAX
- #endif /* __APPLE__ */
- 
- #include "windows.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h	2021-07-26 10:43:37.456487724 -0400
-+++ src/file_transfers.h	2021-07-26 11:41:30.513057111 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "toxic.h"
- #include "windows.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-07-26 10:43:37.459821058 -0400
-+++ src/settings.h	2021-07-26 11:45:46.709716594 -0400
-@@ -25,6 +25,13 @@
- 
- #include <limits.h>
- 
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
-+
- #include <tox/tox.h>
- 
- /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/toxic-0.8.3-r3.ebuild b/net-im/toxic/toxic-0.11.3.ebuild
index 97ed2aa0ae38..540224d42d30 100644
--- a/net-im/toxic/toxic-0.8.3-r3.ebuild
+++ b/net-im/toxic/toxic-0.11.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 xdg
 
@@ -13,28 +13,37 @@ SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="notification python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	video? ( sound X ) "
 
-BDEPEND="dev-libs/libconfig"
+BDEPEND="dev-libs/libconfig:=
+	virtual/pkgconfig"
 
 RDEPEND="net-libs/tox:=
 	net-misc/curl
-	sys-libs/ncurses:=
 	sys-kernel/linux-headers
+	sys-libs/ncurses:=
+	audio-notify? (
+		media-libs/freealut
+		media-libs/openal
+	)
 	notification? ( x11-libs/libnotify )
+	debug? ( llvm? ( sys-devel/llvm:* ) )
 	python? ( ${PYTHON_DEPS} )
-	qrcode? ( media-gfx/qrencode:= )
+	qrcode? (
+		media-gfx/qrencode:=
+		png? ( media-libs/libpng )
+	)
 	sound? (
-		media-libs/freealut
 		media-libs/openal
 		net-libs/tox:=[av]
 	)
-	video? (
-		media-libs/libvpx:=
-		net-libs/tox:=[av]
-		x11-libs/libX11 )"
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)"
 
 DEPEND="${RDEPEND}"
 
@@ -46,40 +55,61 @@ src_prepare() {
 	default
 	#prevent man files from being compressed.
 	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-	#Fix incorrect include declarations for NAME_MAX and PATH_MAX.
+	#Fix incorrect linkage of pthread (may be optional)
+	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
+	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
+	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
+	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
+	sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS"
+	#Fix incomplete invocation of python-config
+	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
+	#This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros
 	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
 }
 
 src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use sound; then
-		export DISABLE_AV=1
+	if ! use audio-notify; then
 		export DISABLE_SOUND_NOTIFY=1
 	fi
-	if ! use video; then
-		export DISABLE_VI=1
+	if use debug; then
+		export ENABLE_RELEASE=0
+		if use llvm; then
+			export ENABLE_ASAN=1
+		fi
 	fi
-	if ! use X; then
-		export DISABLE_X11=1
+	if ! use games; then
+		export DISABLE_GAMES=1
 	fi
 	if ! use notification; then
 		export DISABLE_DESKTOP_NOTIFY=1
 	fi
-	if ! use qrcode; then
-		export DISABLE_QRCODE=1
+	if ! use png; then
 		export DISABLE_QRPNG=1
 	fi
 	if use python; then
 		export ENABLE_PYTHON=1
 	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+	fi
+	if ! use sound; then
+		export DISABLE_AV=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
 	#set install directory to /usr.
 	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
 }
 
 src_install() {
 	default
-	if ! use sound; then
+	if ! use audio-notify; then
 		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
 	fi
 }