6 files changed, 14 insertions, 22 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 219d62160d68..5eedd508b120 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index dd1d09fc1891..fc2f74125c34 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -157,7 +157,7 @@ DIST yeslogic-fontconfig-sys-6.0.0.crate 6677 BLAKE2B 6f8cd2b5de9a397546641b6ce2
 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c
 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb
 EBUILD binwalk-2.4.2.ebuild 1047 BLAKE2B 77b3990a4e1caaa66367299a842312fb81d4ccd813ea9e9a5d0d108d339d99a192663c12af938b64eaae1171bf69fce050966db8f376ce4620b5d25dbc50ca69 SHA512 222b7316919b4e7495b39eeec375b4a77b6ecb76138094e278d88f4d684fad6865e724920a27a1bf74dc011ff42216981ad2fcdcf3a5874214678e7b8e30bf70
-EBUILD binwalk-2.4.3.ebuild 1053 BLAKE2B 653f82fe8ff43dd21ac308a96d9fc6060f958adfe16138ee01217584d77491b9ead6c3cfe26a3d9af2f95dbbd1fc495f1dc91ecdd76b249a470bf0d2d9a6a858 SHA512 564ee553e3700a1aa3fa77d9ebd0c355e761f8527051d9b715d94e6305a72c1b443f334cf8ac7356d79fac93925eb80ed34240344d2b239f481edf9760397079
-EBUILD binwalk-3.1.0.ebuild 3905 BLAKE2B 0b9fdbf58b544c86609cead686eaed1fe84c0e3448344250c173b0165b57f9ad2bb6c6b47f315c5c85ec8d6dbd3fa9aba3bd81d7e5f9d21def3c3de19d6a4cdd SHA512 40ce2c4a94ae6a97b60228214e145408798f35593f00b74751f0c438b0185a70800ec0e0f5573cc05daefd2f66a0cd2220f9e9e6c0dd5acfd2724c91b93cce03
+EBUILD binwalk-2.4.3.ebuild 1047 BLAKE2B 9a7e1907ae925afb71c54ae888f558cc6acd543a3d6308605beb16a320a32ed533b8cfa44102d08ec2a9b38ac400e6a34d8e90e99b723005c022f6216d42a012 SHA512 cac6aebddf92dbe3361110f45071ece8147dc1c49d8c8af0c97378a29442bc18ab476f76fd1f37ab7a0cf7ddcc73d1b727e44ab394892283d35eea8e666f6e2b
+EBUILD binwalk-3.1.0.ebuild 3909 BLAKE2B ec1aefa37378de06d07ddff3c0c834529b63008f66e7bf6f23908533881adc416522e6eb10abd8f24f3899fdc94a14425773a494502e172225d1e97b188d5ce8 SHA512 940bb6a3221512ec45e5277f26e7df138a4569039e8dceb3b4c8fdf9c79ae7c2c0192230679342e967c2f511722bd92866b413cb56307789c6546a32a81095bc
 EBUILD binwalk-9999.ebuild 806 BLAKE2B f62a6e3f1c89c4741962037a012ec3abb58f901f27227ebaa548f6203d02ff6dd50e37d5bf3b85554e03dfa1dccd7176ad9e88548ca84bcfb6a6e8cdd4dfa405 SHA512 3a9aa48a303bc94266367f93343b5fcf0c92dca1336ba9a85b1958660c1b708b758f1100744c82ba73dca3b32d84e9dcf45c42dc7cac687ca2d21a8e2da5d5c5
 MISC metadata.xml 1056 BLAKE2B 6af373bfeff084c9d068255f7e8fec1fa485f23a3619c9995c83e94ad1a88c269926a71777c7165355ac8d363808efb65ac16a496e2b39a96c5c25f1c3aee9ce SHA512 b65dbca86bb1f9dfca4b2656426576f9dc8d98859f52ad7fe9c9c5fbf0c893c3b3022452fc707730fbab85d7ca32d84a3c3fddbd80826cec73ff2b8747d2bc70
