4 files changed, 140 insertions, 0 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9bb4b5b1e72..54e122560e93 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index c961ac25f43b..d6289a957a71 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,9 @@
 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-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 3309 BLAKE2B 02dc7e6789d3890ae623eb0661444ba90a36527bdbe2deeee894fcdafb1a67547eca9105edc34eb177e6afba7ad3846ade573d217590c18dc5bbffbd671367bc SHA512 83ed2e9ba94f4efcd111e4ccb3a21422c462bf819f62d0caff9d360e0e15aef119d7f19162ef4068238a3921a66a713dfad9fecd4b7e0e4c999b36d4721fc557
+EBUILD mc-4.8.29.ebuild 3323 BLAKE2B 0873428a3aac8ea142fb467e06fcc115055b6b71e6c0cbdf81536f98fe7ff3c839867ce2c77e9078eb8b2616a3914b43f018715984347922858979501473df13 SHA512 02f80f7bb904d4eefd4e6d3c5bb4bc5807d2e7d55820d14ba24d32fc425b2d4a81bae1130d66c70f1ccd18f0802893df6e8463857f59770217573b9e3acef156
 EBUILD mc-9999.ebuild 3573 BLAKE2B bfc47edaf0d2d929fba3abd75c739bcbc213c18344be024f0ea773dfdd3ae52e27177c6c8028a939550b384d6a7b9e4c594b9da2bf79a76e7003a098e75f3e7e SHA512 a577f23011c6382b671d46724e57effeff59c4c3e608fa8f05622d8c240c142cc776504c21f21cc779530a982f76f44875bfe2542e5bb716ff3a97951e3b2c83
 MISC metadata.xml 742 BLAKE2B 159a395bd2c0c56d8997bc198c55491d5ae0fe881eb8124345fd66a82f2ebad6c169f2c83c8f16e344bd4ac2355bf608868a5a775adc117a72d5547b42766567 SHA512 38b1fbe9480b4f23d3f00c234a2f8315e7c81080d8fe4da39701999bd46bf4aca4b45de34ceb11891d07a1fe92ec1bf7b86044d906467710c0bff0fdd7677a08
diff --git a/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch b/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch
new file mode 100644
index 000000000000..4c7ccfed942b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch
@@ -0,0 +1,11 @@
+--- a/misc/ext.d/video.sh
++++ b/misc/ext.d/video.sh
+@@ -19,7 +19,7 @@
+         elif which mpv_identify.sh >/dev/null 2>&1; then
+             mpv_identify.sh "${MC_EXT_FILENAME}"
+         else
+-            echo "Please install either mplayer or mpv to get information for this file"
++            echo "Please install either mplayer or mpv[tools] to get information for this file"
+         fi
+         ;;
+     esac
diff --git a/app-misc/mc/mc-4.8.29.ebuild b/app-misc/mc/mc-4.8.29.ebuild
new file mode 100644
index 000000000000..dd866468de2a
--- /dev/null
+++ b/app-misc/mc/mc-4.8.29.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+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 )"
+
+DEPEND="
+	>=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
+	)
+"
+RDEPEND="${DEPEND}
+	spell? ( app-dicts/aspell-en )"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	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
+)
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_prepare() {
+	default
+	# patch touches configure.ac
+	eautoreconf
+}
+
+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"
+}