gentoo resync : 05.02.2020

4 files changed, 121 insertions, 2 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2df4c38fed6e..f496df93b124 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,9 @@
 AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
+AUX pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch 1148 BLAKE2B 3d11b4da8d8d518e295af03f1fee1339e493cb0e6a8f3db3778986b53deab5a2a6193d5c0aeb38461a9f2fa5d32324eb23fc3cd16ccd927602bf76a805036538 SHA512 8c70c0e42b25946f1e4bf907e353c78721389ac726ef4574f1d2e34e4d6f93fcdd7d4d095c5fa0d6f1e085b148d7ed653713dd1876a255dd7703bf190f2d159f
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 75ea8501c2d36ec6a4e523ec05f076ed2de4252c18424ce10cc41d76f4c43299115e35640daf52a2b79c10c32c9e87eea7a989ee3d99dc3cd2c7d417fbba9d51 SHA512 22ee1035c822380fc2f2d4fb89507ac945ae6752e90114f6b1a8695b9821d9bf551692ae56717f2bc6febd51926bc833455515d58b6e37f0b94f19ae76d3ddab
+DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
+EBUILD pango-1.42.4-r2.ebuild 2336 BLAKE2B 8c35093e164a29d4a2a79f26340b99331c2124ab02fec894878f35be8758b71ee4120fc5c2ddc79282b25f4ed4a218bb5aa7f54260d128995bef9399a41e6e6a SHA512 28d7c495050851f8d957169ad8cf5a47fb4551aff31856827aba945cb42a47927c4670812395069736b4090d1c55ce68e31a1ab1038757f8f98f2f3064f3989e
+EBUILD pango-1.44.7.ebuild 2130 BLAKE2B 45c7b415b2d039c840b4f75c47d61fe13aa66af59ab045779956fda58cbfffd0714531529d3170bdc5d7ea0038a5a13f22ed4c8b86f665ea9a339318c3e37a56 SHA512 cb2c95cc8a3aaeb2f982c7634d4789c9ab8ab1f51f8fb31b0e23e37b768830f219e98986aed7eec4176f58f139ea50a416114df38d4714cf2b3080862bc86c23
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
new file mode 100644
index 000000000000..181d84587e13
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/pango/merge_requests/161
+
+From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Mon, 25 Nov 2019 14:58:32 +0800
+Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai
+ available
+
+The four.break test data file involves the Thai language, meaning that
+this test will fail unless we have libthai.  Skip this test unless
+libthai is found.
+---
+ tests/test-break.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/test-break.c b/tests/test-break.c
+index 8549b678..47fa3009 100644
+--- a/tests/test-break.c
++++ b/tests/test-break.c
+@@ -305,6 +305,12 @@ main (int argc, char *argv[])
+       if (!strstr (name, "break"))
+         continue;
+ 
++#ifndef HAVE_LIBTHAI
++      /* four.break involves Thai, so only test it when we have libthai */
++      if (strstr (name, "four.break"))
++        continue;
++#endif
++
+       path = g_strdup_printf ("/break/%s", name);
+       g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
+                                  test_break, g_free);
+-- 
+2.24.1
+
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 55f956cec0bb..97f10d1025d6 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
new file mode 100644
index 000000000000..cbaa8b80c48a
--- /dev/null
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
+IUSE="gtk-doc +introspection test +X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	tc-export CXX
+
+	local emesonargs=(
+		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
+		-Dintrospection="$(multilib_native_usex introspection true false)"
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+muiltilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}