gentoo resync : 28.04.2019

3 files changed, 2 insertions, 133 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 4c04c8f58b7f..7f50293f905c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,7 +3,6 @@ AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751
 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 3681 BLAKE2B 6d28bd41c31fb0dfaeac9a8786cd40e2c6233a64706f9de0dd3e5278d2364083209c5678df75302f0e340b6e38efbcd83005e17b1b3e206180f9123f62538e1f SHA512 e950d8b0b93dd80191d76bed991cf511160cfb16e81bef2ef5a2209cd39fa943f43ba1ed2df11223b4c773cbca30fb505569cea1b8a60dc239402ef9dca84477
-EBUILD cairo-1.16.0-r3.ebuild 3813 BLAKE2B 4671bf8af5126607c6a31a0131be5e1817a989becdccac6e229aa7afa095353391d4bbd554749a96983a28b8f284be8947aaeb6d09b6c82d1684a50a9dbd68d0 SHA512 f3311e01f52fcb1401f06ef6b661930c189b199ab4bf1211bde4de203260677c6a42551659c744b9fa5784c5fa53e350684d4e83821df758c0fc35723e9cdf69
+EBUILD cairo-1.16.0-r3.ebuild 3808 BLAKE2B 197542ebf3a0b0d6309298b26caecb9e360a3645fe306aab046293070d0907f0db5f97016b4a9653e43f6e21c48771e3fef15059c8ae16e2204f6b304b3e7cb5 SHA512 46ef3fa23592fc554ed6433cadadb8683c0b60c359948d2c0a88425539f43b1111abdbf6bf12f344f71534d957ece4f105e18eca9775ce784dbc3b655b92c0f3
 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
deleted file mode 100644
index 33d36a607036..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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
-)
-
-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-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 189a0e2b92e8..5b9b8adaa412 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	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"