gentoo auto-resync : 26:06:2024 - 00:12:24

6 files changed, 10 insertions, 542 deletions

diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index a6d5eeb867e1..a75f735b05a6 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,21 +1,11 @@
 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
 DIST pubgrub-a68cbd1a26e43986a31563e1d127e83bafca3a0c.gh.tar.gz 86909 BLAKE2B f7e3cc92d813590f971786967996383fa20243cfff1962bdf2e67a5875597372927c67b4b7b2bc5a227da2b3baa8936387842c940da4123b13a049882f34b50c SHA512 4f6915693acee1ba51d37c6a77ac537010e165bfdc4b7840fc7600bfbc8d64f16ab97729e74b61a40e1382f839605e57c1694806c325a51f4d47f571ed21ee03
-DIST pubgrub-e981e4dfe315582e84e2fd724832fb0e0c50b7aa.gh.tar.gz 76914 BLAKE2B e7039f3b2fdc2a702f4824ff99acba9549e916c211290b79ec710060369b2c76e518c210c109103bf5ba50cbb373d0a4e3185df09935d7e47241ec25da259776 SHA512 94cfc88b6736ffd78bcbcc3f4cd9940d27c902bf2dfca38dddb470b8a6a0bb3a8e4a61dd1b2654e49327c9386c3ac2a7f090f9a6c2426b19ecf00d9f9716d400
+DIST pubgrub-b4435e2f3af10dab2336a0345b35dcd622699d06.gh.tar.gz 86966 BLAKE2B 783191e6a6d6eaeb6d8b1f773d449de5aebd7864296758b8a0fa87df62fae855c0c0edcb4ddb11694d70a3cd8870d7b14b0c7b48a2788026d3a6104685bf46dd SHA512 2e58fad9633070adc8e7549475a8d01c2d8d56d0b6492ab3fa773cff94dc004ca1d841e3428a84dfb495e664850a184d4699d364a4d8e4298b6b8370282d110d
 DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE2B f9efab73c65394e33e090a6292875ebf35e6669b15c356f102eb109784a4503606ae39106cd0ebe3d7d479cb0b30806d7baaaebf22d826836a24f7ed49100934 SHA512 3b845b05d97c5ab5cea286a7c11846838b40bb1fac98a51782600849a53231be8fa205094c6bdd00f6e193c807b10b28f947698696382be99cae0a8d681dabdc
-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.2.10-crates.tar.xz 49410344 BLAKE2B d1e921cac3e9ef07fc9055fa6ff463776e1f0fcf0c7e655d7774e5a422c8aaab4f892e3962d38e8500545f831f25d106628d11bddc98095b722156a913d824b4 SHA512 71ba87d1d7c9668086d62420318c6d9489446259d55ae17ee9bb63530e63c140533dfb575d838ff75f8fb053dc316924c7e699386a78ca043428b87a3e68d70f
-DIST uv-0.2.10.gh.tar.gz 1178721 BLAKE2B ae7d527016c5f10b700db89167acef1a9bc62779e1486e908659a8f73ed22957eea39654c97d94fd7976ba19a907b9abd92cd93f620ca3d8f0bee8b2289f1436 SHA512 f8afe27ec75e89e00343e59123e4e785dae77c49f63a3bcb88ec6e194bc761f27447c92c9ec2d7e6d885ea90b8df1747fafd9800e6f0066af61d3ed590e7f3c9
 DIST uv-0.2.11.gh.tar.gz 1188556 BLAKE2B 9d22cf0bc202635c0631eb15dc955d19c4c65f1baff31391e62962837ff91611479bb9190cbcd15655dd92366ce58c8b13bfea369812c68fb6a56cb11883d745 SHA512 124f4d866307ff0ac522c5780995d6f4be3ae95a35ff4615937511b2d658eb4444005fa49905f1886fc22fe35e7882efbe5fbd87752d457e441c462639d8506a
