gentoo auto-resync : 26:01:2023 - 19:56:42

9 files changed, 1 insertions, 359 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 76e91a2a9b4b..bbd01d7cd08b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,13 +1,5 @@
-AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
-AUX cairo-1.16.0-binutils-2.34.patch 2332 BLAKE2B a0df3d0f99b26a867ac554ee515c7e435f02f49c97806bd7d2684a8d6fd737014560c2451761273641b88d9892fb4f5d00f9ca22a1b021e4edece442e7cd7425 SHA512 ca05ea37273c17d4e6b3076f23defb028d25ad96cf99e65937c3e59f5cf9e63a35cb8374a8e0d4037b03f889f338628c9303686cbc6dd2d695505fdde2119c95
-AUX cairo-1.16.0-binutils-2.39-ptr.patch 1174 BLAKE2B 7afe9aba01102dcf8ea52a26db9830c18e9bcb5d87833de760ff8b4fe5343c2ed178a74d043ef6fa5ec1d5bdead6b8f41f11ae2c6fa46317a07e76ce966c123e SHA512 8499bb67c0c17131ebab37c114838876a7afc051691adba83d848663e38d83006dedfaa0553e05b99216767a8d6d93c13ea370bc2d2b3e417cac9ebda4b08fb6
-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-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
-DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
-EBUILD cairo-1.16.0-r6.ebuild 3919 BLAKE2B 4d35c54d4e93fa37dbf726f524b01bc44a0eee6179b1772823f6a08bc75085688bf3d1dff318f71599e8ccc8a46e5fa51c48f13ec0dd7553ad205bed5fbcde4e SHA512 65a715633863be2a29f97786b7db63e2b160f0fe342438d4df6c4eb9ca83ace1cbc6315da229258286f7547490414339b270ad2aa047955c9be5658a694be4c3
 EBUILD cairo-1.17.6.ebuild 2835 BLAKE2B 6d3239007d7bfa930aef8921756a95f68fafc4e316d48c9e65333313779f8fdb9839505dac7067869511b2f81336dbba254f8c2b366ddcb2f3937c809a3666c8 SHA512 a8195ce1e421200eca17618fcd768697ae78910deae20e97e8644cb1476ca1dd82979d8835902bd5a870855d099e98123fa8318fbf2e0ec819ab539bce9b52ea
 EBUILD cairo-9999.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
