gentoo resync : 29.12.2022

4 files changed, 59 insertions, 5 deletions

diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index dc708c7b9554..a6aed39d2c2b 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,6 +1,6 @@
 AUX gparted-1.3.1-musl-nullptr.patch 2446 BLAKE2B a1a0e278edfecaac9de5068d4ff37bd7f8ee7223c46004e64ae7d26ff1e9b463e2064d20ef0e4d15fdd6a0bc00253acabee6102feb604e0016e4f2e558b6ff68 SHA512 386f3e79cd443dcd7db1c9dae2f79b070d254e86a3651b8de2386934f69724651e398e41db1365859060bb0869d35528418cec683173ee4f0d9e39fa430ac81d
-DIST gparted-1.3.1.tar.gz 4169647 BLAKE2B 0e79ea51df79460ae70e15a0f4d5bb1158dd808b52224bdf78f153bada278e6a8cb1606aa99e564016db0b4755e4063e0db151628d8d03904626e9f5648d61a1 SHA512 2dd2b1eae72f627d8f302d34286e684c6b884faf0246f1f534795213d243a9416ff2a7ead48f44958de1ce00248550336176c0df2469ede825b22ed1b5915c76
+AUX gparted-1.4.0-musl-basename.patch 2166 BLAKE2B b7241a431d0df6e8780ce28746356ce8d716fdb2561ea80c424c9bbcac13e262540dca5661fd72cebba539444f51ef54f49a4b18d5d398768367e7b5d6ee2e26 SHA512 1456d8f4dbf253c22e8dbf2ac59865a7b27066ba25d8f31537a822be3faea1976c0e56341aecc322ac9787cb2e3e55242f35d8e7d28203799edfe2cd007e66a4
 DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
-EBUILD gparted-1.3.1.ebuild 2808 BLAKE2B cc84d49cb77db5bf0b582e3bce8cf280c5cdffd378c7a5ae266930ec6fd1bf69dd2a41bc91bc403decab2638800f9a3dddc97be7e173a3842fe8d864bd063358 SHA512 4f4b19616bcc9e5158114e28a86452f0fd5a7d32dd0eb6144ae6a6b290de4ffcf614f916066df6adf916ad15fede72c0ba5de73ffb5b9715372144922de0e811
-EBUILD gparted-1.4.0.ebuild 2819 BLAKE2B 092bdc7b8c454344176701edb934ff556a40d480a8210f394e2246ba460cce2846fb32f97c3fdddda99f0cebe02dc25310b676bf7809e8c97c06a396d70ed38e SHA512 4fd82d8f29e739fe1b2874dc336b10153bcc8699785dc8441f7ca462b35dbaa9b3bdcc25ae4fab2cd2f9bc4b440d7fcaf81968cc800ce848112cb5470580f5d1
+EBUILD gparted-1.4.0-r1.ebuild 2866 BLAKE2B 406a2dbc84155dfd8ddf5edfa49c89cb7ee09eb51728310f480f277c9cbff23d2e52ce63bb14482bb42779e7c9dd423ec72538576f9f2e93d406348d9c968ebf SHA512 ee2815335403c399e173e976d39b9af84b2b9884325d62a5f9f4acc513f2ea83cf9ef99e04c2f9d638dd988809683a05791ade5a01f97967de2726d511bd7100
+EBUILD gparted-1.4.0.ebuild 2815 BLAKE2B 03acf37610fc4fe3e33c5aaefd2a8f963fca3c0b84d6562a43874f8a8eae4119d2c49278debc1dfbad6b0a5856e5c18bdb1f24bf6389f23985f9c99b8ebe682b SHA512 9568098e125de639f4bab0a155ffedd94678ba49e895d227f375f89552a41124c66f9eff50766789887b9269967ef23d16896c8833ba71e819ab46addae6ffdb
 MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
diff --git a/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
new file mode 100644
index 000000000000..eeba8867ed42
--- /dev/null
+++ b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99.patch
+https://bugs.gentoo.org/837794
+
+From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Fri, 8 Apr 2022 08:58:46 +0000
+Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99)
+
+Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4],
+obtained via #include <string.h>.  Therefore GParted fails to build on
+such distributions:
+
+   fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden  -c -o ../../gparted-1.4.0/src/BCache_Info.cc:52:33:
+
+    error: use of undeclared identifier 'basename'; did you mean 'g_basename'?
+            return "/dev/" + Glib::ustring(basename(buf));
+                                           ^~~~~~~~
+                                           g_basename
+
+Fix by using the POSIX implementation of basename() [5] instead,
+obtained via #include <libgen.h>, which musl libc does implement [6].
+Note that the POSIX implementation of basename() is allowed to modify
+the string passed to it.  This is okay because
+BCache_Info::get_bcache_device() is using a modifiable local character
+buffer.
+
+[1] musl libc
+    https://musl.libc.org/
+[2] Projects using musl
+    https://wiki.musl-libc.org/projects-using-musl.html
+[3] The GNU C Library, 5.10 Finding Tokens in a String
+    https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html
+[4] basename(3) - Linux manual page
+    https://man7.org/linux/man-pages/man3/basename.3.html
+[5] POSIX basename()
+    https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html
+[6] musl source, basename.c
+    http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c
+
+Closes !99 - Fix undeclared identifier 'basename' build failure with
+             musl libc
+--- a/src/BCache_Info.cc
++++ b/src/BCache_Info.cc
+@@ -17,7 +17,7 @@
+ 
+ #include "BCache_Info.h"
+ 
+-#include <string.h>  // GNU version of basename()
++#include <libgen.h>  // POSIX version of basename()
+ #include <unistd.h>
+ #include <glibmm/ustring.h>
+ #include <glibmm/fileutils.h>
+GitLab
diff --git a/sys-block/gparted/gparted-1.3.1.ebuild b/sys-block/gparted/gparted-1.4.0-r1.ebuild
index 1119005c1bb3..4fa2d910bc99 100644
--- a/sys-block/gparted/gparted-1.3.1.ebuild
+++ b/sys-block/gparted/gparted-1.4.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="kde policykit wayland"
 
 DEPEND="
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
+	"${FILESDIR}"/${PN}-1.4.0-musl-basename.patch
 )
 
 src_configure() {
diff --git a/sys-block/gparted/gparted-1.4.0.ebuild b/sys-block/gparted/gparted-1.4.0.ebuild
index a209f0a714db..f459c427b2ad 100644
--- a/sys-block/gparted/gparted-1.4.0.ebuild
+++ b/sys-block/gparted/gparted-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="kde policykit wayland"
 
 DEPEND="