11 files changed, 127 insertions, 151 deletions
diff --git a/dev-util/claude-code/Manifest b/dev-util/claude-code/Manifest
index 496227938467..969e5f84b78e 100644
--- a/dev-util/claude-code/Manifest
+++ b/dev-util/claude-code/Manifest
@@ -1 +1 @@
-DIST claude-code-2.0.61.tgz 25360237 BLAKE2B 4255fbd17d2ed2a070a62e4c10b5b9edc676fe533380f7a7d6a9f128dbe652f251d7f11d4f12feb79bf69cc29b32eb475e1c650f6bfe46cf02f55a8a1cc79e79 SHA512 dc791bd49e89e76bb291c1ff5279e691816405bbd5113d07bc5e8adc0e09d9a6567732e8f5a8096deafd00ce7278fa689a98e6c0369c8013029ff4a8258b2735
+DIST claude-code-2.0.62.tgz 25361504 BLAKE2B a903f3f374f88769f1e25e223a1eb8082230cb4b323cd8d1ef036e40d094889d85540f7761e8a548e21f87b5809df129a9c68e260503a62a0402d392b68bfaa9 SHA512 b29b70d3df73f2bccdf5dcde1c8e48d76d2ebd18bf0116a25a24251449d68eb83ed591f3e9c36ce0b01beb98d253ddac74a80999f7a0e541116b9bd62b31793c
diff --git a/dev-util/claude-code/claude-code-2.0.61.ebuild b/dev-util/claude-code/claude-code-2.0.62.ebuild
index 54322b5c3554..54322b5c3554 100644
--- a/dev-util/claude-code/claude-code-2.0.61.ebuild
+++ b/dev-util/claude-code/claude-code-2.0.62.ebuild
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index c4a4f3d25b8d..df2857cc6747 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,4 @@
 DIST ctags-6.0_p20230423_p0.tar.gz 3038197 BLAKE2B 4b6114526e9dc94c95dcf1b27136fe1fde185aadcd3f880459314b6567f4ec935da10f87aaad590f4c16999adea8b15b3a153f4e80b3b9e57d9a04ecee377a09 SHA512 7a4b3ffcc4906765dda381ad637981f5ce8c6fc24d4141b8b0e9997b71767dda307dab4d2c2aa0e5ba003774c100d8f85e494e368cedbef12c8f415a13b85554
 DIST ctags-6.1_p20240609_p0.tar.gz 3158634 BLAKE2B fe662dc0c48a0ac484bf3fc7ba7d0a31285398cd5da111a96f14b3637045fa0b0245119da034ab467e43b776849f47891e829af86a1889548f410070df6395d4 SHA512 60ebc506a04aabd7ada13801ab3ac662a9798960cf2aaa90270e6d5df82850b4e709a15a7523eb2e1e347a08b458ff2b85a99c787ab08b3c2599232492ef0ebc
 DIST universal-ctags-6.2.0.tar.gz 3203203 BLAKE2B 396cb48a5ebedabd3a3cbfac6d1308af0dcce952c7a5693936363b1e4228bdb47addc69012ce0091a7c65557baa4e5b555b27e02e92db5a5b68517bc4b480a07 SHA512 a27c3d9b8b3edf9aaf16e5525a61998b2afb0d4905200f1fda421bf7844aba9604ecdfa1bd329d39b729c42d70a78413cec955fc38b112d3d47bd3f3c96aa559
