diff options
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch | 85 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch | 29 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.23-gettext-test.patch | 54 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.23-gettext.patch | 56 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch | 16 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.29-gentoo-tools.patch | 11 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.30-fish_fix_broken_national_characters.patch | 40 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch | 36 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.30-musl-tests.patch | 15 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.30-r1.ebuild (renamed from app-misc/mc/mc-4.8.23-r1.ebuild) | 83 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.30-r2.ebuild (renamed from app-misc/mc/mc-4.8.22.ebuild) | 85 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.31.ebuild (renamed from app-misc/mc/mc-4.8.23.ebuild) | 89 | ||||
| -rw-r--r-- | app-misc/mc/mc-9999.ebuild | 118 | ||||
| -rw-r--r-- | app-misc/mc/metadata.xml | 18 |
15 files changed, 283 insertions, 456 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index e921d36443b1..821186c1f709 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,2 +1,2 @@ -DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed -DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6 +DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e +DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d 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 be08e68b296c..000000000000 --- 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 <aborodin@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 <aborodin@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 173def62eb0b..000000000000 --- 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 <aborodin@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 <aborodin@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-gettext-test.patch b/app-misc/mc/files/mc-4.8.23-gettext-test.patch deleted file mode 100644 index 7e19cd7fa119..000000000000 --- 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 3ad67dbe5d40..000000000000 --- 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 <and@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 <and@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.26-ncurses-mouse.patch b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch new file mode 100644 index 000000000000..bde04c99b86e --- /dev/null +++ b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch @@ -0,0 +1,16 @@ +Fix mouse-key input with ncurses6 in terminals without basic X10 mouse +support, at the cost of breaking it with ncurses5. See discussion in +https://midnight-commander.org/ticket/4144 . + +--- a/lib/tty/key.c ++++ b/lib/tty/key.c +@@ -2124,8 +2124,7 @@ + gboolean extended = c == MCKEY_EXTENDED_MOUSE; + + #ifdef KEY_MOUSE +- extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL +- && xmouse_extended_seq != NULL); ++ extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL); + #endif /* KEY_MOUSE */ + + xmouse_get_event (event, extended); 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/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/files/mc-4.8.30-mcdiff-segfault.patch b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch new file mode 100644 index 000000000000..ad752a11816f --- /dev/null +++ b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch @@ -0,0 +1,36 @@ +From dfe3279a365d629ba848f0265108d98d9f12348f Mon Sep 17 00:00:00 2001 +From: Andrew Borodin <aborodin@vmail.ru> +Date: Sun, 27 Aug 2023 19:32:53 +0300 +Subject: [PATCH] Ticket 4500: mcdiff: segfault when display of line numbers is + enabled. + +The bug was introduced in 00f84fbf24b5f65381f41c5d6333182bc7921700. + + * (dview_load_options): avoid NULL dereference: don't caclulate the + width of line numbers field here because dview->a isn't created yet. + * (dview_update): caclulate the width of line numbers field using an + actual length of diff lines array. + +Signed-off-by: Andrew Borodin <aborodin@vmail.ru> +--- a/src/diffviewer/ydiff.c ++++ b/src/diffviewer/ydiff.c +@@ -2366,7 +2366,7 @@ dview_load_options (WDiff * dview) + dview->display_symbols = 1; + show_numbers = mc_config_get_bool (mc_global.main_config, "DiffView", "show_numbers", FALSE); + if (show_numbers) +- dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a); ++ dview->display_numbers = 1; + tab_size = mc_config_get_int (mc_global.main_config, "DiffView", "tab_size", 8); + if (tab_size > 0 && tab_size < 9) + dview->tab_size = tab_size; +@@ -2885,6 +2885,10 @@ dview_update (WDiff * dview) + if (height < 2) + return; + ++ /* use an actual length of dview->a */ ++ if (dview->display_numbers != 0) ++ dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a); ++ + width1 = dview->half1 + dview->bias; + width2 = dview->half2 - dview->bias; + if (dview->full) diff --git a/app-misc/mc/files/mc-4.8.30-musl-tests.patch b/app-misc/mc/files/mc-4.8.30-musl-tests.patch new file mode 100644 index 000000000000..0e8ea32e2990 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.30-musl-tests.patch @@ -0,0 +1,15 @@ +--- a/tests/lib/vfs/path_len.c ++++ b/tests/lib/vfs/path_len.c +@@ -89,12 +89,6 @@ + "/тестовый/путь", + 26 + }, +-#ifdef HAVE_CHARSET +- { /* 3. */ +- "/#enc:KOI8-R/тестовый/путь", +- 38 +- }, +-#endif /* HAVE_CHARSET */ + }; + /* *INDENT-ON* */ + diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild index 9f58fc202682..f8dcfce73f52 100644 --- a/app-misc/mc/mc-4.8.23-r1.ebuild +++ b/app-misc/mc/mc-4.8.30-r1.ebuild @@ -1,67 +1,73 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic -MY_P=${P/_/-} +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://www.midnight-commander.org" -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" +HOMEPAGE="https://midnight-commander.org" 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" +IUSE="+edit gpm nls sftp +slang spell test unicode X" REQUIRED_USE="spell? ( edit )" -RDEPEND=">=dev-libs/glib-2.26.0:2 +DEPEND=" + >=dev-libs/glib-2.30.0:2 gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) + kernel_linux? ( sys-fs/e2fsprogs[tools(+)] ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0=[unicode?] ) + !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} + 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} +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.26-ncurses-mouse.patch + "${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch + "${FILESDIR}"/${PN}-4.8.30-mcdiff-segfault.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 + + # Bug #906194 + use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch + + eautoreconf } src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules --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 @@ -70,7 +76,6 @@ src_configure() { # 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) @@ -82,6 +87,12 @@ src_configure() { } 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. # @@ -89,24 +100,24 @@ src_test() { # information. CK_FORK=no emake check VERBOSE=1 } - src_install() { emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS + 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 - - 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() { + 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" diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild index a246a79ffb5a..3c52e9a0e0ba 100644 --- a/app-misc/mc/mc-4.8.22.ebuild +++ b/app-misc/mc/mc-4.8.30-r2.ebuild @@ -1,60 +1,76 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic -MY_P=${P/_/-} +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://www.midnight-commander.org" -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" +HOMEPAGE="https://midnight-commander.org" 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" +IUSE="+edit gpm nls sftp +slang spell test unicode X" REQUIRED_USE="spell? ( edit )" -RDEPEND=">=dev-libs/glib-2.26.0:2 +DEPEND=" + >=dev-libs/glib-2.30.0:2 gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) + kernel_linux? ( sys-fs/e2fsprogs[tools(+)] ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0=[unicode?] ) + !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} + 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 ) - " +" -S=${WORKDIR}/${MY_P} +RESTRICT="!test? ( test )" -pkg_pretend() { - if use slang && use unicode ; then - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." - fi +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.30-mcdiff-segfault.patch +) + +src_prepare() { + default + + # 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 } src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules --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 @@ -63,7 +79,6 @@ src_configure() { # 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) @@ -75,6 +90,12 @@ src_configure() { } 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. # @@ -82,24 +103,24 @@ src_test() { # information. CK_FORK=no emake check VERBOSE=1 } - src_install() { emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS + 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 - - 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() { + 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" diff --git a/app-misc/mc/mc-4.8.23.ebuild b/app-misc/mc/mc-4.8.31.ebuild index 32597904a63f..5981d616172c 100644 --- a/app-misc/mc/mc-4.8.23.ebuild +++ b/app-misc/mc/mc-4.8.31.ebuild @@ -1,60 +1,78 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic -MY_P=${P/_/-} +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://www.midnight-commander.org" -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" +HOMEPAGE="https://midnight-commander.org" 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" +IUSE="+edit gpm nls sftp +slang spell test unicode X" REQUIRED_USE="spell? ( edit )" -RDEPEND=">=dev-libs/glib-2.26.0:2 +DEPEND=" + >=dev-libs/glib-2.30.0:2 gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) + kernel_linux? ( sys-fs/e2fsprogs[tools(+)] ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0=[unicode?] ) + !slang? ( sys-libs/ncurses:=[unicode(+)?] ) spell? ( app-text/aspell ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} + 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 ) - " +" -S=${WORKDIR}/${MY_P} +RESTRICT="!test? ( test )" -pkg_pretend() { - if use slang && use unicode ; then - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." - fi +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch + "${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch +) + +# This is a check for AIX, on Linux mc uses statvfs() regardless of whether +# LFS64 interfaces are available in libc or not. +QA_CONFIG_IMPL_DECL_SKIP=( + statvfs64 +) + +src_prepare() { + default + + # Bug #906194 + use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch + + eautoreconf } src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules --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 @@ -63,7 +81,6 @@ src_configure() { # 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) @@ -75,6 +92,12 @@ src_configure() { } 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. # @@ -82,24 +105,26 @@ src_test() { # information. CK_FORK=no emake check VERBOSE=1 } - src_install() { emake DESTDIR="${D}" install - dodoc AUTHORS README NEWS + 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 - - 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 "${PN} extension scripts depend on many external tools, install them as needed" + elog + 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" diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild deleted file mode 100644 index 14377f18812e..000000000000 --- a/app-misc/mc/mc-9999.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git" - LIVE_ECLASSES="git-r3 autotools" - LIVE_EBUILD=yes -fi - -inherit flag-o-matic ${LIVE_ECLASSES} - -MY_P=${P/_/-} - -if [[ -z ${LIVE_EBUILD} ]]; then - SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" - 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" -fi - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="https://www.midnight-commander.org" - -LICENSE="GPL-3" -SLOT="0" -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 ) - " - -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 - - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh -} - -src_configure() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules - --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 doc/{FAQ,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 - - 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/metadata.xml b/app-misc/mc/metadata.xml index 5c99ff657dde..0b8d9189b22a 100644 --- a/app-misc/mc/metadata.xml +++ b/app-misc/mc/metadata.xml @@ -1,22 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</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> - <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag> </use> + <upstream> + <remote-id type="github">MidnightCommander/mc</remote-id> + </upstream> </pkgmetadata> |