-DIST uv-0.2.8-crates.tar.xz 49233792 BLAKE2B 9ba3816b627b02079ca64c29764c4484a2ca617f8ea5426f0cbae367c5e2647f5b0a3927408e3352645358a1de5513e66e3cec38955920435d1165178e348196 SHA512 b2474f3445745f4351774c597100bafc471db30d9078c4891b426ef299b0b5b30185fb5a2398cc4cf3851e2bdab1fc2c361a990d80eddbd9100314102583cc2a
-DIST uv-0.2.8.gh.tar.gz 1139645 BLAKE2B 6a3ce5cf2b9978e0b292c543e81b17df476f410a832524b9d036981a4fcb8ab67f1769e9f975599c7df950b9de802a8147ce209fb5f7c7ea66b4d0197843e6e0 SHA512 e0c6e9e5274095b2315604fd9ae4742c931cd64a893a832142c2ee54be2b8b32fa28a72eb16ef7ef26c7ad3d37ba8428dca62ad653977e98a5c1f029b9260201
-DIST uv-0.2.9-crates.tar.xz 49233792 BLAKE2B 9ba3816b627b02079ca64c29764c4484a2ca617f8ea5426f0cbae367c5e2647f5b0a3927408e3352645358a1de5513e66e3cec38955920435d1165178e348196 SHA512 b2474f3445745f4351774c597100bafc471db30d9078c4891b426ef299b0b5b30185fb5a2398cc4cf3851e2bdab1fc2c361a990d80eddbd9100314102583cc2a
-DIST uv-0.2.9.gh.tar.gz 1147989 BLAKE2B 283bddd99defa92c71da8bad75a9d943585f2feb862fd5764fc9c4d529752506bb79e4fae5d3db532e92a961eaac7554fb679ceaeca6b224c5264a12191586a3 SHA512 bae1ad801ca2dc1d79dfd3b2ce166a97aaab048566059c3ccdbd794bb94876ff4ada45f5a86a22dd92435b9fe4b0b099b6b83132eda2c2fd98d9ceba65c3b66c
-EBUILD uv-0.1.24.ebuild 2164 BLAKE2B 3caf382115984e87a0f44b5e8f619f38b3a7503ac12738519d0edff253eafbc7474924aa1997e332738ffe316da40dd199b906b1c560f1a00a53c805a39edc75 SHA512 c0c83640c43d073a1447228993e8384eee6a4adf73760d651456899ba285d25cc83f0611f6196123125f94fa9fa5d85710308ccf603e7261a699efc2f927dad7
-EBUILD uv-0.2.10.ebuild 2274 BLAKE2B b780fdf7644c62e7aa5fd086b1c9d0cd7a4e7f67fe69e7512ce5892250b9ddca1e39b478e20baf3c5f08015449d8c3981e184d93cf5b1c7f19c86140be48465f SHA512 0b46b6ddf0a5cc68c5a16f74a444397f110e78b04e078d5056a3f2497f827d4f1398b1304e2f09d101913fe7eb94c82a97296c17ad15ec52f70ed7e4d8302adf
+DIST uv-0.2.15-crates.tar.xz 48793072 BLAKE2B 5988199d887f371f275a6ee40415743823c73a164a3dcf0c2d384e644d75625305e503543aa6027df0aefafcfc434c1a5da7ed9bea5760a3b83f4aef2f097545 SHA512 8ccf76686df81b0b704322e35e22ff95b8bf9aa4b417365e25ca77d50463095975de75959580cf2465404da7abcd88c6bc2aad5c9633110d55d5534ddeac97b2
+DIST uv-0.2.15.gh.tar.gz 1227841 BLAKE2B 712b0a2180631ce6c8e1d8e1bbd714efc9f97a31e92c295142826f53b1c740b922f80c05d1ab802eca684220252cad699cbece5679e7cc855e2ca34b45cac2d6 SHA512 c54e78c665f61dc649f11fc0a0d49d422c6f06115453512d98de593736b0789843d1c5431d93e5af1541f02031a4c650b7233d23016d70eab1e384672919068c
 EBUILD uv-0.2.11.ebuild 2227 BLAKE2B 5a10ac4cf8bebf95d9a42a8a95d76b228592c3c09d8c6afbda89804e61e3410e6042eba71f52b7b9f6cc649916d4110cffe411034d0e8e2678c3216b19a3b27c SHA512 913e959a32a91e906159704c50ef4fad4c89224726bae361faaf79bbe52f34d054366c033be0340dacae15b6da4c27423e7f0065ab9abf86b114970b082625d8
