Publish srcux candidate 0000000776-20261021-173123

15 files changed, 288 insertions, 343 deletions

diff --git a/dev-util/codex/Manifest b/dev-util/codex/Manifest
index 6571b3749506..31e43347236b 100644
--- a/dev-util/codex/Manifest
+++ b/dev-util/codex/Manifest
@@ -1,12 +1,9 @@
 DIST cloudflare-zlib-sys-0.3.6.crate 147199 BLAKE2B b7089d328048b838fd9003f14cd9bddb720507a3426bd3a99ab70aa32dabee44078d6e9f9cc0171d7674ebf084fdd60776063e6976d5bd9ae61b2943c94c00d1 SHA512 c0064ab7dda47088450b3abd0ac12981e1db44564e7acf03af0836f9a9c54310cac5f93dd0cbc64c32749ea9cfe899ead81533f630dd00f5e29e9c6ef7150e6e
-DIST codex-0.157.0.tar.gz 16112186 BLAKE2B 10bd25c71650418e8b0dbd21b9903ccf474e52ea002c959adba99e929293acdef35290ce73f7c794ebb180a821a30943e79c2d002c10df32f8251a7c280b2ae9 SHA512 9d74ac25bbf53b755b9131f41e2048c06e6a78499f61dc942630511f6ff26da0fa12a0aa72f0c3813915a98bb9de20901d2549d2c09425d570655d209e36ffbc
-DIST codex-0.160.0.tar.gz 16677782 BLAKE2B 426ee2ecddf9ed54f36ade4350cb0961d0ca612caf54054f6803c4135f86395f25fd48f1b3701d55bc1a361903a11d71d5a6fdbb690070a34e9e1293a021df79 SHA512 f0b44cff050e8f665a4019c6cb20923dbafb9ae93dec4ae52595c1406962db77d23006c4a655291bfd175278a94e89366cc79e79847c8e15d5c6779b76393fd1
 DIST codex-0.162.0.tar.gz 17185464 BLAKE2B 598d6225e1771f3613b0a9a78966e1a362fd1e9ad7e1e20a39e3f3df66bdf0fe5e5fd8c2f426464a50bb5bcad0308d9db761f56c492f5599aad7a87c2947225c SHA512 a83fb429657816e7e3eb81220b139988bbd884343c72cb53244dbac60ff9478bdd44781f262e2e749ed38004806eb23fa5782949e07c70cd2e802cfc67af7a46
-DIST codex-rust-v0.157.0-crates.tar.xz 157554932 BLAKE2B 97eed631134b7a03e2923f1a1a8548d1c746e8b24f43fe352fc47b27a2c02de15ad676939976eefb515786fa314cc6f0499dc46fc6e3559c13a4dea0fd7c21ba SHA512 9fb979c584745cf77c99638f83465a953ee100aff8c048700318d09bbd6105d0c25b8eeefd9b9dc5bd414370591d0f6acc89c9d4f5d0a262bb6424532aea4c6d
-DIST codex-rust-v0.160.0-crates.tar.xz 157575148 BLAKE2B 604051f98230a239a8f7a25b100cdbb70a36a7c2cc76881e776a530a747ddd377c3b72d6a775157f5a61a7fb2c4dbf54ab017550bd78ec937ff72612203f4963 SHA512 e0c76be465c904edd8acb07235ec645b71c816be62195f4ff4f9d9150638800fe67dfed1a0ec30df356bd60dc152505924798c599ea94177ee0a7d7eca5cfbf4
+DIST codex-0.163.0.tar.gz 17505520 BLAKE2B 07894bdcc675592346acfc71998ac31cba847c4816cb6f0d85b451006cc1576ad2c1c4531d3cd85c31e18b40ecd74422a2a64c80654e11d5b4aa3c85141f68aa SHA512 5ae2a24f1d359b4ba0ad782c362c7a84bbb436f8f4a6e920338db9d095a469f28fa51e01002dfe79478a06565a93dd750881e5784cc9ff9ae31a0081aee975ec
 DIST codex-rust-v0.162.0-crates.tar.xz 158312872 BLAKE2B 28c01090275034d0ea5dc1178775970ff7f1ab79b77b1e583114824ed031e895ddb5e719e2a2a937e48378b66c48b45e61559cdee0d8f8f945b41202c269a603 SHA512 4af40e540fd92c972742a600d345f752afd584686ccec43c5a8e692c8f2821d797c223a72a4b5104c68b0e65f2c4c3845d0578475cb31ba4a77a119a2075b28f
+DIST codex-rust-v0.163.0-crates.tar.xz 158329364 BLAKE2B e4f131dd59982013715ed9d88d155399b10d21ab6fef247b05c8de04583c57db16621b67644a58f366d36c20d8867499f05d5f232f8f53718eb1ab181e992a86 SHA512 be2fd2e614799d537e832467c2230874ff443c69944ff435e3c32b512cff08f7d284ba91bae57208d65856c72931b01d805845f1978a134b7a9504563c49ebb1
 DIST crossterm-ed1cdab335221515706178d68495bba2aed1924f.gh.tar.gz 162382 BLAKE2B 6611cdebbdce8f8b0795f344d1826bc17a6b06b8a24754a0c3db5e85acb1c38aab29624d4c7e59eba1d75da602be7eff4509bd251ba9c9df752a923b1356167b SHA512 960fc78854343bb811d6811e628575c6bbd01e24416613d2ee4fc695016031c5a87cf0da31c53a04fada1582b7447d1128a1c645e311c3d157a09e256f3790ee
-DIST crossterm-efa177859fd9623d57b9fe7ae9bf491ae1ac6ec4.gh.tar.gz 145349 BLAKE2B c75ce5f67f7d0040f183a32cd1d8420a307e2acf11de9163a0c69fbd788de34452dcc48b160b2cf15d64c971634f7fe93a50127582aaac14d70373a4b68324f4 SHA512 6aedeb88d51e59db101aa37a0f3b77f24f4a251e3a3da533c32c6919102b93ff02cdcb4b37b3eeb7407debf1c970c51e6f05bf0baa0eb206497a33c6c9e68895
 DIST h3-e07e69412876f7e26f026bd75a48b2704d8c8283.gh.tar.gz 244832 BLAKE2B bea2d550925b09b3fd0a33aef734a26a7457d91dc0a89fe72cd6de684dd2f2a37de5ac615691e7d92cc47fa7aaad4ab13c253dd30eaa3287f7d62e139f77d07a SHA512 9dc2589b2ea013f6bb79c05fb515fdf236834116241ecb33c783b64102e3904c11beea7d75ad12d3fd48b66276387da96c162657010292eae5a8c84260ef94d2
 DIST libz-ng-sys-1.1.16.crate 478122 BLAKE2B 7c1be97251029732cd3a8c77dad8a492193282b5fddf40df480ef3a35a49f5d25c7dc183d81aa267722276156c8b97243742117686d078f2d3a566546fa83d58 SHA512 c7d1b062a06b283ee2d398ff456f13634ed1d2d436ea2b8a55f19fbbad47bc419e068b0f9e805221321062b8c5ad309dd3e5d466741780549ae3e5299eee06e1
 DIST libz-sys-1.1.20.crate 830422 BLAKE2B 26265b1faf04f7d0cfd751ddf003585b1be59fcf8fde3ddfd86f18cc3e2d5c3b62a808f47c01329a57759d14fe6283cd94a72eda46d5c5031249df0f1696ab03 SHA512 9b537e7c01553e782be145223c6d174601ade3a950bfd0eb4ea09658da5b8910cf0d0c5984672f9d198f73d5aa63d21e0c20c4c44ff7d0a017ee11ae4ecf4859
