gentoo auto-resync : 12:05:2024 - 00:01:15

21 files changed, 40 insertions, 402 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b68d4ddc14a8..36b63b0f8e16 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 53ad65ba8926..e826ec7084bd 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -10,5 +10,5 @@ DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e554
 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988
 EBUILD android-tools-34.0.0.ebuild 2438 BLAKE2B 59b54a35075efb311afad6b54a70d3091a16bd16fe7d99e23d189784ab40481b89e36d836c076aeb5f134d320051375d7cabc8ff8bd5fa834b95cfa7de5fafae SHA512 019fc5ca93170e7a4441a806940621a2b03cc2e50443a8fe26a458aef1150605bbb5c12fecc45687aed2b64a51cb48369d341deaf325e92c98d15398493974a6
 EBUILD android-tools-34.0.1.ebuild 2629 BLAKE2B e276806cb3c07c8123056839ffcb1ab0dda81b0abbd048e6305a504f5e12545304c8eb920a5902b082576e41f3eb9f68c1ceaf702df11950c51061de589b2557 SHA512 12512889b2f79c8e7ed64df366b3b51b4ff6a409a87f4249d5055b137c042f6c7a339d852d6ff95bd30954268e56a35ec668d4f63cb0aaad9624c663c0c86346
-EBUILD android-tools-34.0.5.ebuild 2612 BLAKE2B 5aac169b97f527c1c44b17b20bb49e98f88d0680bf37c64ed7da8669a714b3b408e6596cdbb9e63874c6f700a2567f1576d4492c2aa1a24a962f96897f52ead0 SHA512 1d38afc6e3829cc44ea551dc0afb026a45a0841f50afedbb86b87d51060739862e6064da0a71785d8195c330dda65711b4343270af7616428e52d105d4ef8a10
+EBUILD android-tools-34.0.5.ebuild 2610 BLAKE2B 03f017c5432b6c93c5deb7316266f1142ac7065842198fcf80c4b48c5599db6acd030b5c19b59541fd25144765c58fcfb59a91da5dee0f75e9f56382a9896233 SHA512 d530c84e5fcf62cf347dc2fc1bb393347b0831c0bb1ec1b7311ddbaf45a442cd2fa895aa391f92379ded5cec02dc0be6f2917184257bdce5530583b79ac55131
 MISC metadata.xml 666 BLAKE2B 826f37b3e3c762165b6dce866f9e244ff6c6312a7d7f061f55bedf6a53ec08276afcce53ebd0a3d8d7e5ab95065436c3ab559d0d1cc40ee5d66d958bb7bd36b0 SHA512 aa6da78d3bd0a5efa99629c20ecdd407235f9055af8d1891ef606d3fbc14e1054987239a50edc2ba1a74c97cbf81ce044ca6ab89a1c11a36500979103fe74437
diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild
index 0ff6f3bbb94f..b23eeacddd90 100644
--- a/dev-util/android-tools/android-tools-34.0.5.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index c62d31916c82..f1504b9dafc9 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -2,6 +2,6 @@ DIST cutter-2.3.2.tar.gz 11280258 BLAKE2B 20dba40d96fed296b9af0b0e0b66dd46901bfc
 DIST cutter-2.3.3.tar.gz 11609727 BLAKE2B bea428892d242c8112d5004b9960d9f74b3aa48b5988436bba54983abf3d26f4bca89b4dc75061e857c2cc51f724ea392fc4f380f227c36f38618078ec0a5761 SHA512 7731b6a2efa03a745cd0760d905df474383dc77906d5aefada7bd94098d771b75ae030cb71ed33256cc2f3e23c1c4930d45355cf6371361cb9780b26996dd2cb
 DIST cutter-2.3.4.tar.gz 11608176 BLAKE2B f83cd117bdd1a9ea985b52d4029bd3874f92b08709ac50dd1c6a526aadd022e05f9b75586cf826cc6b46c2004cb6b3185c5770b8622bc3c6a7140307a9c1a98a SHA512 c35a7091aaf2c99a4595b48029017353092b178ed6a57cbe2f0d9758f1330d2521e3fc339558ffc0dfa500ace0510daded8591f7a04b0efa0209ba4f8a5e7d33
 EBUILD cutter-2.3.2.ebuild 1530 BLAKE2B aced04ddaa1d532f319020fded521542b8a7ee64e3689f0cdbc3134ade3dd0b75722c85adf28fdf2c6a0d8ee14bf9bf805b9350b1c5748be7e2a185a18815a51 SHA512 60b2702e0205615a1e740aff6ab02b124ccafc85a5c55073d79635510708a1c5f8bc89d53593611c922a49c15baa0759f8c09196027ba5f402a0cdf0f5835524
