diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/pixi/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/pixi/files/pixi-0.60.0-network-tests.patch | 75 | ||||
| -rw-r--r-- | dev-util/pixi/pixi-0.60.0.ebuild | 150 | ||||
| -rw-r--r-- | dev-util/pixi/pixi-0.62.2.ebuild (renamed from dev-util/pixi/pixi-0.62.0.ebuild) | 0 | ||||
| -rw-r--r-- | dev-util/pkgcruft/pkgcruft-0.0.18-r1.ebuild | 100 | ||||
| -rw-r--r-- | dev-util/pkgcruft/pkgcruft-9999.ebuild | 51 | ||||
| -rw-r--r-- | dev-util/spirv-llvm-translator/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild | 69 |
8 files changed, 200 insertions, 253 deletions
diff --git a/dev-util/pixi/Manifest b/dev-util/pixi/Manifest index be7208b830d1..c0c7c48b9e79 100644 --- a/dev-util/pixi/Manifest +++ b/dev-util/pixi/Manifest @@ -1,9 +1,7 @@ -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 pixi-0.62.0-crates.tar.xz 70265408 BLAKE2B e80bbd0b74e4f31923edfae29d0d92fabe3339f929fc046f39b9d53444bd51405d302dd6c86c4f9278934b5460f425952406747db758b9ac8c6d8346091fa09d SHA512 013018f34272d5ed16eea6110dcc25bc9e2b6604297ae89ba52e154a5a109795015a72aac4f7b9f405dd3726334e9ef308254a9226fe6623f4568833b445ec9e -DIST pixi-0.62.0.tar.gz 11555369 BLAKE2B db2b4761827502ee44cf0be7d5ca523b44b485c069046c207c4423b194aef407d2026ca2d4476ed9d0f5944461125534136963f97dd19b7bd91bf4f61018dde5 SHA512 2c23d93ee263fe0c63d92fd25f19fa783114abdc0536d37df6aeed9e40d9b36a1b85a7568ad4c5557e05f14ed3af1a2bb65d9c8808492a4da507e373fcec38aa DIST pixi-0.62.1-crates.tar.xz 70288300 BLAKE2B d0f019c2db0c491cab344498ac96494e44f169ccba3deac006db35a7f24251950cf2ad4fb64de5a936df7115a33175c62699bd26365bdfb850784410d5896b99 SHA512 903228e51b857e1740e62e460ab44d443754729e3bd7232bdcf90a48ff672b1a6c75940877cd3b24025f0953c72d225634df865243e84fb45b93f59bdc4414ab DIST pixi-0.62.1.tar.gz 11581268 BLAKE2B 4b29aa9786fc165bf2529c25f939f0be611c8d3eb6c8d8de39bc7143ee0672df48280a2f5a4437881f624c9095f689f968633558c418f708043721cc129b08b8 SHA512 c51658155b5ea7c34b5884940caa777fe96fc17058ea449d5b1f3d83589f93eb15a461cd999d9f3be38e94b2110c4e8a82e5e5beb74f9b5742445df80b32a4c6 +DIST pixi-0.62.2-crates.tar.xz 70288300 BLAKE2B d0f019c2db0c491cab344498ac96494e44f169ccba3deac006db35a7f24251950cf2ad4fb64de5a936df7115a33175c62699bd26365bdfb850784410d5896b99 SHA512 903228e51b857e1740e62e460ab44d443754729e3bd7232bdcf90a48ff672b1a6c75940877cd3b24025f0953c72d225634df865243e84fb45b93f59bdc4414ab +DIST pixi-0.62.2.tar.gz 11588385 BLAKE2B 97d49d082e21dba7cf24bb91ad19fe8bbc5ad4cba778350efd65ad6f769d80f66cf6f615c1b167d7c986f6f1a058cc1006faa729e6228000263b30555b5adf6e SHA512 fa5e2a440565ac41acf9125dd2cc74228c4b57bf954cea0907c911ace462a21a70eeb20d278266b72776f3d7472fdbfdbb0a0f5050fa3b5ce714f1e45266647f DIST pubgrub-d8efd77673c9a90792da9da31b6c0da7ea8a324b.gh.tar.gz 100042 BLAKE2B cacdd77783aae1a94c3aaea56c2bd47b22f13ca34eddcef53b5d205244a213eff2934db03965532085c1aa6892b27bbbabfc19513f62936f8ac1faa466570dd4 SHA512 3a2a146fd9d9b458dced6563a1f5674e81e8ba36de11be5c189b0c76b6ede6f32957f48fb0978b97b0892768822c6c4c32c6870141e8fc1ea5d8b8f7d8b5b464 DIST reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2.gh.tar.gz 42520 BLAKE2B ca415865947873f8b309f5b348a600677802fa8128a154b7c86d3e30bffece9df8606504073ddb688c5185e27866b5d7dc8a891e6d390ca075910a691e9bb2aa SHA512 904fd652b0f3ecc90eee571d5488aba977dee643a1d6267e2fda264fa4c7b4bfcfacd4d5a23287dfb710ecc82d667479fcd0c48166259c2368df0e8b0c9d6707 DIST rs-async-zip-285e48742b74ab109887d62e1ae79e7c15fd4878.gh.tar.gz 37003 BLAKE2B c4aed18d82641ced2771ad8b8e800c45b1ded279e8ba1874ec9766907d042ae13b460beac739ced6e31c03a647e4238af96fb41e8c0dff4c5d4dd7f59c0ebbff SHA512 d6dd699f43ca6e23a4c8abb8673b37d3983081a8c78545492ea3c1d0b35e3a491277c341df6dd64fb7efaec3b23eb479dede99e9b41016b5504d1a6dc9fbc617 diff --git a/dev-util/pixi/files/pixi-0.60.0-network-tests.patch b/dev-util/pixi/files/pixi-0.60.0-network-tests.patch deleted file mode 100644 index a0e42d66d840..000000000000 --- a/dev-util/pixi/files/pixi-0.60.0-network-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ -From cb2a8ae299ee871af4f120f417b6600a672d6388 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 4 Dec 2025 05:30:00 +0100 -Subject: [PATCH] Mark more tests as `online_tests` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - crates/pixi/tests/integration_rust/pypi_tests.rs | 2 ++ - crates/pixi/tests/integration_rust/solve_group_tests.rs | 1 + - crates/pixi/tests/integration_rust/update_tests.rs | 3 +++ - 3 files changed, 6 insertions(+) - -diff --git a/crates/pixi/tests/integration_rust/pypi_tests.rs b/crates/pixi/tests/integration_rust/pypi_tests.rs -index f2733e90e..5f6fad542 100644 ---- a/crates/pixi/tests/integration_rust/pypi_tests.rs -+++ b/crates/pixi/tests/integration_rust/pypi_tests.rs -@@ -877,6 +877,7 @@ async fn test_uv_index_correctly_parsed() { - /// Tests that prerelease-mode = "allow" allows pre-release versions to be resolved. - /// Without this setting, the resolver would skip pre-releases unless explicitly requested. - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_prerelease_mode_allow() { - setup_tracing(); - -@@ -938,6 +939,7 @@ async fn test_prerelease_mode_allow() { - - /// Tests that prerelease-mode = "disallow" prevents pre-release versions from being resolved. - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_prerelease_mode_disallow() { - setup_tracing(); - -diff --git a/crates/pixi/tests/integration_rust/solve_group_tests.rs b/crates/pixi/tests/integration_rust/solve_group_tests.rs -index 22b50f4a6..944939576 100644 ---- a/crates/pixi/tests/integration_rust/solve_group_tests.rs -+++ b/crates/pixi/tests/integration_rust/solve_group_tests.rs -@@ -786,6 +786,7 @@ async fn test_disabled_mapping() { - } - - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_custom_mapping_ignores_backwards_compatibility() { - setup_tracing(); - -diff --git a/crates/pixi/tests/integration_rust/update_tests.rs b/crates/pixi/tests/integration_rust/update_tests.rs -index edd3b84bc..68b9b58af 100644 ---- a/crates/pixi/tests/integration_rust/update_tests.rs -+++ b/crates/pixi/tests/integration_rust/update_tests.rs -@@ -160,6 +160,7 @@ async fn test_update_single_package() { - } - - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_update_conda_package_doesnt_update_git_pypi() { - setup_tracing(); - -@@ -245,6 +246,7 @@ async fn test_update_conda_package_doesnt_update_git_pypi() { - } - - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_update_conda_package_doesnt_update_git_pypi_pinned() { - setup_tracing(); - -@@ -293,6 +295,7 @@ async fn test_update_conda_package_doesnt_update_git_pypi_pinned() { - } - - #[tokio::test] -+#[cfg_attr(not(feature = "online_tests"), ignore)] - async fn test_update_git_pypi_when_requested() { - setup_tracing(); - diff --git a/dev-util/pixi/pixi-0.60.0.ebuild b/dev-util/pixi/pixi-0.60.0.ebuild deleted file mode 100644 index 06315c0d5044..000000000000 --- a/dev-util/pixi/pixi-0.60.0.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -RUST_MIN_VER="1.88.0" -CRATES=" -" - -declare -A GIT_CRATES=( - [async_zip]='https://github.com/astral-sh/rs-async-zip;285e48742b74ab109887d62e1ae79e7c15fd4878;rs-async-zip-%commit%' - [pubgrub]='https://github.com/astral-sh/pubgrub;d8efd77673c9a90792da9da31b6c0da7ea8a324b;pubgrub-%commit%' - [reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;7650ed76215a962a96d94a79be71c27bffde7ab2;reqwest-middleware-%commit%/reqwest-middleware' - [reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;7650ed76215a962a96d94a79be71c27bffde7ab2;reqwest-middleware-%commit%/reqwest-retry' - [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' - [uv-auth]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-auth' - [uv-build-backend]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-build-backend' - [uv-build-frontend]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-build-frontend' - [uv-cache-info]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-cache-info' - [uv-cache-key]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-cache-key' - [uv-cache]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-cache' - [uv-client]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-client' - [uv-configuration]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-configuration' - [uv-console]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-console' - [uv-dirs]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-dirs' - [uv-dispatch]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-dispatch' - [uv-distribution-filename]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-distribution-filename' - [uv-distribution-types]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-distribution-types' - [uv-distribution]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-distribution' - [uv-extract]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-extract' - [uv-flags]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-flags' - [uv-fs]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-fs' - [uv-git-types]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-git-types' - [uv-git]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-git' - [uv-globfilter]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-globfilter' - [uv-install-wheel]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-install-wheel' - [uv-installer]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-installer' - [uv-keyring]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-keyring' - [uv-macros]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-macros' - [uv-metadata]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-metadata' - [uv-normalize]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-normalize' - [uv-once-map]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-once-map' - [uv-options-metadata]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-options-metadata' - [uv-pep440]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-pep440' - [uv-pep508]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-pep508' - [uv-platform-tags]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-platform-tags' - [uv-platform]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-platform' - [uv-preview]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-preview' - [uv-pypi-types]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-pypi-types' - [uv-python]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-python' - [uv-redacted]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-redacted' - [uv-requirements-txt]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-requirements-txt' - [uv-requirements]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-requirements' - [uv-resolver]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-resolver' - [uv-scripts]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-scripts' - [uv-settings]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-settings' - [uv-shell]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-shell' - [uv-small-str]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-small-str' - [uv-state]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-state' - [uv-static]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-static' - [uv-torch]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-torch' - [uv-trampoline-builder]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-trampoline-builder' - [uv-types]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-types' - [uv-version]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-version' - [uv-virtualenv]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-virtualenv' - [uv-warnings]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-warnings' - [uv-workspace]='https://github.com/astral-sh/uv;d5f39331a73d5042e70ab770463dff632e20c127;uv-%commit%/crates/uv-workspace' - [version-ranges]='https://github.com/astral-sh/pubgrub;d8efd77673c9a90792da9da31b6c0da7ea8a324b;pubgrub-%commit%/version-ranges' -) - -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 - CC0-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() { - local PATCHES=( - # https://github.com/prefix-dev/pixi/pull/5060 - "${FILESDIR}/${P}-network-tests.patch" - ) - - 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/pixi/pixi-0.62.0.ebuild b/dev-util/pixi/pixi-0.62.2.ebuild index d8185e5d1317..d8185e5d1317 100644 --- a/dev-util/pixi/pixi-0.62.0.ebuild +++ b/dev-util/pixi/pixi-0.62.2.ebuild diff --git a/dev-util/pkgcruft/pkgcruft-0.0.18-r1.ebuild b/dev-util/pkgcruft/pkgcruft-0.0.18-r1.ebuild new file mode 100644 index 000000000000..0bc19b4a49cc --- /dev/null +++ b/dev-util/pkgcruft/pkgcruft-0.0.18-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {19..21} ) +RUST_MIN_VER="1.90.0" + +inherit cargo edo multiprocessing llvm-r2 shell-completion + +DESCRIPTION="QA library and tools based on pkgcraft" +HOMEPAGE="https://pkgcraft.github.io/" + +if [[ ${PV} == 9999 ]] ; then + SCALLOP_VERSION="9999" + EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft" + inherit git-r3 + S="${WORKDIR}"/${P}/crates/${PN} +else + # For releases, SCALLOP_VERSION must match the value of PACKAGE_VERSION in + # the vendored library's configure script. + # + # To get the value from the repo use the following command: + # sed -rn "/^PACKAGE_VERSION=/ s/^.*='(.*)'/\1/p" **/scallop/bash/configure + SCALLOP_VERSION="5.3.9.20251212" + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +# dependent crate licenses +LICENSE+=" + Apache-2.0 BSD-2 BSD CC0-1.0 CDLA-Permissive-2.0 ISC MIT MPL-2.0 +" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +# Strict dependency versioning is required since the system library must match +# the vendored copy as scallop exports many parts of bash that aren't meant to +# be a public interface and compatibility is not guaranteed between releases. +RDEPEND="~sys-libs/scallop-${SCALLOP_VERSION}" +DEPEND="${RDEPEND}" +# clang needed by bindgen to generate bash bindings +BDEPEND=" + virtual/pkgconfig + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') + test? ( dev-util/cargo-nextest ) +" + +QA_FLAGS_IGNORED="usr/bin/pkgcruft" + +pkg_setup() { + llvm-r2_pkg_setup + rust_pkg_setup + + # use system scallop library + export SCALLOP_NO_VENDOR=1 +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_compile() { + cargo_src_compile + + if [[ ${PV} == 9999 ]] ; then + einfo "Generating shell completions" + local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pkgcruft" + "${BIN}" completion --dir shell || die + fi +} + +src_test() { + # FAIL [ 0.148s] pkgcruft::pkgcruft diff::output + # FAIL [ 0.018s] pkgcruft::pkgcruft show::reports::all + # FAIL [ 0.045s] pkgcruft::pkgcruft show::reports::sets + unset CLICOLOR CLICOLOR_FORCE + + local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)" + + edo ${CARGO} nextest run $(usev !debug '--release') \ + --color always \ + --tests \ + --no-fail-fast +} + +src_install() { + cargo_src_install + + newbashcomp shell/pkgcruft.bash pkgcruft + dozshcomp shell/_pkgcruft + dofishcomp shell/pkgcruft.fish +} diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild b/dev-util/pkgcruft/pkgcruft-9999.ebuild index be85423ae41e..0bc19b4a49cc 100644 --- a/dev-util/pkgcruft/pkgcruft-9999.ebuild +++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild @@ -3,28 +3,32 @@ EAPI=8 -CRATES=" " -LLVM_COMPAT=( {17..21} ) +LLVM_COMPAT=( {19..21} ) RUST_MIN_VER="1.90.0" -inherit cargo edo llvm-r2 multiprocessing shell-completion toolchain-funcs +inherit cargo edo multiprocessing llvm-r2 shell-completion DESCRIPTION="QA library and tools based on pkgcraft" HOMEPAGE="https://pkgcraft.github.io/" if [[ ${PV} == 9999 ]] ; then + SCALLOP_VERSION="9999" EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft" inherit git-r3 - S="${WORKDIR}"/${P}/crates/${PN} else + # For releases, SCALLOP_VERSION must match the value of PACKAGE_VERSION in + # the vendored library's configure script. + # + # To get the value from the repo use the following command: + # sed -rn "/^PACKAGE_VERSION=/ s/^.*='(.*)'/\1/p" **/scallop/bash/configure + SCALLOP_VERSION="5.3.9.20251212" SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz" - KEYWORDS="~amd64" fi LICENSE="MIT" -# Dependent crate licenses +# dependent crate licenses LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 CDLA-Permissive-2.0 ISC MIT MPL-2.0 " @@ -32,11 +36,15 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -# clang needed for bindgen -BDEPEND+=" - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - ') +# Strict dependency versioning is required since the system library must match +# the vendored copy as scallop exports many parts of bash that aren't meant to +# be a public interface and compatibility is not guaranteed between releases. +RDEPEND="~sys-libs/scallop-${SCALLOP_VERSION}" +DEPEND="${RDEPEND}" +# clang needed by bindgen to generate bash bindings +BDEPEND=" + virtual/pkgconfig + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') test? ( dev-util/cargo-nextest ) " @@ -45,6 +53,9 @@ QA_FLAGS_IGNORED="usr/bin/pkgcruft" pkg_setup() { llvm-r2_pkg_setup rust_pkg_setup + + # use system scallop library + export SCALLOP_NO_VENDOR=1 } src_unpack() { @@ -57,33 +68,25 @@ src_unpack() { } src_compile() { - # For scallop building bash - # TODO: Package scallop - tc-export AR CC - cargo_src_compile if [[ ${PV} == 9999 ]] ; then einfo "Generating shell completions" - mkdir shell || die local BIN="${WORKDIR}/${P}/$(cargo_target_dir)/pkgcruft" - "${BIN}" completion bash > shell/pkgcruft.bash || die - "${BIN}" completion zsh > shell/_pkgcruft || die - "${BIN}" completion fish > shell/pkgcruft.fish || die + "${BIN}" completion --dir shell || die fi } src_test() { + # FAIL [ 0.148s] pkgcruft::pkgcruft diff::output + # FAIL [ 0.018s] pkgcruft::pkgcruft show::reports::all + # FAIL [ 0.045s] pkgcruft::pkgcruft show::reports::sets unset CLICOLOR CLICOLOR_FORCE - # TODO: Maybe move into eclass (and maybe have a cargo_enable_tests - # helper) local -x NEXTEST_TEST_THREADS="$(makeopts_jobs)" - # The test failures appear ebuild-related - edo cargo nextest run $(usev !debug '--release') \ + edo ${CARGO} nextest run $(usev !debug '--release') \ --color always \ - --all-features \ --tests \ --no-fail-fast } diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index 461158c3ba6b..b5a3723f4a8e 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -1,5 +1,7 @@ DIST SPIRV-LLVM-Translator-8ef804541897a80384ae8aaaf0265ef014d0d747.tar.gz 1858936 BLAKE2B 6bc6a075054acde99724b4bb83903098ca4da4f896fe082c8cb8f2cc51044b3c0dbbf4e14b87d6df1de237bb46c77d9b0bed2555032ab29638ee717f581fd71a SHA512 f88315a4ff3ecbcf2108295ae73d891b45ac3867c9a24e1de855a113d59148a41fe03fc76886aa284738c4d01d92f52a51d410078fe501e4da4e1650919f91b2 +DIST SPIRV-LLVM-Translator-93ca5f905e3c1e9359e77d8b3191999bd5ce2c93.tar.gz 1864438 BLAKE2B 5e342209d8295daf203a6e644ec478994df81e75519e43a02fe0aea092b1ac15fef4f6e8af03a786338542bf69e96a909b58d761cb139ae403c257dc3bfc390f SHA512 575782d1185cba35a772412a0e5cf35950e13349c022069ab92c3b37249f70c94cb8a917dc30ba0485312d86feae253665177d6bf0836584ed79197283fbf8c5 DIST spirv-headers-01e0577914a75a2569c846778c2f93aa8e6feddd.tar.gz 545892 BLAKE2B 7e6e0b6e0963a983e89c5f54e99c8013c6a4f491c87440aedb3bf747ef4e99f14bb0e2a85d67570531dcb536d39b94dbbe7459f8f8d0209eca929d66d50eb03b SHA512 e2b90e95b6f492e640cd27c090d7072f0d03c8fc7382be67cbe176fc8f3fdd78b59f5f0b906198e09808fde645427f409cb9ab8fe4843de7f7dc5b510d454a0a +DIST spirv-headers-9268f3057354a2cb65991ba5f38b16d81e803692.tar.gz 546201 BLAKE2B 850d4cf42dae126330f7121e703f62593811c0ea8eedd4ed5b4de07ec425938820abe3af93c47049fcf6f6dd4e34b686aa8f825aada54c6351b3c9420ce6a7db SHA512 cc80f6a4d793dfaa55e24a44145b6ff3c4d9400331ff0cb975f6d287ddf35c366bd5d604e7b5243eea806153476965ae03ae1f600ef21419fae4d9f733166a89 DIST spirv-llvm-translator-15.0.15.tar.gz 1635429 BLAKE2B 821cd883481c63263b57b0fbf97776174e3e1f939639c4b83c244afdfcb0c06a73f829b56388f0f52eb2215fe4c04e96bc6ec24926947d055c5d9534cf5f470e SHA512 5f80d57ac61f5ed634bd8e967a1f365e27849555a39e5ca86cfbee0bbce80d8da05fec96b78d91bb7a5026da6c088e9b70593067aecb6b0fe4ce8e2fb2d749be DIST spirv-llvm-translator-15.0.17.tar.gz 1654324 BLAKE2B 10226173ee596719a7eac7aa0b0eea5a0f919934602a68933357e71560088fd31e589d9428f6353d296d49c165c8cec0b7477a328966eedae3cefd36d58e07a3 SHA512 b997857b6d0f696729034ccc47f024f6db47c495178bd441f5658ae50f57cefdec7d3219ce1c2392f53b7729a43e7ca0161b030b727bc08562b6c173b32091a1 DIST spirv-llvm-translator-15.0.18.tar.gz 1655118 BLAKE2B bf3ef7ffcb33911761ad0ccb60da4a53faed3a1f4b731ecd532abcc8468533e7e7fcb869d4fd29108ba306b59ae5612cd6c581b9d5fd93ee0d68ec15f99eedac SHA512 d62d30a2c7d6790ebe085343739eb01f57e0fa7609ce514d75cc169f7dd459a886952c679321108625e13563d1d456f12067a94583e0176f95d253134cf4c409 diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild new file mode 100644 index 000000000000..eb483f0d45ec --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-22.0.0_pre20251123.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# spirv-headers-tag.conf +HASH_SPIRV="9268f3057354a2cb65991ba5f38b16d81e803692" +LLVM_COMPAT=( 22 ) +MY_PN="SPIRV-LLVM-Translator" +EGIT_COMMIT=93ca5f905e3c1e9359e77d8b3191999bd5ce2c93 +MY_P=${MY_PN}-${EGIT_COMMIT} + +inherit cmake-multilib flag-o-matic llvm-r2 multiprocessing + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI=" + https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz + -> ${MY_P}.tar.gz + https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz + -> spirv-headers-${HASH_SPIRV}.tar.gz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools[${MULTILIB_USEDEP}] + llvm-core/llvm:${SLOT}=[${MULTILIB_USEDEP}] +" +# We need to use currently newer spirv-headers, as stable release is too old.. +# DEPEND="${RDEPEND} +# >=dev-util/spirv-headers-1.4.313.0 +# " +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + llvm-core/clang:${SLOT} + ) +" + +src_prepare() { + append-flags -fPIC + cmake_src_prepare + + # do not force a specific LLVM version to find_package(), this only + # causes issues and we force a specific path anyway + sed -i -e '/find_package/s:${BASE_LLVM_VERSION}::' CMakeLists.txt || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${WORKDIR}/SPIRV-Headers-${HASH_SPIRV}" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +multilib_src_test() { + lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die +} |
