gentoo auto-resync : 14:09:2024 - 12:32:27

5 files changed, 3 insertions, 308 deletions

diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 4bbe0d79463c..10ce434c8eaa 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,17 +1,10 @@
-AUX tokio-tar-0.3.1-ppc.patch 794 BLAKE2B 2c1188d96310710fabe8d248be01ab5e4d30aa02fe2b4f812a79a6c9440052178227534485122643bf4ed7f32ce3bfea289d78398c53229dd825eef44de6e164 SHA512 869d98ddd3eef7f8d9a7643ec5f93c73fed7bd4f1fb73b54a9e640293e831d24ca59bdd63377b07656ae706b5bf9833dd731b0537b43e8476d8cae0f3b8ab439
 DIST pubgrub-388685a8711092971930986644cfed152d1a1f6c.gh.tar.gz 87945 BLAKE2B 7c10db2eff97656a379e8beff9f77bf09b4ab2fdd0d5c171e36babc6f3bff08d05774c55a51a23d79144c4110a942764cefa8a1baf7c36174809d2e648f2d12d SHA512 15539076de8fe9a459f70efcf07ccb7f61ced2be9832c4eb7123e7baa2bb85f3263fd4cb5d8b277c28a70ba316d5128d74d59d6f1de96b6e55ef04321a42c4dc
 DIST reqwest-middleware-5e3eaf254b5bd481c75d2710eed055f95b756913.gh.tar.gz 40049 BLAKE2B d284947a108e2d3233a4fa7c9eb5e1a959bc5b569e754861daef076672672b0500cb737b85871d1fc0587bdbf6d5020e03e7c906cb5de34ff2f81c05b66918d1 SHA512 540a71e59a8b57e5e0bd7fad18fed265552bdae4518690a9823c94dcf23ee1d436f91b9cecf21129917b25e78b91d8d7290760edaea68053666e28af7223476e
 DIST rs-async-zip-011b24604fa7bc223daaad7712c0694bac8f0a87.gh.tar.gz 51706 BLAKE2B 354eb52c95ea355521e1e6a7c841102424c47c156fdb0efb62e3cac666ecf289806aeefab8a0273a7c3283429ac81502283bdb5424d5f925621e5c2b1430fd4d SHA512 6650eef354e84daf41a8572b98b29f2873b7f071dd1d6983292c70b2f580fdc50cd26762d2228a70c2b200eae2f40476e6604702aa62cc97558301195bf19eb8
 DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
