subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-misc\/mc\/files\/, app\-misc\/mc\/"

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2024-01-24 Thread Marek Szuba

commit: 13e8f68494f4c02c91bc047a8224d8b059105b3e
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 24 16:28:10 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 24 16:30:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e8f684

app-misc/mc: fix broken non-ASCII characters in shell links

With many thanks to the reporter of and the participants in the relevant
bug, for the thorough debugging and having eventually found the fix.

Closes: https://bugs.gentoo.org/916528
Signed-off-by: Marek Szuba  gentoo.org>

 8.30-fish_fix_broken_national_characters.patch |  40 +++
 app-misc/mc/mc-4.8.30-r2.ebuild| 127 +
 2 files changed, 167 insertions(+)

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 ..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/mc-4.8.30-r2.ebuild b/app-misc/mc/mc-4.8.30-r2.ebuild
new file mode 100644
index ..1d701a9bdb43
--- /dev/null
+++ b/app-misc/mc/mc-4.8.30-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 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"
+
+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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2023-09-28 Thread Marek Szuba

commit: 6e09b30342bb353a0c6603325c27a79332c9e66f
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep 28 08:21:30 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep 28 08:25:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e09b303

app-misc/mc: backport upstream fix for mcdiff segfaults

Closes: https://bugs.gentoo.org/914724
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch  | 36 ++
 .../mc/{mc-4.8.30.ebuild => mc-4.8.30-r1.ebuild}   |  1 +
 2 files changed, 37 insertions(+)

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 ..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 
+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 
+--- 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/mc-4.8.30.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild
similarity index 98%
rename from app-misc/mc/mc-4.8.30.ebuild
rename to app-misc/mc/mc-4.8.30-r1.ebuild
index e1576c254b12..8bd59fa87beb 100644
--- a/app-misc/mc/mc-4.8.30.ebuild
+++ b/app-misc/mc/mc-4.8.30-r1.ebuild
@@ -50,6 +50,7 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2021-07-13 Thread Marek Szuba

commit: 25aac466357a303896fa961e759488e9d4ea6eee
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 13 11:46:02 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 13 11:57:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25aac466

app-misc/mc: fix mouse-key garbage output on ncurses and modern terminals

While at it, bump to EAPI 8 and fix some DEPEND/BDEPEND confusion.

Closes: https://bugs.gentoo.org/753578
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch |  16 +++
 app-misc/mc/mc-4.8.26-r3.ebuild | 125 
 2 files changed, 141 insertions(+)

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 000..bde04c99b86
--- /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/mc-4.8.26-r3.ebuild b/app-misc/mc/mc-4.8.26-r3.ebuild
new file mode 100644
index 000..e3d96886ce3
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-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}"
+BDEPEND="app-arch/xz-utils
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-libs/check )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch
+   "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+   "${FILESDIR}"/${PN}-4.8.26-shadow-crash.patch
+)
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+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-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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2020-12-18 Thread Sergei Trofimovich

commit: fbefa922cd8b49ea4ba4a9f2b27ecbd0eede1e18
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 18 09:51:04 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 18 09:52:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbefa922

app-misc/mc: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/mc/Manifest   |   1 -
 .../mc/files/mc-4.8.24-mc-lib-twice-4070.patch |  84 
 app-misc/mc/mc-4.8.24.ebuild   | 108 -
 3 files changed, 193 deletions(-)

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b5f95b45833..f94aa2c85e2 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 
18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60
 SHA512 
ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 
47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272
 SHA512 
51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e

diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch 
b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
deleted file mode 100644
index 8db6fdfb2ea..000
--- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://midnight-commander.org/ticket/4070
-
-From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Tue, 3 Mar 2020 09:26:12 +
-Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
-
-Before the change `mc.lib` was installed twice due to being
-in two `_DATA` variables:
-
-```
-dist_pkgdata_DATA = \
-mc.lib
-
-pkgdata_DATA = \
-$(dist_pkgdata_DATA) \
-$(PKGDATA_OUT)
-```
-
-This causes occasional install failures when two parallel
-`/usr/bin/install` calls race in installing the file:
-
-```
-$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
-...
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
--c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
--c -m 644 mc.lib mc.charsets 
'/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
-...
- /usr/bin/install: cannot create regular file
-   '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
-```
-
-After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
-
-Signed-off-by: Sergei Trofimovich 

- misc/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
 a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
