gentoo auto-resync : 20:04:2024 - 12:05:23

13 files changed, 170 insertions, 184 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ab2e6f5c7b0f..0420934c6e84 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index deed8a4ffe42..149a4a040976 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,9 @@
 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
 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
 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-265.ebuild b/dev-util/diffoscope/diffoscope-265.ebuild
new file mode 100644
index 000000000000..7db31ced97d2
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-265.ebuild
@@ -0,0 +1,124 @@
+# 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/packer/Manifest b/dev-util/packer/Manifest
index b4563b97818a..e3b6810fb0c6 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -2,6 +2,9 @@ DIST packer-1.8.6-deps.tar.xz 386558076 BLAKE2B 54903da9788ad483bb9dd66fd9c130f6
 DIST packer-1.8.6.tar.gz 2265929 BLAKE2B bb56ab642d3f358afed58153de27e52ad1d4fa9e97f5ab94ad9212cb6e46ba845606c266246ca89a74cc93738ed197e545772c0db22f32ed9c2f8b1bcb7d1f3b SHA512 1e0e36959f1efb6eeae076da3d27c200f4888a6a08e759072ac6c767e1cc3e14876f09f96bdd208b788d32efde9420357afe3105337b7edcc87ba2d99966578c
 DIST packer-1.9.4-deps.tar.xz 330480200 BLAKE2B 8c02e0fac4763f6a4cff98631ee0151a8d66ad199ae4979a0750e684c8b51284c59e5f99dd265590737be37e8ff0f65e692d3ebb11dcbcd8cba372e393c9e517 SHA512 d0bf06769ac66fda4d721388a612d7d8c981e091172a6ef0ae7f5ec461b32f834d024c031dd9c9da08de4ac46ed8bb69ca5f5f0eee0d764d8fdf5f9bdffb5790
 DIST packer-1.9.4.tar.gz 2301344 BLAKE2B 431b843076cc20127bdd0bc1acbb030cecc42ba9c3200a1c3b72c8e2ea4081e99a5c9f15d73397c67c176902f4ef1bbf4796efe32bdd1d8fe583a5996bb5f7ec SHA512 966de31fc7a174e5397e89b0c84979c13cf538971b2ea228f6fbf7dc54bed61d7cb21b58699175e93b9c81a9fc0c515e7cefffbd7b2865f2f6c36e4f78a81a95
+DIST packer-1.9.5-deps.tar.xz 373922748 BLAKE2B 793b0e5501bca56849a2471fbe2892c4775c3aa2d3ad6346e65f3d0cf1e3d86339a64371a35e4fddb0053082e98e2ec527b4f052b901bf8d35bd5db08a577ee4 SHA512 1f49b45841308dba95fcce2139d21931708e099102cc0870be00f2142cfb0d0e8ce9e2c729c9556ca68c1036e224f120fe0cd8833715a62cc212eead2448a6e3
+DIST packer-1.9.5.tar.gz 2302965 BLAKE2B dc0b8fedd83a477594c7235ffe6ca2052ba389e105bd451ad6c3987cea68c37f9c3153957012339f2a09045f20ac81ff6a59ed33834247408a3539643d9ecedf SHA512 7df1a85d0746e400c42f2b2a52b14ef5a806bcd2dc346eceaf5f8928b42a8b046ff8da7b45e5af0486bd444d8325e1cabdcd15f7b28711241a46034c9781a279
 EBUILD packer-1.8.6.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
 EBUILD packer-1.9.4.ebuild 762 BLAKE2B 23f81351b95c960ccaf1548f8e26d888b6a672d0c120c424818b2b1a684b5595a8e5df8f8c0094e47dd9bbbd9f2379d4eec60ec4770671661e369bae05fe74a4 SHA512 5f00c8f619b94f383f4c1bec59025e3fe6e9533f796e2826f3ca5a1045340bbd6ce9a609e73a6317ef44a976160567b041db37bd926b3e4b4a1b33e053d28910
