gentoo resync : 05.04.2019

6 files changed, 201 insertions, 7 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 59b9a74a8eaf..4c04c8f58b7f 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,9 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
+AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
+AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r2.ebuild 3632 BLAKE2B 9d12a4c2c07e203df7574aa36f5b16d436e0bf0d0bbdfdf0a98ad54abc55a2542ea40108c6d34ff176be91f472566b50c3f8b82e40cd22932dbc2094cef06ead SHA512 e166e6931907c4ef8736d037d9f4b745114df4e75fc799dcd215764a573a9a04cb5e3a98dd73d3d615e9a807e9f5abf74b52e77da9b48c7db319204f19d7d698
-EBUILD cairo-9999.ebuild 3643 BLAKE2B ea2f2d7ff707c26ec1ed270013402aaf5812f858d7d88fa7ca1388920951f33b4c84f5b331c83535e92d981b2af92c69c341845559d35757b4828dd701ff8046 SHA512 085453031a155971d810e1e9b96abf50d52a16a1525c25116bdeffc46c22fa948d2323c1bbaa081f2bb95b77cbdd0f003df7e13eda79a0651ab74a52db58ad9e
+EBUILD cairo-1.16.0-r2.ebuild 3681 BLAKE2B 6d28bd41c31fb0dfaeac9a8786cd40e2c6233a64706f9de0dd3e5278d2364083209c5678df75302f0e340b6e38efbcd83005e17b1b3e206180f9123f62538e1f SHA512 e950d8b0b93dd80191d76bed991cf511160cfb16e81bef2ef5a2209cd39fa943f43ba1ed2df11223b4c773cbca30fb505569cea1b8a60dc239402ef9dca84477
+EBUILD cairo-1.16.0-r3.ebuild 3813 BLAKE2B 4671bf8af5126607c6a31a0131be5e1817a989becdccac6e229aa7afa095353391d4bbd554749a96983a28b8f284be8947aaeb6d09b6c82d1684a50a9dbd68d0 SHA512 f3311e01f52fcb1401f06ef6b661930c189b199ab4bf1211bde4de203260677c6a42551659c744b9fa5784c5fa53e350684d4e83821df758c0fc35723e9cdf69
+EBUILD cairo-9999.ebuild 3692 BLAKE2B 95df8b4195124919a4e49485619e2fc550a0d267f86482c98dbffc473e4c44138f0d09e9879e240d46309b95faf02593cbd36f27f58ff1b17ab28b3dd18744a2 SHA512 c179e201e4a7e5ad1c61eea111e41b080f19d2f8cf0783064dd88e1bb276f5575ba91f09a4fc1bc17c069b399c8acbff667228f7d410e9c389535ff82d7c2fc4
 MISC metadata.xml 704 BLAKE2B 25cce9fa8743e9f12ee5f41d189dfdb8850673c129f0ee1089922aead08d50a0eca451f926a9f58fcfe7fee256764db2102364968971d7f971a026f8f29fcfd1 SHA512 4c2c54b38569197ebbcb8145017b77c4f77fed2f6b6b6c4198386ee1e3f067b3ca4539cbf239bd7f3ead1e3d428992bae67b3e80edfbf8bcf48fad43d14256b1
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index f49627585235..33d36a607036 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
new file mode 100644
index 000000000000..189a0e2b92e8
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable utils trace) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--enable-script \
+		--enable-interpreter \
+		--disable-drm \
+		--disable-directfb \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 50f6c6a7649f..2145909816d9 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
new file mode 100644
index 000000000000..3709c5a90f80
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
@@ -0,0 +1,30 @@
+From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <cgarcia@igalia.com>
+Date: Mon, 19 Nov 2018 12:33:07 +0100
+Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
+ cairo_ft_apply_variations
+
+Fixes a crash when using freetype >= 2.9
+---
+ src/cairo-ft-font.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 325dd61b4..981973f78 100644
+--- a/src/cairo-ft-font.c
++++ b/src/cairo-ft-font.c
+@@ -2393,7 +2393,11 @@ skip:
+ done:
+         free (coords);
+         free (current_coords);
++#if HAVE_FT_DONE_MM_VAR
++        FT_Done_MM_Var (face->glyph->library, ft_mm_var);
++#else
+         free (ft_mm_var);
++#endif
+     }
+ }
+ 
+-- 
+2.19.2
+
diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
new file mode 100644
index 000000000000..19345f141872
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
@@ -0,0 +1,29 @@
+From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu, 25 Oct 2018 18:46:17 +1030
+Subject: [PATCH] pdf: add missing flush
+
+Issue #342
+---
+ src/cairo-pdf-surface.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
+index 7eb61aa1e..939b2d2d7 100644
+--- a/src/cairo-pdf-surface.c
++++ b/src/cairo-pdf-surface.c
+@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void			*abstract_surface,
+      * and most common, case to handle. */
+     if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) &&
+ 	_can_paint_pattern (source)) {
++
++	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
++	if (unlikely (status))
++	    goto cleanup;
++
+ 	_cairo_output_stream_printf (surface->output, "q\n");
+ 	status = _cairo_pdf_surface_paint_pattern (surface,
+ 						   op,
+-- 
+2.19.2
+