From 72cfdbe760c78e1f7e232757bdabe29bb0f90459 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sun, 27 Sep 2026 23:20:40 -0700 Subject: [PATCH] dev-util/codex: add 0.158.0, drop 0.157.0 Signed-off-by: Huang Rui --- dev-util/codex/Manifest | 4 +- ...ex-0.157.0.ebuild => codex-0.158.0.ebuild} | 44 +++++++++++++++++-- 2 files changed, 42 insertions(+), 6 deletions(-) rename dev-util/codex/{codex-0.157.0.ebuild => codex-0.158.0.ebuild} (83%) diff --git a/dev-util/codex/Manifest b/dev-util/codex/Manifest index 4e715b9a30..36d97cb978 100644 --- a/dev-util/codex/Manifest +++ b/dev-util/codex/Manifest @@ -1,7 +1,7 @@ -DIST codex-0.157.0.tar.gz 16112186 BLAKE2B 10bd25c71650418e8b0dbd21b9903ccf474e52ea002c959adba99e929293acdef35290ce73f7c794ebb180a821a30943e79c2d002c10df32f8251a7c280b2ae9 SHA512 9d74ac25bbf53b755b9131f41e2048c06e6a78499f61dc942630511f6ff26da0fa12a0aa72f0c3813915a98bb9de20901d2549d2c09425d570655d209e36ffbc DIST codex-0.157.1.tar.gz 16115184 BLAKE2B d8fd027fe5808a722bf4e77dd78854930a806746e78ff5e80f464d5f172af971e5fed38f307f9e8fce3b8d5d02d903020aed08e23c404e93885fb6574464481a SHA512 2e95b06fe2172fd03cd0ecfc6594a663cd0085641d38b79ef6b3772e5b1ddc83aa606f265e79c854f79baa57617845867ae202d015e93e357f9bd4eae32cbbfa -DIST codex-rust-v0.157.0-crates.tar.xz 157554932 BLAKE2B 97eed631134b7a03e2923f1a1a8548d1c746e8b24f43fe352fc47b27a2c02de15ad676939976eefb515786fa314cc6f0499dc46fc6e3559c13a4dea0fd7c21ba SHA512 9fb979c584745cf77c99638f83465a953ee100aff8c048700318d09bbd6105d0c25b8eeefd9b9dc5bd414370591d0f6acc89c9d4f5d0a262bb6424532aea4c6d +DIST codex-0.158.0.tar.gz 16454306 BLAKE2B cc9b213069155bcea845038dc85d9483a69195241f7c2f90b0f128b8eb10e407ede161435a94f359f5acc30de43d7ea15992e3e868b87770ff17513eeb1ec72c SHA512 2675fa47b52dfcb7a5d37245a93719bb38545c7117deb17b9fc108eacfdb9e81a87e175b47446d548eca3a37cf4f80d9ba3f6bfd36dadc618393e3af5f0fd4c7 DIST codex-rust-v0.157.1-crates.tar.xz 157554932 BLAKE2B 97eed631134b7a03e2923f1a1a8548d1c746e8b24f43fe352fc47b27a2c02de15ad676939976eefb515786fa314cc6f0499dc46fc6e3559c13a4dea0fd7c21ba SHA512 9fb979c584745cf77c99638f83465a953ee100aff8c048700318d09bbd6105d0c25b8eeefd9b9dc5bd414370591d0f6acc89c9d4f5d0a262bb6424532aea4c6d +DIST codex-rust-v0.158.0-crates.tar.xz 157554932 BLAKE2B 97eed631134b7a03e2923f1a1a8548d1c746e8b24f43fe352fc47b27a2c02de15ad676939976eefb515786fa314cc6f0499dc46fc6e3559c13a4dea0fd7c21ba SHA512 9fb979c584745cf77c99638f83465a953ee100aff8c048700318d09bbd6105d0c25b8eeefd9b9dc5bd414370591d0f6acc89c9d4f5d0a262bb6424532aea4c6d DIST crossterm-efa177859fd9623d57b9fe7ae9bf491ae1ac6ec4.gh.tar.gz 145349 BLAKE2B c75ce5f67f7d0040f183a32cd1d8420a307e2acf11de9163a0c69fbd788de34452dcc48b160b2cf15d64c971634f7fe93a50127582aaac14d70373a4b68324f4 SHA512 6aedeb88d51e59db101aa37a0f3b77f24f4a251e3a3da533c32c6919102b93ff02cdcb4b37b3eeb7407debf1c970c51e6f05bf0baa0eb206497a33c6c9e68895 DIST h3-e07e69412876f7e26f026bd75a48b2704d8c8283.gh.tar.gz 244832 BLAKE2B bea2d550925b09b3fd0a33aef734a26a7457d91dc0a89fe72cd6de684dd2f2a37de5ac615691e7d92cc47fa7aaad4ab13c253dd30eaa3287f7d62e139f77d07a SHA512 9dc2589b2ea013f6bb79c05fb515fdf236834116241ecb33c783b64102e3904c11beea7d75ad12d3fd48b66276387da96c162657010292eae5a8c84260ef94d2 DIST mxc-6cd3d58f05d3447e67109cfb75e042803b843ca4.gh.tar.gz 5985947 BLAKE2B f2c48e8d16586407986dee718cc2aa9bc58174e6e9e1a13b36bcc5a9aae7d9f033863479d077e2e579a21d07914043fcac52d0981feb9230109336675fe28485 SHA512 ac2ce0b3a30a0e0faff40a31fea16d44a7eea1c40cce3bbb8fa98319d221a04b5ab27085620c1929d4c1d17b3cefea1e3e0586a8246a8569199e417e804ddbba diff --git a/dev-util/codex/codex-0.157.0.ebuild b/dev-util/codex/codex-0.158.0.ebuild similarity index 83% rename from dev-util/codex/codex-0.157.0.ebuild rename to dev-util/codex/codex-0.158.0.ebuild index 65ef446a07..8de803cb5b 100644 --- a/dev-util/codex/codex-0.157.0.ebuild +++ b/dev-util/codex/codex-0.158.0.ebuild @@ -50,7 +50,7 @@ HOMEPAGE="https://github.com/openai/codex" # 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/openai/${PN}/archive/rust-v${PV}.tar.gz -> ${PN}-${PV}.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_release_x86_64-unknown-linux-musl.a.gz @@ -88,11 +88,12 @@ DEPEND=" " RDEPEND="${DEPEND} >=sys-apps/bubblewrap-0.11.2 + sys-apps/ripgrep " BDEPEND="virtual/pkgconfig" # rust does not use *FLAGS from make.conf, silence portage warning -QA_FLAGS_IGNORED="usr/bin/${PN}" +QA_FLAGS_IGNORED="usr/lib/${PN}/bin/*" pkg_pretend() { check-reqs_pkg_pretend @@ -153,7 +154,42 @@ src_compile() { } src_install() { - dobin "$(cargo_target_dir)/codex" - dobin "$(cargo_target_dir)/codex-code-mode-host" + local pkgdir="/usr/lib/${PN}" + local pkg_target + case ${ARCH} in + amd64) pkg_target="x86_64-unknown-linux-gnu" ;; + arm64) pkg_target="aarch64-unknown-linux-gnu" ;; + esac + + exeinto "${pkgdir}"/bin + doexe "$(cargo_target_dir)/codex" "$(cargo_target_dir)/codex-code-mode-host" + + # The app-server daemon installs the CLI from this layout, see + # https://github.com/openai/codex/issues/48050 + cat > "${T}"/codex-package.json <<-EOF || die + { + "layoutVersion": 1, + "version": "${PV}", + "target": "${pkg_target}", + "variant": "codex", + "entrypoint": "bin/codex", + "resourcesDir": "codex-resources", + "pathDir": "codex-path" + } + EOF + insinto "${pkgdir}" + doins "${T}"/codex-package.json + + # The layout requires both files, they resolve to the system programs + printf '#!/bin/sh\nexec %s/usr/bin/rg "$@"\n' "${EPREFIX}" > "${T}"/rg || die + printf '#!/bin/sh\nexec %s/usr/bin/bwrap "$@"\n' "${EPREFIX}" > "${T}"/bwrap || die + exeinto "${pkgdir}"/codex-path + doexe "${T}"/rg + exeinto "${pkgdir}"/codex-resources + doexe "${T}"/bwrap + + dosym ../lib/"${PN}"/bin/codex /usr/bin/"${PN}" + dosym ../lib/"${PN}"/bin/codex-code-mode-host /usr/bin/codex-code-mode-host + einstalldocs }