From 7896e968620f545121daeea31881814ccc8d4f47 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 16 Aug 2022 02:29:20 +0100
Subject: gentoo auto-resync : 16:08:2022 - 02:29:20

---
 app-benchmarks/Manifest.gz                         | Bin 4690 -> 4686 bytes
 app-benchmarks/bootchart2/Manifest                 |   3 ++-
 .../bootchart2/bootchart2-0.14.9-r1.ebuild         |   1 +
 .../files/bootchart2-0.14.9-glibc-2.36.patch       |  24 +++++++++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch

(limited to 'app-benchmarks')

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index e0855ddd9f18..5634a1bdceb2 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index d4dfc905a3e4..ff010b2b0467 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,5 +1,6 @@
 AUX bootchart2-0.14.8-no-compressed-man.patch 802 BLAKE2B 0d09c6a2de65079c0c928e0b2617e5b493d0decbea9644f844752470942db09b199cea18be052a8160b3a59a8491f849e5bb2dc16b80c8e6f77a69b4bda1d30c SHA512 4e5c48a6a29bef5544f3ae491718531407d8ac47ae0439ccaa7dd0f7009e148437810f5d984a98b6623d9ea7bffbc514a31bd1c19ee57b8a17e02a2f5d2a7394
+AUX bootchart2-0.14.9-glibc-2.36.patch 687 BLAKE2B c1085be5e5179c8c7f68826f3cdc2fc42921b909134416e4b925a4120ff95ad8a4d48b83f7702882c5c63f5be2171b6c2046f3246cd9773e97a46ac06c5554ca SHA512 71f5a7fac09adb032d331d8cee09cd2e9b54c5d46e6c77c489f17265c2f576bf54056bf475cb82222e6cc1d322e984bc1abfdd9710c4bbfbf26aeb86b6e95a0f
 AUX bootchart2.init 693 BLAKE2B f91997826a6128f3f496f581d662b3a8c7749f978f442700c9e7f910d0a5d4e62f5f91fac63958f85fcc08f17fcc0710e5553abb36fc0d90f6c70c0191f63b61 SHA512 181ecf9b64c8303ade8544530698a6a217c367927673feaca4d837bb72d13922d47eff9374a482cd225c3189ea80d36ba72ff658aba596f96639f0d1be7a432b
 DIST bootchart2-0.14.9.tar.gz 1175710 BLAKE2B af472193c7de313e770da1a88baf00e9ee38e36c0d3c900bab2657bfa5d2398dd9edc616ec770f49a6c5fa8e29f738ddf2c0951ea039a48a2a89b0ffd94759fb SHA512 7ee1220b0add027fc39f710cc01119d7aaa22fe11736497b089c26955216cef10552216ed29ca55bf08aa848f92bb11d74deeb3aa69769dfecf3a55aa988e58b
-EBUILD bootchart2-0.14.9-r1.ebuild 2056 BLAKE2B 2a6129375d7f95898f87a397bc1cb980a6298ee44707c70fd62d21176071652fca99c62672fe57c2f906f78ffb69cf5492952228b3ac3e7e35ac9f853e891f6e SHA512 14ce967eb294300416d7eb1f77ab0532de259ecdd113a724a884bf8580723f68d33ffd35a92e5a6b05a4dfaa08d5f517f099b12f77cd441e9236741c50199651
+EBUILD bootchart2-0.14.9-r1.ebuild 2093 BLAKE2B 3b42eca2249d3e67dc17f5bbd19719f12265cf00f5513783f13ca4cf61b52a24655f904229a7f6771d777b960f3be89d9817460c3ec1b4352092204dd2665caa SHA512 a5d1d7d13c6fd0d25d1f447452555d30b181ac8fc075922d7b008ba5ef2d204dcd7964e1cd6230caaefd8c8ea0b5612c2b8d98beb0c888916b2b231e9dfbf796
 MISC metadata.xml 254 BLAKE2B b8871c3dd876ef6465e4974848eb79348553a30c6c4de2c9d2ad5b4f8ca0a3b07834f191543a1a5cb20748d5334ed8ec64f823a6da80e6e8066e95b18c5ec880 SHA512 43653fc5ea4f4126f285982b8f9f092e720c4616e5327589a132ce43c67398b9b4e8d3d965c43be2b58c52096ed7d2e010361bc942a582e6887280ecd3a0ac02
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
index 6cd79686f3af..83e421f91a32 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -31,6 +31,7 @@ CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.8-no-compressed-man.patch
+	"${FILESDIR}"/${P}-glibc-2.36.patch
 )
 
 src_prepare() {
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
new file mode 100644
index 000000000000..720079e9d794
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/864205
+https://github.com/xrmx/bootchart/commit/8591c1e3edaea8f17396e3d2819d9064b2818cfb
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2022 20:39:01 -0700
+Subject: [PATCH] Do not include linux/fs.h
+
+This header is not needed to be included anymore, moreover it conflicts
+with sys/mount.h from glibc 2.36+ see [1]
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -34,7 +34,6 @@
+ 
+ #include <sys/mount.h>
+ #include <sys/sysmacros.h>
+-#include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
+ #include <linux/cgroupstats.h>
+
-- 
cgit v1.2.3