-DIST uv-0.4.2-crates.tar.xz 46277420 BLAKE2B 9f516f586a5e46bbd6c09e116f91e90b563b4de89b2d2dac50f208e4116583ba05418baa998a74f6d31503ec56cb5ff5966cdf579d026c53bcfc500b5e4fb15c SHA512 b30b70225eae9a5970dd18d383d9129b5161cb66942af8796220fe7a58cd3357308111374193d8fc4e1c7fde8a0b62f44e8efd76603411d882df016afecbc69f
-DIST uv-0.4.6.gh.tar.gz 2553065 BLAKE2B f793c01042db0a45b53a57157852ed5035a96bfc58c2cf81eb3d6a59b9eb6315dbd675817e1bca0a34f9d348d10c0668f9213fd11f230f606386405ee4d51c31 SHA512 79b50783596c6307934c378f7f7b60628de3edd8fe75f6675efd406e7e4cb7cd049a3966eefcb2708f8ab925ee5b5e315f6540f2c25693ffe1ee29f2d501523c
-DIST uv-0.4.7.gh.tar.gz 2558161 BLAKE2B 5508af9b6e0d04d165aa3b120be138fb4ccfddd643395175e5d31618ec34a5139567c0162b0ce1c741fed551397d1ec9d9693ce0397d1f0346a5c1df13c20b8d SHA512 8395f96eb36c2131b203de9991b994532047b7928ac1765a426accdaae4ed3a242a8b9554808123f5359d41778d3e7783606265b60d372bed2a0a76fea027e3e
-DIST uv-0.4.8-crates.tar.xz 46272636 BLAKE2B 467c146c8598863c62a7a210f3c20a6a73dc318651d730803eddd5e1ae54eb815b0487e991cc4e2d493813ea6e6e8622ed503d952a63ce7ee3aa9cfbe4d36439 SHA512 b207acd6fa7d7e95d7e0b3201d9d0ae2457d427f866eb292c6e097444e6d596455e1478813cfcf6851abbe936709d4afa155e0c55367a3f9fb25d4387990a84d
-DIST uv-0.4.8.gh.tar.gz 2569754 BLAKE2B 413121093c1a30e75afa62f5dd6496e3686c06e956ef1d633740d498387a7b0c5272b811daf3efe10d5ba95fd628f29ff3e7ee914df03069bff287dce0c96caa SHA512 e1a728d25ca9400ddf7a005da94d217631ee2a1a2b6b2b8421496496ac9379993dc81d8603f523308a9d232a1c20058149868cc413511ef7d3c7a57bd9354938
+DIST uv-0.4.10.gh.tar.gz 2585899 BLAKE2B f941068e58877cc859b2eb52f3b35ea79cdf23aa33f746dc1e7e954a77d5a3f08fbbed8a8312f750143cef6a0eb812eb783750750eccf6144ef869f1f69732b3 SHA512 9582d8f97515bc182d699f9994a21f7c883203dabb338848c751d97737c864272e5efbaf3a81d08545caac6643ba9cbde2fe11769ec6b98062416d7501d022f8
 DIST uv-0.4.9-crates.tar.xz 46250584 BLAKE2B 6beb0a00885b674f3d8e35c67372d4ba04c6512306f78522fac2ff170d7cc6cb6c0702546da1d1de3dc84397f04258c56558c666b8f935130a0fea1debce01d0 SHA512 676f6a197af92bc9f6716c0e1df1f87d81b1b07dc81c591b94b34b985bbe4a49fb0b319fe8fba7f83d158124af84f64ebefe1ce0119e6238f9ae837e4652c5c0
 DIST uv-0.4.9.gh.tar.gz 2580667 BLAKE2B baadc0d950d57e224d7d4980424ab58c4e278c2d67a06e9d83d778ac5a6b561cdadfc514c5068ce365dbdb4da3b5165e4180567f7abe90f46d5597fce144b91d SHA512 d7746d71f1429df7d39c3f03c02934792124318f92d2eda03b68a255586567d053349e6d294da0910351d976844aee564334540563435d0e60f6a3792088f416
-EBUILD uv-0.4.6.ebuild 2938 BLAKE2B 4c418853746d9d098e3558c8dca06ac539e32c937b7c6a754994bfaa4014b87f3478cd7b7934c05529d642b856a8e270214fe950d81b75b479352db620669160 SHA512 373267d4f0ea6d399ceb921358004c153c791bf4d205ff699b6004a7e1666da99235c5c67b088e0571086863deefcf34e95a3a71c36dc4f879a94f51b8868ca9
-EBUILD uv-0.4.7.ebuild 3695 BLAKE2B a429e8ba6fe4e6472f9d625b918be97ad643adda9815ef4e1649665cac532974b1d61399cedff551acfb1068b8260cbcbc2a274cf3003b12bc3ee49af2e88287 SHA512 8e1ef3d836d40de0b3abe9fd0873f71277d42cf90f62fc23c08fcb6eea5cbc57af53c46a8acaa9d3aeb318cf86ef4627e367bb3f20a0a4056ad183fd27a2980f
-EBUILD uv-0.4.8.ebuild 3695 BLAKE2B 2c96d9669eb0b8e101c14381fedef314818f332f36e8a1bca608bddaf182e84b90ffb6572cdd930364e2d16ff5e114f0d20fb9a27b51e9ee79d13785e1d1a455 SHA512 f1028cab66cfea0508886d782f37524aa4dc061b8c73a56b1e71ebd00cb3250902e0e748ee7190d98de75680a69f26afab38d9ba9eea6ec227c644da0d3c113b
+EBUILD uv-0.4.10.ebuild 3418 BLAKE2B 65ccb90ff42aca5661008932ae9da4e66a818313c4ad698fef14ba5414c342cac8a3d512bbd344684dd30c6843319d43ba68d891ec872714e40c67c296466c4e SHA512 121cd7db96da40225dc086e2658388f227818167777a8805d093e1e6546248fa8c3fc0523cac72548db690e3d52ab591751b51b9824a38254a93cf6cf3d227e9
 EBUILD uv-0.4.9.ebuild 3418 BLAKE2B 65ccb90ff42aca5661008932ae9da4e66a818313c4ad698fef14ba5414c342cac8a3d512bbd344684dd30c6843319d43ba68d891ec872714e40c67c296466c4e SHA512 121cd7db96da40225dc086e2658388f227818167777a8805d093e1e6546248fa8c3fc0523cac72548db690e3d52ab591751b51b9824a38254a93cf6cf3d227e9
 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