+EBUILD packer-1.9.5.ebuild 762 BLAKE2B c970a797ba9409c0403873b4378de49c195d03662a0b8af2b52d854b9f2010a262cb1247d57032780595add9372acd20c6fd4e947c2cac4688cdc8ba0feda099 SHA512 cf116262ea2fbed1d19d6d29da6130e153eee4d5fadb35fcd560566f71cbd92109792dd54fba0bc568f6f8b5ac587bebe116e41798fcaca11e4182004ae32c9b
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.9.5.ebuild b/dev-util/packer/packer-1.9.5.ebuild
new file mode 100644
index 000000000000..da2364a5b847
--- /dev/null
+++ b/dev-util/packer/packer-1.9.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo.neutroniak.com/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	ego build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index dae499e0fe25..c40604adc3f2 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -198,7 +198,7 @@ DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e
 DIST result-like-0.5.0.crate 4342 BLAKE2B 23ca46c346cc409dbf959bc7a7bf8d81e219b2ad352a1eae7f7195ee9b8573a89c495d38d5e53630a49a993a07b4b54074c8f324b97a1d9435040f7490bbf5ba SHA512 581f36be8e9affaf3d7bd8a57506e0570aa04c77faed27f95cfc7297fcd5653125e5cf79bc51b16a08c56ce5935d39685ec3e3a61bafc1e869fa2fffdf19704b
 DIST result-like-derive-0.5.0.crate 6718 BLAKE2B ddf707ee5a4d838052f0b97259a5862c22738419a8ecd5f10d0a1c5f62b572dd46c79b631370b4c6c9a00d87828171bbf240ccd19cd6e6973c2e42908a5c52cf SHA512 0c1951599d76aa0d6586242eea9b41700cfa1b2d77f078c46b9e90f9d57a69a198c46b6f697abfb7336224ba3f388d8233cb77721b74787c5e23b77f9ad37307
 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358
-DIST ruff-0.4.0.gh.tar.gz 4094156 BLAKE2B 7db5144acfc740ef7472b03d159c281477c689aba46a25ad6691eeede6851e4b3f4a4e5781a9a7b7f808b77767e6ca76f40f22136c6f09ca8a6ec68bbfe620ff SHA512 4f7b00d9ee091ca6b0fe4e73178663562c55682d168962a8e295d874f004f456f6f6b1680137891c8bab2705402a53d5dab542d23cb3546deb116d27daf25dec
+DIST ruff-0.4.1.gh.tar.gz 4099638 BLAKE2B 5fa1254c9d48b92fd6ffbb4d425552081f7ce2068ba8b985f59a2329d14254bfec37455762b11a59a9881f9f9ece3beef690447417cdd05405b540c7835f46af SHA512 8fc9a90fc00b9c6b6ac34353738dd8b1cf5601709545ac3caa1e17b1a8e9356369d765e795a649ea3041f35dfeda5bf0719117e27500fbc699c7b9a17d4e89c3
 DIST rust-stemmers-1.2.0.crate 2351301 BLAKE2B d633c0d7091fd05e55a521670104831bed89deef7a2fb7c1eed3528246e65b67a97888fed48b134b10c477e7b95c034e8bbad70500c779b1ff7b0c334de0b37b SHA512 b9453a0984d41e5a692e5ea1a8a7bc6142de30f7b345a269489b8d4ebe3b3d442e7fe5f338c72a790521dea7a2ad9605c0ca8218a6b76d8bc5e19ae02cf711d7
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
@@ -330,5 +330,5 @@ DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0ac
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
-EBUILD ruff-0.4.0.ebuild 8282 BLAKE2B 81628e7dc4a39713b869824a896eadb0c67b843c6bbbecfb758fbf2b05cf44cb50febdede7413898d0c373bfb2ec68fffae81feb9191f867ac7c1cda3954deb2 SHA512 18847b89ba178cefe48c0a85e9400dfceeefc8b8fdcd741062022aa4ea3613c46bfa71664c7fb39698a4cb9436f18f2a7837200da3abd6089b6f4e2dc286fab1
+EBUILD ruff-0.4.1.ebuild 8282 BLAKE2B 81628e7dc4a39713b869824a896eadb0c67b843c6bbbecfb758fbf2b05cf44cb50febdede7413898d0c373bfb2ec68fffae81feb9191f867ac7c1cda3954deb2 SHA512 18847b89ba178cefe48c0a85e9400dfceeefc8b8fdcd741062022aa4ea3613c46bfa71664c7fb39698a4cb9436f18f2a7837200da3abd6089b6f4e2dc286fab1
 MISC metadata.xml 499 BLAKE2B 61aba59fd1d841fc28bed33097dd53a3fb7590cb7920cd326e052caf1915315dcaabf8c5f71f22f7e1404742fb2a555aac1fb815ed392a3e1f1b8943c80517b5 SHA512 14c5a0c0f53e5925d7a0b1e4a846238ff37a0b763d93712f692844312162c102dfe85ffc641458d6e0f06ef40d98ae6e48c5862fed973f9dbc25ee4679201d0a
