7 files changed, 68 insertions, 55 deletions
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index 09642d07117e..bae8f97e2ce6 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,2 +1,3 @@
 DIST codespell-2.2.6.tar.gz 300968 BLAKE2B f97aca1c1398cecd6257dc5fc8c0c6e8b35d34a82338e0ede4b03b6df8d030f095fbb8ae77a5bcfe6955f954a556fcea34927b4f44069010becd724b29a07184 SHA512 993734138e017324039a2954fc3559411aa7e3a96b8e6b6b2176985641225755adb9dde7125260211e531a1ecf1f1d82f2294434c21e8a35c7898212f3db3273
 DIST codespell-2.3.0.tar.gz 329791 BLAKE2B dd586645bd1d5ba956da85ab699eb205ebd3610e825ec9c7d85cac19dcb138f9e4561d95c79347e9509ba56d116844fbe9b2cb9380f724c9e5ec2bbdea7cd929 SHA512 2614ce6d47fadf62d1048efcd248a72486b1cab3332d10a143ef28bc441855330ad57ea0ce2c93546a93592d182053286255f35421e889518e6a66e31f8294b8
+DIST codespell-2.4.1.tar.gz 344740 BLAKE2B d3b62f89f50a1219063e765c22ed82782c93b6bc4a2ffa5929c842e6767acb7d3cd37fa7033df6fb9f9c7c51434da7de2d8d028dbf583e34cf3f259a64e89799 SHA512 744543ee9565130248928390404076ae43f89425a61461809e5fa157ab16cbe2ae361a53f6997e48e93dce8b46ee5f3a8a63bcbc8f62c7efffb3fec3e01ded6b
diff --git a/dev-util/codespell/codespell-2.3.0.ebuild b/dev-util/codespell/codespell-2.3.0.ebuild
index cd620e36eb54..de1ff376276d 100644
--- a/dev-util/codespell/codespell-2.3.0.ebuild
+++ b/dev-util/codespell/codespell-2.3.0.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://pypi.org/project/codespell
 # Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
 LICENSE="GPL-2 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-util/codespell/codespell-2.4.1.ebuild b/dev-util/codespell/codespell-2.4.1.ebuild
new file mode 100644
index 000000000000..f81f4ec9776a
--- /dev/null
+++ b/dev-util/codespell/codespell-2.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Check text files for common misspellings"
+HOMEPAGE="https://pypi.org/project/codespell
+	https://github.com/codespell-project/codespell"
+
+# Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Remove bundled dictionary
+	sed -e '/addopts/d' -i pyproject.toml || die
+}
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index aab93033aa0b..dd603b5e5a3c 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -3,3 +3,4 @@ DIST cucumber-html-formatter-21.3.1.gem 272384 BLAKE2B cc6dd87f1a3ecf312b0310a03
 DIST cucumber-html-formatter-21.4.1.gem 273920 BLAKE2B c0fb1402118d5aa670346953a5f9322fe848e1006ef8b3cf5e8169d46269d8d15c1d452301c167220fefce1775e311282bbd3d9ede9088440f8148b67ea0e691 SHA512 968b74210c34b227e66b614c613333b683097e425747d54f0cf0f76360cc0f97095022bfb94737bd882b766ba5db1264057c753d341585eedb94f891993e09fb
 DIST cucumber-html-formatter-21.6.0.gem 271872 BLAKE2B dc7ed26539d298e7df5cb7c8809b66a7cde98c596df6537aa19436325d322b49dfc0c17fd899ed072983634f9c3de340a2612ea9221cf25a189bbb7553176eda SHA512 51046ac0dd5ecfe93e89c7b19a211af49c4e93ea613a073711c6a4351e3f2b0f478099c54a6ba60ea2b02aa81905ca0b618980a3058680b179cb32dcde85783a
 DIST cucumber-html-formatter-21.7.0.gem 271872 BLAKE2B 1fd904e5915ce8551b127ae873af9a98e8d48c9832426f60342a12d7a6fbe2c7291bd0703cea99796c958c8ea96a2e1528932fadc4f521f28c17d84b6742df08 SHA512 d5c489d4af2d681f3c43b6ba34f9edca9a23e271c5d7246c3a7e642639c0d274f240f3bdb7abb5cd6498d0f76e42b03e611b6304c4ce070d3adfa4ac93ce3a0c
