gentoo auto-resync : 27:04:2024 - 23:59:42

5 files changed, 48 insertions, 236 deletions

diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 356a79cbb7c7..d2d711bf352f 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,3 +1,4 @@
+AUX tokio-tar-0.3.1-ppc.patch 794 BLAKE2B 2c1188d96310710fabe8d248be01ab5e4d30aa02fe2b4f812a79a6c9440052178227534485122643bf4ed7f32ce3bfea289d78398c53229dd825eef44de6e164 SHA512 869d98ddd3eef7f8d9a7643ec5f93c73fed7bd4f1fb73b54a9e640293e831d24ca59bdd63377b07656ae706b5bf9833dd731b0537b43e8476d8cae0f3b8ab439
 AUX uv-0.1.24-skip-tests.patch 6070 BLAKE2B 10c111a2782bc0de45317dc4b6d7f7d66474aec38d61992a63686678a70685aa030acc2b96cb5cced70cf2b290e6f69cdb3e5c42464e04b937a9ef9cb2d7f9f7 SHA512 84fa60b254b3d14fbae337aceba1f34e9f4cd35e0d8da7e90c4ef75c81ccc5268dbfe3e46967ba05899af7862331cade50dcd4a364acd51fcb04a0923cbf7688
 AUX uv-0.1.37-test.patch 869 BLAKE2B ed0dbcc9e2aac2a66974cfa408aa6b714d3fc0cf72c94d2d84bcfe203da4b5428b51e7d2016fdca552db80a4eb260b5c10a69b798354cd7d2887647086e3aae7 SHA512 3d919a23a126a5c8612fb5ce5931bdf8953ed113ee748241c5b6526874957a7503b06bf64afa9828f5ccfd3646d9f6d4ed00fadcd6afa87875bdb09e58f0d03e
 DIST pubgrub-c26e485213e39582c6f2e4d45c0328422670e7a7.gh.tar.gz 86123 BLAKE2B 743bb61460903d276f467b23bb001313598b50cb54fd1a56bcadbc732dd606bafd48a2d9960add3424bd03222450b455f9f1bc8716a80933e5ed0cfb76dcc50a SHA512 9f9c8b58dd2ddeb3ed89abcd790641bd9b7b2cf4fc66dcc4d964a1b69d879adcdaf2775545631ca20f06a8ab5d6bc1df6b2eb272207d2642584c269b358f4d76
@@ -6,14 +7,8 @@ DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE
 DIST rs-async-zip-d76801da0943de985254fc6255c0e476b57c5836.gh.tar.gz 95906 BLAKE2B a5a0e4d20926d637cbfa25cb486580de6682365c588a9653c873622424ec28ac8c7380d1c99ec260cd342b214aacd5124b51fc5e5646f15f76db4148aada2f41 SHA512 dd5b61bfc913a94822d74f1dac3b30f7a3979a641c3b08ccb5fa84cfbb2bfd8c0f807a30cc4ae0abfe5df7079011c20e1f8a642fd439ce6ba2c404ddee06baf5
 DIST uv-0.1.24-crates.tar.xz 64420840 BLAKE2B 7324461092a07c86aadaddf051aaa7454ec08085940f34d07d8a8dc7171abcbf94409df5cd8afd71f1022adb2e76c0aeb1eabe9190598cad4d06e390ccd612f4 SHA512 6701a768a8a1d48ac43038e5161b578b684abed1c2055cc4b7fb5656ec40118287893ee2674b7161292ce7c3e4c062c32ff0038f1548c8f79f4df473d8d26f30
 DIST uv-0.1.24.gh.tar.gz 899637 BLAKE2B fab26ba9934fc5f586505b5ac1fa386c11f07e51ca2bb2a79f46d5dec9475ba8d75ad8587223d5149df5f2a225146d020a49b7ff81ed26b949cff55892738c2d SHA512 520b47a096b50fce9e7b7af5bca203df9bf4c2d0aafbe28a3dcfe0592d8ddcaa7b58d52300c67454f6aeecfd196f1592be18e45c95b7c67257361917cdb0154d