-   mc.lib
- 
- pkgdata_DATA = \
--  $(dist_pkgdata_DATA) \
-+  \
-   $(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -54,7 +53,7 @@ EXTRA_DIST = \
-   $(LIBFILES_SCRIPT) \
-   $(SCRIPTS_IN) \
-   $(noinst_DATA) \
--  $(dist_pkgdata_DATA) \
-+  \
-   $(PKGDATA_IN)
- 
- install-data-hook:
 a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
-   mc.lib
- 
- pkgdata_DATA = \
--  $(dist_pkgdata_DATA) \
-+  \
-   $(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -508,7 +509,7 @@ EXTRA_DIST = \
-   $(LIBFILES_SCRIPT) \
-   $(SCRIPTS_IN) \
-   $(noinst_DATA) \
--  $(dist_pkgdata_DATA) \
-+  \
-   $(PKGDATA_IN)
- 
- all: all-recursive
--- 
-2.25.1
-

diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
deleted file mode 100644
index de7e49b8689..000
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ /dev/null
@@ -1,108 +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 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
-

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2020-03-22 Thread Lars Wendler

commit: 68173da90fada5003a3a202446ae86a166f1b010
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Mar 22 13:54:47 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Mar 22 13:55:00 2020 +
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  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..000
--- 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 
-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 

- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2020-01-19 Thread Sergei Trofimovich

commit: f83e8e55fd6d69c9438b7e6115ff51cf97b35050
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jan 19 15:20:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jan 19 15:20:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83e8e55

app-misc/mc: fix build failure on gcc-10

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/mc/files/mc-4.8.23-gcc-10.patch | 79 
 app-misc/mc/mc-4.8.23-r2.ebuild  |  3 +-
 2 files changed, 81 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..b7cc3ee71a9
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-gcc-10.patch
@@ -0,0 +1,79 @@
+From 093571938a6c31706f918b011335b8ab30602336 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin 
+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 
+---
+ 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 
+ 
+ #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/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
index 856331ef9aa..64112aaf67b 100644
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,7 @@ PATCHES=(
"${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() {

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2019-11-21 Thread Sergei Trofimovich

commit: 9bebf5560d10a6264e05cdb38ebca50978b5aef8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Nov 21 09:41:27 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Nov 21 09:41:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bebf556

app-misc/mc: fix VFS SEGV in GC, bug #700708

Paul reports that nested archives cause corruption
of mc's data structures.

Picked upstream patch that avoids dereference of stale entries.

Reported-by: Paul Osmialowski
Closes: https://bugs.gentoo.org/700708
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch |  37 
 app-misc/mc/mc-4.8.23-r2.ebuild   | 116 ++
 2 files changed, 153 insertions(+)

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
new file mode 100644
index 000..e72d641a5c3
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/700708
+
+From 8411b93ff7cc955b0acf1541207977c52201bbfc Mon Sep 17 00:00:00 2001
+From: Andrew Borodin 
+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 
+---
+ 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, , 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-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
new file mode 100644
index 000..856331ef9aa
--- /dev/null
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 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
+)
+
+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=(
+   --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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2019-09-11 Thread Sergei Trofimovich

commit: 4939d79d562b3490794aac9d3875d1fdf9a60e92
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 11 21:41:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 11 21:44:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4939d79d

app-misc/mc: workaround linkage against internal gettext, bug #693850

The underlying issue is lack of support of linking in static
gettext into libmc.a due to a deficiency in m4/gettext.m4 (see
upstream bug for more details).

The workaround is to manually link bundled gettext into every
final binary. It fixes default case for musl but does not fix
the underlying issues. Let's leave fixing those to upstream.

Reported-by: Michael 'veremitz' Everitt
Bug: https://bugs.gentoo.org/693850
Bug: https://midnight-commander.org/ticket/3629
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 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/mc-4.8.23-r1.ebuild|  2 +
 3 files changed, 112 insertions(+)

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
new file mode 100644
index 000..7e19cd7fa11
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
@@ -0,0 +1,54 @@
+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
new file mode 100644
index 000..3ad67dbe5d4
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-gettext.patch
@@ -0,0 +1,56 @@
+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 
+Date: Fri, 1 Apr 2016 06:44:22 +
+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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2019-07-20 Thread Sergei Trofimovich

commit: 11c1d710556ac8e59d1c4fd68ba0d2d23b2757ca
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 20 17:12:41 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 20 17:12:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c1d710

app-misc/mc: improve iso9660 error detection, bug #533214

Reported-by: Łukasz Stelmach
Bug: https://bugs.gentoo.org/533214
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich  gentoo.org>

 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/mc-4.8.23-r1.ebuild  | 111 +++
 3 files changed, 225 insertions(+)

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
new file mode 100644
index 000..be08e68b296
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
@@ -0,0 +1,85 @@
+From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin 
+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 
+---
+ 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
new file mode 100644
index 000..173def62eb0
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
@@ -0,0 +1,29 @@
+From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001
+From: Andrew Borodin 
+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 
+---
+ 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/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
new file mode 100644
index 000..322ccb31aed
--- /dev/null
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2018-06-04 Thread Lars Wendler

commit: a27cd0025512e177241409fda36fb1492909787f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun  4 09:41:31 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun  4 09:41:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27cd002

app-misc/mc: Removed old.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-misc/mc/Manifest  |   3 -
 app-misc/mc/files/mc-4.8.16-makedev.patch |  28 
 app-misc/mc/files/mc-4.8.18-html.patch|  29 
 app-misc/mc/mc-4.8.15.ebuild  | 101 
 app-misc/mc/mc-4.8.18-r1.ebuild   | 103 
 app-misc/mc/mc-4.8.19.ebuild  | 107 --
 6 files changed, 371 deletions(-)

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index cc24abb2204..9967ef41480 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,2 @@
-DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 
33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187
 SHA512 
b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
-DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 
10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0
 SHA512 
edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
-DIST mc-4.8.19.tar.xz 2521808 BLAKE2B 
b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa
 SHA512 
aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
 DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 
14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c
 SHA512 
c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
 DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 
0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f
 SHA512 
db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf

diff --git a/app-misc/mc/files/mc-4.8.16-makedev.patch 
b/app-misc/mc/files/mc-4.8.16-makedev.patch
deleted file mode 100644
index 8e7fd0e0f1c..000
--- a/app-misc/mc/files/mc-4.8.16-makedev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4ba3a1a92a59658bc9f5f9d0745db8bb829778cb Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Wed, 13 Apr 2016 23:38:47 +0100
-Subject: [PATCH] filemanager/mountlist.c: add makedev() declaration
-
-On glibc-2.23 link fails as
-
-$ mc-/src/filemanager/mountlist.c:750: undefined reference to `makedev'
-
-Reported-by: Thomas D.
-Bug: https://bugs.gentoo.org/579858
-Signed-off-by: Sergei Trofimovich 
-
-diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
-index 166b246..7d6e178 100644
 a/src/filemanager/mountlist.c
-+++ b/src/filemanager/mountlist.c
-@@ -186,6 +186,7 @@
- 
- #include "lib/global.h"
- #include "lib/strutil.h"/* str_verscmp() */
-+#include "lib/unixcompat.h" /* makedev */
- #include "mountlist.h"
- 
- /*** global variables 
/
--- 
-2.8.1
-

diff --git a/app-misc/mc/files/mc-4.8.18-html.patch 
b/app-misc/mc/files/mc-4.8.18-html.patch
deleted file mode 100644
index d8483446bfc..000
--- a/app-misc/mc/files/mc-4.8.18-html.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 6b656100ac907636f0b54b12921408260a9fd583
-Author: Raymond Jennings 
-Date:   Fri Oct 7 22:38:07 2016 +0200
-
-mcedit: syntax: fix mismatched highlighting for <{o,u}l> HTML tags
-
-Signed-off-by: Raymond Jennings 
-Signed-off-by: Yury V. Zaytsev 
-
-diff --git a/misc/syntax/html.syntax b/misc/syntax/html.syntax
-index 2b3afd30e..3adbe4d0b 100644
 a/misc/syntax/html.syntax
-+++ b/misc/syntax/html.syntax
-@@ -52,6 +52,7 @@ context default
- keyword  brightcyan/17
- keyword  brightcyan/17
- keyword  brightcyan/17
-+keyword  brightcyan/17
- keyword  brightcyan/17
- keyword  brightcyan/17
- keyword  brightcyan/17
-@@ -59,6 +60,7 @@ context default
- keyword  brightcyan/17
- keyword  brightcyan/17
- keyword  brightcyan/17
-+keyword  brightcyan/17
- 
- 
- context brightcyan/17

diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild
deleted file mode 100644
index c01cae5c612..000
--- a/app-misc/mc/mc-4.8.15.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2017-03-06 Thread Lars Wendler

commit: 8d037598fc78bf5e41e5f6b7594fe753dd56b3f5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar  6 09:44:44 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar  6 09:45:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d037598

app-misc/mc: Removed old.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-misc/mc/Manifest   |   3 -
 .../mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch  |  11 ---
 app-misc/mc/mc-4.8.14.ebuild   | 101 
 app-misc/mc/mc-4.8.16.ebuild   | 106 -
 app-misc/mc/mc-4.8.17.ebuild   | 103 
 app-misc/mc/mc-4.8.18.ebuild   | 102 
 6 files changed, 426 deletions(-)

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9511916028f..dd32e78a0f4 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,3 @@
-DIST mc-4.8.14.tar.xz 2305788 SHA256 
6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 
656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724
 WHIRLPOOL 
6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
 DIST mc-4.8.15.tar.xz 2304812 SHA256 
cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 
b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
 WHIRLPOOL 
6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
-DIST mc-4.8.16.tar.xz 2387724 SHA256 
bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512 
209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944
 WHIRLPOOL 
88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454
-DIST mc-4.8.17.tar.xz 2457156 SHA256 
0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d SHA512 
e995e5b1eb0a5831fe567e4398c9a68fa610c8631f1f13fb277f67f709656bc97bd7b20f289bdace35276984556edd1aed324412d225698c5853809a6d128f72
 WHIRLPOOL 
ad36526d4961baafd35ed55c600c534826036afb1a7b14b81f9617ea766a6cc9100b317a49349428c36b091389e20fa4abd01c931e2e93d9028024857f2419c1
 DIST mc-4.8.18.tar.xz 2462080 SHA256 
f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece SHA512 
edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
 WHIRLPOOL 
dd0c1cdfe93468ebc399b270d693751bc7c0665cb49040d9409c3a336c953be0d304c463b8c8a0a26e42c720c116a4b4bd9b930caa2f2101298e01c4ac5c6237
 DIST mc-4.8.19.tar.xz 2521808 SHA256 
eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df SHA512 
aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
 WHIRLPOOL 
21c57a2717c58488cc7aa5ba5159b9231e09181059662f392a5212a17aa5475493793d49b99e73ebe74d9594201a84cfc63c3a460654579b7399cc563594ab7a

diff --git a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch 
b/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
deleted file mode 100644
index dda0d834ca9..000
--- a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 mc-4.8.15/misc/syntax/ebuild.syntax
-+++ mc-4.8.15/misc/syntax/ebuild.syntax
-@@ -75,6 +75,8 @@
- keyword whole dosed yellow
- keyword whole dosym yellow
- keyword whole eaclocal yellow
-+keyword whole eapply yellow
-+keyword whole eapply_user yellow
- keyword whole eautoconf yellow
- keyword whole eautoreconf yellow
- keyword whole eautomake yellow

diff --git a/app-misc/mc/mc-4.8.14.ebuild b/app-misc/mc/mc-4.8.14.ebuild
deleted file mode 100644
index bb36c56e0d5..000
--- a/app-misc/mc/mc-4.8.14.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org;
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-   gpm? ( sys-libs/gpm )
-   kernel_linux? ( sys-fs/e2fsprogs )
-   samba? ( net-fs/samba )
-   sftp? (

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2017-01-22 Thread Sergei Trofimovich

commit: 16f2e2e5bc3b663a545c0fa752fdfa0804da3d69
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jan 22 22:52:47 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jan 22 22:52:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f2e2e5

app-misc/mc: add HTML highlighting fixes, bug #542982

Patch by Raymond Jennings.

Reported-by: Raymond Jennings
Bug: https://bugs.gentoo.org/542982

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-misc/mc/files/mc-4.8.18-html.patch |  29 +
 app-misc/mc/mc-4.8.18-r1.ebuild| 104 +
 2 files changed, 133 insertions(+)

diff --git a/app-misc/mc/files/mc-4.8.18-html.patch 
b/app-misc/mc/files/mc-4.8.18-html.patch
new file mode 100644
index ..d848344
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.18-html.patch
@@ -0,0 +1,29 @@
+commit 6b656100ac907636f0b54b12921408260a9fd583
+Author: Raymond Jennings 
+Date:   Fri Oct 7 22:38:07 2016 +0200
+
+mcedit: syntax: fix mismatched highlighting for <{o,u}l> HTML tags
+
+Signed-off-by: Raymond Jennings 
+Signed-off-by: Yury V. Zaytsev 
+
+diff --git a/misc/syntax/html.syntax b/misc/syntax/html.syntax
+index 2b3afd30e..3adbe4d0b 100644
+--- a/misc/syntax/html.syntax
 b/misc/syntax/html.syntax
+@@ -52,6 +52,7 @@ context default
+ keyword  brightcyan/17
+ keyword  brightcyan/17
+ keyword  brightcyan/17
++keyword  brightcyan/17
+ keyword  brightcyan/17
+ keyword  brightcyan/17
+ keyword  brightcyan/17
+@@ -59,6 +60,7 @@ context default
+ keyword  brightcyan/17
+ keyword  brightcyan/17
+ keyword  brightcyan/17
++keyword  brightcyan/17
+ 
+ 
+ context brightcyan/17

diff --git a/app-misc/mc/mc-4.8.18-r1.ebuild b/app-misc/mc/mc-4.8.18-r1.ebuild
new file mode 100644
index ..190ccad
--- /dev/null
+++ b/app-misc/mc/mc-4.8.18-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org;
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test 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= )
+   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 )
+   "
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+   "${FILESDIR}"/${P}-html.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   local myscreen=ncurses
+   use slang && myscreen=slang
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+   local homedir=".mc"
+   use xdg && homedir="XDG"
+
+   econf \
+   --disable-silent-rules \
+   --disable-dependency-tracking \
+   $(use_enable nls) \
+   --enable-vfs \
+   $(use_enable kernel_linux vfs-undelfs) \
+   --enable-charset \
+   $(use_with X x) \
+   $(use_enable samba vfs-smb) \
+   $(use_enable sftp vfs-sftp) \
+   $(use_enable spell aspell) \
+   $(use_with gpm gpm-mouse) \
+   --with-screen=${myscreen} \
+   $(use_with edit internal-edit) \
+   $(use_enable mclib) \
+   $(use_enable test tests) \
+   --with-homedir=${homedir}
+}
+
+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

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

2016-03-13 Thread Lars Wendler

commit: 0decf44a4b1d5235da1d9def00aa0302c4006f2b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Mar 13 14:56:57 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Mar 13 14:56:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0decf44a

app-misc/mc: Bump to version 4.8.16

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 app-misc/mc/Manifest   |   1 +
 .../mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch  |  11 +++
 app-misc/mc/mc-4.8.16.ebuild   | 106 +
 3 files changed, 118 insertions(+)

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index a60c2bd..b46b161 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1,3 @@
 DIST mc-4.8.14.tar.xz 2305788 SHA256 
6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 
656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724
 WHIRLPOOL 
6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
 DIST mc-4.8.15.tar.xz 2304812 SHA256 
cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 
b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
 WHIRLPOOL 
6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
+DIST mc-4.8.16.tar.xz 2387724 SHA256 
bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512 
209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944
 WHIRLPOOL 
88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454

diff --git a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch 
b/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
new file mode 100644
index 000..dda0d83
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
@@ -0,0 +1,11 @@
+--- mc-4.8.15/misc/syntax/ebuild.syntax
 mc-4.8.15/misc/syntax/ebuild.syntax
+@@ -75,6 +75,8 @@
+ keyword whole dosed yellow
+ keyword whole dosym yellow
+ keyword whole eaclocal yellow
++keyword whole eapply yellow
++keyword whole eapply_user yellow
+ keyword whole eautoconf yellow
+ keyword whole eautoreconf yellow
+ keyword whole eautomake yellow

diff --git a/app-misc/mc/mc-4.8.16.ebuild b/app-misc/mc/mc-4.8.16.ebuild
new file mode 100644
index 000..81a069c
--- /dev/null
+++ b/app-misc/mc/mc-4.8.16.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org;
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.8: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= )
+   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 )
+   "
+
+[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for 
SCM source tree (autopoint uses cvs)
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.8.13-tinfo.patch"
+   "${FILESDIR}/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch"
+)
+
+src_prepare() {
+   [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+   default
+
+   eautoreconf
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+   local myscreen=ncurses
+   use slang && myscreen=slang
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+   local homedir=".mc"
+   use xdg && homedir="XDG"
+
+   econf \
+   --disable-silent-rules \
+   --disable-dependency-tracking \
+   $(use_enable nls) \
+   --enable-vfs \
+   $(use_enable kernel_linux vfs-undelfs) \
+   --enable-charset \
+   $(use_with X x) \
+

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

[gentoo-commits] repo/gentoo:master commit in: app-misc/mc/files/, app-misc/mc/

13 matches

Site Navigation

Mail list logo

Footer information