gentoo resync : 07.10.2018

5 files changed, 90 insertions, 65 deletions

diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 79f33154c36e..3240f6e090ea 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,8 @@
+AUX fonts.conf 1656 BLAKE2B 551a0651aeeaf43ac955731c492232014d10cdbac7e04a0be7bb915218e1f70c4082491d5e081b3cdc4c713398119a7ce9d25c787647f521b37f00a5b16caa15 SHA512 662ad4f6b91ae4d8479ee79f298d94f7862eb71031b5aa726b89e1d1e1bc71050437af73137a3aad71236fd3535527cbc37d394300a2191bcc51ea8d075ec513
 AUX telegram-desktop-bin-r1 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.3.14.tar.gz 17199969 BLAKE2B 996b1b8113253b12592727fcced27b26e9c9f020f8112ac2460b8c9665c3445f8e8707cc0d62c22a3452367d483a016a471119437ae3da6cea10cc3bc3ed656e SHA512 0fa0792970d4ed044ddc06f97b02d1b7de137cccba7792cc5cbbfbce0d3ef8dbf78cfe3464d3f846c2d6285a9d7db2f40cc4ff76b4ef7138f238ac9045cd2931
+AUX telegram-desktop-bin-r2 646 BLAKE2B 4a99820a48dee103680bd81ba738c3a56538864b44f39a950e41232a7f39d85aee69542abb2de3bdc09ce9bc00de20aa17983626ffe25ba71e53a7d25a2573c6 SHA512 56be7103c3d9aa120aa16f67e11c1600d52b69c9424f9cb88754bf2dd8b559abfa254ca60fba07d07de35c2d9375fce90fb37bb008e5cc806386df043dfab6ff
 DIST tdesktop-1.4.0.tar.gz 17318129 BLAKE2B bd77ac1c20aeb3e760294f32d8649d49740ef97aae37fabc90aee8207e87109812ce824e25b028785f4ab6fc932ed2e727022cf40a61a189e9f90eb056b0e19a SHA512 4eb123dc34edd3a47848abac66ca7c07a6bf9cf0658a9e904797ae52324f3cdcef3de9a63983f4003652c36087d4ab2e0a9fbf6c6c95b424fd68a65bd77ecadf
-DIST tsetup.1.3.14.tar.xz 34544980 BLAKE2B 3a0ec56d3e49fb47484c959006126a39ed41da6d58706a51808207c0d285a06d72954a17754e7b166468e924f549d08200355f5c83ca68b9fe535304fcb12e34 SHA512 b880782ead5acc40c81d62028e88b5565f6740bc044cdd1eb2e701854d2c5c23ecd2c6d68f7a3b00d8e85d2ad89b1cdf1e7b65b691b2178ea9556cd9b852a726
 DIST tsetup.1.4.0.tar.xz 34811788 BLAKE2B a46e38b8d27ce764b7e9e735809a5098456368ed747e83bc16d125d80e6b772e1fb0eeee0d6b8eab937c04148b2516d5130c365dbda7e7a05571b14137b5a9c5 SHA512 c646763d66a807ade2c5d475444ce651dfd8ff488cafc4148a9e6850485fcfa8bc41d821dea1a9a6d6d5ac8f97593f5cedefa20a533d057c40e72a497afe264c
-DIST tsetup32.1.3.14.tar.xz 37060108 BLAKE2B 5fb87cab91cef06cfd585907e5a40f3099f10a91cf6226704c2f5822d9ec4459f8a65b5714a1177ce1b8c2bbc7f8030af8d82d72ec98b4fe9dd4b3fbaeb09b76 SHA512 446f7091b568b56466d9ee53343a7433335817c0589e5338010dfccb78e615745262fcae18b856c0929d045d3caa46ddace1893c2a44fdf9507c09fad3b09626
 DIST tsetup32.1.4.0.tar.xz 37403084 BLAKE2B dd134c49da40fb25266e0bbaf5722675eea84bf760029646f0d727f6df587a789d42d40c1de1d3f8eb6a2623e5f5e569524b618df18ea48d26e0a05a1a597310 SHA512 8700221f791fa366bedbe666f8d73ec68a216db0dd0ceef43332fd4ce075897c003b069f51946e29dc1b1574dd50fdd6abb1ed491d1c09f5952d044628656a3a
