From dfd0139069bb79941b882fe714d38b7fc8dcdb16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Apr 2025 08:45:29 +0100 Subject: gentoo auto-resync : 15:04:2025 - 08:45:29 --- dev-util/Manifest.gz | Bin 65447 -> 65436 bytes dev-util/android-tools/Manifest | 2 +- dev-util/android-tools/android-tools-34.0.5.ebuild | 4 +- dev-util/aruba/Manifest | 4 +- dev-util/aruba/aruba-2.1.0.ebuild | 67 ---------- dev-util/aruba/aruba-2.3.0-r1.ebuild | 2 +- dev-util/diffoscope/Manifest | 4 +- dev-util/diffoscope/diffoscope-288.ebuild | 140 -------------------- dev-util/diffoscope/diffoscope-294.ebuild | 143 +++++++++++++++++++++ dev-util/gprof2dot/Manifest | 2 + dev-util/gprof2dot/gprof2dot-2025.4.14.ebuild | 20 +++ dev-util/pixi/Manifest | 8 +- dev-util/pixi/files/pixi-0.45.0-offline.patch | 37 ++++++ dev-util/pixi/metadata.xml | 3 + dev-util/pixi/pixi-0.45.0.ebuild | 130 +++++++++++++++++++ 15 files changed, 349 insertions(+), 217 deletions(-) delete mode 100644 dev-util/aruba/aruba-2.1.0.ebuild delete mode 100644 dev-util/diffoscope/diffoscope-288.ebuild create mode 100644 dev-util/diffoscope/diffoscope-294.ebuild create mode 100644 dev-util/gprof2dot/gprof2dot-2025.4.14.ebuild create mode 100644 dev-util/pixi/files/pixi-0.45.0-offline.patch create mode 100644 dev-util/pixi/pixi-0.45.0.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 511b292e13cc..0d91cf3337ad 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 90eca30d3d5d..8c0fd240fdbb 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -6,7 +6,7 @@ DIST android-tools-34.0.5.tar.xz 19389824 BLAKE2B a86ad9d22c356d2b3d0d85dd17e554 DIST android-tools-35.0.1.tar.xz 21460424 BLAKE2B e87a4ad13e5b8030069c87cbbe47f3698888e797e319aa3a054a668ad55f4cdd7445e5ef7825f2d185f6891958fd52f815ee0cb3909649ee3ea703061d72d0ab SHA512 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296 DIST android-tools-35.0.2.tar.xz 18847376 BLAKE2B 5db4d32e4d9acca5f98f0fa76d02f2cbb9c8ad23f7138deb57aa78bcfb02e8e1998dd5649e2a7f77df99f4f4c0b47440c8f6b84d2a001ae8ec2f4840e01535a8 SHA512 391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10 EBUILD android-tools-33.0.3-r1.ebuild 2436 BLAKE2B 792138db6c8b3429787098d558f033235344f60b0e202fc2df4c0667fd558ec6cf616e2874886583cea635c8fb126ebf231777e3f68f088e43025bc58e9468ce SHA512 1773ef3a6ab054dcb59de6686e0acaa72bfd6d8cae2cd8e1ea23885d2e8bbaaef94c735be1f04513100a15427b856208d68c6b468b9679c95cd3e38b38bb00fe -EBUILD android-tools-34.0.5.ebuild 3095 BLAKE2B 5a647166599a3df4e500d3aaeb544c642c023bab18b48deeaf785a1d9f886deedf35ac390d5b33e01643a36c8a1a69160c8da026f29ac0136730e4853418bde0 SHA512 1612935e3d1b7639a680e57f90674df99061e00c25baa7ff965ed51cd1f884df7aad7aa95eca743ddcd82b95643db08ebd09d166c10edd047bc6b0bb60a7cdc8 +EBUILD android-tools-34.0.5.ebuild 3091 BLAKE2B c7cb5337289d57ef31e9686070f9f0e36014b537d70ae4485b1745c6ed7d5786cf2052a7119105c46b72b18a52a40c6f99f772e70165ac714f1e684ea8064edf SHA512 401c4b86d5199e337a76ec65d912abcaa1b87ec128c59cfa2a907277ca0cbd1fdf17093e003504a5fc91b3e9af691721e23b80d14e0dc23fb5cdc11a1fdea515 EBUILD android-tools-35.0.1.ebuild 3094 BLAKE2B 6308ee61fc90c12ebddd3574886466f30442557f4b5700f41b99f0326ab2e0d00fd5e9397be5bbec15de9b41c378230a51f694251a0c3f0c1e12445e64fe0b65 SHA512 5d673389b1afa4eaba14eee82c5273fb4c97fe8bf715bf74f7627058e2a6dbe284bd67966de0a688a3bcde29b2cfa20f0f83cc26735819661f3fcc7c116abcf5 EBUILD android-tools-35.0.2.ebuild 3098 BLAKE2B ae18984a91fe3ea424c838f229b127c5942b692530d2b2ae48f945528da139ea16894ba12cb907673bce280d6130c1fb83754bace9338478064b2ea5d00f97f5 SHA512 2dc23a4f98f8d15ef37976f01723d7b0e9f8a78267ee9f30fc5a4b40b99173613e8de65b415e5df88a36cd5904624393b9c8c817ed706246ae1801dbc5a26bfe MISC metadata.xml 666 BLAKE2B 826f37b3e3c762165b6dce866f9e244ff6c6312a7d7f061f55bedf6a53ec08276afcce53ebd0a3d8d7e5ab95065436c3ab559d0d1cc40ee5d66d958bb7bd36b0 SHA512 aa6da78d3bd0a5efa99629c20ecdd407235f9055af8d1891ef606d3fbc14e1054987239a50edc2ba1a74c97cbf81ce044ca6ab89a1c11a36500979103fe74437 diff --git a/dev-util/android-tools/android-tools-34.0.5.ebuild b/dev-util/android-tools/android-tools-34.0.5.ebuild index 5f1240993fed..2523b7b713c3 100644 --- a/dev-util/android-tools/android-tools-34.0.5.ebuild +++ b/dev-util/android-tools/android-tools-34.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ DEPEND=" app-arch/zstd:= dev-cpp/abseil-cpp:= dev-libs/libpcre2:= - >=dev-libs/protobuf-3.0.0:= + =dev-ruby/childprocess-2.0 =dev-ruby/contracts-0.16.0 =dev-ruby/rspec-expectations-3.4:3 - dev-ruby/thor:1 - >=dev-util/cucumber-2.4 +Date: Mon, 14 Apr 2025 09:15:50 +0200 +Subject: [PATCH] Mark `add_tests::add_pypi_git` as an online test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Mark `add_tests::add_pypi_git` as requiring Internet, as in isolated +environment it fails with: + +``` +thread 'add_tests::add_pypi_git' panicked at tests/integration_rust/add_tests.rs:915:30: +called `Result::unwrap()` on an `Err` value: × Request failed after 3 retries + ├─▶ error sending request for url (https://prefix.dev/conda-forge/noarch/ + │ repodata_shards.msgpack.zst) + ├─▶ client error (Connect) + ├─▶ dns error: failed to lookup address information: Name or service not + │ known + ╰─▶ failed to lookup address information: Name or service not known +``` +--- + tests/integration_rust/add_tests.rs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/integration_rust/add_tests.rs b/tests/integration_rust/add_tests.rs +index 6cef9054..bb35c795 100644 +--- a/tests/integration_rust/add_tests.rs ++++ b/tests/integration_rust/add_tests.rs +@@ -895,6 +895,7 @@ preview = ['pixi-build']"#, + + /// Test adding a git dependency using ssh url + #[tokio::test] ++#[cfg_attr(not(feature = "online_tests"), ignore)] + async fn add_pypi_git() { + let pixi = PixiControl::from_manifest( + format!( diff --git a/dev-util/pixi/metadata.xml b/dev-util/pixi/metadata.xml index 8d4e3d5944d6..4c14558aee50 100644 --- a/dev-util/pixi/metadata.xml +++ b/dev-util/pixi/metadata.xml @@ -8,4 +8,7 @@ prefix-dev/pixi + + Use Rustls instead of OpenSSL. + diff --git a/dev-util/pixi/pixi-0.45.0.ebuild b/dev-util/pixi/pixi-0.45.0.ebuild new file mode 100644 index 000000000000..48ca33f8f489 --- /dev/null +++ b/dev-util/pixi/pixi-0.45.0.ebuild @@ -0,0 +1,130 @@ +# 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/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%' + [pubgrub]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;pubgrub-%commit%' + [tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%' + [uv-auth]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-auth' + [uv-build-backend]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-build-backend' + [uv-build-frontend]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-build-frontend' + [uv-cache-info]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache-info' + [uv-cache-key]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache-key' + [uv-cache]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-cache' + [uv-client]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-client' + [uv-configuration]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-configuration' + [uv-console]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-console' + [uv-dirs]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-dirs' + [uv-dispatch]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-dispatch' + [uv-distribution-filename]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution-filename' + [uv-distribution-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution-types' + [uv-distribution]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-distribution' + [uv-extract]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-extract' + [uv-fs]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-fs' + [uv-git-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-git-types' + [uv-git]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-git' + [uv-globfilter]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-globfilter' + [uv-install-wheel]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-install-wheel' + [uv-installer]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-installer' + [uv-macros]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-macros' + [uv-metadata]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-metadata' + [uv-normalize]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-normalize' + [uv-once-map]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-once-map' + [uv-options-metadata]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-options-metadata' + [uv-pep440]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pep440' + [uv-pep508]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pep508' + [uv-platform-tags]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-platform-tags' + [uv-pypi-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-pypi-types' + [uv-python]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-python' + [uv-requirements-txt]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-requirements-txt' + [uv-requirements]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-requirements' + [uv-resolver]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-resolver' + [uv-shell]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-shell' + [uv-small-str]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-small-str' + [uv-state]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-state' + [uv-static]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-static' + [uv-torch]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-torch' + [uv-trampoline-builder]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-trampoline-builder' + [uv-types]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-types' + [uv-version]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-version' + [uv-virtualenv]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-virtualenv' + [uv-warnings]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-warnings' + [uv-workspace]='https://github.com/astral-sh/uv;3d946027841ac949b9ecfd5ceaeec721836ee555;uv-%commit%/crates/uv-workspace' + [version-ranges]='https://github.com/astral-sh/pubgrub;b70cf707aa43f21b32f3a61b8a0889b15032d5c4;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 + ISC MIT MPL-2.0 MPL-2.0 Unicode-3.0 ZLIB +" +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/3586 + "${FILESDIR}/${P}-offline.patch" + ) + + default + + local vr_dep=$(grep version-ranges "${ECARGO_HOME}"/config.toml || die) + sed -i -e "/version-ranges/s;^.*$;${vr_dep};" Cargo.toml || die +} + +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 +} -- cgit v1.2.3