diff --git a/dev-util/ruff/ruff-0.4.0.ebuild b/dev-util/ruff/ruff-0.4.1.ebuild
index da70297bbbf9..da70297bbbf9 100644
--- a/dev-util/ruff/ruff-0.4.0.ebuild
+++ b/dev-util/ruff/ruff-0.4.1.ebuild
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 762c072005f1..447fbfdceae7 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,9 +1,6 @@
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
 DIST nashorn-core-15.4.jar 2167292 BLAKE2B f40349e9f369eed1bb3795622ffe9353c98f35df1d5c2f5f3845d8f1fd5ecea553e11da15d17b9083f6ae2efa4485df131a9a9216499f1c7d440ca4b1d772a2b SHA512 3b560e1ae67d5d5d19250849dee3f813d2c801e56ba85d90439a067378a47f95020910da85b7c8afb6675ea2e25cd274953483efd07e89097656aadc804c8020
-DIST nb140_platform_20230511.zip 25886135 BLAKE2B 1b40f39dcb3d89cc91d2e90b5df87d393344606fb97f073630a7d160ab5ed35ba31966c4960ff3c657a75375b518f1667e2fca597626192e8cdc1dabfec1a63d SHA512 9781af27d4492dc84d65b9bc8bbda0ad42c22e32c29e14c6a55c4d94650d20798ee7a7fccf83150c88e7c428b8626c1767b21a1af230bc035496e65512d36442
 DIST nb190_platform_20231030.zip 26056691 BLAKE2B 7815c08ad60515e8018336452e24c2fb0743d1ef48c58ffd80d371000fa664f8f0053a4c1d56a012b9e50f6714a44c300a915061afebd586f9438abae7867447 SHA512 779256d678c9a13dde4314a5771480c450ae86c49e80ac99eb90a4e9e32e3bc5759128f60a610aecc3ce9e7dbce56b0076b528c8f18a682ebac2dd74cb5a6eea
-DIST visualvm-2.1.7.tar.gz 11617370 BLAKE2B 3a6bdffbbfa63de2290551a285c78f28239367163b71ffa8d8b9660cc149463c2aa85fdad028f35c25da640e8d2374aee56a8a572bdc90116e14bdad95b24e58 SHA512 3164021ecb4f65a0d263f76f9644e0563c97903bc1cb046bd5c9a99ee3b6fc6a0adeb048b65ff7f7599cd13c8744aa927622f3c28cb1db815af22bc99272d22c
 DIST visualvm-2.1.8.tar.gz 11630256 BLAKE2B 503866654d969ef127455ce6d3c5d087c7543e100cb8bd8712d15dc3d0530ee3fd31ee571837be9dfe99cb01cbf0ebf7a29084cb16b80d9ebbf5ebc2654f945b SHA512 34329db8be5ab6727d1500e4a7bb07af704c6f815912418bd5fa0a872671f53237054c8fc13129124e5bb8c953bc31a47bb7c857962aa9ed080f16d2b6965331
