gentoo auto-resync : 22:03:2024 - 01:00:40

3 files changed, 47 insertions, 20 deletions

diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 782826400f36..f070e36305a0 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,7 +1,7 @@
-AUX uv-0.1.13-skip-tests.patch 1948 BLAKE2B e155d96cade60daca9ef5438b1bf30134f2aeb3ff5ceb81ec72ef30b520d52f0f1bc0e39951f58ec7df10c1ab0f85aace80a72586ad7d167115c2634bd96ed4d SHA512 4ccea4023be89433726f33aac77bb8832aaa5a0f8e3cd2865023564d40e33b2ceec6b0f2a93e8a40f7ed345ba89cb67723d41cc680ccfb43d43e23b9ba5a201d
+AUX uv-0.1.13-skip-tests.patch 2450 BLAKE2B ab33cab9edb39b4d675f219552b89d7dc4e187a3794628de88ea7274e0834193afcfdd25780f886f058cf1ac4b34311026233082018c78c1731f8a7b0203eb3a SHA512 3f0afac1a5c3aa9ae3c86a7479b458e750ab0e4ddf9179151c57cd7f8c3db9618b949a6a3371b9db0c0a0e15e4a7146468d77930be4122df0642b1ed52a9118d
 DIST pubgrub-aab132a3d4d444dd8dd41d8c4e605abd69dacfe1.gh.tar.gz 73856 BLAKE2B 9e30babd5159de0f80a69de082e990cade3768a4f62c64ecec46253b1c8a3da56a61d096f0cd2e74da436cbabb444c5acbfe27cc55160a5c0c99205c0317612a SHA512 f49c63df7394fcd4ce6a616e3c8d7893274f4bbe4d451f3fb46eed80a3e03eb345818c5ff87e9d3ac23c80ea7ffee5de01237a5dfff40f740f88a6d61eab5f81
 DIST rs-async-zip-d76801da0943de985254fc6255c0e476b57c5836.gh.tar.gz 95906 BLAKE2B a5a0e4d20926d637cbfa25cb486580de6682365c588a9653c873622424ec28ac8c7380d1c99ec260cd342b214aacd5124b51fc5e5646f15f76db4148aada2f41 SHA512 dd5b61bfc913a94822d74f1dac3b30f7a3979a641c3b08ccb5fa84cfbb2bfd8c0f807a30cc4ae0abfe5df7079011c20e1f8a642fd439ce6ba2c404ddee06baf5
 DIST uv-0.1.13-crates.tar.xz 47903460 BLAKE2B da7a2f023054197820cd1bcd13c6e4ff6d4c4bc4780fa109b2c5b796830333f21bc4c7f426052f7ed31a6c02f4e28694cfd94b1aa9d3044ebde49570e565c04b SHA512 cce73590c12a082fed36092bada42b878437cc44137f47c47b4e0e6fae214295867fbda90576d8ed47b025d873dc5655ab74c9914d6ccbaf6cea994b793800d5
 DIST uv-0.1.13.gh.tar.gz 1860446 BLAKE2B e5c209e11ea10a0aa8a88d4d40b40fe84cdd764cab1e852b49a52d8ff8749aac59d62234626fa768e6b1c304ee7b7a54cf99f5af4ecf21b368a1b521a8f903df SHA512 dc00cc26bc3b8e30edcc619bd49ff44962180623be8d1e2d7dc7c2b1c29969c8b393eda31b1392d90f0d72c15f2cb19af489e1e44f857225e461393c4b4b96c1