-DIST uv-0.1.36-crates.tar.xz 65852268 BLAKE2B f9dac75dc992d37c54554c25e0ce0895aa017753a6688754acee5b6a99822e0f55923a539fcd67a8d30332abf1d2b2ed333b8b1125eef5061da2d8f57307004b SHA512 c0dd2171416333f8267592c75699fd35f686d04b3b81241e51cbf4b9f8d1e0def54ab9336b2e62e1fb5e40d3ad73146eba7dd6c0093fa23230d23c4fa73d8f74
-DIST uv-0.1.36.gh.tar.gz 1018114 BLAKE2B c57a3362940803df34f45c0dd2bcc176fb4928d1b0c168adc89d150ffb59a39d0fb57b41c063485a7c324a2101b9f4334cf29e175f910122842f893c6be9970a SHA512 39a4ec3b17803a13a53f331185bfb4fa321f9ee2c158828ad9f88aa7214ee72a58a87dcef74eaeac7a1e3a989909f0d50a457431ce22a72703db0e8c3fc4a6c2
-DIST uv-0.1.37-crates.tar.xz 65881140 BLAKE2B c1a640c44d73d5607c8d07468cefc66c150135b0f0249362148bd2b8f8c99a43c9031a642c0f76140631177df947be7637b49e99e247afbd7efbebb2ad79bcb1 SHA512 99bf6f341f9e6cf8eb0834c436b81453615725cabd3ddc4cca34edb307200bdbb71e913e8ff52a2a1d11e5f1a4abfb4dbdfe40a9c4f114079a7d9fdace0bcaab
-DIST uv-0.1.37.gh.tar.gz 1020667 BLAKE2B 4aa459b15dc06d57d5cad66ebeb5925ec833870dea17f72ef54889f8e8699719cba59bd0600263c1647f17402c002000114d603a474dbcf873ac2f2c37301fb8 SHA512 88d9233bd05e8003b75759e39bc22c469a0094a5ca5b6bd6f2bd8b266b376c44ecfa442f3cd5fff1c099234b660a871153423bacbf785863deb79df321b05574
 DIST uv-0.1.38-crates.tar.xz 65881140 BLAKE2B c1a640c44d73d5607c8d07468cefc66c150135b0f0249362148bd2b8f8c99a43c9031a642c0f76140631177df947be7637b49e99e247afbd7efbebb2ad79bcb1 SHA512 99bf6f341f9e6cf8eb0834c436b81453615725cabd3ddc4cca34edb307200bdbb71e913e8ff52a2a1d11e5f1a4abfb4dbdfe40a9c4f114079a7d9fdace0bcaab
 DIST uv-0.1.38.gh.tar.gz 1023332 BLAKE2B e62259084fc9122d311bbcac754796b9e0ac28f4865755e03729eb6ad5adab4f9e3f77c41af1dbdbdc3a55d5a4736875aa26ddc7b78b745c8d6fb4d6b8bbd959 SHA512 7dad22d038aad03ad72ee0c5fdb77ccfbf56fc94a38613373a037eb26c2f228bc6c883d542621b45f2a55c8d51b7345fdd919dc1db45aa4d598e368311c72fdd
 EBUILD uv-0.1.24.ebuild 2164 BLAKE2B 3caf382115984e87a0f44b5e8f619f38b3a7503ac12738519d0edff253eafbc7474924aa1997e332738ffe316da40dd199b906b1c560f1a00a53c805a39edc75 SHA512 c0c83640c43d073a1447228993e8384eee6a4adf73760d651456899ba285d25cc83f0611f6196123125f94fa9fa5d85710308ccf603e7261a699efc2f927dad7