@@ -14,6 +11,7 @@ DIST mxc-6cd3d58f05d3447e67109cfb75e042803b843ca4.gh.tar.gz 5985947 BLAKE2B f2c4
 DIST nucleo-4253de9faabb4e5c6d81d946a5e35a90f87347ee.gh.tar.gz 86782 BLAKE2B a812a2d2f08df818ac7b13b800f51c4229ea1f968668b1224fbc1fd82fb4e045f6b2c536ec6d2647a579097efbddaf041f4b7b356107679156aaa3ca5a9d4068 SHA512 354061278efce55defb30b9ee2ef5cdab745ab56d7d113f6f47a8ac174b4215ec6efe15c15bef0e3d907350182c0d189071e9d7d17d40e807d4db5361682f4e0
 DIST rules_rust-b56cbaa8465e74127f1ea216f813cd377295ad81.gh.tar.gz 3951333 BLAKE2B e369b7ccc25326726340fced4c8f8f9181f02f45be9d5f24d00201999a2b11c42d010e7623429b1910db7fdfdf4c202e061a5ba5db722d3126ee26d9597d7e0d SHA512 3f2ef3d7940096fa34b85ee0d9979085fe99c7d2ae8c5ed9399bd5cf8370a31fa93d16c752f22166b42d30c2b7f9f921f7a963928519592e3ffd588644d3b1c7
 DIST rust-sdk-3e636cab26c013eca5131103c03d20237f12c4df.gh.tar.gz 711661 BLAKE2B b7b03cfc9f5c5bb063d8d40eadb7f294acc77b52c577e4a6f1837c21c282d87dd77832771e0a7d13f7e1e62cac96b86d04747057670b64f46832fd1b3eca3d21 SHA512 8e8cb7302c81c4e8e3b05fb95ac8cc43e28fdd168a4625847aca550631413af17e1296ff433824e533074cf41c03eba29e6c56d80b81cf9ecdc1631b72e732ed
+DIST rust-sdk-4048ac40e958fb1a7d614617a2ae8d26666ee2fa.gh.tar.gz 741132 BLAKE2B 282c360ef618299529c285d92dc586e4af890a842092766bcaff9dd487198122ee320070a5b68df5ea5bf1d9acbc3d5639d6b715ecb0419b61ed4a1ac9b78723 SHA512 d01b0cd0814abedfcd71e8b6fd5365af305da1547cbef009e9da043a6259d79fcfd45a1a78db8956a20763d72e878bd1dfe56e93b73836807a83a59c3b1c3601
 DIST rusty_v8_150.4.0_librusty_v8_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.a.gz 28897449 BLAKE2B ff719ae67fb52adbe51ac310aa56d059cdd81b466f0e3cc056367888257df306c0554773e2474f2e6438ab2c0e3c29bd039fb1e083f695164cb4db3c22a60cc0 SHA512 5a858b6eea1080cf1182caef98c58ccb62c44a52969e5e3409b2b9a9fb2adc2e2b98273195328e4608d4027b80ea1fc6eea286ba53b9796eab46dbe998213784
 DIST rusty_v8_150.4.0_librusty_v8_ptrcomp_sandbox_release_x86_64-unknown-linux-musl.a.gz 29557041 BLAKE2B eb2a923086cf66e6c9d3322889f3e9dbbd6cba2b70aff1ecc5bfd3954ffd24a1eb079a1ce4f2852c54a03270919c93617dac479259bc0a9fefaa04f6f12a2806 SHA512 a29c010e56a64a9abcca01606bae1961c74fe8be38eed73c3ef6670013d8998f0c9e806ef00c46dc33cc38dff72d8941a4cfe8a984113134b841aa2404972ede
 DIST rusty_v8_150.4.0_src_binding_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.rs 39884 BLAKE2B b21381b7f09d0205455ba541b2a38ff79b9535c4b8436b309f39f4b40d819e604b3689298ae81deb00c07a12a21ef0fd1bd0bbddb196d63f24d8621ace7165c1 SHA512 4ebc8dfb8b87fb6e1b39a67582e4690278ebcadf8a18314f642fd6658e2b5706a7acbbd52ab1899d985700a8e886dda6a601a29d977bdfcc9da46209b1a90571
diff --git a/dev-util/codex/README.md b/dev-util/codex/README.md
index 85276ef79cef..1e4eecdd516e 100644
--- a/dev-util/codex/README.md
+++ b/dev-util/codex/README.md
@@ -1,6 +1,7 @@
 # Codex daemon upgrades
 
-`codex-0.162.0-r1.ebuild` adds the post-install daemon update. Keep its
+`codex-0.163.0.ebuild` retains the post-install daemon update introduced in
+`codex-0.162.0-r1.ebuild`. Keep its
 `pkg_postinst` function when bumping versions; upgrading `/usr/bin/codex` alone
 does not replace an existing managed background-server package.
 
@@ -18,14 +19,14 @@ The ebuild does not install a complete standalone package, so `--from-cli`
 cannot be used. Override `CODEX_DAEMON_HOME` in `make.conf` for another shared
 home, or set `CODEX_DAEMON_AUTO_UPDATE="no"` to disable this hook.
 
-The matching revision is available immediately in the local personal overlay.
-This source revision enters srcux through its normal publication process;
-published release trees have not been edited.
+Keep the versioned recipe in this distribution authoring tree and the local
+personal overlay consistent. Publish source updates through Crucible's normal
+checked workflow; do not edit generated release trees.
 
 ```sh
-emerge --pretend --oneshot '=dev-util/codex-0.162.0-r1::personal'
+emerge --pretend --oneshot '=dev-util/codex-0.163.0::personal'
 bash /var/git/repos/personal/dev-util/codex/tests/test-postinst.bash \
-  /var/lib/crucible/repos/srcux/sources/distribution/dev-util/codex/codex-0.162.0-r1.ebuild
+  /var/lib/crucible/repos/srcux/sources/distribution/dev-util/codex/codex-0.163.0.ebuild
 CODEX_HOME=/var/lib/ai/codex/.codex codex app-server daemon version
 ```
 
