gentoo auto-resync : 24:01:2024 - 22:45:43

3 files changed, 52 insertions, 6 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index c9b30623e4bd..22f0ce948b05 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,10 +1,10 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 AUX mc-4.8.29-autoconf-c99.patch 849 BLAKE2B 7d9eb9b7f046dac592dee09e3598620c61167365aefb41186f4d60b803f17cf151280b9bf5facef7101f5297d9faa3b269c9b759095ad6bd01f79b4a8ee38211 SHA512 983de54aa05b09c9510945f4c3b83231779ee24808ec2cbbb2ce0e2b5743bb120d85edf0e9bd0d78e5aafb42601272997c2bcef9fb606de9e043d9619eba4485
 AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa
+AUX mc-4.8.30-fish_fix_broken_national_characters.patch 2236 BLAKE2B 4d1b018106c6a0154ad71c5401c7b202517702dd6a86e072bb47506d17e12c6487e545a6074cc10411412c6c57e556c22cbba9764374fa63b293243fc9e8d52d SHA512 56868f9b1788a3d6109ee6ee94d3e5e94156aaea882daff99662fbb93e3d2e3ec351ae13418ec8ef2c39fdbec63fba4498cc1d28f12f827d443a6aa268e900d5
 AUX mc-4.8.30-mcdiff-segfault.patch 1534 BLAKE2B ff3904f22a3f46251833f259255abd15015d47fed685447fb7f42b4d8adc042adb3104b4e41c2bedc0552335e681ca5df7404cd9cd0e4066a8a84714faa718c2 SHA512 41aa773416a3bd2f035ed584b6179f237b216010bd541b1a881f95f25eb5d05abbe721af2ae3c64dc39916525ff284cf0c5bf2ddde89e4bcf3647f7c5cad4e2d
 AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed39d01735f6da351bdf3dadc70ce1b14e8320b5edb08a8ae1a2db533f1bea60ef6bb1c37bc24a80a0c671384349d SHA512 73b32f64c5976a1b4518d2cdb8c802d9a93c71aab3781c6edfc731d7088ac67e3a09687bc1cce8a3597117b333e13ba96c50c4b26a21f5ad4c81aa76f03cfb41
-DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
-EBUILD mc-4.8.29.ebuild 3169 BLAKE2B 45799991a3957bcfbce629af833b917cce30b72e8a1cdea82109f2277db5decc2d834b514917daccc0732409fb39fc9ae99f4a7200e8aa984ee2ea00d2d7fa77 SHA512 de440cd97097d9e0d90fb6756da921e51ddf56f682991bd49a5b4ec966bf230f7d0d4cdbb3d302d2621b801c2b8cc6328524fe5002dc4df13d35cbcafaab78c7
 EBUILD mc-4.8.30-r1.ebuild 3229 BLAKE2B ba2bc855289dffb0750eec94f045fa337b337e4863e96a4a3110c71260227fcd1e56530ab87deb87d69a19c579b1d446002015a19930d233edee84c48e326be8 SHA512 ba5d06fdb16fc8b7f925b021a3a99cc622446f241973cd7bc61c47bfafb80c511cccc58d494a23533e4f2dc3f322fe974f655b6d0cb39bd35a04549a3b1d1363
+EBUILD mc-4.8.30-r2.ebuild 3345 BLAKE2B eabe094ad69d03d6c601f92e74b4d5199fee078f0797cc70c6f91d6acca09ec181680a451b85db4dba535c21edc9d82b0a3fb6c7417087fc523129b0fbab5c8b SHA512 c7b1f4b47d109b5531040fa35a9e12783ae838f1df296dc728270f943fc6d196e0db7b1561ab336d1b22bae9ef38ec4384c548c9dea2f7108ed289e83fc709a5
 MISC metadata.xml 623 BLAKE2B 780b4f47a79d96cfe18308032aedcf02040eb3b2b90a3241dc1a26d03c1fa6e801144b9a343731b96c9cde2554a34ed52235859851025fd074675fdb1f7c91d9 SHA512 85ab83892b0ad219dfc1112e1d3f2141c186c8cc1b274fd397a34bf68345a0821d3cf5a5421f9d6053e7e99178aa45724e1057a9386e4bdf9c5136d69232e776
