gentoo resync : 13.06.2020

4 files changed, 76 insertions, 2 deletions

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 1cae4ea3384c..5651da706519 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,4 +1,6 @@
+AUX trinity-1.9-gcc10_fix.patch 1743 BLAKE2B 237257370a85c9a78b97c84620ab299d3fe4a602b1521f79fb655fa205dba60bfc0bdcfc1b319e2d8fbc2e66d13b92ed20eec84db15327407e11e7cdf3825f47 SHA512 a50354912c2fab90f5f6ee8d34f65b5e01283185d0491f4463ef3465a6da81b716a632cfc8a93d2a863b0ce5e61d5a97cb396c45e1aa6a1cfc693e29667e4e21
+AUX trinity-1.9-include_types_h.patch 1110 BLAKE2B f5d697256cc2f15f9942c12b4e8e98fb296f14cd64999790c3e6b4b708443c8c1e9dd81645e5e3515a040398fc75be087073728e43fbb35c94bf3b958dbddfe5 SHA512 9e0ff9906d588472cf2a86bd42760228d05105f62f4761ebac8495ed576bb1f66228610d2f3b08d6989b07b808c360a1cf25d26c2797b99d6a8614f118590522
 DIST trinity-1.9.tar.xz 216364 BLAKE2B dbf5af03539fc7bac37fd49f495e3feb506c7a403f72d0ef0b85327a3714b8edef52260a03dce1082db05d520376d7b96b0f85d541d6dff67e1245b0e1b35fe8 SHA512 3a2ab84b61b450d50e46a5da5dffa803f92bf469fc3d04ff4cb39f26b4f486bede9790bb48fc6b3bbda0ee882f0acf5b610d39e86b16bea7f2207adef94be31a
-EBUILD trinity-1.9.ebuild 935 BLAKE2B c57a0190ae530d5a0409b0361810973598641c105ec86e51f69439bc8c39c22c27f5c2d7bcb26a7ee3ae1618524ee6cb26d3bb88eeb936ee1a34a81cb8211834 SHA512 cd258c851f925c3a1047be98ed3ff6ed7aadfa68a1befaf25ba102ff89cd31bcadcc48cad414098a934ca569fc8ded2be643a15511474dd8d7cb932490fa21cd
+EBUILD trinity-1.9.ebuild 1026 BLAKE2B e57b904695694b19fe4d8d21edaaf9b943587198b41fc2a5c9def443ab2ae984b3cd43a3ed4d66c52335c140663ab1cb3a579e25843f03a08f193237fb26c853 SHA512 8186cb445b77e0de47f1a0557cf8ba2bbba2e5c9a5e8354453024f9f7fcde6b49231859f2c9c8c791ecb3997a82ffb38a247a8522b84a6a420f75a1554be3477
 EBUILD trinity-9999.ebuild 919 BLAKE2B eb7b31f4af2efef42488ea8e674b0c04f499c034ce135d96eef871206d516d7acdac5f899dc30d376969bd67f75e3379a480828d8cea8afda2a671dde8431324 SHA512 955a09b5ef2f7f60a036dbcceb47083630f78e75aeb24092ca07a13f75de442c4b74ff9eaaa0ce29a4d5c657547157359105a33e15a3ed47483ea155053b311b
 MISC metadata.xml 346 BLAKE2B ff94232f302bb57d0d5a0b5819eeac32f2a0757f9df61ecefa1f00f9f43ff02499bd2e9f8f026a5464e2c0d10027190bdd625e6ffa8a9c61d996105a357239d4 SHA512 cdd71a11b6355fc8b7d71804adcd7159df6764d4abe587ebfd69ac4f1159ab7b30d6d7519209a3b53fb201923ef62a4df68907e6bcdcfa78f41c87c0968ce63e
diff --git a/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch b/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch
new file mode 100644
index 000000000000..9a17adaebcf9
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.9-gcc10_fix.patch
@@ -0,0 +1,34 @@
+From e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Thu, 30 Jan 2020 22:09:45 -0800
+Subject: [PATCH] Fix build with GCC 10.
+
+  CC	trinity
+/usr/bin/ld: debug.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: log-files.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: log.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: main.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: output.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: params.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: shm.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+/usr/bin/ld: trinity.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
+
+Fixes: 13856316c259 ("reinstate the log-to-file code for now.")
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+---
+ include/logfile.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/logfile.h b/include/logfile.h
+index 90ea8b23..2305ac15 100644
+--- a/include/logfile.h
++++ b/include/logfile.h
+@@ -5,7 +5,7 @@
+ FILE *find_logfile_handle(void);
+ void synclogs(void);
+ 
+-FILE *mainlogfile;
++extern FILE *mainlogfile;
+ void open_main_logfile(void);
+ void close_logfile(FILE **handle);
+ 
diff --git a/dev-util/trinity/files/trinity-1.9-include_types_h.patch b/dev-util/trinity/files/trinity-1.9-include_types_h.patch
new file mode 100644
index 000000000000..0b8318ba2fb9
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.9-include_types_h.patch
@@ -0,0 +1,33 @@
+From 45fdc97620063be4318b9b361482fa1b5463e1d5 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Mon, 18 Nov 2019 10:14:55 +0100
+Subject: [PATCH] modify_ldt: include linux/types.h before ASSEMBLY == 1
+
+Otherwise we see a lot of:
+In file included from /usr/include/bits/statx.h:30,
+                 from /usr/include/sys/stat.h:446,
+                 from include/files.h:3,
+                 from include/shm.h:6,
+                 from syscalls/x86/modify_ldt.c:12:
+/usr/include/linux/stat.h:57:2: error: unknown type name '__s64'
+   57 |  __s64 tv_sec;
+      |  ^~~~~
+/usr/include/linux/stat.h:58:2: error: unknown type name '__u32'
+   58 |  __u32 tv_nsec;
+      |  ^~~~~
+---
+ syscalls/x86/modify_ldt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/syscalls/x86/modify_ldt.c b/syscalls/x86/modify_ldt.c
+index f2eaf065..0221561a 100644
+--- a/syscalls/x86/modify_ldt.c
++++ b/syscalls/x86/modify_ldt.c
+@@ -6,6 +6,7 @@
+  */
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <linux/types.h> /* before __ASSEMBLY__ == 1 */
+ #define __ASSEMBLY__ 1
+ #include <asm/ldt.h>
+ #include "sanitise.h"
diff --git a/dev-util/trinity/trinity-1.9.ebuild b/dev-util/trinity/trinity-1.9.ebuild
index 583104b92a5e..06d08790fac7 100644
--- a/dev-util/trinity/trinity-1.9.ebuild
+++ b/dev-util/trinity/trinity-1.9.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
@@ -18,6 +18,11 @@ DEPEND="
 	>=sys-kernel/linux-headers-4.8
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10_fix.patch"
+	"${FILESDIR}/${P}-include_types_h.patch"
+)
+
 src_prepare() {
 	sed -e 's/-g -O2//' \
 		-e 's/-D_FORTIFY_SOURCE=2//' \