+DIST universal-ctags-6.2.1.tar.gz 3122094 BLAKE2B 2de0dd4590fbd649fff3f81543c599b4fbf2247ae7e39cae183c2889965eacb1d8e15cb52cd7c7f0bc25b31e31224a8aeb90f1bd3fb30fefa1eb7d3602b51efe SHA512 70e1767a72ba804cf4bc5e5c2dfe13498694c67865d5c8ca412d14b7f7f4c01410c94f7d57daad62ce5885166c4e05128d1beb8184f39a11596045a3f4131007
diff --git a/dev-util/ctags/ctags-6.2.1.ebuild b/dev-util/ctags/ctags-6.2.1.ebuild
new file mode 100644
index 000000000000..f52aa318efe1
--- /dev/null
+++ b/dev-util/ctags/ctags-6.2.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+	inherit git-r3
+elif [[ ${PV} == *.*_p*_p* ]] ; then
+	# 6.0_p20230423_p0
+	#
+	# 6.0
+	MY_PV_BASE=${PV/_p/.}
+	MY_PV_BASE=${MY_PV_BASE%*.*}
+	# 20230423_p0
+	MY_PV_PATCH=${PV#*_p}
+	# 20230423
+	MY_PV_PATCH_DATE=${MY_PV_PATCH%_p*}
+	# 0
+	MY_PV_PATCH_DATE_SUFFIX=${MY_PV_PATCH##*_p}
+	# p6.0.20230423.0
+	MY_PV=p${MY_PV_BASE}.${MY_PV_PATCH_DATE}.${MY_PV_PATCH_DATE_SUFFIX}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/releases/download/v${PV}/universal-${P}.tar.gz"
+	S="${WORKDIR}"/universal-${P}
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json pcre seccomp test xml yaml"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
+	xml? ( dev-libs/libxml2:2= )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="app-eselect/eselect-ctags"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# manual check for function in a library that doesn't exist, passes -liconv
+	# which either fails to link anyway (glibc) or passes this check (musl)
+	libiconv_open
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	# Don't automagically use Valgrind
+	sed -i -e '/if type valgrind/s:valgrind:valgrind-falseified:' Tmain/optscript.d/run.sh || die
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable json)
+		$(use_enable pcre pcre2)
+		$(use_enable seccomp)
+		$(use_enable xml)
+		$(use_enable yaml)
+		--disable-etags
+		--enable-tmpdir="${EPREFIX}"/tmp
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# Namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can set the version to be started by ${EROOT}/usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/geany-plugins/geany-plugins-2.1.ebuild b/dev-util/geany-plugins/geany-plugins-2.1.ebuild
index a359181c1089..bfe1e70d79ab 100644
--- a/dev-util/geany-plugins/geany-plugins-2.1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2 GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~ppc ppc64 ~riscv x86"
 
 IUSE="ctags debugger enchant geniuspaste git gpg gtkspell lsp lua markdown nls pretty-printer scope test webhelper workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/maturin/maturin-1.10.2.ebuild b/dev-util/maturin/maturin-1.10.2.ebuild
index b8e6fe9ae1fd..11ceee788a05 100644
--- a/dev-util/maturin/maturin-1.10.2.ebuild
+++ b/dev-util/maturin/maturin-1.10.2.ebuild
@@ -24,7 +24,7 @@ LICENSE+="
 	Unicode-3.0 ZLIB BZIP2
 " # crates
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest
index a41f8f41b7a7..25f305d2c306 100644
--- a/dev-util/pixi/Manifest
+++ b/dev-util/pixi/Manifest
@@ -1,13 +1,7 @@
-DIST pixi-0.59.0-crates.tar.xz 66355568 BLAKE2B 6805dc905c76ab5927efd9b38d1c1e1c31f6c64485778f34083e68dee67068cc0c431445ed53369c94b58717172ead6292f3b0fa773cf5d93f0eada279a7748c SHA512 8fa8e803ed73da879298726d05aa28f68beab92856b54d2c1f3315f9cf72c65f94985e5b3fd72e94fce0ed33bb1c7ddedd615d3e52771f4b48aeccb80b351edf
-DIST pixi-0.59.0.tar.gz 11289983 BLAKE2B 163082aa2b0426973024c7af983b97b062ae4985d591e3cc5986a4e4365f7b19cfa263bc6212ca1d03d15db52ded61a838c4b77bc83d8048fd2dc6294cae8146 SHA512 38a03f9ee2888473fcdff4040dbd286ed11f13c10eb701f305037721b9df6d7fcf154be5eec809ba55f68540bbd7ee169a26eec936054fd6cd1453629deb68a6
 DIST pixi-0.60.0-crates.tar.xz 68064184 BLAKE2B c7e5f1f1f22a81d9721a82481c739601970ce04ee03641b736a89730441dbd3816669c258bb0b6e68f31793e16f1716c6c036397964fbf593201db74c416effe SHA512 aff112e947afdd472cc6517df25fe6117a222f29fc8f789de87be07bb13bc1f2fe46d207fd214bf24d91414e56ea8ae6b1c6e183e3d5b7a6d137be350b57907e
 DIST pixi-0.60.0.tar.gz 11369759 BLAKE2B 5dea37140af5a7c80ebbdb37239d222a7e9eac31d1cc1ca80d117085a1668b8217a4bea9db3c41d65253f8e7bfa7b8617a157e8dda40e7d2939f521f71659331 SHA512 af727dea295c8ba52e30d1e7095f2d98cdb82e58e52f56c2a195726ab52b71420c1aea1041c2c8039a1798fa1b664fdfa9d1eff2ff42310e2706c7cdf9a1b76a
-DIST pubgrub-06ec5a5f59ffaeb6cf5079c6cb184467da06c9db.gh.tar.gz 99881 BLAKE2B 5fcc2d1a06eb44351773081de4f616c93301eb2fe71b0c6f7b95779ec4bd9bb6cccc702a87a6399b0674711302a19de3a96fa31044660430fd74ff549000ad25 SHA512 3f0b18aecbc73fee91fc7de9f10d240ddc06c836fa2f116c1f007dd7818d099e6aea1852ca0b8d1a26ac19aac896535dba1a6298851a65515b553810c6245784
 DIST pubgrub-d8efd77673c9a90792da9da31b6c0da7ea8a324b.gh.tar.gz 100042 BLAKE2B cacdd77783aae1a94c3aaea56c2bd47b22f13ca34eddcef53b5d205244a213eff2934db03965532085c1aa6892b27bbbabfc19513f62936f8ac1faa466570dd4 SHA512 3a2a146fd9d9b458dced6563a1f5674e81e8ba36de11be5c189b0c76b6ede6f32957f48fb0978b97b0892768822c6c4c32c6870141e8fc1ea5d8b8f7d8b5b464
 DIST reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2.gh.tar.gz 42520 BLAKE2B ca415865947873f8b309f5b348a600677802fa8128a154b7c86d3e30bffece9df8606504073ddb688c5185e27866b5d7dc8a891e6d390ca075910a691e9bb2aa SHA512 904fd652b0f3ecc90eee571d5488aba977dee643a1d6267e2fda264fa4c7b4bfcfacd4d5a23287dfb710ecc82d667479fcd0c48166259c2368df0e8b0c9d6707
-DIST reqwest-middleware-ad8b9d332d1773fde8b4cd008486de5973e0a3f8.gh.tar.gz 41975 BLAKE2B db42a68b8f0d592edc297462c19a34caa068464b9a5f307e8e1c1fdacde95cd08c5af0f73fa55ed62217dee63940a1d02a4322c5edb2c2c8a568a7e04efd80e6 SHA512 2dad83835c87cdd79e2a08c19b5024b3fdf30d1d8cd14e480e434612e856ecc20a5404881ff81d5793d3e9d5808ee3d59ce920312a86a100535009da43d7d46b
 DIST rs-async-zip-285e48742b74ab109887d62e1ae79e7c15fd4878.gh.tar.gz 37003 BLAKE2B c4aed18d82641ced2771ad8b8e800c45b1ded279e8ba1874ec9766907d042ae13b460beac739ced6e31c03a647e4238af96fb41e8c0dff4c5d4dd7f59c0ebbff SHA512 d6dd699f43ca6e23a4c8abb8673b37d3983081a8c78545492ea3c1d0b35e3a491277c341df6dd64fb7efaec3b23eb479dede99e9b41016b5504d1a6dc9fbc617
-DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a
 DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
-DIST uv-ce37286814dbb802c422f0926487cfab7aefd2b7.gh.tar.gz 4240004 BLAKE2B ab2fcd73bffa6ab83ddd939cc48eeb8e6278ccc242d922085b42422fa74cbc67f8d323a371a1328aaf01492e6a4752cd6422a25d198cb29a1452ac356c2c11aa SHA512 d5ee3043fa2e40cc8a0ef958cb33f88457acc09ccea4a04af078e87f43ab02b96f719c436e215972fadc9499c9d4b7ef08f5cdb9bd3e9ec691104f1cb20cdec6
 DIST uv-d5f39331a73d5042e70ab770463dff632e20c127.gh.tar.gz 4755462 BLAKE2B da0ff2271e5bb5f08bed22702d1e96d3b25e3c6cf3e14055e686e47617432835e6c6d96b98e838545ad3dffb34e9217435a895f97ba6fbacdc299224cd3bdb9c SHA512 106390ae9f4792e746b8eb51c20f29547c261942618cc783f4057f3c2d2ec8574aed02202a2883c126265ccba45e5a30afb18043571a61953eb3b992e87f216d
diff --git a/dev-util/pixi/pixi-0.59.0.ebuild b/dev-util/pixi/pixi-0.59.0.ebuild
deleted file mode 100644
index 316ec4dc1336..000000000000
--- a/dev-util/pixi/pixi-0.59.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/astral-sh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;06ec5a5f59ffaeb6cf5079c6cb184467da06c9db;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;ad8b9d332d1773fde8b4cd008486de5973e0a3f8;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;ad8b9d332d1773fde8b4cd008486de5973e0a3f8;reqwest-middleware-%commit%/reqwest-retry'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[uv-auth]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-auth'
-	[uv-build-backend]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-build-backend'
-	[uv-build-frontend]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-build-frontend'
-	[uv-cache-info]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache-info'
-	[uv-cache-key]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache-key'
-	[uv-cache]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-cache'
-	[uv-client]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-client'
-	[uv-configuration]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-configuration'
-	[uv-console]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-console'
-	[uv-dirs]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-dirs'
-	[uv-dispatch]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-dispatch'
-	[uv-distribution-filename]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution-filename'
-	[uv-distribution-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution-types'
-	[uv-distribution]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-distribution'
-	[uv-extract]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-extract'
-	[uv-fs]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-fs'
-	[uv-git-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-git-types'
-	[uv-git]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-git'
-	[uv-globfilter]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-globfilter'
-	[uv-install-wheel]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-install-wheel'
-	[uv-installer]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-installer'
-	[uv-macros]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-macros'
-	[uv-metadata]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-metadata'
-	[uv-normalize]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-normalize'
-	[uv-once-map]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-once-map'
-	[uv-options-metadata]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-options-metadata'
-	[uv-pep440]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pep440'
-	[uv-pep508]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pep508'
-	[uv-platform-tags]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-platform-tags'
-	[uv-platform]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-platform'
-	[uv-pypi-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-pypi-types'
-	[uv-python]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-python'
-	[uv-redacted]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-redacted'
-	[uv-requirements-txt]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-requirements-txt'
-	[uv-requirements]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-requirements'
-	[uv-resolver]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-resolver'
-	[uv-shell]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-shell'
-	[uv-small-str]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-small-str'
-	[uv-state]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-state'
-	[uv-static]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-static'
-	[uv-torch]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-torch'
-	[uv-trampoline-builder]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-trampoline-builder'
-	[uv-types]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-types'
-	[uv-version]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-version'
-	[uv-virtualenv]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-virtualenv'
-	[uv-warnings]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-warnings'
-	[uv-workspace]='https://github.com/astral-sh/uv;ce37286814dbb802c422f0926487cfab7aefd2b7;uv-%commit%/crates/uv-workspace'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;06ec5a5f59ffaeb6cf5079c6cb184467da06c9db;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.86.0"
-
-inherit cargo
-
-CRATE_P=${P}
-DESCRIPTION="A package management and workflow tool"
-HOMEPAGE="
-	https://pixi.sh/
-	https://github.com/prefix-dev/pixi/
-"
-SRC_URI="
-	https://github.com/prefix-dev/pixi/releases/download/v${PV}/source.tar.gz
-		-> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-	https://github.com/gentoo-crate-dist/pixi/releases/download/v${PV}/${P}-crates.tar.xz
-"
-
-LICENSE="BSD"
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0
-	CDLA-Permissive-2.0 ISC MIT MPL-2.0 Unicode-3.0 ZLIB BZIP2
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rustls"
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	!rustls? ( dev-libs/openssl:= )
-"
-
-src_prepare() {
-	default
-
-	# replace upstream crate substitution with our crate substitution, sigh
-	local pkg
-	for pkg in reqwest-middleware reqwest-retry version-ranges; do
-		local dep=$(grep "^${pkg}" "${ECARGO_HOME}"/config.toml || die)
-		sed -i -e "/\[patch\.crates-io\]/,\$s;^${pkg}.*$;${dep};" Cargo.toml || die
-	done
-
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usex rustls rustls-tls native-tls)
-	)
-	cargo_src_configure --no-default-features
-
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_test() {
-	# tests use it to test preserving envvars, apparently assuming
-	# it will be always set
-	local -x USER=${USER}
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/pixi || die
-	cargo_src_install
-}
diff --git a/dev-util/rustup/rustup-1.28.2-r2.ebuild b/dev-util/rustup/rustup-1.28.2-r2.ebuild
index 09d89dcb1a8a..72149d24ff81 100644
--- a/dev-util/rustup/rustup-1.28.2-r2.ebuild
+++ b/dev-util/rustup/rustup-1.28.2-r2.ebuild
@@ -80,6 +80,8 @@ src_install() {
 		dobashcomp "${T}/${PN}"
 		./rustup completions zsh > "${T}/_${PN}" || die
 		dozshcomp "${T}/_${PN}"
+		./rustup completions fish > "${T}/${PN}.fish" || die
+		dofishcomp "${T}/${PN}.fish"
 	else
 		ewarn "Shell completion files not installed! Install them manually with '${PN} completions --help'"
 	fi
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index 09d89dcb1a8a..72149d24ff81 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -80,6 +80,8 @@ src_install() {
 		dobashcomp "${T}/${PN}"
 		./rustup completions zsh > "${T}/_${PN}" || die
 		dozshcomp "${T}/_${PN}"
+		./rustup completions fish > "${T}/${PN}.fish" || die
+		dofishcomp "${T}/${PN}.fish"
 	else
 		ewarn "Shell completion files not installed! Install them manually with '${PN} completions --help'"
 	fi
diff --git a/dev-util/umockdev/umockdev-0.19.3.ebuild b/dev-util/umockdev/umockdev-0.19.3.ebuild
index 62bbd93dfa15..4ab54c932cab 100644
--- a/dev-util/umockdev/umockdev-0.19.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.19.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Mock hardware devices for creating unit tests"