deleted file mode 100644
index cb3c2f93cf57..000000000000
--- a/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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.4.7.ebuild b/dev-python/uv/uv-0.4.10.ebuild
index 0f6e94f4f948..ae16e664c50f 100644
--- a/dev-python/uv/uv-0.4.7.ebuild
+++ b/dev-python/uv/uv-0.4.10.ebuild
@@ -16,7 +16,7 @@ declare -A GIT_CRATES=(
 
 inherit cargo check-reqs
 
-CRATE_PV=0.4.2
+CRATE_PV=0.4.9
 DESCRIPTION="A Python package installer and resolver, written in Rust"
 HOMEPAGE="
 	https://github.com/astral-sh/uv/
@@ -94,13 +94,6 @@ src_prepare() {
 	reqmw=${reqmw%;*}
 	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
 
-	# https://github.com/vorot93/tokio-tar/pull/23
-	# (fortunately uv already depends on portable-atomic, so we don't
-	# have to fight Cargo.lock)
-	pushd "${ECARGO_VENDOR}/tokio-tar-0.3.1" >/dev/null || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-	popd >/dev/null || die
-
 	# enable system libraries where supported
 	export ZSTD_SYS_USE_PKG_CONFIG=1
 	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
diff --git a/dev-python/uv/uv-0.4.6.ebuild b/dev-python/uv/uv-0.4.6.ebuild
deleted file mode 100644
index 3990f1fa30dc..000000000000
--- a/dev-python/uv/uv-0.4.6.ebuild
+++ /dev/null
@@ -1,114 +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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
-	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-)
-
-inherit cargo check-reqs
-
-CRATE_PV=0.4.2
-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
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-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 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-BDEPEND="
-	>=virtual/rust-1.80
-	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_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	local reqmw=${GIT_CRATES[reqwest-middleware]}
-	reqmw=${reqmw#*;}
-	reqmw=${reqmw%;*}
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
-
-	# 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 "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	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.4.8.ebuild b/dev-python/uv/uv-0.4.8.ebuild
deleted file mode 100644
index 891f045cb8b8..000000000000
--- a/dev-python/uv/uv-0.4.8.ebuild
+++ /dev/null
@@ -1,142 +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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
-	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-)
-
-inherit cargo check-reqs
-
-CRATE_PV=0.4.8
-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
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-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 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=virtual/rust-1.80
-	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_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	local reqmw=${GIT_CRATES[reqwest-middleware]}
-	reqmw=${reqmw#*;}
-	reqmw=${reqmw%;*}
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
-
-	# https://github.com/vorot93/tokio-tar/pull/23
-	# (fortunately uv already depends on portable-atomic, so we don't
-	# have to fight Cargo.lock)
-	pushd "${ECARGO_VENDOR}/tokio-tar-0.3.1" >/dev/null || die
-	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
-	popd >/dev/null || die
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# 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_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}