-EBUILD visualvm-2.1.7-r1.ebuild 5044 BLAKE2B e22dbbef9fb3fb5c006cbf5203b11c8e330c14e8ba7b1de8c806a9126eb01dba6de134465e791914893208cadc5379d100bca91d58b0cb7000e4c8d5fbfe8cb2 SHA512 de36a8e249671c43f83d09a35f8e27ec7dc77c221477f2af652d0af3a185951fc1e6c86444b30acfab264591e0ef45ab5a45fc3c0ec673fdb2fad5051e7c9c6d
-EBUILD visualvm-2.1.8.ebuild 5700 BLAKE2B fdafbc434bef8dc4e01a52ac9c1a675b3646cc07ae2a1dfc7e880505ad33007b28f90691bb7a6a2c25169b6faf7a0d010d4b9e6ffd562be7562ddf70d9cef09f SHA512 f877028a29494c82a5348e1473f00b55773e4291859cf632dca52931fedea0bfae6790b03cb8774c849a3ba2ed0917655dd7cebc3e7ecc16bef8bbb36e84ead8
+EBUILD visualvm-2.1.8.ebuild 5699 BLAKE2B 29dc5dfa09f8810b36fc70e2015b98a67fc5d11b9d91971a5badf527202928ab3fde641ef2dbb55acc930ea436399cfdc0439961d1ca34f6cca3c98dbee446e6 SHA512 ea1e5d7fc905b73fba9d2c7d8447bef1532258c0da4b7d15e8387b61bfc005d054c1b8daca86bf5d72ff5b818b1b79aaf441f31d00f9138d0506d048c5ddabdd
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.7-r1.ebuild b/dev-util/visualvm/visualvm-2.1.7-r1.ebuild
deleted file mode 100644
index 79f02f1b0841..000000000000
--- a/dev-util/visualvm/visualvm-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NBV=140
-NBT=20230511
-NBZ=nb${NBV}_platform_${NBT}.zip
-FLIGHT_RECORDER_VERSION="8.3.0"
-FLIGHT_RECORDER_FILE="flightrecorder-${FLIGHT_RECORDER_VERSION}.jar"
-COMMON_VERSION="8.3.0"
-COMMON_FILE="common-${COMMON_VERSION}.jar"
-ENCODER_VERSION="1.2.3"
-ENCODER_FILE="encoder-${ENCODER_VERSION}.jar"
-LZ4_JAVA_VERSION="1.8.0"
-LZ4_JAVA_FILE="lz4-java-${LZ4_JAVA_VERSION}.jar"
-
-inherit java-pkg-2 java-ant-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-COMMON_DEPEND="
-	dev-java/jmc:0
-	dev-java/lz4-java:0
-	dev-java/owasp-java-encoder:0
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-java/asm:9
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/junit:4
-	dev-java/junit:5
-	dev-java/testng:0
-	>=virtual/jre-1.8:*"
-
-# it does not compile with java 11
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/jdk:1.8"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P}/${PN}"
-
-QA_PREBUILT="
-	/usr/share/visualvm/cluster/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
-	/usr/share/visualvm/platform/modules/lib/aarch64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/platform/modules/lib/riscv64/linux/libjnidispatch-nb.so
-"
-
-EANT_BUILD_TARGET=build
-EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true"
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-
-	# link in external libraries
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-common.jar ${COMMON_FILE} \
-		|| die "Failed to link jmc common jar"
-	java-pkg_jar-from --into jfr.generic/external jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} \
-		|| die "Failed to link jmc flightrecorder jar"
-	java-pkg_jar-from --into jfr.generic/external lz4-java lz4-java.jar ${LZ4_JAVA_FILE} \
-		|| die "Failed to link lz4 java jar"
-	java-pkg_jar-from --into jfr.generic/external owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} \
-		|| die "Failed to link owasp-java-encoder jar"
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins launcher/visualvm.conf ${PN}.conf
-	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to update userdir"
-	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to update cachedir"
-	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" \
-		|| die "Failed to set jdk detection"
-
-	# replace bundled stuff
-	pushd "${ED}/${INSTALL_DIR}/platform/core" > /dev/null || die
-	for name in asm{,-commons,-tree}; do
-		rm ${name}-9.2.jar && java-pkg_jar-from asm-9 ${name}.jar ${name}-9.2.jar || die
-	done
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/platform/modules/ext" > /dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar || die
-	rm jcommander-1.78.jar && java-pkg_jar-from jcommander jcommander.jar jcommander-1.78.jar || die
-	for name in jna{,-platform}; do
-		rm ${name}-5.12.1.jar && java-pkg_jar-from jna-4 ${name}.jar ${name}-5.12.1.jar || die
-	done
-	rm junit-4.13.2.jar && java-pkg_jar-from junit-4 junit.jar junit-4.13.2.jar || die
-	for name in junit-jupiter-{api,engine,params}; do
-		rm ${name}-5.6.0.jar && java-pkg_jar-from junit-5 ${name}.jar ${name}-5.6.0.jar || die
-	done
-	rm testng-6.14.3.jar && java-pkg_jar-from testng testng.jar testng-6.14.3.jar || die
-	popd > /dev/null
-
-	pushd "${ED}/${INSTALL_DIR}/cluster/modules/ext" > /dev/null || die
-	rm ${COMMON_FILE} && java-pkg_jar-from jmc jmc-common.jar ${COMMON_FILE} || die
-	rm ${FLIGHT_RECORDER_FILE} && java-pkg_jar-from jmc jmc-flightrecorder.jar ${FLIGHT_RECORDER_FILE} || die
-	rm ${LZ4_JAVA_FILE} && java-pkg_jar-from lz4-java lz4-java.jar ${LZ4_JAVA_FILE} || die
-	rm ${ENCODER_FILE} && java-pkg_jar-from owasp-java-encoder owasp-java-encoder.jar ${ENCODER_FILE} || die
-	popd > /dev/null
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.1.8.ebuild b/dev-util/visualvm/visualvm-2.1.8.ebuild
index 645b533711d6..8f7769ac553c 100644
--- a/dev-util/visualvm/visualvm-2.1.8.ebuild
+++ b/dev-util/visualvm/visualvm-2.1.8.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 COMMON_DEPEND="
 	dev-java/jmc:0