diff --git a/app-misc/mc/files/mc-4.8.30-fish_fix_broken_national_characters.patch b/app-misc/mc/files/mc-4.8.30-fish_fix_broken_national_characters.patch
new file mode 100644
index 000000000000..193ac7225076
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.30-fish_fix_broken_national_characters.patch
@@ -0,0 +1,40 @@
+--- a/src/vfs/fish/fish.c
++++ b/src/vfs/fish/fish.c
+@@ -647,7 +647,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
+     /* Set up remote locale to C, otherwise dates cannot be recognized */
+     if (fish_command
+         (me, super, WAIT_REPLY,
+-         "LANG=C LC_ALL=C LC_TIME=C; export LANG LC_ALL LC_TIME;\n" "echo '### 200'\n",
++         "LANG=C.UTF-8 LC_ALL=C.UTF-8 LC_TIME=C.UTF-8; export LANG LC_ALL LC_TIME;\n" "echo '### 200'\n",
+          -1) != COMPLETE)
+         ERRNOR (E_PROTO, -1);
+ 
+--- a/src/vfs/fish/fishdef.h
++++ b/src/vfs/fish/fishdef.h
+@@ -12,7 +12,7 @@
+ /* default 'ls' script */
+ #define FISH_LS_DEF_CONTENT ""                                            \
+ "#LIST /${FISH_FILENAME}\n"                                               \
+-"export LC_TIME=C\n"                                                      \
++"export LC_TIME=C.UTF-8\n"                                                \
+ "ls -Qlan \"/${FISH_FILENAME}\" 2>/dev/null | grep '^[^cbt]' | (\n"       \
+ "while read p l u g s m d y n; do\n"                                      \
+ "    echo \"P$p $u.$g\"\n"                                                \
+@@ -129,7 +129,7 @@
+ 
+ /* default 'retr'  script */
+ #define FISH_GET_DEF_CONTENT ""                                                 \
+-"export LC_TIME=C\n"                                                            \
++"export LC_TIME=C.UTF-8\n"                                                      \
+ "#RETR $FISH_FILENAME\n"                                                        \
+ "if dd if=\"/${FISH_FILENAME}\" of=/dev/null bs=1 count=1 2>/dev/null ; then\n" \
+ "    ls -ln \"/${FISH_FILENAME}\" 2>/dev/null | (\n"                            \
+@@ -181,7 +181,7 @@
+ 
+ /* default 'info'  script */
+ #define FISH_INFO_DEF_CONTENT ""                                          \
+-"export LC_TIME=C\n"                                                      \
++"export LC_TIME=C.UTF-8\n"                                                \
+ "#FISH_HAVE_HEAD         1\n"                                             \
+ "#FISH_HAVE_SED          2\n"                                             \
+ "#FISH_HAVE_AWK          4\n"                                             \
diff --git a/app-misc/mc/mc-4.8.29.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
index 9d854b2d8832..1d701a9bdb43 100644
--- a/app-misc/mc/mc-4.8.29.ebuild
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
@@ -50,12 +50,18 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
 	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
-	"${FILESDIR}"/${PN}-4.8.29-autoconf-c99.patch
+	"${FILESDIR}"/${PN}-4.8.30-mcdiff-segfault.patch
 )
 
 src_prepare() {
 	default
-	# patch touches configure.ac
+
+	# Bug #906194
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+
+	# Bug #916528
+	use unicode && eapply "${FILESDIR}"/${PN}-4.8.30-fish_fix_broken_national_characters.patch
+
 	eautoreconf
 }