-EBUILD telegram-desktop-bin-1.3.14.ebuild 1291 BLAKE2B beafdaae27e3b314ac53fd54e813f654c90f1c8d452e32a22cc25557d3e3cac830e70522c54548ab8f34aa613bf853194ea03de44f6848acce010e31201c8855 SHA512 57d47a377d349169f9ee8c3a3dcc8931b17103affc64d2219c00a4dcfa3a57c4b6ad0cef60287550aa3ebbdb1e7413e751bca80eccac6142236a0d71fb76a1f2
-EBUILD telegram-desktop-bin-1.4.0.ebuild 1552 BLAKE2B b15d5e41ecb4b0ce7d70e124136db5c96d06e4b14f2173387446df4a241e256ff60c3f1ea548163f1eaaf83648173e40cd9cff307a6c3e7570d2e91961223e84 SHA512 82831ff5408cddb6f633b0e3345ab48781ae1ec8868c60a497e7127d4d898f27c0b02252b08fd703dcaa8d4bd4c910f79197315f2af815f2abb08f8514ba881b
+EBUILD telegram-desktop-bin-1.4.0-r1.ebuild 1981 BLAKE2B f6eb9c0679418be38ca899e4d9f958e1d745ebb684c4534586af855c5cc77b49fafd4b2f29d255337b29ca7ff965d8dd139e883a66cfda94f27d9d1f7512f5c7 SHA512 cce4faa310dcaf5d6f4be9c5118dc48d76fa1835d02d7c8c06c8a7e4f9b612ff1e31d9d6ab383a79a9516be7c57cd93925c96179531f185b02186c2991c17046
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/files/fonts.conf b/net-im/telegram-desktop-bin/files/fonts.conf
new file mode 100644
index 000000000000..d3ddc32d7776
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/fonts.conf
@@ -0,0 +1,60 @@
+<?xml version='1.0'?>
+<!--
+     This file is only here to work around
+     https://github.com/telegramdesktop/tdesktop/issues/4240
+     It has been taken from (with slight modification)
+     https://github.com/telegramdesktop/tdesktop/issues/4493
+-->
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+    <dir>/usr/share/fonts</dir>
+    <dir>/usr/local/share/fonts</dir>
+    <dir prefix="xdg">fonts</dir>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>mono</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>monospace</string>
+	</edit>
+    </match>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>sans serif</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>sans-serif</string>
+	</edit>
+    </match>
+    <match target="pattern">
+	<test qual="any" name="family">
+	    <string>sans</string>
+	</test>
+	<edit name="family" mode="assign" binding="same">
+	    <string>sans-serif</string>
+	</edit>
+    </match>
+    <cachedir>/var/cache/fontconfig</cachedir>
+    <cachedir prefix="xdg">fontconfig</cachedir>
+    <cachedir>~/.fontconfig</cachedir>
+    <match target="font">
+	<edit mode="assign" name="antialias">
+	    <bool>true</bool>
+	</edit>
+	<edit mode="assign" name="embeddedbitmap">
+	    <bool>false</bool>
+	</edit>
+	<edit mode="assign" name="hinting">
+	    <bool>true</bool>
+	</edit>
+	<edit mode="assign" name="hintstyle">
+	    <const>hintslight</const>
+	</edit>
+	<edit mode="assign" name="lcdfilter">
+	    <const>lcddefault</const>
+	</edit>
+	<edit mode="assign" name="rgba">
+	    <const>rgb</const>
+	</edit>
+    </match>
+</fontconfig>
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2
new file mode 100644
index 000000000000..a8b0e3e6d99c
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2
@@ -0,0 +1,15 @@
+#!/bin/sh
+# this wrapper disables the auto-updater of telegram-desktop
+# This program is licensed under the same license as telegram-desktop
+
+# telegram-desktop fails to set RestartCommand with the session manager
+# exclude it from session management to prevent restarts without the argument
+unset SESSION_MANAGER
+
+# telegram-desktop expects old fontconfig configuration files
+# this is a workaround to try and deal with that
+[ -e /etc/telegram-desktop-bin/fonts.conf ] && \
+  [ -z $( printenv FONTCONFIG_FILE ) ] && \
+  export FONTCONFIG_FILE=/etc/telegram-desktop-bin/fonts.conf
+
+exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.ebuild
deleted file mode 100644
index 8b7d2c549cd7..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils 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 )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="telegram"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r1 "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-desktop.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild
index e0cfb12960a6..c709f83a6719 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	>=sys-apps/dbus-1.4.20
 	x11-libs/libX11
 	>=x11-libs/libxcb-1.10[xkb]
+	>=media-libs/fontconfig-2.13
 "
 
 S="${WORKDIR}/Telegram"
@@ -32,7 +33,7 @@ S="${WORKDIR}/Telegram"
 src_install() {
 	exeinto /usr/lib/${PN}
 	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN}-r1 "telegram-desktop"
+	newbin "${FILESDIR}"/${PN}-r2 "telegram-desktop"
 
 	local icon_size
 	for icon_size in 16 32 48 64 128 256 512; do
@@ -41,6 +42,10 @@ src_install() {
 			telegram-desktop.png
 	done
 
+	dodir /etc/${PN}
+	insinto /etc/${PN}/
+	doins ${FILESDIR}/fonts.conf
+
 	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
 }
 
@@ -56,6 +61,12 @@ pkg_postinst() {
 	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
 	einfo "conflict with the one shipped by portage and should be removed"
 	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+	einfo
+	einfo "This versions fixes fontconfig issues that have been reported"
+	einfo "by several users. However, the fix might have side-effects on"
+	einfo "non-latin fonts. If you have font issues with this version just"
+	einfo "delete \"/etc/${PN}/fonts.conf\" and leave a comment here"
+	einfo "https://bugs.gentoo.org/664872"
 }
 
 pkg_postrm() {