gentoo resync : 13.11.2021

2 files changed, 30 insertions, 17 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index e75cc849014d..575874a83df3 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,5 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
 EBUILD mc-4.8.27.ebuild 3277 BLAKE2B f0ad166643a2f22cac89583cb6793e47462a96a9d5acef7870fec3598403cd356e2bdedab092601371f3aa18a3e76596caaae3fa48a454051aa5af39c6bbe6c3 SHA512 282ac6d42a7de75cc3973ffa4259d33ce32eb0b7f1714f136f2dd349f09481fbe6aad7086d0f5bb4d6a0a24389bae4bd7b0962c5c573718bd5019750d676b605
-EBUILD mc-9999.ebuild 3187 BLAKE2B e23cd19959a0708d24b5035e6af3df69fa8e345b403f6b8bb7b19d67ee2929e0bcf5148ab1c4a81962afe6db98a7b17733896a1e7bcc8a8485f9fa17950012d2 SHA512 5ae2b7579a5f05c56c39a5d3c568e1ddd1d2f3ceb0bf4a0c10203a10feeae7ecc76a597c8d16d654969bbf80c4f0789e3cfeed0893dc9b209ab5b7deef2a4f86
+EBUILD mc-9999.ebuild 3561 BLAKE2B 81d6dbc9ea9033e235a980b2d7a384eb52a76246d6c3cf63bd1cf742e54a46856f3e3c5f84824ad68f351b83c78cc14c76d8e6da0732a480ff38788713267349 SHA512 8b023194bb6d2054d2d5856d6f1c9c2b6df1b6c50c31681310d8489dc59f3ec4a81c8a06e22d055d2866fd06641cfa7e4d66d531557e5660e897f14ae87b94ac
 MISC metadata.xml 771 BLAKE2B 9680a9a9c9cdd9dd6c7972947f8d62eab08e14c8c1285009f4f55a90409bca51ea9bf72be913eb5812db7723230fa469acbc731a959b7caaa9473136b68115e4 SHA512 5c4dd207f8f3fc8c33bf571c78f50e51a4331ddddaa1b0cfdee93601b86d34a234482a1168ba021440fde04bcc4e034e223e89413a034ddf21faca08a112a9e9
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 1d3a9867b94d..efb7afe860f7 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+inherit flag-o-matic
+
+MY_P="${P/_/-}"
 if [[ ${PV} = *9999* ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git"
-	LIVE_ECLASSES="git-r3 autotools"
-	LIVE_EBUILD=yes
-fi
-
-inherit flag-o-matic ${LIVE_ECLASSES}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
-	SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz"
+else
+	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 ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
@@ -21,14 +19,13 @@ HOMEPAGE="https://midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X"
+IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 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:=[unicode(+)?] )
@@ -38,15 +35,18 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
 		x11-libs/libXau
 		x11-libs/libXdmcp
 		x11-libs/libSM )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( dev-libs/check )
-	"
+"
 
 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."
@@ -56,7 +56,15 @@ pkg_pretend() {
 src_prepare() {
 	default
 
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+		# taken from autogen.sh script
+		xgettext --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
+			$(find . -name '*.[ch]') | sed -ne '/^#:/{s/#://;s/:[0-9]*/\
+			  /g;s/ //g;p;}' | grep -v '^$' | sort | uniq > po/POTFILES.in \
+			  || die
+		./version.sh ${S} || die
+	fi
 }
 
 src_configure() {
@@ -73,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)
@@ -85,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.
 	#
@@ -94,7 +107,7 @@ src_test() {
 }
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc AUTHORS doc/{FAQ,NEWS,README}
+	dodoc AUTHORS NEWS README
 
 	# fix bug #334383
 	if use kernel_linux && [[ ${EUID} == 0 ]] ; then