commit: 68173da90fada5003a3a202446ae86a166f1b010
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 13:54:47 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 13:55:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68173da9
app-misc/mc: Removed old
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/mc/Manifest | 1 -
app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch | 85 -----------------
app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch | 29 ------
app-misc/mc/files/mc-4.8.23-gcc-10.patch | 79 ----------------
app-misc/mc/files/mc-4.8.23-gettext-test.patch | 54 -----------
app-misc/mc/files/mc-4.8.23-gettext.patch | 56 -----------
app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch | 37 --------
app-misc/mc/mc-4.8.23-r1.ebuild | 113 ----------------------
app-misc/mc/mc-4.8.23-r2.ebuild | 115 -----------------------
9 files changed, 569 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 7975a3d8d7e..78cdde68001 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.23.tar.xz 2552944 BLAKE2B
f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee
SHA512
e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
DIST mc-4.8.24.tar.xz 2434988 BLAKE2B
18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60
SHA512
ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
deleted file mode 100644
index be08e68b296..00000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aboro...@vmail.ru>
-Date: Sun, 7 Jul 2019 14:44:10 +0300
-Subject: [PATCH 1/2] Ticket #3933: report iso9660 listing errors.
-
-Variation 1:
-
-Steps to reproduce:
-
- * create empty .iso file (touch foo.iso)
- * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield).
-Actual result: mc elters a file as if it would be empty valid file.
-
-Variation 2:
-Steps to reproduce:
-
- * pick valid .iso file
- * deinstall all helper tools that handle .sio (isoinfo, xorriso, etc.)
- * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield)
-Actual result: mc enters a file as if it would be empty valid file
-
-Variation 2 is especially confusing for users as it does not hint them
-that they should install a tool to get it working. They just observe
-silently broken behaviour.
-
-Signed-off-by: Andrew Borodin <aboro...@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in
b/src/vfs/extfs/helpers/iso9660.in
-index 8c2240e8e..76273522e 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -93,6 +93,8 @@ xorriso_rm() {
-
- # tested to comply with isoinfo 2.0's output
- test_iso () {
-+ which isoinfo 2>/dev/null || (echo "isoinfo not found" >&2; return 1)
-+
- CHARSET=$(locale charmap 2>/dev/null)
- if test -z "$CHARSET"; then
- CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e
's/.*\.\(.*\)"$/\1/p')
-@@ -119,6 +121,8 @@ test_iso () {
- }
-
- mcisofs_list () {
-+ local lsl r
-+
- # left as a reminder to implement compressed image support =)
- case "$1" in
- *.lz) MYCAT="lzip -dc";;
-@@ -133,7 +137,11 @@ mcisofs_list () {
- *) MYCAT="cat";;
- esac
-
-- $ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON '
-+ lsl=$($ISOINFO -l -i "$1" 2>/dev/null)
-+ r=$?
-+ test $r -gt 0 && return $r
-+
-+ echo "$lsl" | @AWK@ -v SEMICOLON=$SEMICOLON '
- BEGIN {
- dir="";
- # Pattern to match 8 first fields.
-@@ -183,8 +191,8 @@ shift
- case "$cmd" in
- list)
- xorriso_list "$@" || {
-- test_iso "$@";
-- mcisofs_list "$@";
-+ test_iso "$@" || exit 1
-+ mcisofs_list "$@" || exit 1
- }
- exit 0
- ;;
---
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
deleted file mode 100644
index 173def62eb0..00000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aboro...@vmail.ru>
-Date: Sun, 7 Jul 2019 15:51:28 +0300
-Subject: [PATCH 2/2] iso9660: report errors in copyout in case of isoinfo
- usage.
-
-Signed-off-by: Andrew Borodin <aboro...@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in
b/src/vfs/extfs/helpers/iso9660.in
-index 76273522e..f9c6e50ef 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -222,8 +222,8 @@ case "$cmd" in
- ;;
- copyout)
- xorriso_copyout "$@" || {
-- test_iso "$@";
-- mcisofs_copyout "$@";
-+ test_iso "$@" || exit 1
-+ mcisofs_copyout "$@" || exit 1
- }
- exit 0
- ;;
---
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gcc-10.patch
b/app-misc/mc/files/mc-4.8.23-gcc-10.patch
deleted file mode 100644
index b7cc3ee71a9..00000000000
--- a/app-misc/mc/files/mc-4.8.23-gcc-10.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 093571938a6c31706f918b011335b8ab30602336 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aboro...@vmail.ru>
-Date: Sat, 23 Nov 2019 17:41:58 +0300
-Subject: [PATCH] Ticket #4035: fix compile failure on OS X 10.9.
-
-Fix duplication of menu_map definition.
-
-Move menu_map definition to lib/widget/menu.c.
-
-Signed-off-by: Andrew Borodin <aboro...@vmail.ru>
----
- lib/widget/menu.c | 2 +-
- lib/widget/menu.h | 2 ++
- src/keybind-defaults.c | 3 +--
- src/keybind-defaults.h | 1 -
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/widget/menu.c b/lib/widget/menu.c
-index b7476b62b..68ae6f6ce 100644
---- a/lib/widget/menu.c
-+++ b/lib/widget/menu.c
-@@ -46,7 +46,7 @@
-
- /*** global variables
****************************************************************************/
-
--const global_keymap_t *menu_map;
-+const global_keymap_t *menu_map = NULL;
-
- /*** file scope macro definitions
****************************************************************/
-
-diff --git a/lib/widget/menu.h b/lib/widget/menu.h
-index c522a16c8..fad6fa639 100644
---- a/lib/widget/menu.h
-+++ b/lib/widget/menu.h
-@@ -39,6 +39,8 @@ typedef struct WMenuBar
-
- /*** global variables defined in .c file
*********************************************************/
-
-+extern const global_keymap_t *menu_map;
-+
- /*** declarations of public functions
************************************************************/
-
- menu_entry_t *menu_entry_create (const char *name, long command);
-diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c
-index 10ba341ee..0ba4840df 100644
---- a/src/keybind-defaults.c
-+++ b/src/keybind-defaults.c
-@@ -28,7 +28,7 @@
- #include <config.h>
-
- #include "lib/global.h"
--#include "lib/widget.h" /* dialog_map, input_map, listbox_map */
-+#include "lib/widget.h" /* dialog_map, input_map, listbox_map,
menu_map */
-
- #include "keybind-defaults.h"
-
-@@ -56,7 +56,6 @@ GArray *diff_keymap = NULL;
- const global_keymap_t *main_map = NULL;
- const global_keymap_t *main_x_map = NULL;
- const global_keymap_t *panel_map = NULL;
--const global_keymap_t *menu_map = NULL;
- const global_keymap_t *tree_map = NULL;
- const global_keymap_t *help_map = NULL;
-
-diff --git a/src/keybind-defaults.h b/src/keybind-defaults.h
-index edb05c67f..6b7266589 100644
---- a/src/keybind-defaults.h
-+++ b/src/keybind-defaults.h
-@@ -35,7 +35,6 @@ extern GArray *diff_keymap;
- extern const global_keymap_t *main_map;
- extern const global_keymap_t *main_x_map;
- extern const global_keymap_t *panel_map;
--extern const global_keymap_t *menu_map;
- extern const global_keymap_t *tree_map;
- extern const global_keymap_t *help_map;
-
---
-2.25.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gettext-test.patch
b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
deleted file mode 100644
index 7e19cd7fa11..00000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-Test change counterpart.
-
---- a/tests/lib/Makefile.am
-+++ b/tests/lib/Makefile.am
-@@ -9,3 +9,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/mcconfig/Makefile.am
-+++ b/tests/lib/mcconfig/Makefile.am
-@@ -11,3 +11,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/search/Makefile.am
-+++ b/tests/lib/search/Makefile.am
-@@ -10,3 +10,3 @@ AM_CPPFLAGS = \
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la @PCRE_LIBS@
-+ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
-
---- a/tests/lib/vfs/Makefile.am
-+++ b/tests/lib/vfs/Makefile.am
-@@ -14,3 +14,3 @@ EXTRA_DIST = mc.charsets
- LIBS = @CHECK_LIBS@ \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la $(LIBINTL)
-
---- a/tests/lib/Makefile.in
-+++ b/tests/lib/Makefile.in
-@@ -636 +636 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -542 +542 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/search/Makefile.in
-+++ b/tests/lib/search/Makefile.in
-@@ -584,2 +584 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ \
-- $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
$(am__append_1)
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -641 +641 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
diff --git a/app-misc/mc/files/mc-4.8.23-gettext.patch
b/app-misc/mc/files/mc-4.8.23-gettext.patch
deleted file mode 100644
index 3ad67dbe5d4..00000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-From 2a97524b42eeececd2ecd928a1154da1f5b7378a Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <a...@gmx.li>
-Date: Fri, 1 Apr 2016 06:44:22 +0000
-Subject: [PATCH] Linking fix for non-default gettext package
-
-mc lost the linking game if gettext package pulled from outside of system
paths.
-(Pulling can be done by suitable C-/CPP/LDFLAGS settings)
-
-Furthermore gettext package depends on libintl (if system lib
-don't provide needed functions) then gettext prepare INITLIBS/LIBINTL variable
-for working libintl pull in from gettext libdir.
-
-https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-
-Let respect LIBINTL variable at linking (it is empty if not needed).
-
-Failure example for Solaris 10 with non-system-default gettext package:
-
-Undefined first referenced
- symbol in file
- libintl_bind_textdomain_codeset ./.libs/libinternal.a(args.o)
- libintl_gettext main.o
- libintl_textdomain main.o
- libintl_bindtextdomain main.o
- libintl_ngettext ./.libs/libinternal.a(midnight.o)
-
-Signed-off-by: Andreas Mohr <a...@gmx.li>
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -53,7 +53,8 @@ libinternal_la_LIBADD = \
-
- mc_LDADD = \
- libinternal.la \
-- $(top_builddir)/lib/libmc.la
-+ $(top_builddir)/lib/libmc.la \
-+ $(LIBINTL)
-
- if ENABLE_VFS_SMB
- # this is a hack for linking with own samba library in simple way
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -556,7 +557,7 @@ libinternal_la_LIBADD = \
- viewer/libmcviewer.la \
- $(DIFFLIB) $(EDITLIB) $(SUBSHELLLIB)
-
--mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(am__append_6)
-+mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(LIBINTL)
$(am__append_6)
- SRC_mc_conssaver = \
- cons.handler.c consaver/cons.saver.h
diff --git a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
deleted file mode 100644
index e72d641a5c3..00000000000
--- a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/700708
-
-From 8411b93ff7cc955b0acf1541207977c52201bbfc Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aboro...@vmail.ru>
-Date: Wed, 11 Sep 2019 09:17:18 +0300
-Subject: [PATCH] (vfs_stamp_compare): fix NULL dereference.
-
-(vfs_stamp): likewise.
-
-Signed-off-by: Andrew Borodin <aboro...@vmail.ru>
----
- lib/vfs/gc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/lib/vfs/gc.c
-+++ b/lib/vfs/gc.c
-@@ -127,7 +127,7 @@ vfs_stamp_compare (gconstpointer a, gconstpointer b)
- const struct vfs_stamping *vsa = (const struct vfs_stamping *) a;
- const struct vfs_stamping *vsb = (const struct vfs_stamping *) b;
-
-- return (vsa->v == vsb->v && vsa->id == vsb->id) ? 0 : 1;
-+ return (vsa == NULL || vsb == NULL || (vsa->v == vsb->v && vsa->id ==
vsb->id)) ? 0 : 1;
- }
-
- /*
---------------------------------------------------------------------------------------------
*/
-@@ -163,7 +163,7 @@ vfs_stamp (struct vfs_class *v, vfsid id)
- gboolean ret = FALSE;
-
- stamp = g_slist_find_custom (stamps, &what, vfs_stamp_compare);
-- if (stamp != NULL)
-+ if (stamp != NULL && stamp->data != NULL)
- {
- gettimeofday (&(VFS_STAMPING (stamp->data)->time), NULL);
- ret = TRUE;
---
-2.24.0
-
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
deleted file mode 100644
index b904bd1d2cc..00000000000
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org";
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- samba? ( net-fs/samba )
- sftp? ( net-libs/libssh2 )
- slang? ( >=sys-libs/slang-2 )
- !slang? ( sys-libs/ncurses:0=[unicode?] )
- spell? ( app-text/aspell )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-3933-iso9660-1.patch
- "${FILESDIR}"/${P}-3933-iso9660-2.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext-test.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_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --enable-charset
- --enable-vfs
- --with-homedir=$(usex xdg 'XDG' '.mc')
- --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 samba vfs-smb)
- $(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() {
- # 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 README NEWS
-
- # 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
-
- if ! use xdg ; then
- sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
- -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
deleted file mode 100644
index 8de901785a3..00000000000
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org";
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc
x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs )
- samba? ( net-fs/samba )
- sftp? ( net-libs/libssh2 )
- slang? ( >=sys-libs/slang-2 )
- !slang? ( sys-libs/ncurses:0=[unicode?] )
- spell? ( app-text/aspell )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
- "
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-3933-iso9660-1.patch
- "${FILESDIR}"/${P}-3933-iso9660-2.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext.patch
- "${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
- "${FILESDIR}"/${PN}-4.8.23-vfs-gc-SEGV.patch
- "${FILESDIR}"/${PN}-4.8.23-gcc-10.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_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --enable-charset
- --enable-vfs
- --with-homedir=$(usex xdg 'XDG' '.mc')
- --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 samba vfs-smb)
- $(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() {
- # 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 README NEWS
-
- # 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
-
- if ! use xdg ; then
- sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
- -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
- fi
-}
-
-pkg_postinst() {
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
