gentoo resync : 13.06.2020

3 files changed, 149 insertions, 2 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6bd9230b90e1..2b2c4392faac 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,7 +1,9 @@
 AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3
 AUX telegram-desktop-qt5.15.patch 975 BLAKE2B faf7fa6505d760299b05a02684817993162a5d3105581fd425bf4af179543170eb4d4b4c670907b88cbfead9bc288641216edb86f47fe370f0d691918426b4a1 SHA512 6bbe0583103d575a1413141799985c7c7b590d8a9856c727320ce322679a3d38343a144c314eee54fa9776c8f3a084627a333e6860d1b8cb8f496b1702070ac0
 DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
+DIST tdesktop-2.1.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42
 DIST tdesktop-2.1.7-full.tar.gz 36509059 BLAKE2B 4a1bf5879e71e64f34024165f9db39f69d1d8e87b0387704bdb74415d60d6a1efd22ab1fec994116a72a6982a55f13cee0edb667060bbe9336cba4ce12e7472c SHA512 f942ce93d9671f3bb95a8fbba107fc851bfe3f28871c9651f6f2d97d711602f8a671f7b74750894b2175d33a67c25017562cd4ee455da7aa9b86755d1c3f1cfb
-EBUILD telegram-desktop-2.1.0.ebuild 3717 BLAKE2B 5e0a8f4f73140a8f793ff0afe983db06cfaac151cab82aebb4a2900832e5ebf303bae0071d1067108c374b8e5dc2a6467388342512b34d3d77881c24aaadb0ac SHA512 9ff80da4041cafa2b626f5a2f625aa0b47b80d8cdc2f3c443588d08bf689922360a43efda1637921f81e6a94d93f3f2e713bd2326a7f2f434594cb9929ee1d07
+EBUILD telegram-desktop-2.1.0.ebuild 3716 BLAKE2B 9b1960b1cec105bb69527e5540b9621538954f8ae3357702f1f328200c0950312f83d1efb2e5776c4a0e6141f7f57d7ce036a8bf2c25f0310edaeaaf3c5153ce SHA512 7647a66aee7105f0847b916dbff40deceeda6d6aae8ae4621e1027b7b21eccd0d2046ee00e0a9345af1fda93dd7c35cccbe1e12663ad8539212b406c28415ac5
+EBUILD telegram-desktop-2.1.11.ebuild 3963 BLAKE2B fe9e9583ea4bcc15d58430d1d580d8724e9cef05965165e4cc2e267b131264c1db9533760a617d6e7df56c5b2aa9a76fa1f5625a0c372153bea442467070e7f1 SHA512 53add9853b634dffbebd91e0be716558235b2942cc70aeadf6f7be146f657fdc352a113e1707fd0e2e8c9cf643bdbbb19b49e54c4e03d7fdf0237bb15796b0eb
 EBUILD telegram-desktop-2.1.7.ebuild 4010 BLAKE2B 61279753bfbde2ce025953489dbed3f0c629a01d344db8146346110cfdeee27d3b2369f948862bf97bf2fbbd5c265117f3a92bd80dfe99d789a17f6ea3de79e0 SHA512 ad6b101bf0a6f60dd65c73d6fe5bb6e8933181716c337180215cbe2d29ff8b27b09411cf640569e3dd66d4c558f95d30b040a044d45cf9f4ba88b7e2a271724f
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
index dd038756cdd2..3d59edf3d41f 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
@@ -70,7 +70,7 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( 
+PATCHES=(
 	"${FILESDIR}/${PV}-kde-dir.patch"
 	"${FILESDIR}/${PN}-qt5.15.patch"
 )
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.11.ebuild
new file mode 100644
index 000000000000..bc1842516e77
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.11.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[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/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# 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
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-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_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-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_USE_ENCHANT="$(usex enchant ON OFF)" # 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
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}