gentoo auto-resync : 30:06:2024 - 08:00:50

4 files changed, 88 insertions, 26 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 3c123e552663..3b697fbed873 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -3,9 +3,10 @@ AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345e
 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
+AUX mc-4.8.31-musl-tests.patch 1979 BLAKE2B 33e3a27b1063f254e015129a8b7544b6f5c97492b886b0ba9f51166be41b1bcfc118288047a7faac64b7ee948c9cfbb61943ab7699670cfcc5e606cbbd50ac38 SHA512 b1bdecffe89a63e3a9bd19eef63db169a3adf96c3643d9bc8cd2101d8ec23c267b283449d2e164ff67df0551fbe7c48f45e00a38ebb3f513ef0c0b0f6baaf449
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d
 EBUILD mc-4.8.30-r1.ebuild 3229 BLAKE2B ba2bc855289dffb0750eec94f045fa337b337e4863e96a4a3110c71260227fcd1e56530ab87deb87d69a19c579b1d446002015a19930d233edee84c48e326be8 SHA512 ba5d06fdb16fc8b7f925b021a3a99cc622446f241973cd7bc61c47bfafb80c511cccc58d494a23533e4f2dc3f322fe974f655b6d0cb39bd35a04549a3b1d1363
 EBUILD mc-4.8.30-r2.ebuild 3337 BLAKE2B ed90e75a4f486c9807fde430308f58d35a8aa90934f2e0aac4804c373c05dbf15bc10dd7912015d77d902dffbe544d9e61ce74ad8a263bdce53f546077a62aaf SHA512 939a3ec1016fd4fbb7dcf734751113a79a2ac91e444b0ccc00426c8c9fdbf5c0c904a7af6a49740cdab5211b4675942b3e35226a207ea09aaf16796009737ec6
