gentoo resync : 17.07.2021

5 files changed, 153 insertions, 4 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ae70b902f295..462dfe476367 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,8 @@
 AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
+AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-EBUILD mc-4.8.26-r2.ebuild 3296 BLAKE2B 1ab86edd791e881d8ef14d4e9512883c347d7cdd6d637ad4060aa808abe4cefef79307d9062f89c5036c705266ed947c063f33ccc0372c107978183a1a486275 SHA512 3892c4431fff390216f52d53c68c9f958352c79b33f6a616d27190b00a78f423a096acc5132d204a0dbacb0115870c0fbad31b7b609da76b69e0be7f8db8d9fa
-EBUILD mc-9999.ebuild 3189 BLAKE2B def2ba759136e6f6c0753d4882a4b9741f412875a772970998b63ae9c5321ee50c8069bcc3d695bcae2f02ae309d28f9468ed763cf33b5ee5488269cc64f3c75 SHA512 687a919633b26bd0ac19285bca140b6d336d1ce03e13799ef0e188e0d4065c98df93a068cfbea31393d3d6567f3ebd6b44cf2db2e6e924ef0f45d1f17cfe4314
+EBUILD mc-4.8.26-r2.ebuild 3292 BLAKE2B 2c091aa3262679fbb18f0390a372ff4ab90d80575e7ddb1e79d1352ef8ab54aae9dee11ef4bedb796f6626d279bc6c6f763d52b5ac70f3d7048d32b7589067ed SHA512 8cb3aace49f07d83e771cbd1b4a1695f737642066044ab1c89df938b41174a0d9129a9f51b4f7ec729ec835690b931780ab3751eff073db5e06f888b8ae8a31f
+EBUILD mc-4.8.26-r3.ebuild 3588 BLAKE2B 207bb1c63c1f0de049301e593bacaeb27cbd4a08d1a97c65d64f934eff494a7fc2e2047adad2dc11f6339f48888a3560d2f2dc5d93b3b64a1f43a60a247f9e80 SHA512 f04a40556918d46d9cc8cf020d7e5293ea45ea32fdb47ae8c5281eaf182f814d3debc70737b81fd806f4a10f14e0d1311bbfab20cd78be5141972363d5d35ab0
+EBUILD mc-9999.ebuild 3185 BLAKE2B 0a015b440cfa6b88613d3f5ff90ccff9cce90c23fea551d2005bafd655c6280aab472fa1221d3e28622e197d6232db65d7318871274754dc12e61cf877b2781b SHA512 6575219427eed552a7d272adfaf8245ce0590783cb32a6605cd7a1a577e0ca747b5a8ded18858cdc4bc58169165be353371cf6db21b90358c8ae8a5f3f096094
 MISC metadata.xml 886 BLAKE2B 940640f07b9e76e2d2baced47b9ed9a699fad9fcbcd9583b5f78f1ea69f949a26f8f1b34f1de88e5faeeed523fe8b4486724d6f7884c3f186635753391d4d1a7 SHA512 a876eb2a3581ef4e44600c750fa54f7cb85d76ac1a83cbfa982b71313404c89d73dc876cb2d86cb53853ab1e404f93549bef4b4769de11d543cb118e4be8a15b
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/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
index 8ceabe7658df..ad9cf8c1f56d 100644
--- a/app-misc/mc/mc-4.8.26-r2.ebuild
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 MY_P=${P/_/-}
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
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 000000000000..97a15d1bc054
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r3.ebuild
@@ -0,0 +1,131 @@
+# 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://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() {
+	# Bug #759466
+	if ! has userpriv ${FEATURES} && [[ $(id -u) == 0 ]]; then
+		ewarn "You are emerging ${PN} as root with 'userpriv' disabled." \
+			"Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+	fi
+
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS 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() {
+	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
index 0c868d11135d..3bc775bf4695 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${LIVE_EBUILD} ]]; then
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"