gentoo resync : 05.12.2021

3 files changed, 14 insertions, 10 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 9a25c2c2ac88..9dc8673fa70e 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -3,8 +3,8 @@ AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e7
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
-DIST tdesktop-3.2.0-full.tar.gz 38545930 BLAKE2B 03816a90ad283d0620964848514ac271a93fc0eba85f11f1945ad04816f3ff6b09de1359836dbf94661f6b744cbc35d3b57d92a7e9a2a04608c4be83a61346c8 SHA512 39d45234e5cd24b7fcb7dbb7d7f20baa1f7b74b33f5c50486842fa6c0ce5d94314f05594241b44722f101df3ef78462aac8e1290bf42bfb649f6aa664d2466b5
+DIST tdesktop-3.2.4-full.tar.gz 38537053 BLAKE2B d31f354d5efe51b6268eb42a39e1c54af7c3b570534b6f206a7e6bd5cf96555f1c6633b79eda919ffcd25ca38a48d6e297db5a1b071434bbdaddf724068fcb13 SHA512 a4651e0af49195f4f3ff15d74a616a5ccd056f15d0448687138947ab0f816b45c05dec81029b59c5e7b5eefed3059618245ad1b3b3f27f894c6accad697ecd94
 EBUILD telegram-desktop-3.0.1-r1.ebuild 4374 BLAKE2B 1bec2055cdc156572815286d0050aeacd2c388a7cd62d3b60af8140902c0b2dec0ba03a64c8ecc8e143949bcaafe24c84a4e3c79b90593c6246129ff0f60db7d SHA512 754094c452ce7c7e81034c816bab884a6b95f092e619f5774fe887fd4627db0209198e9ef666ed174ee22a3aae78f17c3373c2556c14ef94bca41a7688a90487
-EBUILD telegram-desktop-3.1.8.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
-EBUILD telegram-desktop-3.2.0.ebuild 4383 BLAKE2B 913ac75f99f969a25be2c8d8de4a922abb1b599a0e3800e2102dfcdc031dd317435d3f62b5058572ecc275a9e6028e8eb697479a24e7d4d89f63bb1fbe11a32d SHA512 83fdb75cbd8aaf643484f9a3b0345bb0eb5e0a261f06af506e2da6d47d9b6c8494828e4395b71a433d863fe99e8eea216397efcfcd1342250e35d1c2af27be43
+EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
+EBUILD telegram-desktop-3.2.4.ebuild 4618 BLAKE2B 31504988f3f9bb9979c6e7bdaa61dc5e658f82f23d968daf70d6ad8ca5e98349e6f5bccd371b1e0ff748fb647c1011a6baa7f6ae583ef659065a21af75de837f SHA512 844da601946e54902b7f47ec68f0c211653ad8f6655f1eb440a0a1cb1edeae0e87903ee5cb0ed66ff073ff8b49ac31bbeaacdd7e82fac979bf90ca5f25a253cd
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
index 65f4899c98bf..9a17e6963f61 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
 REQUIRED_USE="
 	spell? (
diff --git a/net-im/telegram-desktop/telegram-desktop-3.2.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.2.4.ebuild
index 8bf892956dfc..ce2c80774863 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.2.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.2.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit xdg cmake python-any-r1
+inherit xdg cmake python-any-r1 optfeature
 
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
@@ -16,12 +16,11 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
+IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
 	)
-	webkit? ( dbus )
 "
 
 RDEPEND="
@@ -55,7 +54,6 @@ RDEPEND="
 	enchant? ( app-text/enchant:= )
 	hunspell? ( >=app-text/hunspell-1.7:= )
 	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}
@@ -91,6 +89,11 @@ src_prepare() {
 	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
 }
 
@@ -104,7 +107,6 @@ src_configure() {
 		-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_WEBKITGTK=$(usex webkit no yes)
 		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
 	)
@@ -144,4 +146,6 @@ pkg_postinst() {
 		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
 }