-EBUILD cutter-2.3.3.ebuild 1531 BLAKE2B 63c1039c4ee18d048c73ba7977f81c32f174989dc609d4cadeff90a97f67abd8d3cf524885ed402a026c7703397d8fafab60e66607220d3f939732c2bf2495f8 SHA512 4af3ea900e91c295de97c06dae74eda45ea6f9b3343330140a177f15a1d73ead7622baf37c8f909eb45e7db4cbaaf2166bc4a79cde22d258d45b0ac73e8a178a
+EBUILD cutter-2.3.3.ebuild 1530 BLAKE2B 394abfec4a4d23fc8860909d1005870508c8c3dd59a4e3b4f0260dcceb0ac5759b2e95d38f9a4291a679dfd4e98309110cb3666e9446133de2aad4b7ec053da4 SHA512 9a55ffe7987406b151949db9f30a7dd56343af7867e5344d8343aa5403bf285476b80fb9471fbd93dcf670cb4a30d35b2ef297997799a9e5b080ac7d6bac492d
 EBUILD cutter-2.3.4.ebuild 1531 BLAKE2B 4b760ee01ca8a24d90ea52d76c48bb2cf20f426d05c78473b33130ef3b4387896db3d459e9f5716cf2b288c79f26a400a860772acef46a5fb5e7352245201e60 SHA512 aaad3ed2e6c250a9baa829c1441e915405c0e96c21dbb0cc89974d6c40f8a039eea19e78faa4e9b0ee52a2f0313bbcda2300d2380ebb283e206b0eb4a89f2699
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.3.3.ebuild b/dev-util/cutter/cutter-2.3.3.ebuild
index edbe36c99f88..ec1ba3714491 100644
--- a/dev-util/cutter/cutter-2.3.3.ebuild
+++ b/dev-util/cutter/cutter-2.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="CC-BY-SA-3.0 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="graphviz"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 149a4a040976..65b80cfc30a0 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,9 +1,5 @@
-DIST diffoscope-257.tar.bz2 3112404 BLAKE2B cdd7901bdb7cfddb77d165d0084bfc4d9ad1c053bbaee67939acef4cbc0ecb81c2c7443fb7c37bc02b3884433e473dd5cf2afaad28b8535fab70b628df3561e4 SHA512 236ff8fc7e74db2201dfbc0757e6c87aa769c69805319a4ad95faec82f1b0d842a54aaf1c0a0f8f7d74d59c078a696714d92a940d1847530288f95be66dd3dc2
 DIST diffoscope-263.tar.bz2 3139927 BLAKE2B 6d13b9a657c4a7618d24487096a0fb94034f4ea2b84384b388dc8441ebe68f8de12dd7a34ec0075bd03ca3d437e65a23fc086184ba7c3764682390f6290a17e4 SHA512 41c5495bd4d4f4a0c340bac444f3cbc4a9b6180227efc02d593590a50b47acd06dc755875419da3a52d8aa831733d76450388c29e856d428b159d3c2c793de1b
-DIST diffoscope-264.tar.bz2 3141558 BLAKE2B 28e50c327b606053d378633bfabd262d12fe8d34778bb1451e7d34d6525ddc9ea3e72907cb948072a8466c36841a9b4d70041b7fbd099924e1dd61a472a7bac8 SHA512 e79e8db1a3a6503f871ed2686110434d1c8b43758d3eb3fd1c98bb6dabe2792297712950470134c592bb6efc4ca741277f3158597381bbdea23945de6adfa1aa
-DIST diffoscope-265.tar.bz2 3143847 BLAKE2B 754124472a37d5dc5208b1dce13cda726dc7868db5c1880db3d6228afffa580b73a4420a625e84d8791fe60ddd4451128d647e7ddc3a5f25ae63271947e2780a SHA512 6c8dd45971966dc965242ffec3061f6c29d0b7bd2367e92aab5a03f4caba99b1f8dde514884d89c6442bdc86afec4deb11c914ffc4fa84e34bace672ff4aefa0
-EBUILD diffoscope-257.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
+DIST diffoscope-266.tar.bz2 3148610 BLAKE2B 28090b8a1e2315f9df43d254d3dbd4ed8f6d4ba4d259c764f53b84137ac0b3dc97b51df56ba595eee950c54974e9b6109c423392d198e277d520f11559ecd78e SHA512 2eb7cbd333b6559ba0f66647184f1747cac52cca6304a27eefe914329797469d5fb9519abe92386d3785f4f2c779f8f5dd95ecc8f54f8b08fd4fc94746bf273d
 EBUILD diffoscope-263.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
