gentoo auto-resync : 16:08:2024 - 12:22:56

3 files changed, 23 insertions, 7 deletions

diff --git a/dev-python/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index 477c9f359a7f..3afeafda7dfd 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -1,7 +1,7 @@
 AUX pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch 1018 BLAKE2B 18405bf1f1ba5a457c9643738258df5d1c3d5ed709954dd274560ae9cbf139f336b75b2c896d9d8bdfe24c4d2cb98ea3e0391d73ac05ba1e38766f2cfa04a431 SHA512 da732fe18cc3f49ed3994133e8a5eefe4c6f8ebf18dad3caeb057bcdbab38f5936c245271d6ff534f3cb6069255e13291a9033594148e70e486fd85d5b9e711e
 AUX pipdeptree-2.13.2-fix-pypy-7.3.14.patch 1353 BLAKE2B 5e3a6f53244de1ae185818e3e2a37a87229b46b02c390a606b65668ae1dc53fe1a6b5e6c9faaf6160f25adc7e2597cceb5fd89bb20414a609880e034c7bdc026 SHA512 e0e8e729d713d347c96ee7db5e6a14ba7a9a986aa41231731973b4ab31f8d866cd4d229b35b54411e171a446d61201675ab3df01a58079786eabf5a080de05ad
 AUX pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch 1170 BLAKE2B e214c79ba1183222d00525e0e795d2ba1f10a3abb1ff6e5c986ba3aa036251326d8244787f549d698ab6a015f79eb2397212060365b8c774e2d1218531f8704d SHA512 a2055d9c828352aa1d2d5ec844acf00bc202a579c2dcf7f27997ac29261680ebee0f674b42eca77c3e039ccbc482eac62adfbb82190e157e65b01755d4972f62
-AUX pipdeptree-2.18.1-fix-pypy-7.3.14.patch 806 BLAKE2B 0162fc2e6fbc9bb0aa64e34a871b24d374e154e2a017cb97154f01dda69a32013532c88de02d3b9e8de958788b3e25898de722eface63c83a84904f71e1f5780 SHA512 5f9621013ed8699ce63230e27fe9eb2b0e8d65bb3e09eb74be794c4a14329cacb9e09e24f4241d36a41261490ba97846162a440b2619e8d1d1f8606be964b6fe
+AUX pipdeptree-2.18.1-fix-pypy-7.3.14.patch 1009 BLAKE2B b887e6e3234bd07a1df87b087907d5658a5e5fe3408defd172ded784362c12081f9cf52b41d471b2c28fc09b7398539d3cfdb2d872435bdb304a8d9a42a6336d SHA512 04a128b51a5bac5b58e30a8b521b4bd596f48a25faf5cd32db164cb95f3d9ddfb876d5afa77353cbb2e0029b8eb893da25d8dbf81133fdf95e0f1911cf456cc4
 AUX pipdeptree-2.21.0-pypy.patch 5682 BLAKE2B f545f7dae932b98e472ec3d4d47cf2538cff50be34257c8c97761096c6e1b3e8664759d5a40a275951591b30b1546d34ccb71afb5f4006951508bfe6707bca6d SHA512 23896b56e93faa64943ebccece52ea5145236ed3670dd962e5f0c74dde4d091c41695fe4300c8f4529bfd2d669d1ce154c01c079dd5708ba8c21de0ee28098e9
 DIST pipdeptree-2.16.2.tar.gz 32151 BLAKE2B 18715b0c7835e19bd5b6846922990e321a7e06315642204e7d79375a50b692f87e2ba1ec5884c4f69ff6e8d75e863c8cf372152aca7561ab94ef265d3c1df9fb SHA512 06d72f94a9165fe52cc15b9f539e3adb6da99e4a63cae78928bf68be3499b2828a5d471f270455b94a960ba2fe2f6319f5319c20ed270029a38a81173a7cd403
 DIST pipdeptree-2.17.0.tar.gz 34677 BLAKE2B 3f92c4361978d2a6b1ae46d3a7e21aca231d504abf3a3cc8388d64a70fc3853a33edeac091a0b60cd3043d86162f6816292f973e9c8691420f906e946a5c9dac SHA512 1e7a4bc7f2f872e9d3115b413acc791eeb912a6f428fca772e30a3c8164ecfa44bba7e5246f9b65cbc4d34ffcd8050ff795ced3e3f9ad918f134ce052a8e8992
