gentoo resync : 28.11.2020

4 files changed, 139 insertions, 5 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0f2d8ec7e8c9..eb5e06519c7c 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,7 +1,9 @@
 AUX mc-4.8.24-mc-lib-twice-4070.patch 1962 BLAKE2B db6f627507fd94443ea0fe13ebd026cd71fbf23d88d6c441d379ae15d19e509a5874bf894e88c3a91e608b34bf39f83bbfc6e4c4f7db2c46bdac80f1d8d688ee SHA512 35765acf211b9519958505e36c3aa30f87575ab904dcd59c7d0feae0afbdaaf83250f73a6e14fc4e9902dc9f4e5b216ffb4c365e1000e767759592048f48c48d
+AUX mc-4.8.25-alacritty-tmux.patch 429 BLAKE2B 2621145cb976e0f9c09abf1071752a2a89a7b143aedde63c7b0c447cb930f1647b0b8c63a96f5f69b6f7abf718ca3b7784e0fa5b30a507f2a8d32fa3923c738f SHA512 32e27a75c55b9044cb2d4c392974e5e9916f1e73755f578102c7826f97525c0410bcc16a1e8b9600d4facc8be7a90fbef4932ef622fb59dc7c1838ad448e5f59
 DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
 EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
+EBUILD mc-4.8.25-r1.ebuild 2871 BLAKE2B 5d9fc7fcdf3d9d6c3a7f8d31799d82d471f9259098724bc0ab0298c4888faa121f852035e1b95c2a7bfcdaf1072e09b380fa99dce47d456ab5b0313553cec16f SHA512 77b2f606b468b292ee958159166436e067cb082a6a5302b5271fc034ca97ba2eb35365f900f47c51503c4fb642a9e502cba1d2b8f0c47447d843ed302e458c64
 EBUILD mc-4.8.25.ebuild 2809 BLAKE2B d2a17486c2fd38a4ec9247bd5e3cbabeb864be1d758552828d1d458a8f73bc084084118a30aa831892a21f4ccb131ab08e4460196b281d28fc0f036f506f141d SHA512 4065fb06be203d628bc46ea6262446b93038765774e167668d585132883b7a4a8dfd387e691f7108ab0c31b45bb72993aa353993926bfeb37872062d972d8f23
 EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
-MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
+MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch b/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
new file mode 100644
index 000000000000..239ac5cb7cb2
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
@@ -0,0 +1,26 @@
+http://midnight-commander.org/ticket/4149
+--- a/misc/mc.lib
++++ b/misc/mc.lib
+@@ -116,6 +116,9 @@ alt-shift-left=\\e[1\;4D
+ alt-shift-up=\\e[1\;4A
+ alt-shift-down=\\e[1\;4B
+ 
++[terminal:alacritty]
++copy=xterm
++
+ [terminal:gnome]
+ copy=xterm
+ 
+@@ -137,6 +140,12 @@ copy=xterm
+ [terminal:screen-256color]
+ copy=xterm
+ 
++[terminal:tmux]
++copy=xterm
++
++[terminal:tmux-256color]
++copy=xterm
++
+ [terminal:ibmpc3]
+ f11=\\e[Y
+ f12=\\e[Z
diff --git a/app-misc/mc/mc-4.8.25-r1.ebuild b/app-misc/mc/mc-4.8.25-r1.ebuild
new file mode 100644
index 000000000000..636e8060c7d1
--- /dev/null
+++ b/app-misc/mc/mc-4.8.25-r1.ebuild
@@ -0,0 +1,110 @@
+# 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
+		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}"/${PN}-4.8.25-alacritty-tmux.patch
+)
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 5c99ff657dde..8a178f2f2d51 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -9,10 +9,6 @@
     <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>
-  </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>