4 files changed, 5 insertions, 66 deletions
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 46cae4661506..d4eb05d2499f 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,6 +1,5 @@
 DIST mtd-utils-2.1.6.tar.bz2 458333 BLAKE2B 799c19fbee1a690fa695edfa7e2ab1691e37fccb3f83685065e93b5ceea96e550eecdba4576b7d1a58a1b0ce06e3e551ee635fe9ed16521952fc85986f74ae6f SHA512 470902475b9e583d3a12801c1cab5492c671ec3ccf853cc3336c4e2b8771eac489d67b1414b9f1e827c42ebdba0fe2cdc681297477d67a796af04d81160442bd
 DIST mtd-utils-2.2.1.tar.bz2 476562 BLAKE2B 81403a5c6a94ad9147cda56a3f821d6b46b2718d7b1e084aa5236802c22e6b75223c68073abdd35f2ceb8b4857880e923dd49274c6ba3e9fce0ec1a0314fef22 SHA512 ef1cf4d6fa5219b8bbe4728282d0d73fd3234c36743cdfb901908269632f55a7993fdbeb22cc2b6841add1a9f320c4504a42980f5856626e259401e8e2f17f7d
-EBUILD mtd-utils-2.1.6-r1.ebuild 1150 BLAKE2B fe66d7e1b4e3249054b092b00595111280a98d5e4a3b2d859f2a53ca1e87391a14b4c3aa822691416256af3d6c5eed6d1b0b8af360033278c33ae0f7dca095a3 SHA512 03d5c04a9221d9e94d0b35851583d5d0c02483f2962abce39dca5477dab02cf3cbdfab778122b01fec63e3d485ab0a6ddc61b84e0d6a955f707a3f8a23271596
-EBUILD mtd-utils-2.1.6-r2.ebuild 1247 BLAKE2B 94ee48ade1517e40419fe1c53d3f74ee999e44fb57ba4dd245aa71cc82ab8bd0540b5f61929327b1196e1f43ca15b8d2e52bb47b815f8dc0eca02167101843a8 SHA512 8dd08ce0cff9424f4301d58261c260b8a2a34147df3f894aba04966ed47c1cfeb31a49cc9d4ed20ba5b0da5d982439eb084bfd8d3235f1ef468bf7e918c042f2
-EBUILD mtd-utils-2.2.1-r1.ebuild 1460 BLAKE2B def53ff2ee09a31927d70a2fcda048f858d6490d9aacca43ffcfadff04acf921b101cdec54ab2871e20a94de9b284961bc9a0fe1c8960a4fe82976200d7e93f1 SHA512 8bd77032a3394a5863c954e8b194db98ef68c6dc45fc561cdc83f32a5cd2a56ace0e6f27804b8d44362705d2af59dbeecbdf1ea7b3a01d0ff6cce086f77ad485
+EBUILD mtd-utils-2.1.6-r2.ebuild 1165 BLAKE2B ea905df5bc94308c28e7b1ed1bd3e0e22b2bbd9f43af92a03f9f68e22982c6216492b5f2e47504105de10e1c1035cb730977e7162a39dfc96ddb4eed7c08262b SHA512 c9b15a49dcc182ad00d695f2b304fdbcd794a4b87e79e2f03a6e113d53c7cd699577c59f104db469b18e7b95b1d0ce654bc943041b61983379d9f4016982c534
+EBUILD mtd-utils-2.2.1-r1.ebuild 1372 BLAKE2B cc96a11363fe983b6bfc54be67a828c6acd6f69bd3d54c1ab61803cba4760a9c8eef973b72e361958784c49f75d65ab9b269b7e0430fd47ae40d564f43bb5102 SHA512 29d1f68c18ffe7ff23d28d444f13e54f6a0fa57a4afe314edbab3a655096d217a080edba680151f9c8604ef761734eb1df2552de17e2744cb03ff3f543041ab9
 MISC metadata.xml 540 BLAKE2B 4271092448c2d331d82ddeccf7d6d4ba89bf56fd865e9036df864925c7eeee68dc2e764993797765b8aae4b6c4a1b31172c0dec6b9bfd539ea5ad8d27732c095 SHA512 6e70671603be8a46369f67d2f8230aa5d961c19859ff22561a175318319f0071dbc9d263b0df5767ea1dd769867fe403948e1e3923aca1a9c6d17509a1d10d4b
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.6-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.6-r1.ebuild
deleted file mode 100644
index 437ded5330bf..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo +ssl test xattr +zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-apps/util-linux:=
-	sys-libs/zlib:=
-	lzo? ( dev-libs/lzo:= )
-	ssl? ( dev-libs/openssl:0= )
-	xattr? ( sys-apps/acl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cmocka )"
-
-DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
-
-src_prepare() {
-	default
-	sed -i '/if test.*then/s: == : = :' configure || die
-}
-
-src_configure() {
-	# --enable-tests is for test programs that are installed
-	econf \
-		--enable-tests \
-		$(use_enable test unit-tests) \
-		$(use_with lzo) \
-		$(use_with ssl ubifs ) \
-		$(use_with xattr) \
-		$(use_with zstd)
-}
-
-src_install() {
-	default
-	doman \
-		jffsX-utils/mkfs.jffs2.1 \
-		ubi-utils/ubinize.8
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild
index ba87d410b5ae..6920a89cf475 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.6-r2.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
@@ -28,11 +28,6 @@ BDEPEND="test? ( dev-util/cmocka )"
 
 DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
 
-src_prepare() {
-	default
-	sed -i '/if test.*then/s: == : = :' configure || die
-}
-
 src_configure() {
 	# --enable-tests is for test programs that are installed
 	local myeconfargs=(
diff --git a/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild
index cedbe3c1639e..1b8029030508 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo +ssl test xattr +zstd ubifs"
 REQUIRED_USE="ubifs? ( lzo ssl xattr zstd )"
 RESTRICT="!test? ( test )"
@@ -29,11 +29,6 @@ BDEPEND="test? ( dev-util/cmocka )"
 
 DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
 
-src_prepare() {
-	default
-	sed -i '/if test.*then/s: == : = :' configure || die
-}
-
 src_configure() {
 	# --with-tests is for test programs that are installed; was --enable-tests in earlier versions
 	local myeconfargs=(