@@ -12,7 +12,7 @@ DIST pipdeptree-2.23.0.tar.gz 39737 BLAKE2B 79fe45880f2942b2ded1d16e2767c4005aca
 DIST pipdeptree-2.23.1.tar.gz 39883 BLAKE2B 63b578cc466871dda284f66bacc7e262b18157e5fb98e3a884c5e3eddd6945ad3d41a95e2e24fc23d0917e902f0e9ead152259d5ddc919e77e2940c2e2933119 SHA512 bc62c9cf6ee01bb8167477a21c70a7dd4ae1141c1c0690a1e95aea49cd4cb7d7e18bf076a532b00b79014a23c069df8aa09ac1bfd2d328b57e444192f1b10e5d
 EBUILD pipdeptree-2.16.2-r1.ebuild 1274 BLAKE2B cb4e0979864fcb41c9324207e37b3b2370a6ecee49662543fde77c17cceb76b45a1bafca4c7ab38aee675788ad357ae39a2c59042a69bcf0c866fd5efa399d0a SHA512 623a7b260d0ec09b901e0a4eac31a0a5680a29a3b7138e9b6961d391616b50b9bc0314fc3fac9af811ff0710e4efa6228d128c924412594075b2b28ff18ca3ae
 EBUILD pipdeptree-2.17.0-r1.ebuild 1274 BLAKE2B e28d9b388627fe9e4cf0f7882f00fdcecfa158a160ed4f01ad47cec927528318f9da05d9a6c1b8fea20ca69feb4fef82632ebc3cb6d6729c9fb281706d10309a SHA512 5ea1417f28a16b5463702a4a3d38877bf8732a3d94fa946e054c15ea5889e78afb786271f3956417d04f7af7b153f6c285c1cc77c5594fcac85c5ed63079cc8a
-EBUILD pipdeptree-2.18.1.ebuild 1153 BLAKE2B 565891fc85d01f081459e707adfb98c9b7241a705cebb5b354c2d1c578eef478e08e641a06f8778797ae9e3be61a11988ff3babd3dcc626de332b828040e62cd SHA512 de32018039407d4832e14d7e1ea743f86a3642d8449489ea579ac30c3d5a92f10668f33c357a1525e22d8ed77cf2b73f0a833a90d53dbb58073c0b76de5a1e3c
+EBUILD pipdeptree-2.18.1-r1.ebuild 1354 BLAKE2B e038a5cb399fdce8ec9e4d228d76fdcce1de2e6395f62f91a90031bffd2da4c77de0cc2de3d433f9410c9b8f999b40bbf5dd53fea33d07e13b332f691223f68a SHA512 ef430841814440421200d052ddcee3fc94b0b303c1657d49277928382fe5846e3d6969c5423ed11f90b132360304c879cb9bdc0e063889a2b26873bd7e27ffa3
 EBUILD pipdeptree-2.21.0-r1.ebuild 1267 BLAKE2B 55cf353976e06689c49d90397a64095f0b9631cad2855f8cd9f9422955bd992ff7ad4ccbd3ca7ed254083381a0218f44713f150f2b8e9e66b6f632c5112fabac SHA512 0d9a554ec7946910a13b28c7ece6fec5eab2b5acb7191ffb53111dabb02e79b222a528103fe0f48534ce1cc5e699b48a826469a449ad7ba4ac1f8aba3ae2761b
 EBUILD pipdeptree-2.22.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
 EBUILD pipdeptree-2.23.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch b/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch
index 6179d823a021..32d039fed519 100644
--- a/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch
+++ b/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch
@@ -1,6 +1,15 @@
---- a/tests/test_non_host.py	2024-06-12 21:33:13.696206671 +0200
-+++ b/tests/test_non_host.py	2024-06-12 21:46:40.146193582 +0200
-@@ -32,10 +32,10 @@
+diff --git a/tests/test_non_host.py b/tests/test_non_host.py
+index 2849375..ed7b7b3 100644
+--- a/tests/test_non_host.py
++++ b/tests/test_non_host.py
+@@ -1,5 +1,6 @@
+ from __future__ import annotations
+
++import json
+ import sys
+ from platform import python_implementation
+ from typing import TYPE_CHECKING
+@@ -31,10 +32,10 @@ def test_custom_interpreter(
      result = virtualenv.cli_run([str(tmp_path / "venv"), "--activators", ""])
      py = str(result.creator.exe.relative_to(tmp_path))
      cmd = ["", f"--python={result.creator.exe}"] if args_joined else ["", "--python", py]
@@ -13,4 +22,3 @@
      implementation = python_implementation()
      if implementation == "CPython":
          expected = {"pip", "setuptools", "wheel"}
-
diff --git a/dev-python/pipdeptree/pipdeptree-2.18.1.ebuild b/dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild
index 3cd1aa8e171f..b99c9659bda4 100644
--- a/dev-python/pipdeptree/pipdeptree-2.18.1.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.18.1-r1.ebuild
@@ -26,6 +26,7 @@ BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
 	test? (
 		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)
@@ -39,9 +40,16 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
+	epytest -p pytest_mock -p console-scripts
 }
 
 pkg_postinst() {