+DIST cucumber-html-formatter-21.9.0.gem 271872 BLAKE2B 19efcaab70423d40ef616d3db30a5b65096cb6c7dd70d04423bf6956ddbc1e933b09d77eee18b99384d5bea739661c32423e9625b707c3c9edfcdcdde6f0d632 SHA512 90b24ca0219d0666e93c950ead734932f03e05c1ef613fa449b8830eecdddb1e3198ecf14dd32469ce71627e6ad5f7567e7098b4716bb1685e4dacbf7f8ed3e6
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.9.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.9.0.ebuild
new file mode 100644
index 000000000000..484c22f3af6d
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-21.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+
+# Can be used for specs but requires assets to be created from npm
+#SRC_URI="https://github.com/cucumber/html-formatter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+#RUBY_S="html-formatter-${PV}/ruby"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+# Specs are no longer available in the distributed gem
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-util/cucumber-messages:22
+	!<dev-util/cucumber-html-formatter-19.2.0-r1:19
+	!<dev-util/cucumber-html-formatter-20.4.0-r1:20
+"
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 5e8acb655b95..dee4c3279bcd 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,2 +1 @@
-DIST diffuse-0.8.2.tar.gz 1187378 BLAKE2B 466cb2291dcc812a82ade4fb59c3e3faf1f632d741fc3efef886c00b100e8edebdddc1837e980d9bb86c18182172cf9afca3b1abc17a8258669f6aada0763beb SHA512 c2a5c1cac435bc0879fc6e6f10bcf10bd8e58e4a2cb603a4e1435c411b3d66373424680d1a41296d38c249e659aa53e67c8783eb26a3d02a42ef5c7e7fa1e245
 DIST diffuse-0.9.0.tar.gz 1193105 BLAKE2B 934d38722e0bd9f83a915c681521c1699e0a2efefdcbbb3e23c3f9635467fb31d9f364a72b0e7c78ca65bf9fe154e5ebbeecdbfe1a4b412149a3b0f3a511d6e9 SHA512 9a9ed6047531eaf80fed867bc2feba081f183ee7e5e5c940b0cb912af6d17c7c22df48b7aa76c3f17d4fafeff1bade45216d26ef689fef33b3680bdc70ed80ac
diff --git a/dev-util/diffuse/diffuse-0.8.2.ebuild b/dev-util/diffuse/diffuse-0.8.2.ebuild
deleted file mode 100644
index 8be46270d7bb..000000000000
--- a/dev-util/diffuse/diffuse-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PLOCALES="cs de es fr it ja ka ko nl pl pt pt_BR ru sv th tr zh_CN zh_TW"
-inherit meson plocale python-r1 xdg
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
-SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	')
-	x11-libs/gtk+:3[introspection]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	default
-	plocale_find_changes po '' '.po'
-
-	rm_locale() {
-		rm -f po/${1}.po
-		rm -rf data/usr/share/man/${1}
-		rm -rf data/usr/share/gnome/help/${PN}/$1
-		rm -f data/usr/share/omf/${PN}/${PN}-$1.omf
-		sed -e "/^${1}/d" -i po/LINGUAS
-	}
-
-	plocale_for_each_disabled_locale rm_locale
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}"/usr/bin/${PN} || die "rm ${PN} failed"
-	python_foreach_impl python_doscript ../${P}-build/src/${PN}/${PN}
-	mkdir "${D}"/usr/share/metainfo || die "mkdir metainfo failed"
-	mv "${D}"/usr/share/appdata/* "${D}"/usr/share/metainfo/ \
-		|| die "mv appdata -> metainfo failed"
-	dodoc AUTHORS CHANGELOG.md README.md
-}