-EBUILD diffoscope-264.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
-EBUILD diffoscope-265.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
+EBUILD diffoscope-266.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-257.ebuild b/dev-util/diffoscope/diffoscope-257.ebuild
deleted file mode 100644
index 7191da7ed124..000000000000
--- a/dev-util/diffoscope/diffoscope-257.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-# We could use pypi, but upstream provide distribution tarballs, so let's use those.
-# TODO: verify-sig
-SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-alternatives/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/pypdf[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( virtual/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		app-arch/p7zip
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	#tests/comparators/test_macho.py::test_llvm_diff
-	#tests/comparators/test_elf.py::test_libmix_differences
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-265.ebuild b/dev-util/diffoscope/diffoscope-265.ebuild
deleted file mode 100644
index 7db31ced97d2..000000000000
--- a/dev-util/diffoscope/diffoscope-265.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-# We could use pypi, but upstream provide distribution tarballs, so let's use those.
-# TODO: verify-sig
-SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-alternatives/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/pypdf[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( virtual/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		app-arch/p7zip
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	#tests/comparators/test_macho.py::test_llvm_diff
-	#tests/comparators/test_elf.py::test_libmix_differences
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-264.ebuild b/dev-util/diffoscope/diffoscope-266.ebuild
index 7db31ced97d2..7db31ced97d2 100644
--- a/dev-util/diffoscope/diffoscope-264.ebuild
+++ b/dev-util/diffoscope/diffoscope-266.ebuild
diff --git a/dev-util/docker-distribution-pruner/Manifest b/dev-util/docker-distribution-pruner/Manifest
index e031bfbde0f3..3ac15d714f48 100644
--- a/dev-util/docker-distribution-pruner/Manifest
+++ b/dev-util/docker-distribution-pruner/Manifest
@@ -1,4 +1,7 @@
+DIST docker-distribution-pruner-0.2.0-deps.tar.xz 13254932 BLAKE2B 02d0e34129a82f77ff4bc67bb9a6fbd3f0312c7c3568be042ea3234ddbf1134d81a4fe86c246522a9358d8b4203f0023e41050ec0d8ebbccb0a6059a91961942 SHA512 96207c2fc418700d6d0a83e79da3a126ff677fafa716e96bca52933fc179f75291b6a723e0cb94114600b9a64dd5f2b3e17c2cefcd96524844e5baaae443bb0d
 DIST docker-distribution-pruner-0_p20170401.tar.gz 6245783 BLAKE2B 7fd29631ff4072a4ef7a9486d8dd9f4b17a2238f94c93e670e7b7af4ba93c8a6577e9ce9f2d248d5d16fb7279f4517317e2c63413424250f14f01d4c47628f5b SHA512 8e2bf3c9be37f7b16299e1e7219d646e2b037ff40ba244bb2262905ab9864b212d7f96d844a096b057c6111440d66236f8ed5eb4a61e95f7a81bac3516f65cdd
+DIST docker-distribution-pruner-v0.2.0.tar.bz2 28288 BLAKE2B 5f82bfc7336a1814c32ac99eff341b042eac8b3594de2d9bb2b06d3c826c4130620278393fc0416b8fe614442b34166ea027df07620041dd853ede981cb365e1 SHA512 c68d9c801c770a4615de7fecf4316786be1f97cd32a9e7f843592fc7e550e0cf2876d79fab1d41c4b1a14243ac3ac6a618e1da70d272a84f986e2d8ebb41ce12
 DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
+EBUILD docker-distribution-pruner-0.2.0.ebuild 633 BLAKE2B 0ad8cb08948c3fca457cfc80afa04bc66a8cfa0e769dc4fd6cd1a889f4bdaa5ef2deb3f4f7a42976a0c495bf13f2ab1a7b9ab140d3f2ed1af858dce9d679f626 SHA512 85d46ea03d19ed2d6ba00c6b4fb2e111dd060ea3e06ea198fe18dac935a96ef9e8647a8eb869783eb204b5dc8a91b27039a087298b3d65f24a3be47f2ffc98a1
 EBUILD docker-distribution-pruner-0_p20170401.ebuild 874 BLAKE2B 80edeedcfba5656cd343bc91a32daca30557e143b27585dcfb42f85c30d2b4ab0231a812ed5e97f9ff1e1ae987f6a871fd595114f1c7e3295bc2d4a38a099250 SHA512 8300b5002ce41c619fde53b0ca820b48583091b5bc62c3e4b495b5c0d5187061958312534a23b0b91fc0e64d69536849eba31f6eb3b9410f6d00cbe62b8c4313
 MISC metadata.xml 270 BLAKE2B 76787a41fae4217ef9bec62cf2f7ef025bb097f405e25f50df14f77c485dcc0b6ddb0acd2a9c04dfaad7ff9f763da770f961a98774b0dd023400a4dc5455a134 SHA512 a3808de5091d20bc59af62a178be534770347bf0e00d4e460f57901133d01561050749b18cf7024355a174cc3d56829dce3039f2ebf0c229674aef6ed7925599
diff --git a/dev-util/docker-distribution-pruner/docker-distribution-pruner-0.2.0.ebuild b/dev-util/docker-distribution-pruner/docker-distribution-pruner-0.2.0.ebuild
new file mode 100644
index 000000000000..4df022f319c0
--- /dev/null
+++ b/dev-util/docker-distribution-pruner/docker-distribution-pruner-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Clean all old container revisions from registry"
+HOMEPAGE="https://gitlab.com/gitlab-org/docker-distribution-pruner"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+	https://dev.gentoo.org/~arthurzam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+S=${WORKDIR}/${PN}-v${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+RESTRICT="test" # no tests
+
+src_compile() {
+	ego build -o ${PN} ./cmds/docker-distribution-pruner
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index f954e912b54c..d1ea8b280918 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,14 +2,8 @@ AUX jenkins-bin-r1.confd 846 BLAKE2B 8ecbab9b974eca823a0039ccf83735648d57604ff8a
 AUX jenkins-bin-r3.init 1485 BLAKE2B e15269e812ae1aed54f4aa88d161e182e7e20433832608481a2a29c79f8da9a3f4e9f29204ba6bf9944e54f3cb1662bfda8500a13ba55d97bdcfd5387ad1cf8f SHA512 fff205e58a09d4f2369aba61598e697542b8cf29908382f973ba465b6c32a57686e6389244f2188b0b432d49f3b633fbd616e002656f9e8dd10ad742b3786abc
 AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309ba7967873699a16a32da3e4e1eb2270d47e9dbd07833cd6afb9bbc65f2bce7c7345891bf1f4bcd2abb3bc40eb SHA512 f064f8516a7c158fee47a4d1c2a5d2520e88483226139b50e9cff828ccb46c41d01f4e8d4c76e82d1400b8c816edeaed18f0ee82f1a353f43f7bf0e6d987dc0d
 AUX jenkins-bin-r5.service 509 BLAKE2B 570167d1949e072aadb03f570166a5c35de71260e3707da2c7258f9d39667be71bb9ede116fccd8d54f02f1769facb076e83ae0102fb65c1f376c37fc4b0d38a SHA512 5f9075977c8df0788cde4fbdfa9e84c4ca23c8927d5b88ab82109fab1326465ddea18b8f99831155a9c5b0fd902d204bd083c0bdf811b83c73eac8ab3ebd9ad9
-DIST jenkins-bin-2.440.1.war 86502820 BLAKE2B 8f94e12aaab5dea9c50169d9ecfd036528db5698c2d9214ab850175be51bd6c4a3d33be38202f099cb375870e2a8bd09863d0ec79eb803d25e39c9d425f88428 SHA512 0c7505204ab7af52dd229eef73e9bcc7c0fea62192eafe6b347a174e1f430a319c135af94fa070e6c0a7ff4ad0957901b14564a7debf76b365de1d2bc9507fc0
-DIST jenkins-bin-2.440.2.war 86482142 BLAKE2B 7afe45a79c2852fcf0a3d047f7227e6e7bd55fc0877be1c419ee60e476e455d6bf10dd213a6e82db51c5e15decc977e774be0fb138442dac7d59910050a528d0 SHA512 590bd2d781671f91401922ee09aee5d2973d6d6a67fedd46b0073dd24a1826822f5beb8f266094055566bcc848b5e88ebd589562e0ddd49f398037919cb92fc0
 DIST jenkins-bin-2.440.3.war 93489042 BLAKE2B 23f7471b8ce5813b7a7018c033b96874e7e040ea900e810dfa6879ee96c6b98bc6b87aa9f09b4874cede44bf40f07bf8a4a57a909530aaa8d12a9ce3f0ab73fb SHA512 e44f0dcbdef443fed38962966e1e6a231e3ab2c070f7f3c197d5c18971ffb7886fca6b684e34608f26d71500662546ec53ea1edd24b3fe15cb624d644fd7dd7e
-DIST jenkins-bin-2.446.war 86466583 BLAKE2B 088bd894bee34fb83700053c3fa598d7ac72d3b3c99e21ced77e64a4564508b214d1fa3ce2ea751e0367579dd7ce45b97b1db90fcc3b7efa1bfc5c08616cb5db SHA512 d1a2d8bb261850bdc2b1a982083570696709e61d492a516d15ce60338cd77cdf5852a5471d41aadcf961af63732dc08237741c716947bc2667e266255ef6bd35
 DIST jenkins-bin-2.454.war 93687808 BLAKE2B 9f52eedaf53d671997bc40816c8d63e1cd8b464c5bb240e0ea01271cdb7a9734899ce3c8c909c3e431220e2a23a4a78a1012e1487bf35639c7b394893a9e4cb2 SHA512 52ed14e3e8edcafd8a192d7ea06bf68d16e6eee9b0da35f5fe2ba258c28701b9ceaff233737f2bdbe525638d1dc1bf613aa5d8b5c6c880e98946ae908a26c777
-EBUILD jenkins-bin-2.440.1.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
-EBUILD jenkins-bin-2.440.2.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
 EBUILD jenkins-bin-2.440.3.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
-EBUILD jenkins-bin-2.446.ebuild 1105 BLAKE2B 54b6c37d361b48403144b1c6bc4685b08cae8d7998c3dad138b7476a904fa69d7cf8aa073545ec25aee71f0da324800b9335ecff047a81caf3e6d0157dc21967 SHA512 539382470b34a88d6fe17b6837c0bf97189278ea52e8ce4057ce8dc6661c66dbf93df47fdf87f49fad89c855f7f5afc8b46d6d7fa67dc71166e1847334aa3dea
 EBUILD jenkins-bin-2.454.ebuild 1105 BLAKE2B 54b6c37d361b48403144b1c6bc4685b08cae8d7998c3dad138b7476a904fa69d7cf8aa073545ec25aee71f0da324800b9335ecff047a81caf3e6d0157dc21967 SHA512 539382470b34a88d6fe17b6837c0bf97189278ea52e8ce4057ce8dc6661c66dbf93df47fdf87f49fad89c855f7f5afc8b46d6d7fa67dc71166e1847334aa3dea
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.440.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.440.1.ebuild
deleted file mode 100644
index ee2930a81a40..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.440.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:17 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.440.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.440.2.ebuild
deleted file mode 100644
index ee2930a81a40..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.440.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:17 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.446.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.446.ebuild
deleted file mode 100644
index 4d3377af21c0..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.446.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="The leading open source automation server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="https://get.jenkins.io/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	|| ( virtual/jre:17 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
-	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index a5f36c4af330..0f83edccea67 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -555,5 +555,5 @@ DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c66
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 EBUILD maturin-1.4.0.ebuild 11605 BLAKE2B 555a0f6926ed589a92c7e363eb50a58329b59bc948e9eebe6afb7b671fd2d3c1f7fb96866f060b69cc14a9ed696834f4a4ee69fb38142d215fa8ef66fc2c94f3 SHA512 c62100a408d4dd398b4a7ae9ae0bee7f9baac01df8dcca1266b8549b6a868ac18e3650e0b2078ccde250fdf690534bf35e77fc2855c1946c17e44eeb66104504
-EBUILD maturin-1.5.1-r1.ebuild 11470 BLAKE2B 945fbf4ff7c7dad03a6665b897b9e9144fceaa49680e8d18141cbdd470e71bcec64449ee2eef922a94efd2ff34bf21c1345ffa28779035e49e45b620bc1b93b7 SHA512 0b9b97fe316979e23cd8019f096aa9cc980e05029bcaa59dcd44c28caaeb96d46b9cb2372c989a2c354d0d433c87a465a73b6dfb103ba701b0765caeb3800ad4
+EBUILD maturin-1.5.1-r1.ebuild 11470 BLAKE2B b08f5586a1a663b7a5984b42f24b66d4d4116e3f0d8c4c516e6dc7bdae4300c437db37c66d432050efc51c14873e81950c1894e2d01e581fb7a3f2b020d278cd SHA512 84dce426be776d67b0bd71cd503f47085b65176c55bd23b5f5a637cd75ec565cc6bf434f60a6ad29bfec09c52ac304a003b0259270ca94ee31fa0e99a9600dbe
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.5.1-r1.ebuild b/dev-util/maturin/maturin-1.5.1-r1.ebuild
index df1a52577b03..f8c7524b7218 100644
--- a/dev-util/maturin/maturin-1.5.1-r1.ebuild
+++ b/dev-util/maturin/maturin-1.5.1-r1.ebuild
@@ -418,7 +418,7 @@ CRATES_TEST="
 	windows_x86_64_msvc@0.48.0
 "
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs
 
 DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 32c3aed7e910..559cc442b7ce 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -11,5 +11,5 @@ EBUILD ostree-2023.2.ebuild 2648 BLAKE2B 78913397d1fb4e66e80e1177892729c32ad3909
 EBUILD ostree-2023.3-r1.ebuild 2732 BLAKE2B 1275dcb62949f523234a8fa451c8c623da3d9d9152f95bfa7d35ade28ae1770ee750591c6fbd68b1fc816eb3c65fdbc383f1ed466e3eddb1f924106ca79ecd71 SHA512 18a9e744b016e9d910ab5aa3b839edaed3ddee8dfb378509651830f764572920e85d17870eb3c92556d81074ad1b0a004bba9ffe946d2bd1d8e94a5e3744db3b
 EBUILD ostree-2023.3.ebuild 2648 BLAKE2B 78913397d1fb4e66e80e1177892729c32ad390985bc5b4dc0acb84e993f9dac3ca7713df21fbcc895ce345d1ad6a4794c464b24f781fec5f8f87209687c0390b SHA512 8fd009570f3e6bf88ff7c842e0a35ad7b8064d2eac28ece04bbf8cdb89b414b48be0143a85cec719e1f2c90f9cfc1d34a97c8e2cebe174e5409c1f3c93e45f68
 EBUILD ostree-2023.5.ebuild 2746 BLAKE2B a5fdea61ea98c8abf61e48694becfa1279179403bff4ac14b28c7dee7b8d5229a61459f1e73ef395608eb1eb51c79fb7c2fdebba6ff8fc7d050a2fdb408ecf62 SHA512 8bb9bbb686e8fa50b7ac6fd86b34c08ffc4bc146407839230a6fa6ec460af4e2f207366cd785d06e81d01c04c0a062730c083cbcffb89d8e25d9022a8122bf6f
-EBUILD ostree-2024.3.ebuild 2748 BLAKE2B d73a3c8c76b1fbb15143ccb9cfd03f616f5f79635dd69adc32d617ddab6dedd91ded90ffc1042bc55ae85597f5fd6e7803ee2d16ace5719def3bca540b617538 SHA512 a4941033c1c2e52dafc4f0bd6735fc55a70332a77ee4f362144bf33ca0109aa65e4484f1566cbcca591a96e88e3b39b07a3b9882b3da6d80a66e1e138958d4ef
+EBUILD ostree-2024.3.ebuild 2746 BLAKE2B 59797a12acc98232aa3efb4e4969cdba92be0e98162e81b80dfea048ffb455f3e5f18862257d9919ddb4490f925695969fc0679f85cc04a50d59de8537175a4b SHA512 c85247c012f61defb6518fbc13e72977ad9618126b989ed23807d56c0a0ea16e80ee22e3c43fa380e58d21e8dcbd055de1cdfce7786ab37c76a6462417a68605
 MISC metadata.xml 1952 BLAKE2B 8beae590951167b42061d4b3f343f2cc87da76bb73bd613ec5eaa3186dae811ed96aacf94bebf321f1df8374df2240f1d904f62b6e8fde99cedbd487b4006a23 SHA512 3e11315c573b2244d9f5d0949efad4d2ed9fefd7939d5bd815a28d9b8d4c3892ddb4fc0fe8ae5c09d6d7793af6ea3dc803a049e0e2e1446e86f8c1e84de4ec9f
diff --git a/dev-util/ostree/ostree-2024.3.ebuild b/dev-util/ostree/ostree-2024.3.ebuild
index 295c98e3a0b9..096a4912c6f8 100644
--- a/dev-util/ostree/ostree-2024.3.ebuild
+++ b/dev-util/ostree/ostree-2024.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
 REQUIRED_USE="
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 375de51aaae9..946bdcb36f1c 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -6,6 +6,6 @@ DIST rizin-src-v0.7.3.tar.xz 18604220 BLAKE2B 9bbfbd8cf86839dcfdc30beb12d4472abf
 DIST rizin-testbins-1203a9a2f51e32337c8434d9f4f7c4543552e271.tar.gz 185572487 BLAKE2B b274a58bebe0123bd8ab7b18a4e88833e7de53133d8f640d00b9efa953cf8ef766582acd5a0f65750ebb273be70d5cc1daf9b700cd6b9bfd4d464cf59ab735ba SHA512 47e8993bea5d7805acb46c1c4e034524fe47d2b0b2471af00d3255f3e853430617658cd6b1f8a4706a748704a52646ec43495f0d4e80f16bce4aaf34e29539a4
 DIST rizin-testbins-903588ed69d7717069955322b31dad5e666b338a.tar.gz 181644100 BLAKE2B ea491bea61a6d17fa2727e1b08b810be2bb99d05cf2afa4e97dc440a69a4fd376a39c25c6e86e9e2d499732b55e7c75e5eef39adef84f571e48d147e410d04e5 SHA512 fffef043d76440976e02e2b890138f57df849f507c0a7a48bd97b421fc1683e73696c50b6daddf906a53685eccfd7346e25881d3d498417e4e55b97ef56b8317
 EBUILD rizin-0.6.3-r1.ebuild 2531 BLAKE2B f0b8ed9b9bb4e75634987d4aaa1a40ac28207eb1504b352d83300501005b9f287aa940d90c96465652a1367b2ea33fcd26ed0babed7e4a09dbda35d3a9062f05 SHA512 48a966414515f9d748f5d8995aefb33c8024a58fef0f87e4e41777560fc6e69aebfec812da2d84adca4b9787b2f27dd742ac01898eecd9d94ca10ff949495cf4
-EBUILD rizin-0.7.1-r1.ebuild 2516 BLAKE2B af12df34e35b77560532f9a3d581c5eece60c8cbe5ce742e0c09572d43d9744d682d45b0e752b542fef0d6ac388df1e6fe523f02860d416e0261f1dd6296e0c6 SHA512 f99be075af1613e1e926d95df11c5b3da6e042c847b87261e16060d481465f31c9b740727a5c4ec196bed67a03b181a0127b381896ca4587ea7daa0ae1c75372
+EBUILD rizin-0.7.1-r1.ebuild 2515 BLAKE2B fbe470d30a28edb631bd66c46bb1717be1f8b0bf68c0fc5fd25472340a1e1c13b72fe0f8765f6d9a1709a203a78c078e1edcf2e5ecceab183b648d8f45af686d SHA512 c160f0a74c153a5da7dc21a8e4e001fe5eda9d6425773fc2eba60c64e7dc84c9bf642165f38719cfe94318737db0abf3594bf96bdd021a7c0ec0fac8be05ed3b
 EBUILD rizin-0.7.3.ebuild 2514 BLAKE2B 39cc4fc096bbb969cea78d1d8610c5bf928958d0d18a45903bf1ca924e76f0b8ef09116e01beb52bd4e33b6fa1d0d01e26c9fed083e326d0b437d9ccbf98c68a SHA512 be049d24ed3638c590faf7230081cd75aac81814327e567e1fc7f9c3b5d4edc4661d3de8b9dc008776433800bc352bc7a66c1e3865382970a61dde25c43ab20d
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/rizin-0.7.1-r1.ebuild b/dev-util/rizin/rizin-0.7.1-r1.ebuild
index 13d65081e186..c213792fb694 100644
--- a/dev-util/rizin/rizin-0.7.1-r1.ebuild
+++ b/dev-util/rizin/rizin-0.7.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 # Need to audit licenses of the binaries used for testing