gentoo resync : 25.08.2020

3 files changed, 2 insertions, 137 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e7add9102b93..79b600dafa4f 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,7 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 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-r3.ebuild 3893 BLAKE2B 98e15a4b9625b26914e80598b84f47b7f8b85e8ab9a786f65f0fb78e96f407d814dd93e93da446b1ffbb6727df9d26f4b914151df174cefeae3754d8dc900ad8 SHA512 053b0d82dcba55dde60a6ffb9f7cefc018a511009c72ee27247575661274ad43483c3194c8cdbc68be2d3edbf33d58d6214bd3e715d706faed4ce0f062039c21
-EBUILD cairo-1.16.0-r4.ebuild 3936 BLAKE2B d8945f862c312e904d22990d68ebf2aab4b9fa1b118ad7aca7bd58c2e72209871f63dd19389a44c91da08fc54ac34b6ee01e3c85e707b1ac8c0d35337935f23f SHA512 9105ed5abbe388eb6a1b5bcb345b4fa89ae6d61a2d71e651d04bebd8ed6f61f6b37edde743a5a9fcac0cc9c40fafa22c7c946fed23d53de93c08b614c75b605b
+EBUILD cairo-1.16.0-r4.ebuild 3927 BLAKE2B d7aceb5380a64539af97bfefc5c24554c7860b46f61028ad8e4e210bde398216375ce04eb47fc4027189e5b09453e1b8506c70873001fac103230d9f1a7aae6c SHA512 3ca945059e7c6a6aface10be7fe7043f6ef6d23f62a4ad4bdb3ff5b7e70218973a784f598d36c5da8bc6934f6473ddc1a10daffe3fb99619afd74244b8a463aa
 EBUILD cairo-9999.ebuild 3775 BLAKE2B 881817b40ccafbf1b08d8625c14726e6cf4ef830a5db0db4ceb33184eb5281df9984ee8a878cd56817dd0cffd9b5c2f5cbd8f02584ae336462db73c7be6a11ce SHA512 b1a2b120987ca449367491559bb16af21e8b78ce0c4dc94f1284bc17068c04f387d816f6c8d15ccb0a822751260386f8e7b7640233b23fc57a6b6e9383d543db
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
deleted file mode 100644
index 541a19e9c301..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 sparc x86 ~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-only +glib opengl static-libs +svg utils valgrind"
-# 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"
-
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-2"
-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-only? ( >=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,X(+),${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}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	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-only? ( !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
-
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
-	# 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 \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable X xcb) \
-		$(use_enable X xcb-shm) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2-only glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		--enable-ft \
-		--enable-interpreter \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index d9108285f736..672498559bf3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.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 ~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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~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"