gentoo auto-resync : 24:08:2024 - 14:56:07

2 files changed, 15 insertions, 24 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 6062c8dfe0a1..15ded4a5f6ae 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -6,9 +6,9 @@ AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed
 AUX mc-4.8.31-musl-tests.patch 1979 BLAKE2B 33e3a27b1063f254e015129a8b7544b6f5c97492b886b0ba9f51166be41b1bcfc118288047a7faac64b7ee948c9cfbb61943ab7699670cfcc5e606cbbd50ac38 SHA512 b1bdecffe89a63e3a9bd19eef63db169a3adf96c3643d9bc8cd2101d8ec23c267b283449d2e164ff67df0551fbe7c48f45e00a38ebb3f513ef0c0b0f6baaf449
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.31.tar.xz 2385632 BLAKE2B aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe SHA512 dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d
-DIST mc-4.8.32_rc1.tar.gz 3072991 BLAKE2B e22cf90530abe7240017688c5659eae14e3bb4d495a61f93c15f00be65459e4cf1ce19b82def55a8c03bf40ca196597cbdf029b55aa1b6542ef4b467355f65a0 SHA512 d9377cfe9214d7a585cf817cf843f4b7238c7d16051c8e19490b5b2786a1e407fa7d500bcb072b8a0ccc5f51bc610778e62091c9cf2f94cd96846dd0f3e44611
+DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
 EBUILD mc-4.8.30-r1.ebuild 3229 BLAKE2B ba2bc855289dffb0750eec94f045fa337b337e4863e96a4a3110c71260227fcd1e56530ab87deb87d69a19c579b1d446002015a19930d233edee84c48e326be8 SHA512 ba5d06fdb16fc8b7f925b021a3a99cc622446f241973cd7bc61c47bfafb80c511cccc58d494a23533e4f2dc3f322fe974f655b6d0cb39bd35a04549a3b1d1363
 EBUILD mc-4.8.30-r2.ebuild 3337 BLAKE2B ed90e75a4f486c9807fde430308f58d35a8aa90934f2e0aac4804c373c05dbf15bc10dd7912015d77d902dffbe544d9e61ce74ad8a263bdce53f546077a62aaf SHA512 939a3ec1016fd4fbb7dcf734751113a79a2ac91e444b0ccc00426c8c9fdbf5c0c904a7af6a49740cdab5211b4675942b3e35226a207ea09aaf16796009737ec6
 EBUILD mc-4.8.31.ebuild 3522 BLAKE2B 98ad323ae6beace1dc780e4c618ee8a84256fd139bb0489cba032848ec3079b7c1b315a2505c56aaa8fcbabaa1c42b08b71014f2bc5a6558f03c1407540f0016 SHA512 7bf5a44eb979d5e96381a622e0a994ceacc8299f48cd7cea3c0650cb965b4ab0745ed345578ebfbbb17ba3256fc93006e520845a46aa014d55439897b42ca809
-EBUILD mc-4.8.32_rc1.ebuild 3867 BLAKE2B 07e070b271e11339acd1b5504cc93a975212dc235ce16ee8093ce6376626b6070199e028a191e974646947fc4adbd5e28ff09bd11b68aa2fa657213cc003273c SHA512 1352755d63feb99b14c3c9949f55aae6c024b28ad11fd527af5e3359a921fa5bc866db7ce115d69c84bb69c8cc814ed8155c3bcd412275d84a65aef45456051f
+EBUILD mc-4.8.32.ebuild 3549 BLAKE2B abb1921da7477b6301b0b304a21a2c1c02e635ba28980a3892c897e3ac197aaf689ae86ed87ea6ca62baf2b118e52283ab93367c153cf70b45464ab48f473fe4 SHA512 957a41380fe0300dfdc808a6d451f302c66f4fcab150cb8586dde6144b35d3307915215f02365e113fb9574c1758bf4992a45a206a5fe6aa60ac986a81211341
 MISC metadata.xml 675 BLAKE2B 706055e17dfe81af1715d1e5ee101e6486d8a0f1fd7791fff17c7f42fdcb1c3a559416c8e413b4c7ab1db6dd9bf2d4b94f67e8cdd035933c38885ae6ca42f8f6 SHA512 a86533b06dc0f64efafda59aa795ed3a5a9bb027bd4c1145d4aedc2af84cb1d64244409a0bcc42d5bb4048ed07190c7f86ebc0c31aa55d95c8837fde676d9284
diff --git a/app-misc/mc/mc-4.8.32_rc1.ebuild b/app-misc/mc/mc-4.8.32.ebuild
index cbd7e1512974..a26ebf139e63 100644
--- a/app-misc/mc/mc-4.8.32_rc1.ebuild
+++ b/app-misc/mc/mc-4.8.32.ebuild
@@ -6,20 +6,20 @@ EAPI=8
 inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
-MY_PV="${PV/_rc/-pre}"
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
-SRC_URI="https://github.com/MidnightCommander/mc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm sftp +slang spell test unicode X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+edit gpm nls sftp +slang spell test unicode X"
 
 REQUIRED_USE="spell? ( edit )"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.30.0:2
 	gpm? ( sys-libs/gpm )
 	kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
@@ -28,24 +28,26 @@ DEPEND="
 	!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
+		x11-libs/libX11
 	)
 "
 
+DEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
 RDEPEND="
 	${DEPEND}
 	spell? ( app-dicts/aspell-en )
 "
 
-# Force nls so xgettext is installed.  Will revert this.
 BDEPEND="
-	sys-devel/gettext
 	app-arch/xz-utils
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
 	test? ( dev-libs/check )
 "
 
@@ -70,13 +72,6 @@ src_prepare() {
 	fi
 
 	eautoreconf
-
-	# Copied from autogen.sh
-	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
-
 }
 
 src_configure() {
@@ -92,7 +87,7 @@ src_configure() {
 		# a library. Let's avoid shared library altogether
 		# as it also conflicts with sci-libs/mc: bug #685938
 		--disable-mclib
-		--enable-nls
+		$(use_enable nls)
 		$(use_enable sftp vfs-sftp)
 		$(use_enable spell aspell)
 		$(use_enable test tests)
@@ -110,10 +105,6 @@ src_test() {
 		ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
 	fi
 
-	# This test fails.  Disable for now
-	# https://midnight-commander.org/ticket/4567
-	rm tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.* || die
-
 	# CK_FORK=no to avoid using fork() in check library
 	# as mc mocks fork() itself: bug #644462.
 	#