gentoo resync : 05.02.2020

4 files changed, 34 insertions, 5 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 743296dad640..28f95a61ec79 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,9 @@
 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-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-r3.ebuild 3814 BLAKE2B d12420a860c616ea33e141583a7dbddf08c9987c5b7603e9e8f2f349f1d9ccb18936aa91df2754454c13d0f79c496b4fa85968d93d6fd3f026035154c9d11d46 SHA512 fec0544504037a1ae69c97555854e6aab30649708e26b57bbaf30b716d89f1974d6aa6eebb559d2fa783e92b25ba837ef176cd4cc95a48b257de4b145ca43212
-EBUILD cairo-9999.ebuild 3698 BLAKE2B 85e189c7eef5e3845716c58d01c4fda9f1b6b4cb7b4834d2d4beb57020c615cb0375942577ebc52e1b28761c615438bab48c8e77b262b165a4e11646eb3f1325 SHA512 8406d49f3c2c3fe2303054862e9366f1686a5ae56c4dc7b2f8574c303408f4422ad3218b853ce6dbdd4d07bd9b2fea4b529459af3e097437294432cffa365a9f
+EBUILD cairo-1.16.0-r3.ebuild 3930 BLAKE2B b625db84805e84b599e499606a4af7f90dbfb3239c2bc5f3ecf8afe1c0f6c31b04e7d9bb3edfacff729f7b90e6d19aca56b5063506780a2df25140c29aee1672 SHA512 5af5f30d24bfcbb4464a8ab7254a2f14ed8ebf72c0104e69547d0b4272e67c3f721ab99b37444aedebbdbb662f8532edc484db976a6bcc3e106eb67bc0720b52
+EBUILD cairo-9999.ebuild 3813 BLAKE2B c3c43b4c79874688dc7a3ec37af105368cb7c6f3819bca98f4a754fa9ef24b456fa659ec2294082d55ed8029d36d81ba1c15e7f689fb188f4ab6287d1d62d019 SHA512 74812bb9a14a0f5238e0e2f4d67146eabddf8b5b056c463c8835ca1a2bf43e29e81789d7ff403f4f9fd007ab418c5701bca5afca9a97be4d2c7fb1cea08c8fd7
 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
index 5c4c80e79af3..2d3601c7a396 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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-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-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"
@@ -67,6 +67,10 @@ 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
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d5022d1759a3..29d74b12d970 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,6 +65,10 @@ 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
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
new file mode 100644
index 000000000000..03daac0eca4b
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,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;
+