diff --git a/dev-util/xmlindent/Manifest b/dev-util/xmlindent/Manifest
index 02b5b8a45de5..12967ea9a22b 100644
--- a/dev-util/xmlindent/Manifest
+++ b/dev-util/xmlindent/Manifest
@@ -1,4 +1,3 @@
 DIST xmlindent-0.2.17.tar.gz 18333 BLAKE2B 5d72679e95cfa9528a94222b31b320993b32588ea18c48b251ceb24147eed57a5308f6ed2ae68a9a2d620107c21b512f16ebc51caa834225b138700f66e2a3d5 SHA512 ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716
-EBUILD xmlindent-0.2.17-r2.ebuild 614 BLAKE2B d7c93c97002b6a79e961137e7f5679868900d0051487e05b03874c1aef7264665a0e7301f21b6dd94dd78a5cf189b48287558bcffc59f130c278179b51e14939 SHA512 c86ac3e236fd67c385c4140d91c10a5ec0fdf630683a937479c32caaa0145b962129b3aa524e21df3bda8c457dcbc1934e7a388e20bb272dc71e33a24e9a572f
-EBUILD xmlindent-0.2.17-r3.ebuild 619 BLAKE2B 3ea706fea228dc6caf807a64da5850e720365bf26b0bba7d30f5ae8d9c41e74225ad2b4e55b189a73930f37ad19c6449f0ade87b2808302a1222cd2382cfe8bf SHA512 c451bd27958c224514028ecccc5a67b9bb821c0930b14cf29de7720dbc78f31d280440d0d56f8a387d143d05c68b4fc046549c6367e4a406aec5e492605b52a8
+EBUILD xmlindent-0.2.17-r3.ebuild 617 BLAKE2B 26489d1882ccf9a613d3590310fa005aa5e73160312dd648ad6d891f205466030d3cdf30bc54481cc8df4a0a2ffcaeec84adb5b16633ea4e5455840506da75f0 SHA512 22bcf2b7826a5ba143227988de3cc85fce0f986a7be085a91fc9cbeb597ae40928eb87b03b114531d72ce79406c06f9a31d967907a4ff8dad941d910c5c9c49a
 MISC metadata.xml 247 BLAKE2B 6e754215e6913c09a29c7fbccdab9b49a3b55907a168019bad17481984c9ca728cf384b8aefeeadc113919db0278a7cf4c3628469d0d92b33c8d3e01a07eb2b0 SHA512 3b98009dda97e82ac21c10b0526b71c20691004fab6eed0d2f1890628025f90ba8a795854cd05b5700591550c64363ba406607c4d80f026ff58f25af9eac21b8
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
deleted file mode 100644
index 98aa27cb72a2..000000000000
--- a/dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="XML stream reformatter for ASCII text, but not UTF-8, written in ANSI C"
-HOMEPAGE="http://xmlindent.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlindent/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-alternatives/lex"
-
-src_prepare() {
-	default
-	sed -i Makefile \
-		-e 's|gcc|$(CC)|g' \
-		-e 's|-g|$(CFLAGS) $(LDFLAGS) |g' \
-		|| die "sed failed"
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin "${PN}"
-	doman *.1
-}
diff --git a/dev-util/xmlindent/xmlindent-0.2.17-r3.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r3.ebuild
index d8030208821d..c55679a9c3d2 100644
--- a/dev-util/xmlindent/xmlindent-0.2.17-r3.ebuild
+++ b/dev-util/xmlindent/xmlindent-0.2.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmlindent/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-alternatives/lex"