-EBUILD uv-0.1.36.ebuild 2094 BLAKE2B 37e23e4dc916b7dbdbc6a749601a3d363fe6b4d4f3f83cff1dfc8ba9c7444c3798fdde8422136f62e02629de599aefc5118aa51cfae819cb756eda525ce54daf SHA512 3e1094213e116c2de3bd650c8fe05b0b9b0b4d12b6db19c22378677965e6659b5c50d46260136406bf04a3c3bf422f66687fb9f829030bdfb6af38cc293a3a44
-EBUILD uv-0.1.37.ebuild 2248 BLAKE2B ee8e52748ea5060ee7c9cd34c4048b561d03316f6281878071d333e795354ee6cb6358174c22e80b7aef9b57b881e1df789a71316cfaf62c95e60ecde64459a9 SHA512 0e597f311016c604687a16a2869c13e8fcc238fdd0051a44138ad91aba683803170752016c8dacc09f90f26856968782b7573e70c6be81bfe03a7b7acb288c82
-EBUILD uv-0.1.38.ebuild 2094 BLAKE2B 37e23e4dc916b7dbdbc6a749601a3d363fe6b4d4f3f83cff1dfc8ba9c7444c3798fdde8422136f62e02629de599aefc5118aa51cfae819cb756eda525ce54daf SHA512 3e1094213e116c2de3bd650c8fe05b0b9b0b4d12b6db19c22378677965e6659b5c50d46260136406bf04a3c3bf422f66687fb9f829030bdfb6af38cc293a3a44
+EBUILD uv-0.1.38.ebuild 2378 BLAKE2B 4da9aaebed3ed245f2153c2ad99476f511f823374b1d0fc07a62234b99c887d43ad189ea75a033c215e71b4353010d92ad395a13fd9a275c2e85a4f4bbe0e6a0 SHA512 62694fce6a481ff261a878846ae24adea2b38b8a9a8288bd4292402bf9dc1b579257783afcb698cd5a79004ada2f1218b95395d84e5ea8de82848b989394228b
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch b/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch
new file mode 100644
index 000000000000..cb3c2f93cf57
--- /dev/null
+++ b/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch
@@ -0,0 +1,35 @@
+diff --git a/src/archive.rs b/src/archive.rs
+index 63f4293..986a146 100644
+--- a/src/archive.rs
++++ b/src/archive.rs
+@@ -3,12 +3,13 @@ use std::{
+     collections::VecDeque,
+     path::Path,
+     pin::Pin,
+-    sync::{
+-        atomic::{AtomicU64, Ordering},
+-        Arc,
+-    },
++    sync::Arc,
+     task::{Context, Poll},
+ };
++use portable_atomic::{
++    AtomicU64,
++    Ordering,
++};
+ use tokio::{
+     io::{self, AsyncRead as Read, AsyncReadExt},
+     sync::Mutex,
+diff -dup a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml	2024-04-27 10:39:21.186708179 +0200
++++ b/Cargo.toml	2024-04-27 10:39:37.940402613 +0200
+@@ -43,6 +43,9 @@ version = "0.2"
+ [dependencies.futures-core]
+ version = "0.3"
+ 
++[dependencies.portable-atomic]
++version = "1"
++
+ [dependencies.tokio]
+ version = "1"
+ features = [
diff --git a/dev-python/uv/uv-0.1.36.ebuild b/dev-python/uv/uv-0.1.36.ebuild
deleted file mode 100644
index 793b60d2c541..000000000000
--- a/dev-python/uv/uv-0.1.36.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2024 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;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
-)
-
-inherit cargo check-reqs
-
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	CRATE_P=${P}
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	dev-libs/libgit2:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_configure() {
-	local myfeatures=(
-		# from upstream defaults
-		flate2/zlib-ng
-		python
-		pypi
-		git
-		maturin
-		# skip tests that require specific patch version of the interpreter:
-		# python-patch
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.1.37.ebuild b/dev-python/uv/uv-0.1.37.ebuild
deleted file mode 100644
index 38bbfee404a1..000000000000
--- a/dev-python/uv/uv-0.1.37.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2024 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;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
-)
-
-inherit cargo check-reqs
-
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	CRATE_P=${P}
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	dev-libs/libgit2:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-PATCHES=(
-	# tests are running on live pip index, and need to be updated
-	# whenever upstreams release new packages x_x
-	"${FILESDIR}/${P}-test.patch"
-)
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_configure() {
-	local myfeatures=(
-		# from upstream defaults
-		flate2/zlib-ng
-		python
-		pypi
-		git
-		maturin
-		# skip tests that require specific patch version of the interpreter:
-		# python-patch
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.1.38.ebuild b/dev-python/uv/uv-0.1.38.ebuild
index 793b60d2c541..7bfc616ced7f 100644
--- a/dev-python/uv/uv-0.1.38.ebuild
+++ b/dev-python/uv/uv-0.1.38.ebuild
@@ -42,7 +42,7 @@ LICENSE+="
 # ring crate
 LICENSE+=" openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="test"
 PROPERTIES="test_network"
@@ -80,6 +80,16 @@ pkg_setup() {
 	check_space
 }
 
+src_prepare() {
+	default
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
 src_configure() {
 	local myfeatures=(
 		# from upstream defaults