@@ -41,3 +42,9 @@ directory to be changed from workbench ownership to `root:root`, mode `0700`.
 After that correction, CLI and server both reported 0.162.0. Do not change
 ownership automatically in the ebuild; another user's daemon needs its own
 permissions.
+
+For 0.163.0, `rmcp` and `rmcp-macros` use upstream lockfile revision
+`4048ac40e958fb1a7d614617a2ae8d26666ee2fa`. The other Git pins, Rust 1.95.0
+minimum, and V8 150.4.0 sandbox/pointer-compression assets remain unchanged.
+Every bump must check all Git pins against the new lockfile; changing only the
+ebuild filename does not update them.
diff --git a/dev-util/codex/codex-0.163.0.ebuild b/dev-util/codex/codex-0.163.0.ebuild
new file mode 100644
index 000000000000..1baaed744e46
--- /dev/null
+++ b/dev-util/codex/codex-0.163.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 2025-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NOTE: This package uses a pre-built crate tarball instead of listing individual
+# crates in CRATES="". This approach is required because:
+# 1. Codex has 800+ crate dependencies, which triggers Portage QA warnings:
+#    "QA Notice: This package uses a very large number of CRATES. Please provide
+#    a crate tarball instead and fetch it via SRC_URI."
+# 2. Stricter ebuild QA checks (e.g., in CI pipelines) fail with too many crates.
+#
+# The crate tarball is auto-generated by GitHub Actions at:
+#   https://github.com/gentoo-zh-drafts/codex/
+# Workflow source code for auditing:
+#   https://github.com/gentoo-zh-drafts/codex/blob/crate-dist/.github/workflows/crates.yml
+# This allows anyone to review and verify the crate packaging process.
+
+CRATES="
+	cloudflare-zlib-sys@0.3.6
+	libz-ng-sys@1.1.16
+	libz-sys@1.1.20
+"
+
+declare -A GIT_CRATES=(
+	[appcontainer_common]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/backends/appcontainer/common'
+	[crossterm]='https://github.com/openai-oss-forks/crossterm;ed1cdab335221515706178d68495bba2aed1924f;crossterm-%commit%'
+	[h3]='https://github.com/hyperium/h3;e07e69412876f7e26f026bd75a48b2704d8c8283;h3-%commit%/h3'
+	[h3-quinn]='https://github.com/hyperium/h3;e07e69412876f7e26f026bd75a48b2704d8c8283;h3-%commit%/h3-quinn'
+	[learning_mode_core]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/core/learning_mode_core'
+	[learning_mode_windows]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/backends/learning_mode/windows'
+	[mxc_config_contract]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/core/mxc_config_contract'
+	[mxc_telemetry]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/mxc_telemetry'
+	[process_security_environment_spec]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/core/generated/process_security_environment_specification'
+	[nucleo-matcher]='https://github.com/helix-editor/nucleo;4253de9faabb4e5c6d81d946a5e35a90f87347ee;nucleo-%commit%/matcher'
+	[nucleo]='https://github.com/helix-editor/nucleo;4253de9faabb4e5c6d81d946a5e35a90f87347ee;nucleo-%commit%'
+	[rmcp]='https://github.com/modelcontextprotocol/rust-sdk;4048ac40e958fb1a7d614617a2ae8d26666ee2fa;rust-sdk-%commit%/crates/rmcp'
+	[rmcp-macros]='https://github.com/modelcontextprotocol/rust-sdk;4048ac40e958fb1a7d614617a2ae8d26666ee2fa;rust-sdk-%commit%/crates/rmcp-macros'
+	[sandbox_spec]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/core/generated/base_container_specification'
+	[runfiles]='https://github.com/dzbarsky/rules_rust;b56cbaa8465e74127f1ea216f813cd377295ad81;rules_rust-%commit%/rust/runfiles'
+	[tokio-tungstenite]='https://github.com/openai-oss-forks/tokio-tungstenite;0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186;tokio-tungstenite-%commit%'
+	[tungstenite]='https://github.com/openai-oss-forks/tungstenite-rs;4fffad30fe373adbdcffab9545e9e9bf4f2fc19f;tungstenite-rs-%commit%'
+	[wxc_common]='https://github.com/microsoft/mxc;6cd3d58f05d3447e67109cfb75e042803b843ca4;mxc-%commit%/src/core/wxc_common'
+)
+
+RUST_MIN_VER="1.95.0"
+
+# python3 .github/scripts/rusty_v8_bazel.py resolved-v8-crate-version
+RUSTY_V8_TAG="150.4.0"
+
+inherit cargo check-reqs toolchain-funcs
+
+CHECKREQS_MEMORY="15G"
+CHECKREQS_DISK_BUILD="20G"
+
+DESCRIPTION="Codex CLI - OpenAI's AI-powered coding agent"
+HOMEPAGE="https://github.com/openai/codex"
+
+# The crate tarball URL uses ${PV} so it auto-updates when bumping versions.
+# This tarball is generated by: https://github.com/gentoo-zh-drafts/codex/
+# See .github/workflows/crates.yml for the generation process.
+SRC_URI="
+	https://github.com/openai/${PN}/archive/rust-v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/gentoo-zh-drafts/codex/releases/download/rust-v${PV}/codex-rust-v${PV}-crates.tar.xz
+	amd64? (
+		https://github.com/openai/codex/releases/download/rusty-v8-v${RUSTY_V8_TAG}/librusty_v8_ptrcomp_sandbox_release_x86_64-unknown-linux-musl.a.gz
+			-> rusty_v8_${RUSTY_V8_TAG}_librusty_v8_ptrcomp_sandbox_release_x86_64-unknown-linux-musl.a.gz
+		https://github.com/openai/codex/releases/download/rusty-v8-v${RUSTY_V8_TAG}/src_binding_ptrcomp_sandbox_release_x86_64-unknown-linux-musl.rs
+			-> rusty_v8_${RUSTY_V8_TAG}_src_binding_ptrcomp_sandbox_release_x86_64-unknown-linux-musl.rs
+	)
+	arm64? (
+		https://github.com/openai/codex/releases/download/rusty-v8-v${RUSTY_V8_TAG}/librusty_v8_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.a.gz
+			-> rusty_v8_${RUSTY_V8_TAG}_librusty_v8_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.a.gz
+		https://github.com/openai/codex/releases/download/rusty-v8-v${RUSTY_V8_TAG}/src_binding_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.rs
+			-> rusty_v8_${RUSTY_V8_TAG}_src_binding_ptrcomp_sandbox_release_aarch64-unknown-linux-musl.rs
+	)
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/${PN}-rust-v${PV}/codex-rs"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0
+	CC0-1.0 CDLA-Permissive-2.0 ISC MIT MPL-2.0 Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+# Tests fail due to ring crate conflicts with system OpenSSL
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/openssl:=
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/${PN} usr/bin/codex-code-mode-host"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+	if tc-is-lto; then
+		export CARGO_PROFILE_RELEASE_LTO=thin
+	else
+		export CARGO_PROFILE_RELEASE_LTO=false
+	fi
+}
+
+gen_git_crate_dir() {
+	# https://github.com/gentoo/gentoo/blob/b09dd88412fe2d5eee5a8891e08bfa2d67848da3/eclass/cargo.eclass#L442
+	IFS=';' read -r crate_uri commit crate_dir <<<"${GIT_CRATES[$1]}"
+	echo "${WORKDIR}/${crate_dir//%commit%/${commit}}"
+}
+
+src_prepare() {
+	default
+
+	# Fix tokio-tungstenite's git dependency on tungstenite
+	sed -i '/^\[dependencies\.tungstenite\]/,/^$/{
+		s|git = "[^"]*"|path = "'"$(gen_git_crate_dir tungstenite)"'"|
+		/^rev = /d
+	}' "$(gen_git_crate_dir tokio-tungstenite)/Cargo.toml" || die
+
+	# Remove the [patch.crates-io] section and add path-based patches
+	sed -i '/^\[patch\.crates-io\]/,/^$/d' "${S}/Cargo.toml" || die
+	sed -i '/^\[patch\."ssh:\/\/git@github\.com/,/^$/d' "${S}/Cargo.toml" || die
+
+	# Add new patch section with local paths
+	cat >> "${S}/Cargo.toml" <<-EOF || die
+
+	[patch.crates-io]
+	crossterm = { path = "$(gen_git_crate_dir crossterm)" }
+	tokio-tungstenite = { path = "$(gen_git_crate_dir tokio-tungstenite)" }
+	tungstenite = { path = "$(gen_git_crate_dir tungstenite)" }
+	EOF
+}
+
+src_compile() {
+	local rusty_v8_triple
+	use amd64 && rusty_v8_triple=x86_64-unknown-linux-musl
+	use arm64 && rusty_v8_triple=aarch64-unknown-linux-musl
+
+	# codex-core trait resolution overflows rustc's default 8MiB stack
+	export RUST_MIN_STACK=16777216
+
+	# codex-code-mode-runtime enables V8's sandbox and pointer compression.
+	RUSTY_V8_ARCHIVE="${DISTDIR}/rusty_v8_${RUSTY_V8_TAG}_librusty_v8_ptrcomp_sandbox_release_${rusty_v8_triple}.a.gz" \
+	RUSTY_V8_SRC_BINDING_PATH="${DISTDIR}/rusty_v8_${RUSTY_V8_TAG}_src_binding_ptrcomp_sandbox_release_${rusty_v8_triple}.rs" \
+		cargo_src_compile --package codex-cli --package codex-code-mode-host
+}
+
+src_install() {
+	# The CLI starts Code Mode through a sibling executable.
+	dobin "$(cargo_target_dir)/codex" \
+		"$(cargo_target_dir)/codex-code-mode-host"
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Only update an existing daemon after a merge on the running system.
+	[[ ${ROOT} == / && -z ${EPREFIX} && -n ${REPLACING_VERSIONS} ]] || return 0
+	[[ ${CODEX_DAEMON_AUTO_UPDATE:-yes} == yes ]] || return 0
+
+	# Portage does not inherit the interactive shell's CODEX_HOME reliably.
+	# This distribution uses a shared home; other installations can override it
+	# with CODEX_DAEMON_HOME in make.conf.
+	local codex_home=${CODEX_DAEMON_HOME:-/var/lib/ai/codex/.codex}
+	[[ -d ${codex_home}/app-server-daemon ]] || return 0
+	[[ -L ${codex_home}/packages/app-server-daemon/current ||
+		-L ${codex_home}/packages/standalone/current ]] || return 0
+
+	# Do not run a user's daemon as root or change its ownership during a merge.
+	if [[ ! -O ${codex_home}/app-server-daemon/settings.json ]]; then
+		ewarn "Skipping Codex daemon update: settings are not owned by the merge user."
+		ewarn "Run 'codex app-server daemon update' as the daemon owner."
+		return 0
+	fi
+
+	# A restarted daemon must not inherit Portage's temporary HOME or build env.
+	local passwd_entry daemon_user daemon_home daemon_shell unused
+	if ! passwd_entry=$(getent passwd "${EUID}"); then
+		ewarn "Cannot resolve the merge user's home; update the Codex daemon manually."
+		return 0
+	fi
+	IFS=: read -r daemon_user unused unused unused unused daemon_home daemon_shell \
+		<<< "${passwd_entry}"
+	if [[ ${daemon_home} != /* || ! -d ${daemon_home} ]]; then
+		ewarn "The merge user's home is unavailable; update the Codex daemon manually."
+		return 0
+	fi
+
+	einfo "Updating the Codex background server in ${codex_home} (may restart it)..."
+	# The system build has no standalone package manifest, so --from-cli is
+	# unavailable. Use the upstream daemon updater with a bounded wait.
+	if ! ( cd "${daemon_home}" && env -i HOME="${daemon_home}" \
+		USER="${daemon_user}" LOGNAME="${daemon_user}" SHELL="${daemon_shell}" \
+		PATH=/usr/sbin:/usr/bin:/sbin:/bin CODEX_HOME="${codex_home}" \
+		/usr/bin/timeout --kill-after=10s 300s \
+		"${EROOT}usr/bin/codex" app-server daemon update ); then
+		ewarn "Codex CLI was installed, but the background server update did not complete."
+		ewarn "Retry: CODEX_HOME='${codex_home}' codex app-server daemon update"
+		ewarn "If migration completed but startup failed, fix the reported error and run:"
+		ewarn "CODEX_HOME='${codex_home}' codex app-server daemon start"
+	fi
+}
diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest
index fba6eb4fbeca..fa73a9f91800 100644
--- a/dev-util/gammaray/Manifest
+++ b/dev-util/gammaray/Manifest
@@ -1,2 +1,2 @@
-DIST gammaray-3.3.1.tar.gz 10976872 BLAKE2B 8ab4627b1417b0b289c093c72cf52dab5ceff3f48e99f68af0251ffed7ce4110c1c70def6877ecd5132dd2faf0f8eb8049675d20b912961c2e627c3bc1a858f3 SHA512 301be8389b9f268dfabde7655b374a3f7e551b70e144c77aa22fb7b3a065336f46218b2d805305d56910aa25a084dbf945481368217918061883288d00dfec43
 DIST gammaray-3.4.0.tar.gz 10978347 BLAKE2B b6a648b7c0a008835dbd71836bd73830d11249ef3a9f37ca94b0b5e2f4b44a0a35c1421871068c6853848850e8636da868df7d20932adbf71c631a85b4c855b3 SHA512 00d309873cc0108237d469ede1c8fb560891555f1721c0f585b99f972618e397d590fe70f2e143acdd20d9d3015326d356487ec1e8c8578f3596fa99b8c7a4a3
+DIST gammaray-3.4.1.tar.gz 10978322 BLAKE2B 9f7af9a67c77088582af0dd33555fd1f0aa618c7d0b1d6a2111a4f5c8860a505e50eba04a7b3a9c4e25ec9b6c9b98fd702434bd4421210c8e4cd7c41eb5d5517 SHA512 c8e26b854fbe59f903226ad9883059ac1fdaf13ab6e1599f71e0ba9582afeabd7e1fc282d522056b794c114442c5177e030ced01f41fd325603e9adb22582b5b
diff --git a/dev-util/gammaray/gammaray-3.4.0-r1.ebuild b/dev-util/gammaray/gammaray-3.4.0-r1.ebuild
index 3f60a8edbb29..63379ac3b713 100644
--- a/dev-util/gammaray/gammaray-3.4.0-r1.ebuild
+++ b/dev-util/gammaray/gammaray-3.4.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # skip warning for unused files in 3rdparty/backward-cpp
 CMAKE_QA_COMPAT_SKIP=1
 
-inherit cmake flag-o-matic qmake-utils xdg
+inherit cmake flag-o-matic qt-utils xdg
 
 MY_PN="GammaRay"
 DESCRIPTION="High-level runtime introspection tool for Qt applications"
@@ -108,7 +108,7 @@ src_configure() {
 		$(cmake_use_find_package wayland Wayland)
 		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
 		-DBUILD_TESTING=$(usex test)
-		-DECM_MKSPECS_INSTALL_DIR="$(qt6_get_mkspecsdir)"
+		-DECM_MKSPECS_INSTALL_DIR="$(qt_get_mkspecsdir 6)"
 		# enable doc for manpages
 		-DGAMMARAY_BUILD_DOCS=ON
 		-DGAMMARAY_BUILD_UI=ON
diff --git a/dev-util/gammaray/gammaray-3.4.0.ebuild b/dev-util/gammaray/gammaray-3.4.0.ebuild
deleted file mode 100644
index 91aa394e64c7..000000000000
--- a/dev-util/gammaray/gammaray-3.4.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# skip warning for unused files in 3rdparty/backward-cpp
-CMAKE_QA_COMPAT_SKIP=1
-
-inherit cmake qmake-utils xdg
-
-MY_PN="GammaRay"
-DESCRIPTION="High-level runtime introspection tool for Qt applications"
-HOMEPAGE="
-	https://www.kdab.com/software-technologies/developer-tools/gammaray/
-	https://github.com/KDAB/GammaRay
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/KDAB/GammaRay.git"
-else
-	SRC_URI="https://github.com/KDAB/GammaRay/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="BSD-2 GPL-2+ MIT"
-SLOT=0
-
-IUSE="3d bluetooth designer doc geolocation highlight kjob scxml svg test wayland webengine"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
-	dev-qt/qtdeclarative:6[widgets]
-	3d? ( dev-qt/qt3d:6[qml] )
-	bluetooth? ( dev-qt/qtconnectivity:6[bluetooth] )
-	designer? ( dev-qt/qttools:6[designer] )
-	geolocation? (
-		dev-qt/qtlocation:6
-		dev-qt/qtpositioning:6
-	)
-	highlight? ( kde-frameworks/syntax-highlighting:6 )
-	kjob? ( kde-frameworks/kcoreaddons:6 )
-	scxml? (
-		dev-qt/qtscxml:6
-		>=dev-util/kdstatemachineeditor-2.2.0
-	)
-	svg? ( dev-qt/qtsvg:6 )
-	wayland? (
-		dev-libs/wayland
-		dev-qt/qtwayland:6[compositor(+)]
-	)
-	webengine? ( dev-qt/qtwebengine:6[widgets] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-qt/qttools:6[linguist]
-	doc? (
-		app-text/doxygen
-		dev-qt/qttools:6[assistant,qdoc,qtattributionsscanner]
-		media-gfx/graphviz
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.0-unbundle_libs.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc; then
-		cmake_comment_add_subdirectory -f docs manual api collection
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package 3d Qt63DAnimation)
-		$(cmake_use_find_package 3d Qt63DExtras)
-		$(cmake_use_find_package 3d Qt63DInput)
-		$(cmake_use_find_package 3d Qt63DLogic)
-		$(cmake_use_find_package 3d Qt63DRender)
-		$(cmake_use_find_package 3d Qt63DQuick)
-		$(cmake_use_find_package bluetooth Qt6Bluetooth)
-		$(cmake_use_find_package designer Qt6Designer)
-		$(cmake_use_find_package geolocation Qt6Location)
-		$(cmake_use_find_package geolocation Qt6Positioning)
-		$(cmake_use_find_package highlight KF6SyntaxHighlighting)
-		$(cmake_use_find_package kjob KF6CoreAddons)
-		$(cmake_use_find_package svg Qt6Svg)
-		$(cmake_use_find_package scxml Qt6Scxml)
-		$(cmake_use_find_package scxml Qt6StateMachine)
-		$(cmake_use_find_package wayland Qt6WaylandCompositor)
-		$(cmake_use_find_package wayland Wayland)
-		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
-		-DBUILD_TESTING=$(usex test)
-		-DECM_MKSPECS_INSTALL_DIR="$(qt6_get_mkspecsdir)"
-		# enable doc for manpages
-		-DGAMMARAY_BUILD_DOCS=ON
-		-DGAMMARAY_BUILD_UI=ON
-		-DGAMMARAY_DISABLE_FEEDBACK=ON
-		-DGAMMARAY_WITH_KDSME=$(usex scxml)
-		-DQT_VERSION_MAJOR=6
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# avoid gdb/lldb tests
-		connectiontest-*
-		connectiontest-*-filter
-		# GammaRay::ProblemReporterTest::testConnectionIssues() We can't find duplicates with PMF connects, yet.
-		problemreportertest
-		# QFATAL : QuickInspectorTest::testModelsReparent() Failed to initialize graphics backend for OpenGL.
-		quickinspectortest
-		quickinspectortest2
-		# need gdb/lldb
-		# Yama security extension is blocking runtime attaching
-		clientconnectiontest
-		launchertest
-		# need launcher
-		quickmaterialtest
-		quicktexturetest
-	)
-	local -x QT_QPA_PLATFORM=offscreen
-	cmake_src_test
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${BUILD_DIR}"/docs/api/html/. )
-		find "${HTML_DOCS}" \( -iname '*.map' -o -iname '*.md5' \) -delete || die
-	fi
-
-	cmake_src_install
-
-	docompress -x /usr/share/doc/${PF}/${PN}{.qhc,-manual.qch,-api.qch}
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-util/gammaray/gammaray-3.3.1.ebuild b/dev-util/gammaray/gammaray-3.4.1.ebuild
index 91aa394e64c7..63379ac3b713 100644
--- a/dev-util/gammaray/gammaray-3.3.1.ebuild
+++ b/dev-util/gammaray/gammaray-3.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # skip warning for unused files in 3rdparty/backward-cpp
 CMAKE_QA_COMPAT_SKIP=1
 
-inherit cmake qmake-utils xdg
+inherit cmake flag-o-matic qt-utils xdg
 
 MY_PN="GammaRay"
 DESCRIPTION="High-level runtime introspection tool for Qt applications"
@@ -27,13 +27,14 @@ fi
 LICENSE="BSD-2 GPL-2+ MIT"
 SLOT=0
 
-IUSE="3d bluetooth designer doc geolocation highlight kjob scxml svg test wayland webengine"
+IUSE="3d bluetooth designer doc geolocation highlight kjob opengl scxml svg test wayland webengine"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( opengl )"
 
 RDEPEND="
 	dev-libs/elfutils
-	dev-qt/qtbase:6[concurrent,gui,network,widgets,xml]
-	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtbase:6[concurrent,gui,network,opengl?,widgets,xml]
+	dev-qt/qtdeclarative:6[opengl?,widgets]
 	3d? ( dev-qt/qt3d:6[qml] )
 	bluetooth? ( dev-qt/qtconnectivity:6[bluetooth] )
 	designer? ( dev-qt/qttools:6[designer] )
@@ -76,9 +77,17 @@ src_prepare() {
 	if ! use doc; then
 		cmake_comment_add_subdirectory -f docs manual api collection
 	fi
+	if ! use opengl; then
+		# openglsupport requires opengl
+		# quickinspector requires opengl= that we don't want
+		cmake_comment_add_subdirectory -f plugins openglsupport quickinspector
+	fi
 }
 
 src_configure() {
+	# QT_NO_OPENGL for guisupport
+	use opengl || append-cppflags -DQT_NO_OPENGL
+
 	local mycmakeargs=(
 		$(cmake_use_find_package 3d Qt63DAnimation)
 		$(cmake_use_find_package 3d Qt63DExtras)
@@ -99,7 +108,7 @@ src_configure() {
 		$(cmake_use_find_package wayland Wayland)
 		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
 		-DBUILD_TESTING=$(usex test)
-		-DECM_MKSPECS_INSTALL_DIR="$(qt6_get_mkspecsdir)"
+		-DECM_MKSPECS_INSTALL_DIR="$(qt_get_mkspecsdir 6)"
 		# enable doc for manpages
 		-DGAMMARAY_BUILD_DOCS=ON
 		-DGAMMARAY_BUILD_UI=ON
diff --git a/dev-util/go-task/go-task-3.54.0.ebuild b/dev-util/go-task/go-task-3.54.0.ebuild
index d2a347c58535..7de8a366991b 100644
--- a/dev-util/go-task/go-task-3.54.0.ebuild
+++ b/dev-util/go-task/go-task-3.54.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 
-BDEPEND=">=dev-lang/go-1.25.10"
+BDEPEND=">=dev-lang/go-1.26.4"
 
 src_compile() {
 	ego build github.com/go-task/task/v3/cmd/task
diff --git a/dev-util/opencode-bin/Manifest b/dev-util/opencode-bin/Manifest
index 1da0abcbfba8..9b67ec443d9f 100644
--- a/dev-util/opencode-bin/Manifest
+++ b/dev-util/opencode-bin/Manifest
@@ -6,3 +6,5 @@ DIST opencode-bin-2.0.30-amd64.tar.gz 98083095 BLAKE2B e7fa03d46fcedc5fe1acf4b56
 DIST opencode-bin-2.0.30-arm64.tar.gz 96850168 BLAKE2B 5173ac8ee5928519ecbc7eb7848522c91ed3b009c82e26a74b1d1b0f17288bd45c9ddb5f8c29f7935547e40a1822290c48ca26d925186fc9be97180cf5c6b809 SHA512 110cd5038d235a46d831019da82df2ec8ec33949f0e736213cfc026b6bc56ff30afc1b8190766a3dcb030010fcd8409a355189a38de4cfcb340a4a1d6fc100e3
 DIST opencode-bin-2.0.32-amd64.tar.gz 98152394 BLAKE2B 6fae2877ee0cce3323a04fb16cb27ba6785d13b9656e9092f8bd846bbf9807fb77f94e7bda3ee758c4492bacedb5c49d74bfbaaa7948a078b337d9ffd69849d3 SHA512 36b0788a09496fbbc665627a074a951f510c1e1581678003b001bd5b4c4b6a7ce0c49e9e2c412c181bf1457d1c9bf28f6a0e44fcdd32646b03543658727cff39
 DIST opencode-bin-2.0.32-arm64.tar.gz 96915721 BLAKE2B 87db86d27f4b71ff0fce298aca77e9ed05f37efa70f3ff0708d02ac363c4a5c2197301779f917c70705723fd2f2f947f30bbef6f1214c472fafb2c76ef6dffbc SHA512 611e4ed378abbe6a2dfc6d1ff16e3d7a1be19f9baa085377bdff494ec0a1bdfe3b5ba95d8ca08dbec6824974b648fdba74f394310067ed6a9b2a7c87ceb351e7
+DIST opencode-bin-2.1.1-amd64.tar.gz 98936625 BLAKE2B d8e9188d203477da0bbbdbf12d74910120447007154d47f095032727ade4fe1b301fb2f94174082daa66a98457e0cede6974f28e129cd4e257b25b4aef712548 SHA512 6e37924ed3f0a471caa14ab5772e3f35a3885c9d9e8f77a5c29f6d545d9c11f0687519e1b458f700862d7b64c3a0f105ebe746ae53a4a0f0adde3fbfb60624d9
+DIST opencode-bin-2.1.1-arm64.tar.gz 97694833 BLAKE2B 1ae0f4fe4aaaa85f84079db2c4827781fb59d7d24226d74f4190c7461c9ba2a5a1356a77631eb99130b37b1ca1d0c3927a599db660d478944213519aab97094d SHA512 faff230a1d474fa887dae0886134da62ffb1a84d5a1163345ce8e7b22dbfd63cfa1ab8a7828c414f3d6599f5263d8f91e7bd0b4b212373d2d55ba0c1ac76c0c9
diff --git a/dev-util/opencode-bin/opencode-bin-2.1.1.ebuild b/dev-util/opencode-bin/opencode-bin-2.1.1.ebuild
new file mode 100644
index 000000000000..b0dfeaecfd1c
--- /dev/null
+++ b/dev-util/opencode-bin/opencode-bin-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%%-bin}
+
+DESCRIPTION="The open source coding agent"
+HOMEPAGE="https://opencode.ai"
+
+SRC_URI="
+	amd64? (
+		https://registry.npmjs.org/@opencode/cli-linux-x64-baseline/-/cli-linux-x64-baseline-${PV}.tgz -> ${P}-amd64.tar.gz
+	)
+	arm64? (
+		https://registry.npmjs.org/@opencode/cli-linux-arm64/-/cli-linux-arm64-${PV}.tgz -> ${P}-arm64.tar.gz
+	)
+"
+
+S="${WORKDIR}"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="usr/bin/opencode"
+
+src_install() {
+	dobin package/bin/${MY_PN}
+	dosym ${MY_PN} /usr/bin/${MY_PN}2
+}
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest
index 36d54a489852..51c954e364dd 100644
--- a/dev-util/pixi/Manifest
+++ b/dev-util/pixi/Manifest
@@ -1,6 +1,3 @@
-DIST pixi-0.81.0-crates.tar.xz 78356060 BLAKE2B 5eb3734abba07c894ed9ce529b2e55e088f45c9a988c7858cc4c1447a68f33be25c6b65eff54a259fb408aa20d314d0630b36b4ec6a68cc1eb29fc6d63bdf5fa SHA512 7567bf88a5e4faf9d255c6f65cf8a59b53fc68466799159ed7a89527d79300b5d91775dfc92b3a5aea7e2d5acd9105499c00d9960cd3be1cf3726fd2ba4ad7b7
-DIST pixi-0.81.0.tar.gz 19936301 BLAKE2B 583dcc8e6d8cf8c6e18756df758caeb192c9a41471ec134d79c689470020dbbeb06fee3f45704d372ae68ba7baba45a2f1f47c7936f67711d5fb37ecd8c822bf SHA512 2c087c5b9acef2be70f5f0594df548dbf6328eaf18a512e2c48a6649b1b4173e35e28514763dbbabdecbb12875a4cc48465a61313705e44d5750fe02f86e401b
-DIST pixi-0.82.0-crates.tar.xz 80794952 BLAKE2B d5231bcb0619b3f8ede401c331394a4cd6c4eb69d5cb4edb631b36885df56556908cd77dcaf5a6a6c9a93b3fe0ae4633a43439c5afefee502b317398f3891072 SHA512 ae355cc78678563e274b801dd3c7697e72e5471b2354d3e601bf5486422c17ec825f379c3c926442b98771ffe0b98149830319a34836d1b9be13bc9a2fc74d0a
-DIST pixi-0.82.0.tar.gz 20009719 BLAKE2B 207fc1ce4c201921edfb2b9f34c0335099eeec0f37e31617029949d95ef4c42a4b8055016aab2b9e17bb57f5e1fef758382551138e0084ed951eafe1335e3adf SHA512 d7a6723b1cf75063f658d92c0617777b3d146d5417aaa660a31f219a6b0a677d25370ceb0471e816538f9ac7c03113e9f10df6f8e6fecbc10017a1e6eb74ed89
+DIST pixi-0.82.1-crates.tar.xz 81030084 BLAKE2B e72e811ac75b9b8e5d650e4fd5f0a8e67cdb30e485cc044b12ea136c42522f41f0f8803f64a9199e636cfcc58091a898d046b625b33ac6e73b226f6cde1fe03f SHA512 73bedb524983e5d9c5bf6a69e417b892714c69560035db554672c0a058b45979b94d7e2ae054ce31eba7344e5428028b7f3851874e1762cf5c828757a36fdf21
+DIST pixi-0.82.1.tar.gz 20079530 BLAKE2B f6255ba67b38407d661f1d134818f53116efda9ee9b35be84a7ca053a28c3dbacb667ec8d6a2d1293092727d167dabe76400c0020bf1d6b5f6a0f21f257269ed SHA512 1f36c4f7d0d23673f209b28af9937b8f17fb4a6f674f5c83fe2ac5f8fadba01467c97089b18e4e284e3fb8ffe68884a1174a85f7e1429a0fd32747b1a1efda7c
 DIST pubgrub-d8efd77673c9a90792da9da31b6c0da7ea8a324b.gh.tar.gz 100042 BLAKE2B cacdd77783aae1a94c3aaea56c2bd47b22f13ca34eddcef53b5d205244a213eff2934db03965532085c1aa6892b27bbbabfc19513f62936f8ac1faa466570dd4 SHA512 3a2a146fd9d9b458dced6563a1f5674e81e8ba36de11be5c189b0c76b6ede6f32957f48fb0978b97b0892768822c6c4c32c6870141e8fc1ea5d8b8f7d8b5b464
-DIST uv-3cffe97c2e48c9e49422c738da3af95919dd0bf5.gh.tar.gz 5303746 BLAKE2B b45e64d4c036c2fb54ca3e82a1ce953363f10786e76bb1128e20a6204c03dff3e0d18e3ca652320f81d78b94cebdaefd463b45da639260659e00fa0e2cd3d1f6 SHA512 444defce55de8bca79d9d572dc5231198c23df07a43048c7b621496d35ea46fc274b3aa3eb97fcfc4a045ac81ab540dcf9657ef1d74d5a9535e1a86a68e7d9e6
diff --git a/dev-util/pixi/pixi-0.81.0.ebuild b/dev-util/pixi/pixi-0.81.0.ebuild
deleted file mode 100644
index 8913b7bf42cc..000000000000
--- a/dev-util/pixi/pixi-0.81.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 2025-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_MIN_VER="1.95.0"
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[uv-auth]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-auth'
-	[uv-build-backend]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-build-backend'
-	[uv-build-frontend]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-build-frontend'
-	[uv-cache-info]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-cache-info'
-	[uv-cache-key]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-cache-key'
-	[uv-cache]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-cache'
-	[uv-client]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-client'
-	[uv-configuration]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-configuration'
-	[uv-console]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-console'
-	[uv-dirs]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-dirs'
-	[uv-dispatch]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-dispatch'
-	[uv-distribution-filename]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-distribution-filename'
-	[uv-distribution-types]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-distribution-types'
-	[uv-distribution]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-distribution'
-	[uv-extract]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-extract'
-	[uv-fastid]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-fastid'
-	[uv-flags]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-flags'
-	[uv-fs]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-fs'
-	[uv-git-types]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-git-types'
-	[uv-git]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-git'
-	[uv-globfilter]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-globfilter'
-	[uv-install-wheel]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-install-wheel'
-	[uv-installer]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-installer'
-	[uv-keyring]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-keyring'
-	[uv-macros]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-macros'
-	[uv-metadata]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-metadata'
-	[uv-netrc]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-netrc'
-	[uv-normalize]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-normalize'
-	[uv-once-map]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-once-map'
-	[uv-options-metadata]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-options-metadata'
-	[uv-pep440]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-pep440'
-	[uv-pep508]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-pep508'
-	[uv-platform-tags]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-platform-tags'
-	[uv-platform]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-platform'
-	[uv-preview]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-preview'
-	[uv-pypi-types]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-pypi-types'
-	[uv-python]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-python'
-	[uv-redacted]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-redacted'
-	[uv-requirements-txt]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-requirements-txt'
-	[uv-requirements]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-requirements'
-	[uv-resolver]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-resolver'
-	[uv-scripts]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-scripts'
-	[uv-settings]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-settings'
-	[uv-shell]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-shell'
-	[uv-small-str]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-small-str'
-	[uv-state]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-state'
-	[uv-static]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-static'
-	[uv-toml]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-toml'
-	[uv-torch]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-torch'
-	[uv-trampoline-builder]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-trampoline-builder'
-	[uv-types]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-types'
-	[uv-version]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-version'
-	[uv-virtualenv]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-virtualenv'
-	[uv-warnings]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-warnings'
-	[uv-windows]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-windows'
-	[uv-workspace]='https://github.com/astral-sh/uv;3cffe97c2e48c9e49422c738da3af95919dd0bf5;uv-%commit%/crates/uv-workspace'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;d8efd77673c9a90792da9da31b6c0da7ea8a324b;pubgrub-%commit%/version-ranges'
-)
-
-inherit cargo multiprocessing
-
-CRATE_P=${P}
-DESCRIPTION="A package management and workflow tool"
-HOMEPAGE="
-	https://pixi.prefix.dev/
-	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
-	CC0-1.0 CDLA-Permissive-2.0 ISC MIT MIT-0 MPL-2.0 Unicode-3.0 ZLIB
-	BZIP2
-"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+rustls test"
-RESTRICT="test"
-PROPERTIES="test? ( test_network )"
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	sys-apps/dbus
-	!rustls? ( dev-libs/openssl:= )
-"
-BDEPEND="
-	test? ( dev-util/cargo-nextest )
-"
-
-QA_PREBUILT="usr/bin/pixi"
-
-src_prepare() {
-	default
-
-	# replace upstream crate substitution with our crate substitution, sigh
-	local pkg
-	for pkg in 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 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
-
-	# uv is forcing bundled liblzma, sigh
-	sed -i -e '/xz/s:"static"::' "${WORKDIR}"/uv-*/Cargo.toml || die
-
-	# rattler-build is forcing bundled libdbus
-	sed -i -e '/"vendored"/d' -e 's:"crypto-rust":"crypto-openssl":' \
-		"${ECARGO_VENDOR}"/rattler_networking-*/Cargo.toml || die
-}
-
-src_test() {
-	# tests use it to test preserving envvars, apparently assuming
-	# it will be always set
-	local -x USER=${USER}
-	local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)"
-	set -- cargo nextest run --verbose --no-fail-fast \
-		"${ECARGO_ARGS[@]}" $(usev !debug '--release')
-	echo "${@@Q}" >&2
-	"${@}" || die "cargo nextest failed"
-}
-
-src_install() {
-	dobin "$(cargo_target_dir)/pixi"
-}
diff --git a/dev-util/pixi/pixi-0.82.0.ebuild b/dev-util/pixi/pixi-0.82.1.ebuild
index ed1ed59a6e1f..adc5641f9d73 100644
--- a/dev-util/pixi/pixi-0.82.0.ebuild
+++ b/dev-util/pixi/pixi-0.82.1.ebuild
@@ -82,9 +82,6 @@ src_configure() {
 		Libs: -lbz2
 	EOF
 
-	# uv is forcing bundled liblzma, sigh
-	sed -i -e '/xz/s:"static"::' "${ECARGO_VENDOR}"/uv-*/Cargo.toml || die
-
 	# rattler-build is forcing bundled libdbus
 	sed -i -e '/"vendored"/d' -e 's:"crypto-rust":"crypto-openssl":' \
 		"${ECARGO_VENDOR}"/rattler_networking-*/Cargo.toml || die
diff --git a/dev-util/tinyxxd/files/tinyxxd-1.3.17-default-fixes.patch b/dev-util/tinyxxd/files/tinyxxd-1.3.17-default-fixes.patch
index c6cbac6b6f35..05c7e01d7702 100644
--- a/dev-util/tinyxxd/files/tinyxxd-1.3.17-default-fixes.patch
+++ b/dev-util/tinyxxd/files/tinyxxd-1.3.17-default-fixes.patch
@@ -1,4 +1,4 @@
-commit 17c86fd5c241892ad514e5f291e1716e42109c19
+commit 411339dc4eded08e95bc70860873c3632a92bb1b
 Author: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
 Date:   Mon Oct 19 07:55:22 2026 +0600
 
@@ -7,7 +7,7 @@ Date:   Mon Oct 19 07:55:22 2026 +0600
     Signed-off-by: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
 
 diff --git a/Makefile b/Makefile
-index 8ba7bd0..7ca4879 100644
+index 8ba7bd0..a17f446 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,16 +2,7 @@
@@ -24,7 +24,7 @@ index 8ba7bd0..7ca4879 100644
 -else
 -	CFLAGS += -fstack-protector-strong -D_GNU_SOURCE -fno-plt -Wl,-z,now -D_FORTIFY_SOURCE=3
 -endif
-+CFLAGS += -std=c11 -D_GNU_SOURCE -D_FORTIFY_SOURCE=3
++CFLAGS += -std=c11 -D_GNU_SOURCE
  
  PREFIX ?= /usr
  BINDIR ?= $(PREFIX)/bin
diff --git a/dev-util/tinyxxd/files/tinyxxd-da64dbf542cc27ba614e45fcaf82955fa4643d16-default-fixes.patch b/dev-util/tinyxxd/files/tinyxxd-da64dbf542cc27ba614e45fcaf82955fa4643d16-default-fixes.patch
index 0362e94369d5..ab2d628746fb 100644
--- a/dev-util/tinyxxd/files/tinyxxd-da64dbf542cc27ba614e45fcaf82955fa4643d16-default-fixes.patch
+++ b/dev-util/tinyxxd/files/tinyxxd-da64dbf542cc27ba614e45fcaf82955fa4643d16-default-fixes.patch
@@ -1,4 +1,4 @@
-commit db24ab85688e37a00ed4edfd60b8a606d1f4cd98
+commit f525fd83f19b6118b630c009f3d69094dd3b67ad
 Author: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
 Date:   Mon Oct 19 08:56:24 2026 +0600
 
@@ -7,7 +7,7 @@ Date:   Mon Oct 19 08:56:24 2026 +0600
     Signed-off-by: ingenarel (NeoJesus) <ingenarel_neojesus@disroot.org>
 
 diff --git a/Makefile b/Makefile
-index 29759f0..0b2f1f3 100644
+index 29759f0..e928f1c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,16 +2,7 @@
@@ -24,7 +24,7 @@ index 29759f0..0b2f1f3 100644
 -else
 -	CFLAGS += -fstack-protector-strong -D_GNU_SOURCE -fno-plt -Wl,-z,now -D_FORTIFY_SOURCE=3
 -endif
-+CFLAGS += -std=c11 -D_GNU_SOURCE -D_FORTIFY_SOURCE=3
++CFLAGS += -std=c11 -D_GNU_SOURCE
  
  PREFIX ?= /usr
  BINDIR ?= $(PREFIX)/bin