diff --git a/app-misc/binwalk/binwalk-2.4.3.ebuild b/app-misc/binwalk/binwalk-2.4.3.ebuild
index b0874ff39ee8..7586ed5b0719 100644
--- a/app-misc/binwalk/binwalk-2.4.3.ebuild
+++ b/app-misc/binwalk/binwalk-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OSPG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/binwalk-3.1.0.ebuild b/app-misc/binwalk/binwalk-3.1.0.ebuild
index ec75c2ddc63f..1eead581c1cb 100644
--- a/app-misc/binwalk/binwalk-3.1.0.ebuild
+++ b/app-misc/binwalk/binwalk-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.13.3
@@ -176,7 +176,7 @@ else
 		https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 1407e36c3295..a762f03e21ce 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -7,8 +7,8 @@ AUX mc-4.8.31-musl-tests.patch 1979 BLAKE2B 33e3a27b1063f254e015129a8b7544b6f5c9
 AUX mc-4.8.32-fix-chdir.patch 3915 BLAKE2B d6e1a46b4ac8e9db8da309976be5fe3727ca4910a6543e14972e71afa284748b14ecaba1405fc6f86d4c6155d6d0e52779e4b13f8ed9c10ffa32652d768083d9 SHA512 847d9ee8a7d7468b2c17e376bbb82b1e90a18d25d835eebf31845da6124de037a5a8c87fb3291652cd327faf1d04bf7d7e94bb098db85c010b4e9596356d5742
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
-DIST mc-4.8.33_rc1.tar.gz 3119661 BLAKE2B 18d2f98c488a7d440e38ebc5006e10c5543b59392ed0cdc50949e8bec0c09733867a9411237edf3e15501eac7ad6ba72c288bf4c985605e5e70f6cdc54bc88ce SHA512 1a56e5c3b320b2778f9d80fc1b8f95f1ba7ef2ccc3a6bdad0bc4b795a015e3906fb914c011699787607b59a86c1ff650577aa0018f9b07f36cdd31631e8dca83
+DIST mc-4.8.33.tar.xz 2424476 BLAKE2B abfe493006930e7de7f7242308309382cf28c6b7f41967cf151e6507b081149322217f5a10a8e2c98c2bc39b8053a4e51443c956ec93e7850a00f8d19e7c1266 SHA512 3eb857af2fa689e9458aeef6d3b236fb92684e05c0e3e78e7e5a5fa5dba6431cae39bec51bc84598b0bb60579cb0a0679dcdc6e9f7d88ca85dc37ace251c8632
 EBUILD mc-4.8.30-r2.ebuild 3334 BLAKE2B 57c2b55c1f2ffbf94f396a6a3bbb359aa2889665739f1f9a76eb05b2c3c5ec1fd53cf3c6874fed547398d35d692938bd27e7f26b4984acb6781d7f11966ab599 SHA512 333229fec46c0a47cfde51e5edad52bc92dc7832d91da0ea799eec13cab40a30d6461b495e1203d8311ffabb00c243427e336961a6a454547caa4542b650f9cf
 EBUILD mc-4.8.32-r1.ebuild 3571 BLAKE2B f0e6389a24ce16bd3886757317b817d44247db81b9bf70a3838b630c5f5793d572d4b61e11416e5e20c5ee75b34fbfa35c44c7df9480e34bb4576dfbbbab28d5 SHA512 86d34482e0aa620ccf42f82e222d1e3b9c0945e00950fdae1511edf7cc7f375835b484a9b36e30e8627252f3ef38960d88583e224840faf44c3654f37dda7e48
-EBUILD mc-4.8.33_rc1.ebuild 3758 BLAKE2B 2dcb497524eecfa2613182b21813936dd2c5688ddc50df00501467cd4b532ac87648af2eafcc671ce0c8d02a74876aa4164f8c6a9e07ac1781851d60369cee17 SHA512 77daf56f18ec5340d0645f515836a0b43537a161876e8389b2eb5f2dafa36002751fadd06c096911689f82f213e4089f219926066dff9ef9cb6cd6ddf1817d5d
+EBUILD mc-4.8.33.ebuild 3558 BLAKE2B 3dccc278b1df4691d1a7773e481b43ea59d3fc90b3c83d4bbb2e31bd43b79a350d5d10a8080c0af9cfd4a32efdeb1eb6c72043309b907979017cc88d9c632a8d SHA512 80cdd5432af6b8f47e0d2c9346d8a9588458935f969ad50f6c49fbf26a16446cad2f0b7d0457f8813fd82cd8e71c46e9e2cd32b522c4665f970be55543ca0c1e
 MISC metadata.xml 675 BLAKE2B 706055e17dfe81af1715d1e5ee101e6486d8a0f1fd7791fff17c7f42fdcb1c3a559416c8e413b4c7ab1db6dd9bf2d4b94f67e8cdd035933c38885ae6ca42f8f6 SHA512 a86533b06dc0f64efafda59aa795ed3a5a9bb027bd4c1145d4aedc2af84cb1d64244409a0bcc42d5bb4048ed07190c7f86ebc0c31aa55d95c8837fde676d9284
diff --git a/app-misc/mc/mc-4.8.33_rc1.ebuild b/app-misc/mc/mc-4.8.33.ebuild
index 38a14b263024..fdf5a36d691b 100644
--- a/app-misc/mc/mc-4.8.33_rc1.ebuild
+++ b/app-misc/mc/mc-4.8.33.ebuild
@@ -6,15 +6,15 @@ 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 ~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 )"
@@ -44,11 +44,10 @@ RDEPEND="
 	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 )
 "
 
@@ -73,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() {
@@ -95,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)