4 files changed, 4 insertions, 164 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5fc7e5378268..a273a99c5de8 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,10 +1,8 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
-AUX mc-4.8.28-tests.patch 1308 BLAKE2B 37f2d2a3264386d558212741d95c68c9362676d727d4d2b47a690dd6ad97c15ff943b3950cc28456ffceda78e88645bd6f73958a592f425594e727cc383721cf SHA512 41499d5ee4a7d0bf3e08c6fad56c2d46e3761f4f7359db1351c4ca1358a9ba33be7979df55d19263214acb3ea01271278efccff72d32ea3cf8a3cfb84a964f47
 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
-DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
 DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
-EBUILD mc-4.8.28-r2.ebuild 3115 BLAKE2B 733622aa4e6674702e3b691d9d9c8153ffc6c5bf3eada7b5a96535d7f1f2990d811ea1c1e29178cd9f14bb568acdb2a873b6fd9bb976d3ebe9b35f8f2dba01b0 SHA512 105c26047006b516c5a7b657cd309a924c78590793cfe523723022d2560a4ed37b6021b63be41b9885baffa7a39164e2d84d3442e7de49c7a11a72985e2501dc
+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-9999.ebuild 3379 BLAKE2B 795bae9d8f9ba6bf14592a5ba6479c7b2f665bc56371269ad90b3603ccd54d4d0b8a26afcb57fb51476b89f742549b959b1ac8a9fcba0f3c6492360324f73866 SHA512 c8213de7aec56537d0225e76500b68943f3f9ac528251f27c3edc4296a6e25ff6c637a356e887dd1897dd3614fb8da9021871a1e17171ecdfd8bf7b8e955b7d1
+EBUILD mc-4.8.30.ebuild 3130 BLAKE2B 24786f5731c6e065f8f5abe9f1b971ac929dcc1eca66a8bdaebdc1e018a179506397f2d579e24bc50cb9a94d443cfa9cec80bd9ecdccef8c7a8eecf0132fe11b SHA512 51afba7b677296aa2ad847331512be954f555c2da01dc6269863873026c4a151f895ea5d35ee4b1902065e9e4a48707b62fa42140fe83d7331f43d4bbf11d01f
 MISC metadata.xml 623 BLAKE2B 780b4f47a79d96cfe18308032aedcf02040eb3b2b90a3241dc1a26d03c1fa6e801144b9a343731b96c9cde2554a34ed52235859851025fd074675fdb1f7c91d9 SHA512 85ab83892b0ad219dfc1112e1d3f2141c186c8cc1b274fd397a34bf68345a0821d3cf5a5421f9d6053e7e99178aa45724e1057a9386e4bdf9c5136d69232e776
diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch
deleted file mode 100644
index ccd9dc1addc9..000000000000
--- a/app-misc/mc/files/mc-4.8.28-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-START_TEST uses the variable name _i, so GCC complains about redefining it with
-a different type here.
-
---- mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-20 10:02:47.000000000 +0000
-+++ mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-27 15:31:19.812120141 +0100
-@@ -353,20 +353,20 @@
- START_TEST (filevercmp_test5)
- /* *INDENT-ON* */
- {
--    size_t _i;
-+    size_t ii;
- 
--    for (_i = 0; _i < filevercmp_test_ds5_len; _i++)
--        for (; filevercmp_test_ds5[_i] != NULL; _i++)
-+    for (ii = 0; ii < filevercmp_test_ds5_len; ii++)
-+        for (; filevercmp_test_ds5[ii] != NULL; ii++)
-         {
--            const char *i = filevercmp_test_ds5[_i];
--            size_t _j;
-+            const char *i = filevercmp_test_ds5[ii];
-+            size_t jj;
- 
--            for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++)
-+            for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++)
-             {
--                const char *j = filevercmp_test_ds5[_j];
-+                const char *j = filevercmp_test_ds5[jj];
- 
--                ck_assert_int_eq (test_filevercmp (i, j), 0);
--                ck_assert_int_eq (test_filevercmp (j, i), 0);
-+                ck_assert_int_eq (test_filevercmp (i, j), 0);
-+                ck_assert_int_eq (test_filevercmp (j, i), 0);
-             }
-         }
- }
diff --git a/app-misc/mc/mc-4.8.28-r2.ebuild b/app-misc/mc/mc-4.8.30.ebuild
index 9358a40edd7e..e1576c254b12 100644
--- a/app-misc/mc/mc-4.8.28-r2.ebuild
+++ b/app-misc/mc/mc-4.8.30.ebuild
@@ -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"
@@ -49,7 +49,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
-	"${FILESDIR}"/${P}-tests.patch #836812
+	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
 )
 
 src_prepare() {
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
deleted file mode 100644
index 6488062b0d4b..000000000000
--- a/app-misc/mc/mc-9999.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-MY_P="${P/_/-}"
-if [[ ${PV} = *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git"
-else
-	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"
-fi
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://midnight-commander.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+edit gpm nls sftp +slang spell test unicode X"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.30.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:=[unicode(+)?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-		# taken from autogen.sh script
-		xgettext --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
-			$(find . -name '*.[ch]') | sed -ne '/^#:/{s/#://;s/:[0-9]*/\
-			  /g;s/ //g;p;}' | grep -v '^$' | sort | uniq > po/POTFILES.in \
-			  || die
-		./version.sh "${S}" || die
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Bug #759466
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
-		ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
-	fi
-
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	if use spell && ! has_version app-dicts/aspell-en ; then
-		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
-		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
-		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
-		elog
-	fi
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}