gentoo auto-resync : 07:09:2024 - 12:29:07

4 files changed, 31 insertions, 233 deletions

diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 0090eeccc5c5..5708a5cc735a 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -4,12 +4,8 @@ DIST reqwest-middleware-5e3eaf254b5bd481c75d2710eed055f95b756913.gh.tar.gz 40049
 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.3.gh.tar.gz 2514550 BLAKE2B eae7a625869fe0821abb6c194cb72dc7a3ca2c11d40e731929b886e4b781ab0f7a1099986271c402d64f2eee4582ec57c9443eaecdf18f2d55b2640c8bd9bde9 SHA512 ccb8b125bd32c268cbbeb431fb538d63d700a910392afed8c38470175359dc4153367ba71a5326538e9c7188ddc8b649f23e67f1d2da59ddb17b61c71f33b40f
-DIST uv-0.4.4.gh.tar.gz 2529092 BLAKE2B 89c9aee07f55f2ac7366f66b9355ecbc20d76500b4a8e85a154c9613178bb000c513d3b310750f3d5aba835020797d93deade9e51eb5f742edd750836807a071 SHA512 2b8581b27377256f5ddf6681b7f66acf87454d476330627b76704d76860afbeffcf89e7bdb1a56f60789c0246fdb81d459991f52baa451bbadff5f79df3dad5a
-DIST uv-0.4.5.gh.tar.gz 2547342 BLAKE2B a87140ca17b9767b864a8ac2cca4e3dad1f1e0ed7ae93d49c650249a63b5e51f6f36c40f7aa75a710951d98f9e2ba9f7ebf7ae1cd3b7f2525a22e664ac75b613 SHA512 9db24ccde03a7ea665febbd2c707de4efaad560a1fdb3823aae5f4c212df37f3c1f646c7e7ae4cba0e5cc0104995b44f5a4cd130c5beaddd921e71abfc6cbd5c
 DIST uv-0.4.6.gh.tar.gz 2553065 BLAKE2B f793c01042db0a45b53a57157852ed5035a96bfc58c2cf81eb3d6a59b9eb6315dbd675817e1bca0a34f9d348d10c0668f9213fd11f230f606386405ee4d51c31 SHA512 79b50783596c6307934c378f7f7b60628de3edd8fe75f6675efd406e7e4cb7cd049a3966eefcb2708f8ab925ee5b5e315f6540f2c25693ffe1ee29f2d501523c
-EBUILD uv-0.4.3.ebuild 2903 BLAKE2B 5ae8168fc28b260c15c095036baac453df47717a7852b2f1f3c784bd83821fdb6ca3e4b4e43a4d107f0fbf8f0d897fdc3acd38d8d5701ebdf36a220512f721d7 SHA512 7db67cc2e51569aa77ed8e7ae122cfc65496743dc04080060283df351eddad0bee832416d270425d6c04aa3882a8c5c0d529b0ff979ceb44a56a929f8a762da5
-EBUILD uv-0.4.4.ebuild 2903 BLAKE2B 5ae8168fc28b260c15c095036baac453df47717a7852b2f1f3c784bd83821fdb6ca3e4b4e43a4d107f0fbf8f0d897fdc3acd38d8d5701ebdf36a220512f721d7 SHA512 7db67cc2e51569aa77ed8e7ae122cfc65496743dc04080060283df351eddad0bee832416d270425d6c04aa3882a8c5c0d529b0ff979ceb44a56a929f8a762da5
-EBUILD uv-0.4.5.ebuild 2938 BLAKE2B 4c418853746d9d098e3558c8dca06ac539e32c937b7c6a754994bfaa4014b87f3478cd7b7934c05529d642b856a8e270214fe950d81b75b479352db620669160 SHA512 373267d4f0ea6d399ceb921358004c153c791bf4d205ff699b6004a7e1666da99235c5c67b088e0571086863deefcf34e95a3a71c36dc4f879a94f51b8868ca9
+DIST uv-0.4.7.gh.tar.gz 2558161 BLAKE2B 5508af9b6e0d04d165aa3b120be138fb4ccfddd643395175e5d31618ec34a5139567c0162b0ce1c741fed551397d1ec9d9693ce0397d1f0346a5c1df13c20b8d SHA512 8395f96eb36c2131b203de9991b994532047b7928ac1765a426accdaae4ed3a242a8b9554808123f5359d41778d3e7783606265b60d372bed2a0a76fea027e3e
 EBUILD uv-0.4.6.ebuild 2938 BLAKE2B 4c418853746d9d098e3558c8dca06ac539e32c937b7c6a754994bfaa4014b87f3478cd7b7934c05529d642b856a8e270214fe950d81b75b479352db620669160 SHA512 373267d4f0ea6d399ceb921358004c153c791bf4d205ff699b6004a7e1666da99235c5c67b088e0571086863deefcf34e95a3a71c36dc4f879a94f51b8868ca9
+EBUILD uv-0.4.7.ebuild 3695 BLAKE2B a429e8ba6fe4e6472f9d625b918be97ad643adda9815ef4e1649665cac532974b1d61399cedff551acfb1068b8260cbcbc2a274cf3003b12bc3ee49af2e88287 SHA512 8e1ef3d836d40de0b3abe9fd0873f71277d42cf90f62fc23c08fcb6eea5cbc57af53c46a8acaa9d3aeb318cf86ef4627e367bb3f20a0a4056ad183fd27a2980f
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/uv-0.4.3.ebuild b/dev-python/uv/uv-0.4.3.ebuild
deleted file mode 100644
index f5da7b7e4913..000000000000
--- a/dev-python/uv/uv-0.4.3.ebuild
+++ /dev/null
@@ -1,113 +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
-
-	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.4.ebuild b/dev-python/uv/uv-0.4.4.ebuild
deleted file mode 100644
index f5da7b7e4913..000000000000
--- a/dev-python/uv/uv-0.4.4.ebuild
+++ /dev/null
@@ -1,113 +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
-
-	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.5.ebuild b/dev-python/uv/uv-0.4.7.ebuild
index 3990f1fa30dc..0f6e94f4f948 100644
--- a/dev-python/uv/uv-0.4.5.ebuild
+++ b/dev-python/uv/uv-0.4.7.ebuild
@@ -50,6 +50,14 @@ 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? (
@@ -89,8 +97,28 @@ src_prepare() {
 	# 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
+	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() {