gentoo auto-resync : 23:02:2023 - 09:44:00

5 files changed, 9 insertions, 27 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3ca49b4840fe..26bd66815f45 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index ac9d1af194df..f864ee0cfba8 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,11 +1,10 @@
 AUX tdesktop-4.2.4-jemalloc-only-telegram.patch 1309 BLAKE2B c6ed3e2cfcce9540e367fb90fcaacab81fa6dbb150be7207634facfef77361b830175e4e5e2781d884f101833fde022f496b7c39702d97990de4d16585b5c33d SHA512 83d8c3eaafc2947fbe3555d9acf5c78ad07e89009b89f05908dc5cd088652063766c297e4b726ee69423b15804faf79f52815405b09bba554538e664a99ce0e7
 AUX tdesktop-4.3.4-qt5-incompatibility-2.patch 1325 BLAKE2B 0a74bb545024dbd4df62d52a7603f7a3b28b827940900f4338d6c05ac148ddaf2dcb6cefb8ff3905c737e7e330b896e493334f1dd114341d6818b1aec6e8469a SHA512 254acfe8b8cec69df629759f025ff1c979f609b0fa591a4137c96e9e726782049e4b6a799755b9e50ffffe6d0a26ca3211d4c12e28c7bacd07605b028235e474
 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
-AUX tdesktop-4.6.2-fix-gcc12-optional.patch 419 BLAKE2B d798a025929203343cfa6abdbecad0ae861bf00fdd71db170ec29ec67b2363d53da916eb7341335754dd3438b8cf62ceea5062c4c460c716e632281f3825ba6c SHA512 e46a3442ce8a106d417ae36419f954595965e4abd4be94888e5bb994974fbd8b63c7a2a12a3d33f5a590498942838efa90c3fd65c88f715e60017ed6571061d4
 DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563
 DIST tdesktop-4.5.3-full.tar.gz 63718129 BLAKE2B 85492ad92ea2643dd5e74c831609a4f7be9671648d2b542c24f415dbb19b66521ccecb2a545eadfbf9fa7f934d35d32de085b5b8403dce54bed0b85c54ea98fe SHA512 58a9c5d096e236090347388e1ed480527f841045a80771079dc0c3e35e12ce8ac11753987e87bb57870d9bd8488fc6a4734114648ecec7823d8544744b06c6b1
-DIST tdesktop-4.6.2-full.tar.gz 63799003 BLAKE2B 828b75e13f00c50d26df276479500edd7604987d233b3caf433dc1d5611f0743ef6c9e25ccecd35581b809ca1986ffc3f01bcc0a10c7d05b1d8c9396edc026b1 SHA512 9a52cecb2ccde6e1381045b1c96730c63c5f19ca188a1be3bc905762f6e356906b7be141e8d373473390c21bc8b48ef7d5f4ee43bb09229a96b82c4fd974b531
+DIST tdesktop-4.6.3-full.tar.gz 63791674 BLAKE2B 291ed09dc96bb419c38d6c679c14ac5db1a361114c363ed4cfcbbab8e81927a75e87c5c8839bb348cf3395ff167e8e1eae9d6e499b4448e54e705b34ce997e59 SHA512 c01a1b57c71d8e3509664f8dfb8f7aa932e830732ea75211718150c8e4eafaf501f4271e5cb9e0c3348cd398091bc8236ff0cf79c0c6a45e5f897f9e3610566a
 EBUILD telegram-desktop-4.4.1.ebuild 6663 BLAKE2B 2052b75ff309abefcee5bcdc09fb44eefe23590f4364b0ef43818b290ae67eb3df5fef4ecefbbb5b488921e71bbfa9b9185a964aa5aca03ff0529daddd136e38 SHA512 eb90ddcb2eeae86810fb384d648f9e0c01098495c8051e6de5d5caff13ae180a73bd519885c751f23235c2c79932e3d9da7cc14d44f77a3e8a4360fe56186556
 EBUILD telegram-desktop-4.5.3.ebuild 6606 BLAKE2B dace4440f9c9c27afe7295d3414f63f457d75eeb730cb2438ad1d2a76d6061b73cee57ee964460946fed6946f10fc5f1e84f29bd612554f311b615de776feb2a SHA512 dada58163e4f6f0163ab50f090f40887a3d4bb55d386112d368518cb8e4a297c43190b70eae5b0efcca5012cdb35a05ba58bcad74a1427c7887657e7248b41ee
