gentoo resync : 20.03.2022

4 files changed, 77 insertions, 14 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e15d39f26ef2..7e12322d21c9 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,10 +1,10 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
-AUX cairo-1.16.0-binutils-2.34.patch 587 BLAKE2B f2a5ffb4bdb4f2b63f07d0135e63704629093008d8479b19353d790012e8f1cc93707694ee79f71cc6e81c008505e1a069694231357748b54dc45c8bb2e94bba SHA512 ad01c6f651fc66d9a2853fc95f2402b9413d71e6353fdce609e0849a3477abbb2128e460a9c166adbd9c3da80786b2382b884a1249ccf22b8600ab4930d2b0c7
+AUX cairo-1.16.0-binutils-2.34.patch 2332 BLAKE2B a0df3d0f99b26a867ac554ee515c7e435f02f49c97806bd7d2684a8d6fd737014560c2451761273641b88d9892fb4f5d00f9ca22a1b021e4edece442e7cd7425 SHA512 ca05ea37273c17d4e6b3076f23defb028d25ad96cf99e65937c3e59f5cf9e63a35cb8374a8e0d4037b03f889f338628c9303686cbc6dd2d695505fdde2119c95
 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 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
+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
 EBUILD cairo-1.16.0-r5.ebuild 3873 BLAKE2B b3678e94ccef9af83c353e6f2cb3f1f02260277a8ddf5bad33f086ed4675d5aa5ae43dc177c12879469392258fedcf0f2303287cfed590a8e10243d04f129cc9 SHA512 12f69610664fe3e6bfc6ce96c2a80961667c752e3703f91656d27226eeefe706b93455993804b07d44fc299d7915f6918ee986d60942675b245a6d979f4ab31b
-EBUILD cairo-9999.ebuild 3713 BLAKE2B 579cf46822a7a7ede03d8d4cc7ca0a6f6ef0eea7aded1b23f98538a54b385c330b4b7fd1a183aef81f8bad3ff046e99648b21f1b83263d6635f9e34820f4dc46 SHA512 240ee225f56afd65e767dbc137f3ca19a0b3f3d16d814d05c457daa1a838d0fd7bd4b5a88982a812a35fd925783367f7843773005bf200151977f1910c2abc06
+EBUILD cairo-9999.ebuild 3501 BLAKE2B 136a331173d878461a0e827dc74bf42e24fa8d2dc9e907a3c76cc1e12f3ca3f06dddcd4dd7f2fba418a219dfd96c1c696a983ea9f5306e15be72edac35aaf180 SHA512 929ec8991c487415aa7f18760f86276a7b128e44eb8396c48a0018c8c24d49402ca8d56a07b26aa27b4db6b0e9bed8700a310e46c6007ed389a800983335268e
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index f2e78b07a7b0..0c5c1384ad56 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -65,10 +65,6 @@ PATCHES=(
 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
@@ -115,11 +111,6 @@ multilib_src_configure() {
 		--enable-png \
 		--enable-ps \
 		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
 		--disable-xlib-xcb \
 		${myopts}
 }
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
index 03daac0eca4b..a10cad5ee553 100644
--- 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
@@ -1,6 +1,55 @@
+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
-@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+@@ -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;
  
@@ -18,3 +67,6 @@
      if (symbol->pc >= vma + size)
  	return;
  
+-- 
+2.34.1
+
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
index ee72f9dec7ce..2c4742887e36 100644
--- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -1,4 +1,21 @@
-https://bugs.gentoo.org/726200
+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; }
@@ -17,3 +34,6 @@ https://bugs.gentoo.org/726200
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
+-- 
+2.34.1
+