-EBUILD mc-4.8.31.ebuild 3445 BLAKE2B 5841622fb19f116b0ab6f3dd76a9493c0004b14f4c62fb9e60f14fdaefd9a900ef334891a249ab162f95675fb3c3e5c497132223d847e851b2513d703f2a045a SHA512 3b99c966846afa62bc2be93bdb0b344b22a25db6ad31bcd11cb0ba74b1a88e95cc3c85ce9ab36b0bca5556e4b4f01bff15f496c3da10411e9b8b3ff8595282ec
-MISC metadata.xml 626 BLAKE2B 9769ff0dd254a666324b7c0d3fca2138ba25891cc5b71286adad8eee20bc1658d0c1f2b1c3f4bb019371b2668f4abcc3e7eeb8d3f62c258b6911e4bc9b789f78 SHA512 d66ba41d66f7f5ea46880bddb6dce05141f88036bfbb2a01f92ad79fad5679a2322f48eab4573763f8be274a516ba68dab021d31f104ddaea4062ce5347dd401
+EBUILD mc-4.8.31.ebuild 3522 BLAKE2B 98ad323ae6beace1dc780e4c618ee8a84256fd139bb0489cba032848ec3079b7c1b315a2505c56aaa8fcbabaa1c42b08b71014f2bc5a6558f03c1407540f0016 SHA512 7bf5a44eb979d5e96381a622e0a994ceacc8299f48cd7cea3c0650cb965b4ab0745ed345578ebfbbb17ba3256fc93006e520845a46aa014d55439897b42ca809
+MISC metadata.xml 675 BLAKE2B 706055e17dfe81af1715d1e5ee101e6486d8a0f1fd7791fff17c7f42fdcb1c3a559416c8e413b4c7ab1db6dd9bf2d4b94f67e8cdd035933c38885ae6ca42f8f6 SHA512 a86533b06dc0f64efafda59aa795ed3a5a9bb027bd4c1145d4aedc2af84cb1d64244409a0bcc42d5bb4048ed07190c7f86ebc0c31aa55d95c8837fde676d9284
diff --git a/app-misc/mc/files/mc-4.8.31-musl-tests.patch b/app-misc/mc/files/mc-4.8.31-musl-tests.patch
new file mode 100644
index 000000000000..5c7c6b0f2397
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.31-musl-tests.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/922483
+
+--- a/tests/lib/vfs/vfs_path_string_convert.c
++++ b/tests/lib/vfs/vfs_path_string_convert.c
+@@ -116,50 +116,6 @@
+         4,
+         &vfs_test_ops3
+     },
+-#ifdef HAVE_CHARSET
+-    { /* 3. */
+-        "/#test1/bla-bla1/some/path/#test2/bla-bla2/#enc:KOI8-R/some/path#test3/111/22/33",
+-        "/test1://bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-    { /* 4. */
+-        "/#test1/bla-bla1/#enc:IBM866/some/path/#test2/bla-bla2/#enc:KOI8-R/some/path#test3/111/22/33",
+-        "/test1://#enc:IBM866/bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-    {  /* 5. */
+-        "/#test1/bla-bla1/some/path/#test2/bla-bla2/#enc:IBM866/#enc:KOI8-R/some/path#test3/111/22/33",
+-        "/test1://bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-    { /* 6. */
+-        "/#test1/bla-bla1/some/path/#test2/bla-bla2/#enc:IBM866/some/#enc:KOI8-R/path#test3/111/22/33",
+-        "/test1://bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-    { /* 7. */
+-        "/#test1/bla-bla1/some/path/#test2/#enc:IBM866/bla-bla2/#enc:KOI8-R/some/path#test3/111/22/33",
+-        "/test1://bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-    { /* 8. */
+-        "/#test1/bla-bla1/some/path/#enc:IBM866/#test2/bla-bla2/#enc:KOI8-R/some/path#test3/111/22/33",
+-        "/test1://#enc:IBM866/bla-bla1/some/path/test2://#enc:KOI8-R/bla-bla2/some/path/test3://111/22/33",
+-        "111/22/33",
+-        4,
+-        &vfs_test_ops3
+-    },
+-#endif /* HAVE_CHARSET */
+ };
+ /* *INDENT-ON* */
+ 
diff --git a/app-misc/mc/mc-4.8.31.ebuild b/app-misc/mc/mc-4.8.31.ebuild
index 5981d616172c..8b8437c5c57f 100644
--- a/app-misc/mc/mc-4.8.31.ebuild
+++ b/app-misc/mc/mc-4.8.31.ebuild
@@ -6,17 +6,18 @@ EAPI=8
 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"
-
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/glib-2.30.0:2
@@ -34,8 +35,12 @@ DEPEND="
 		x11-libs/libSM
 	)
 "
-RDEPEND="${DEPEND}
-	spell? ( app-dicts/aspell-en )"
+
+RDEPEND="
+	${DEPEND}
+	spell? ( app-dicts/aspell-en )
+"
+
 BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
@@ -43,10 +48,6 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
 	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
@@ -61,8 +62,11 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 src_prepare() {
 	default
 
-	# Bug #906194
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+	# Bug #906194, #922483
+	if use elibc_musl; then
+		eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+		eapply "${FILESDIR}"/${PN}-4.8.31-musl-tests.patch
+	fi
 
 	eautoreconf
 }
@@ -105,6 +109,7 @@ src_test() {
 	# information.
 	CK_FORK=no emake check VERBOSE=1
 }
+
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 3e6d204bb8fc..96a33cf76636 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ceamac@gentoo.org</email>
-    <name>Viorel Munteanu</name>
-  </maintainer>
-  <use>
-    <flag name="edit">Compile and install the mcedit application</flag>
-    <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
-    <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">MidnightCommander/mc</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<use>
+		<flag name="edit">Compile and install the mcedit application</flag>
+		<flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
+		<flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">MidnightCommander/mc</remote-id>
+		<bugs-to>https://midnight-commander.org/wiki/NewTicket</bugs-to>
+	</upstream>
 </pkgmetadata>