-EBUILD telegram-desktop-4.6.2.ebuild 6556 BLAKE2B 26c304bfd0e5e4544ca735418c1af1086bd4a7aaa3256cde53a4190f25f0d5ea2ae301f7e060bd2a4057d717c6528118ff3e649dc83112f36f942f231bd7f951 SHA512 225ddd91f4508d926c69b9735603dafe82ec5c6e236089e937ca5b87cb8c038cbc064e73145a7becbd6db64548a659140554c896dc34033fb5730697b0d5bd91
-MISC metadata.xml 1111 BLAKE2B da28403273bdd0e3055f45070a419b8cc65867ec406f3bb19f048e465604a88426d3857e4b7d696ccfd8405713d7a587d0dec5fde8cb264df59f246045584282 SHA512 2fc1a41ad4dfd78d1e02ef5d0ff2fa391cf2950bf6645038a61f0ad48803ad505917ed4a787f0397d529c1ed07d78c0bfd425f6fb9a9876f5a015f573769d38d
+EBUILD telegram-desktop-4.6.3.ebuild 6474 BLAKE2B 37a8ef4b91948ce8a4da735279b098b1b68690c8d0c520d66693d1c35de9ddd69aa291e7bd993b3290d262c12123826752a1fef1dc57eed521cc93d3e1a900e3 SHA512 536efbce6ee4c39fa8dd2fcf78f29b67006f8796b0b88ba2ca3c12c19a19d37f0380aa024dfd97924a65af599646b751a1e9fd83105ef93c44f17ade74754a72
+MISC metadata.xml 1161 BLAKE2B 96076037734121e259b6d13e42f377106bbd3e29c8bcd7c9f95f38f659d28a9068d07c4d12f5ab5c5e3b5d42a7bbbfac127be6639d787ca626f485b83fb4736f SHA512 5530a1da092a0ed8eeaa65b369849a1e58239bcba37377788bbf4e4be7bc52b6349d6f328109ed66364b8599dbc518dcb3448375bed54d88299cc54fc6a7c6d3
diff --git a/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch b/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch
deleted file mode 100644
index 7e471e143ec0..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-4.6.2-fix-gcc12-optional.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix missing header with gcc 12
-
-Upstream:
-https://github.com/telegramdesktop/tdesktop/commit/a8decf154f5aceeff0b977c0a5845e42404286b3
-
---- tdesktop-4.6.2-full.orig/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h
-+++ tdesktop-4.6.2-full/Telegram/SourceFiles/payments/stripe/stripe_card_validator.h
-@@ -9,6 +9,7 @@
- 
- #include "stripe/stripe_card.h"
- #include <vector>
-+#include <optional>
- 
- class QDate;
- 
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index a87e97ea9955..059c51b94001 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="enchant">Enable the <pkg>app-text/aspell</pkg> spell-checking backend</flag>
-		<flag name="hunspell">Enable the <pkg>app-text/hunspell</pkg> spell-checking backend</flag>
+		<flag name="enchant">Use the <pkg>app-text/aspell</pkg> spell-checking backend instead of <pkg>app-text/hunspell</pkg></flag>
+		<flag name="hunspell">Enable the <pkg>app-text/hunspell</pkg> spell-checking backend (deprecated)</flag>
 		<flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag>
 		<flag name="qt6">Build with Qt6 support</flag>
 		<flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag>
diff --git a/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.6.3.ebuild
index 647c887cfff8..cf71ac36b019 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.6.2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.6.3.ebuild
@@ -17,9 +17,8 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast qt6 qt6-imageformats wayland +X"
+IUSE="+dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
 REQUIRED_USE="
-	^^ ( enchant hunspell )
 	qt6-imageformats? ( qt6 )
 "
 
@@ -44,12 +43,12 @@ RDEPEND="
 	media-libs/opus:=
 	media-libs/rnnoise
 	~media-libs/tg_owt-0_pre20230105:=[screencast=,X=]
-	media-video/ffmpeg:=[opus]
+	media-video/ffmpeg:=[opus,vpx]
 	sys-libs/zlib:=[minizip]
 	virtual/opengl
 	dbus? ( dev-cpp/glibmm:2.68 )
+	!enchant? ( >=app-text/hunspell-1.7:= )
 	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
 	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
 	!qt6? (
 		>=dev-qt/qtcore-5.15:5
@@ -75,7 +74,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/range-v3
-	dev-cpp/ms-gsl
+	>=dev-cpp/ms-gsl-4
 "
 BDEPEND="
 	${PYTHON_DEPS}
@@ -87,7 +86,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
-	"${FILESDIR}/tdesktop-4.6.2-fix-gcc12-optional.patch"
 )
 
 # Current desktop-file-utils-0.26 does not understand Version=1.5