-EBUILD uv-0.2.8.ebuild 2132 BLAKE2B 66ec0c66d500724cbb0010aa649edc604ddac56e570d9a96ff1dc578080282565de6349254481f5b7e14da63fef4e87011b8c3a15d658fee2582bd3683fb5c4a SHA512 d0b46515da91dcc403a38fb2a29465a81809284eec3cc8f4ce5ddb49588b7e67b7146cc7bd346e593dfa3ce2cf0213eab0bdb21809149e1c45f484d1bd84e9f7
-EBUILD uv-0.2.9.ebuild 2274 BLAKE2B b780fdf7644c62e7aa5fd086b1c9d0cd7a4e7f67fe69e7512ce5892250b9ddca1e39b478e20baf3c5f08015449d8c3981e184d93cf5b1c7f19c86140be48465f SHA512 0b46b6ddf0a5cc68c5a16f74a444397f110e78b04e078d5056a3f2497f827d4f1398b1304e2f09d101913fe7eb94c82a97296c17ad15ec52f70ed7e4d8302adf
+EBUILD uv-0.2.15.ebuild 2207 BLAKE2B bdaf77bf2e02056bffddc7f5c11cdf674065b82d4ab2a74c2a854c6a322b7b0107de0d4aa2345b91d5fedb2c24dc5617b27c669db21fc9cb10ff17b8868a9fda SHA512 65af2aea962df0a311e5114429e219566bcc1377c511d2ad347103af9ac45afb98ddacd0c69b98324cba19794d1982e29f383933d9e6b28f3420f28ebe8a68c1
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/files/uv-0.1.24-skip-tests.patch b/dev-python/uv/files/uv-0.1.24-skip-tests.patch
deleted file mode 100644
index e9efee5e8d89..000000000000
--- a/dev-python/uv/files/uv-0.1.24-skip-tests.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs
-index 1fc08d1b..60675de4 100644
---- a/crates/uv/tests/pip_compile.rs
-+++ b/crates/uv/tests/pip_compile.rs
-@@ -5140,7 +5140,6 @@ fn expand_env_var_requirements_txt() -> Result<()> {
- }
- 
- /// Raise an error when an editable's `Requires-Python` constraint is not met.
--#[test]
- fn requires_python_editable() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-@@ -5392,7 +5391,6 @@ fn no_stream() -> Result<()> {
- }
- 
- /// Raise an error when a direct URL dependency's `Requires-Python` constraint is not met.
--#[test]
- fn requires_python_direct_url() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs
-index 6dfbd764..ddc5f37b 100644
---- a/crates/uv/tests/pip_install.rs
-+++ b/crates/uv/tests/pip_install.rs
-@@ -912,7 +912,6 @@ fn install_no_index_version() {
- /// package in.)
- ///
- /// Ref: <https://github.com/astral-sh/uv/issues/1600>
--#[test]
- fn install_extra_index_url_has_priority() {
-     let context = TestContext::new("3.12");
- 
-@@ -2344,7 +2343,6 @@ requires-python = ">=3.11,<3.13"
- }
- 
- /// Raise an error when an editable's `Requires-Python` constraint is not met.
--#[test]
- fn requires_python_editable() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-@@ -2792,7 +2790,6 @@ fn dry_run_install_then_upgrade() -> std::result::Result<(), Box<dyn std::error:
- }
- 
- /// Raise an error when a direct URL's `Requires-Python` constraint is not met.
--#[test]
- fn requires_python_direct_url() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-diff --git a/crates/uv/tests/pip_install_scenarios.rs b/crates/uv/tests/pip_install_scenarios.rs
-index 29ec3483..a538291d 100644
---- a/crates/uv/tests/pip_install_scenarios.rs
-+++ b/crates/uv/tests/pip_install_scenarios.rs
-@@ -2244,7 +2244,6 @@ fn post_greater_than_or_equal_post() {
- /// └── a
- ///     └── a-1.2.3.post1
- /// ```
--#[test]
- fn post_less_than_or_equal() {
-     let context = TestContext::new("3.8");
- 
-@@ -2283,7 +2282,6 @@ fn post_less_than_or_equal() {
- /// └── a
- ///     └── a-1.2.3.post1
- /// ```
--#[test]
- fn post_less_than() {
-     let context = TestContext::new("3.8");
- 
-@@ -2320,7 +2318,6 @@ fn post_less_than() {
- ///     ├── a-1.2.3.post1
- ///     └── a-1.2.3.post1+local
- /// ```
--#[test]
- fn post_local_greater_than() {
-     let context = TestContext::new("3.8");
- 
-@@ -2361,7 +2358,6 @@ fn post_local_greater_than() {
- ///     ├── a-1.2.3.post1
- ///     └── a-1.2.3.post1+local
- /// ```
--#[test]
- fn post_local_greater_than_post() {
-     let context = TestContext::new("3.8");
- 
-@@ -2529,7 +2525,6 @@ fn post_greater_than_post_not_available() {
- /// └── a
- ///     └── a-1.0.0a1
- /// ```
--#[test]
- fn package_only_prereleases() {
-     let context = TestContext::new("3.8");
- 
-@@ -3652,7 +3647,6 @@ fn package_prereleases_specifier_boundary() {
- ///     └── a-1.0.0
- ///         └── requires python>=3.30 (incompatible with environment)
- /// ```
--#[test]
- fn python_version_does_not_exist() {
-     let context = TestContext::new("3.8");
- 
-@@ -3694,7 +3688,6 @@ fn python_version_does_not_exist() {
- ///     └── a-1.0.0
- ///         └── requires python<=3.8 (incompatible with environment)
- /// ```
--#[test]
- fn python_less_than_current() {
-     let context = TestContext::new("3.9");
- 
-@@ -3736,7 +3729,6 @@ fn python_less_than_current() {
- ///     └── a-1.0.0
- ///         └── requires python>=3.10 (incompatible with environment)
- /// ```
--#[test]
- fn python_greater_than_current() {
-     let context = TestContext::new("3.9");
- 
-@@ -3778,7 +3770,6 @@ fn python_greater_than_current() {
- ///     └── a-1.0.0
- ///         └── requires python>=3.8.14 (incompatible with environment)
- /// ```
--#[test]
- fn python_greater_than_current_patch() {
-     let context = TestContext::new("3.8.12");
- 
-@@ -3942,7 +3933,6 @@ fn python_greater_than_current_backtrack() {
- ///     └── a-4.0.0
- ///         └── requires python>=3.12 (incompatible with environment)
- /// ```
--#[test]
- fn python_greater_than_current_excluded() {
-     let context = TestContext::new("3.9");
- 
-diff --git a/crates/uv/tests/pip_list.rs b/crates/uv/tests/pip_list.rs
-index 15d784c1..f15f14b1 100644
---- a/crates/uv/tests/pip_list.rs
-+++ b/crates/uv/tests/pip_list.rs
-@@ -100,7 +100,6 @@ fn list_single_no_editable() -> Result<()> {
-     Ok(())
- }
- 
--#[test]
- fn list_editable() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-@@ -197,7 +196,6 @@ fn list_editable() -> Result<()> {
-     Ok(())
- }
- 
--#[test]
- fn list_editable_only() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-@@ -323,7 +321,6 @@ fn list_editable_only() -> Result<()> {
-     Ok(())
- }
- 
--#[test]
- fn list_exclude() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-diff --git a/crates/uv/tests/pip_sync.rs b/crates/uv/tests/pip_sync.rs
-index af3f4946..0df9ed80 100644
---- a/crates/uv/tests/pip_sync.rs
-+++ b/crates/uv/tests/pip_sync.rs
-@@ -1447,7 +1447,6 @@ fn install_git_source_dist_cached() -> Result<()> {
- }
- 
- /// Check that we show the right messages on cached, registry source distribution installs.
--#[test]
- fn install_registry_source_dist_cached() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-@@ -2955,7 +2954,6 @@ fn compile_invalid_pyc_invalidation_mode() -> Result<()> {
- }
- 
- /// Raise an error when an editable's `Requires-Python` constraint is not met.
--#[test]
- fn requires_python_editable() -> Result<()> {
-     let context = TestContext::new("3.12");
- 
-diff --git a/crates/uv/tests/venv.rs b/crates/uv/tests/venv.rs
-index 067c1414..1462f6a0 100644
---- a/crates/uv/tests/venv.rs
-+++ b/crates/uv/tests/venv.rs
-@@ -327,7 +327,6 @@ fn create_venv_unknown_python_patch() -> Result<()> {
-     Ok(())
- }
- 
--#[test]
- fn create_venv_python_patch() -> Result<()> {
-     let temp_dir = assert_fs::TempDir::new()?;
-     let cache_dir = assert_fs::TempDir::new()?;
diff --git a/dev-python/uv/uv-0.1.24.ebuild b/dev-python/uv/uv-0.1.24.ebuild
deleted file mode 100644
index 831f3149f08d..000000000000
--- a/dev-python/uv/uv-0.1.24.ebuild
+++ /dev/null
@@ -1,107 +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;d76801da0943de985254fc6255c0e476b57c5836;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;e981e4dfe315582e84e2fd724832fb0e0c50b7aa;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
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${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="
-	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() {
-	local PATCHES=(
-		# skip broken tests:
-		# - requiring pinned CPython versions (3.8.12, 3.11.7, 3.12.1)
-		# - requiring specific terminal width (COLUMNS don't seem to work)
-		# - other (perhaps failing because of other skipped tests?)
-		"${FILESDIR}/uv-0.1.24-skip-tests.patch"
-	)
-
-	rm crates/uv/tests/pip_compile_scenarios.rs || die
-	default
-}
-
-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.2.10.ebuild b/dev-python/uv/uv-0.2.10.ebuild
deleted file mode 100644
index fe1601abeb5d..000000000000
--- a/dev-python/uv/uv-0.2.10.ebuild
+++ /dev/null
@@ -1,110 +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;a68cbd1a26e43986a31563e1d127e83bafca3a0c;pubgrub-%commit%'
-)
-
-# workaround faulty assumptions that 3.12 is the newest Python installed
-PYTHON_COMPAT=( python3_12 )
-
-inherit cargo check-reqs python-any-r1
-
-CRATE_P=${P}
-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/${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 ~loong ~ppc ~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
-	python-any-r1_pkg_setup
-}
-
-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_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.2.8.ebuild b/dev-python/uv/uv-0.2.15.ebuild
index 7abcad2230c5..b0b964235e5d 100644
--- a/dev-python/uv/uv-0.2.8.ebuild
+++ b/dev-python/uv/uv-0.2.15.ebuild
@@ -8,12 +8,12 @@ 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;a68cbd1a26e43986a31563e1d127e83bafca3a0c;pubgrub-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;b4435e2f3af10dab2336a0345b35dcd622699d06;pubgrub-%commit%'
 )
 
 inherit cargo check-reqs
 
-CRATE_P=${P}
+CRATE_PV=${PV}
 DESCRIPTION="A Python package installer and resolver, written in Rust"
 HOMEPAGE="
 	https://github.com/astral-sh/uv/
@@ -27,7 +27,7 @@ SRC_URI="
 "
 if [[ ${PKGBUMPING} != ${PVR} ]]; then
 	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
 	"
 fi
 
@@ -47,12 +47,6 @@ IUSE="test"
 RESTRICT="test"
 PROPERTIES="test_network"
 
-DEPEND="
-	dev-libs/libgit2:=
-"
-RDEPEND="
-	${DEPEND}
-"
 BDEPEND="
 	>=virtual/rust-1.77
 	test? (
@@ -96,6 +90,9 @@ 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}
+
 	cd crates/uv || die
 	cargo_src_test --no-fail-fast
 }
diff --git a/dev-python/uv/uv-0.2.9.ebuild b/dev-python/uv/uv-0.2.9.ebuild
deleted file mode 100644
index fe1601abeb5d..000000000000
--- a/dev-python/uv/uv-0.2.9.ebuild
+++ /dev/null
@@ -1,110 +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;a68cbd1a26e43986a31563e1d127e83bafca3a0c;pubgrub-%commit%'
-)
-
-# workaround faulty assumptions that 3.12 is the newest Python installed
-PYTHON_COMPAT=( python3_12 )
-
-inherit cargo check-reqs python-any-r1
-
-CRATE_P=${P}
-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/${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 ~loong ~ppc ~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
-	python-any-r1_pkg_setup
-}
-
-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_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
-}