-EBUILD uv-0.1.13.ebuild 1968 BLAKE2B f282ab87c5307d6b3f93bbd2c62874b049673959cb911aec72f3b7a2327e0b8c8078fc93905c0d8f0a298ca8f83feabd92246d93e611c25bb32eed8cc2b97702 SHA512 1c24142c9bd6538fe1eb078a462f4ccfbcc0bf6d2cfe984ee93e7458241b90b8387eee9f757a8c93b70d0d8933769b2cd96165006da8f20d741e317c78458698
+EBUILD uv-0.1.13-r1.ebuild 2130 BLAKE2B 136f4c90c5d9efcac30138a7ac8f7a877dbbd22f2cf3934172ea6ad73e5d4965665b891f8ae077bf38bb3d021e2359f0961a5d0dfcecda66cccabe69e4ff8726 SHA512 798c04eb2d7b14f6e874e3d2108c3373acc5f8ea0a4845edbff5764056b5452de179734b90d90c21116adfc674c68470535ee30c005066c5a95658e9e7c7efdc
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/files/uv-0.1.13-skip-tests.patch b/dev-python/uv/files/uv-0.1.13-skip-tests.patch
index 5dccfe525f81..440d78bddd01 100644
--- a/dev-python/uv/files/uv-0.1.13-skip-tests.patch
+++ b/dev-python/uv/files/uv-0.1.13-skip-tests.patch
@@ -1,19 +1,35 @@
-diff --git a/crates/uv/tests/pip_compile_scenarios.rs b/crates/uv/tests/pip_compile_scenarios.rs
-index 2cbece6d..9b785300 100644
---- a/crates/uv/tests/pip_compile_scenarios.rs
-+++ b/crates/uv/tests/pip_compile_scenarios.rs
-@@ -118,3 +118,2 @@ fn requires_incompatible_python_version_compatible_override() -> Result<()> {
- /// ```
+diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs
+index bb6f719e..e8628b4d 100644
+--- a/crates/uv/tests/pip_install.rs
++++ b/crates/uv/tests/pip_install.rs
+@@ -827,3 +827,2 @@ fn install_no_index_version() {
+ /// Ref: <https://github.com/astral-sh/uv/issues/1600>
 -#[test]
- fn requires_compatible_python_version_incompatible_override() -> Result<()> {
+ fn install_extra_index_url_has_priority() {
 diff --git a/crates/uv/tests/pip_install_scenarios.rs b/crates/uv/tests/pip_install_scenarios.rs
-index e0ad34ec..87bff298 100644
+index e0ad34ec..4e0c33c9 100644
 --- a/crates/uv/tests/pip_install_scenarios.rs
 +++ b/crates/uv/tests/pip_install_scenarios.rs
-@@ -2369,3 +2369,2 @@ fn requires_python_version_greater_than_current() {
+@@ -2246,3 +2246,2 @@ fn package_prereleases_specifier_boundary() {
+ /// ```
+-#[test]
+ fn requires_python_version_does_not_exist() {
+@@ -2287,3 +2286,2 @@ fn requires_python_version_does_not_exist() {
+ /// ```
+-#[test]
+ fn requires_python_version_less_than_current() {
+@@ -2328,3 +2326,2 @@ fn requires_python_version_less_than_current() {
+ /// ```
+-#[test]
+ fn requires_python_version_greater_than_current() {
+@@ -2369,3 +2366,2 @@ fn requires_python_version_greater_than_current() {
  /// ```
 -#[test]
  fn requires_python_version_greater_than_current_patch() {
+@@ -2529,3 +2525,2 @@ fn requires_python_version_greater_than_current_backtrack() {
+ /// ```
+-#[test]
+ fn requires_python_version_greater_than_current_excluded() {
 diff --git a/crates/uv/tests/pip_list.rs b/crates/uv/tests/pip_list.rs
 index 71bdf344..b80fea5f 100644
 --- a/crates/uv/tests/pip_list.rs
diff --git a/dev-python/uv/uv-0.1.13.ebuild b/dev-python/uv/uv-0.1.13-r1.ebuild
index 11c9289c98f5..b610be166f23 100644
--- a/dev-python/uv/uv-0.1.13.ebuild
+++ b/dev-python/uv/uv-0.1.13-r1.ebuild
@@ -46,6 +46,12 @@ IUSE="test"
 RESTRICT="test"
 PROPERTIES="test_network"
 
+DEPEND="
+	dev-libs/libgit2:=
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	test? (
 		dev-lang/python:3.8
@@ -56,14 +62,6 @@ BDEPEND="
 	)
 "
 
-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.13-skip-tests.patch"
-)
-
 QA_FLAGS_IGNORED="usr/bin/.*"
 
 check_space() {
@@ -80,6 +78,19 @@ 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.13-skip-tests.patch"
+	)
+
+	rm crates/uv/tests/pip_compile_scenarios.rs || die
+	default
+}
+
 src_compile() {
 	cd crates/uv || die
 	cargo_src_compile
@@ -87,7 +98,7 @@ src_compile() {
 
 src_test() {
 	cd crates/uv || die
-	cargo_src_test
+	cargo_src_test --no-fail-fast
 }
 
 src_install() {