gentoo auto-resync : 03:08:2022 - 13:50:40

3 files changed, 30 insertions, 55 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 41519e73283e..53a216f78a4f 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -6,8 +6,8 @@ AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1343 BLAKE2B bc257ee3bc3577b05a7
 AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044
 AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff179288eb4bcc4acdfbe280ae51da11d254054adcc00f4c1387cdc9a24e026e06612d55765a1689b4bfc6381349b75053c4156a0cff71f SHA512 82855396f367f3669a34246a031626bba158d5361ec39e728c2d33f0d5b9ff5196c38a33551614848b5d439e25bbe45eb3795eaf7ca7442f5f27ab0bdeb0e72e
 AUX tdesktop-3.6.1-fix-use-after-free.patch 1627 BLAKE2B 867dde2d1d8d6535e2305f841fe97477bd08c37e96684196563f9ce6dbfb12c7b2941ddc3e00182126e24ec08e1692ec201006d2c46548fcbf2f9bae09dca532 SHA512 e52369b6aee6c772bef56b73cf4656813614694af714eb83432ffbe7a2234dde4be9888e927c1304350c5c31a0a9cf37a53ea41df2e9b47a00de6dc4433a1c1b
+DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
-DIST tdesktop-4.0.2-full.tar.gz 41059443 BLAKE2B da4efb15c8a2d11719d3aa56c3a40b12f70c37577d2909c43e6029e10ca0bb1f8445ed68ed9acd532009c8e0a8f48fa13d2a51573a81f58a8a83b13427ffb631 SHA512 0078b627d06dd8e655bd2bcc222ecbb3b15b7d88f858810bccdca84793ad02a60f4a4bf3808838752d65d4f6cffa3ddb5f70c5afc8e94cb6edae52101362feeb
+EBUILD telegram-desktop-3.5.2-r1.ebuild 4822 BLAKE2B 2511fe0122a1784d393ea19f3d0453ead0a2038c99c8b4d15f370e254f3bdd3f7dd349fc70c39a42c3ca67f7b9b4b984f452563ffe227956443d6f2d55ee0c1b SHA512 7d6d91c054a38b118f7ca028b6ceeb9b40312626cf2489f2abbc3b77bff1fbb409cc9d714ff3a299426272a33fc595ba44df696e2fc9fb23b0fb043ce7770519
 EBUILD telegram-desktop-3.6.1-r1.ebuild 4886 BLAKE2B e82263eb280dbf9443beaeeaf960be7381953c69cfc6c800aae6b8d02a273350062dd42d31f85467990c71584c6f6d33ee811260ef202866cd4df9ef65e4b190 SHA512 3a700af06f41db67a8d33ed6e2def3ab38d95770b41b444921725ef00cb5fcced425adfa3bfb69942cee5539a8284fd587df495fb43b4d4673a5f62cfa2ceb27
-EBUILD telegram-desktop-4.0.2.ebuild 5876 BLAKE2B d9ee18a8d35a0d6cf9b579bb9dd3ae40f12573054872223851cff67861b9bb2ec10c4460d8d8cfc365285150342fbbeacc96e52c0822062fb65f396747680c54 SHA512 0aee7f042dee7e98c35313d8a12ff02eafa25d6046b57f63f90d1130724f63adff93d6bb6c8fc0c3291b17c21f2119197117d567f2b261b62121cd11eb51951f
-MISC metadata.xml 637 BLAKE2B 643abb06bad4683b713dfd6a697e13540f911aef5b55ad79c41d8076dcca5a96ae40c80131329f8240a8d382c81c788142f71e5b8f8b8b0870a1767eb8fa3c22 SHA512 bfe3f00d0f6b3b65962475ae0641f527f115baaccb6069653c31fe1f2a0096a7e90bfe58ffc037edddb8541a898def866ce6b4036b4a592d6f8ed4a8decf1fb4
+MISC metadata.xml 588 BLAKE2B 1b53c778dbad032cfaff286c58d495ff2c84c2862b4e29aba4120ec8fbe589323adb33351740150e7f62ef5c109992c7520a80d4d5c5e5a8a64adab4895ccac9 SHA512 b2b6cf121907705ebe568af9f384aee156551970d3ce11bccbea60d8b48753d9af439b7957d2fb15430f3723e96f77c7eb4864774fcba96a2acf214f00b1c79b
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 102293a68d35..3f9fa364ab61 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -12,6 +12,5 @@
 	<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="qt6">Build with Qt6 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
index 930d3d186fc3..757e0eab2ba4 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit xdg cmake python-any-r1 optfeature
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
 
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell +jemalloc screencast +spell qt6 wayland +X"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
@@ -31,33 +31,30 @@ RDEPEND="
 	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_p20220503
+	~media-libs/libtgvoip-2.4.4_p20220117
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20220507[screencast=,X=]
+	~media-libs/tg_owt-0_pre20220209[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
-	dbus? ( dev-cpp/glibmm:2 )
+	dbus? (
+		dev-cpp/glibmm:2
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
 	enchant? ( app-text/enchant:= )
 	hunspell? ( >=app-text/hunspell-1.7:= )
 	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
-	!qt6? (
-		>=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?]
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
-		dev-qt/qtsvg:6
-		dev-qt/qt5compat:6
-		wayland? ( dev-qt/qtwayland:6 )
-	)
+	wayland? ( kde-frameworks/kwayland:= )
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}
@@ -72,28 +69,21 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
 	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
+	"${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch"
+	"${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
 )
 
-# Current desktop-file-utils-0.26 does not understand Version=1.5
-QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
-
 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
-	if use qt6; then
-		ewarn "Qt6 support in gentoo is experimental."
-		ewarn "Please report any issues you may find, but don't expect"
-		ewarn "everything to work correctly as of yet."
-		ewarn "Qt6 ebuilds are available in the ::qt overlay."
-		ewarn
-	fi
 }
 
 src_prepare() {
@@ -105,26 +95,20 @@ src_prepare() {
 }
 
 src_configure() {
-	# DESKTOP_APP_DISABLE_JEMALLOC is heavily discouraged by upstream, as the
-	# glibc allocator results in high memory usage.
-	# https://github.com/telegramdesktop/tdesktop/issues/16084
-	# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-
-	# DESKTOP_APP_QT6=OFF force-enables DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-	# This means that REQUIRED_USE="wayland? ( qt6 )", but a lot of people
-	# enable USE=wayland globally, so we instead silently disable it...
-
 	local mycmakeargs=(
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-		-DDESKTOP_APP_QT6=$(usex qt6)
+		-DDESKTOP_APP_QT6=OFF
 
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
 		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+
+		# This option is heavily discouraged by upstream.
+		# See files/tdesktop-*-jemalloc-optional.patch
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -169,14 +153,6 @@ pkg_postinst() {
 		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
 		ewarn
 	fi
-	if use wayland && ! use qt6; then
-		ewarn "Wayland-specific integrations have been deprecated with Qt5."
-		ewarn "The app will continue to function under wayland, but some"
-		ewarn "functionality may be reduced."
-		ewarn "These integrations are only supported when built with Qt6,"
-		ewarn "which isn't available in ::gentoo as of writing."
-		ewarn
-	fi
 	optfeature_header
 	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
 }