-MISC metadata.xml 935 BLAKE2B d435dd01dd10a8b95567ef6c5ebbe41a48affea6c583895e2be8d1767658ff91b4c4cad409dbcf5391585f03ef283364abab450a183076fdfbfc926608fb58d8 SHA512 70e88efc9758f49ea62c79cba5c010c3acbfbd319eb6e760912036a345606dc574284943b19b4683444ceea65209727b1c21747567df4cfe00dcec6d770dc2da
+MISC metadata.xml 781 BLAKE2B 93cef84890039f9bbf75544a857cf611b3444fed5f82611d0f180de9c0df4ec5ea468b569cf99d158135354bec1d06c3aab97e139840db7e18d2b0b8ce350731 SHA512 c8008c604fa8956301078eced6c2c355f0205d9fcdfae68da39b1019fa54724239c713cbbd5f44f3d4d1b4d4d21a75248a00e7da4adffbb1974b6c2d36a30ee7
diff --git a/x11-libs/cairo/cairo-1.16.0-r6.ebuild b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
deleted file mode 100644
index 299a8c20e695..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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[png,${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
-	"${FILESDIR}"/${P}-strings.patch
-	"${FILESDIR}"/${P}-binutils-2.39-ptr.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
-
-	# [[ ${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) \
-		--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/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
deleted file mode 100644
index 6822121ce495..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 03fa352..7e11d24 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
- 
- DIST_SUBDIRS = src doc util boilerplate test perf
- SUBDIRS = src doc util
--# libpng is required for our test programs
--if CAIRO_HAS_PNG_FUNCTIONS
--SUBDIRS += boilerplate test perf
--endif
- 
- configure: cairo-version.h
- 
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
deleted file mode 100644
index a10cad5ee553..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e30259f6237571c61992433c110bc6e1ef900244 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Tue, 23 Feb 2021 11:36:24 +0000
-Subject: [PATCH] cairo-trace: fix build with newer versions of bfd
-
-And update configure/meson checks to check for the new function.
-
-Drop libiberty.h check since it's only needed by backtrace-symbols.c
-which we're about to remove.
-
-Closes #391, #460
----
- Makefile.am                        |  1 +
- configure.ac                       |  8 +++++++-
- meson-cc-tests/bfd-section-flags.c |  9 +++++++++
- meson.build                        | 11 ++++++-----
- util/cairo-trace/lookup-symbol.c   |  7 +++----
- 5 files changed, 26 insertions(+), 10 deletions(-)
- create mode 100644 meson-cc-tests/bfd-section-flags.c
-
-diff --git a/configure.ac b/configure.ac
-index 18e4a305f..6444a3da3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -826,7 +826,13 @@ CAIRO_ENABLE(interpreter, cairo-script-interpreter, yes, [
- AC_CHECK_LIB(bfd, bfd_openr,
- 	 [AC_CHECK_HEADER(bfd.h, [have_bfd=yes],
- 	 [have_bfd=no])], [have_bfd=no])
--AC_CHECK_HEADER(libiberty.h,, [have_bfd=no])
-+dnl bfd_section_flags is an inline func so we don't bother with linking the lib in
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([
-+  #include <bfd.h>
-+  asection *s;
-+],[
-+  return bfd_section_flags(s) == 0;
-+])],[],[have_bfd=no])
- if test "x$have_bfd" = "xyes"; then
-     AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils development files installed])
-     BFD_LIBS=-lbfd
-diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c
-index f9665b36f..9af0b5944 100644
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -65,7 +65,6 @@
- 
- #if HAVE_BFD
- #include <bfd.h>
--#include <libiberty.h>
- 
- struct symtab {
-     bfd *bfd;
-@@ -145,14 +144,14 @@ find_address_in_section (bfd *abfd,
-     if (symbol->found)
- 	return;
- 
--    if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
-+    if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
- 	return;
- 
--    vma = bfd_get_section_vma (symtab->bfd, section);
-+    vma = bfd_section_vma (section);
-     if (symbol->pc < vma)
- 	return;
- 
--    size = bfd_section_size (symtab->bfd, section);
-+    size = bfd_section_size (section);
-     if (symbol->pc >= vma + size)
- 	return;
- 
--- 
-2.34.1
-
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
deleted file mode 100644
index 6749786d23bd..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
-https://bugs.gentoo.org/868405
-
-From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 13 Jul 2022 21:26:57 +0100
-Subject: [PATCH] Fix build with newer binutils-dev installed
-
-It seems the PTR typedef (or macro?) has been removed from newer versions
-of libbfd.
-
-Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
-Signed-off-by: Simon McVittie <smcv@debian.org>
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
-     if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
- 	goto BAIL;
- 
--    symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
-+    symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
-     if (symcount == 0) {
- 	symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
--		(PTR) &symtab->syms, &size);
-+		(void **) &symtab->syms, &size);
-     }
-     if (symcount < 0)
- 	goto BAIL;
-GitLab
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
deleted file mode 100644
index 3709c5a90f80..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 19345f141872..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
deleted file mode 100644
index 2c4742887e36..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 23b6e8bb5798c77550da613fadc3da8b3be14573 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 14 Jun 2020 09:58:52 +0100
-Subject: [PATCH] build/aclocal.float.m4: detect 'strings' with AC_CHECK_TOOL
-
-This way all binutils tools are detected with $CHOST prefix
-if exist. And strings is allowed to be substituted with
-STRINGS environment override, so 'llvm-strings' (or other)
-alternative can be used.
-
-Bug: https://bugs.gentoo.org/726200
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- build/aclocal.float.m4 | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
-index f92db03e6..d9728c123 100644
---- a/build/aclocal.float.m4
-+++ b/build/aclocal.float.m4
-@@ -31,10 +31,13 @@ int main() { return 0; }
- 
- ]])], [
- 
--if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
-+# allow users to override default 'strings' with 'llvm-strings'
-+# or ${CHOST}-strings.
-+AC_CHECK_TOOL(STRINGS, strings)
-+if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then
-   ax_cv_c_float_words_bigendian=yes
- fi
--if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
-+if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
-   if test "$ax_cv_c_float_words_bigendian" = unknown; then
-     ax_cv_c_float_words_bigendian=no
-   else
--- 
-2.34.1
-
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 605713de435c..bdaadf1326b7 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -10,8 +10,6 @@
     <flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
     <flag name="gles3" restrict="&gt;=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
     <flag name="glib">Compile with GLib Object System support</flag>
-    <flag name="utils">Build support for Cairo script and trace utilities</flag>
-    <flag name="valgrind">Built-in support to mark memory regions</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>