gentoo auto-resync : 06:05:2023 - 05:33:06

5 files changed, 127 insertions, 20 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 1288b4310361..22086b06a912 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,7 @@
-AUX pipenv-2022.12.19-append-always-install.patch 633 BLAKE2B 54d1b3fdb871a1eda116622bbd5e353a4e4ce14e94689b45ea4e6ebfcd328236f7b0e99e451366bd1198bee7d8177cf5518428c6468f50f6a53f70dd91dd641b SHA512 9671134a4c60c4938246882fe109b3e6d301c4b4b818d5fd5d92c182f05ad0e484f45a05d5034d7598f6571aaeafd71b8ef0631a1672ea5d47ea4cd80d3a3906
 AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc
-DIST pipenv-2022.12.19.gh.tar.gz 11118843 BLAKE2B 812aa7eacd2b1eaa42a586e64b73e7a13d2ac3ed4c2abf834e190ed5a8a4398d3d17999c1e196de6b01eb755f6771493967b8497710ac3fe20d73408f6251f80 SHA512 edd1e43cb3e91ed0001aff0a590f72e510f9b4c5f436a1c81d1e8a815d22f5bcf199254e5faf78dbdfec3ee0d4b51709b6de28163cf01e58d6f0de044ae99fdc
-EBUILD pipenv-2022.12.19.ebuild 4359 BLAKE2B bf055bd4b4d95e03f18dcf637460b2b34461232d5dd80a75e4cfe47eaa78ced3cdd73a96f4fc1168c9eb66179087628fe49933e86511ca2c8d445a53ddcfb38a SHA512 6990de3d26bd15ddf2925762f2f00cc23a61ed3b16c7824da665b8204f943ba90427ede9cf2139e30dae4dc110eba76e837bf77015dca7be6ac46e3384606e13
+AUX pipenv-2023.4.29-append-always-install.patch 696 BLAKE2B 61ae23b3c948358109a80b406eb83a835293b6a986a191dbb759c9ffcb7e1a22b0766d4eb1271e5d2dd849ee97747f998417c79024ef5b212e3c21ebcebc2412 SHA512 635a1cccf28b7869b06538eb668d8abc385465fa28bc708376fd7ba1dda621d12529c0843a6d545577456f46d7ec7ae5794df34b0d5b73a897b67c3fc71145a2
+AUX pipenv-2023.4.29-fix-imports.patch 946 BLAKE2B 76cc36b1a60cb600851198340f1b42bed7210f62d9aec536a8bd203e86a62a11659cccf5c328e2ebbc11c0b22f863a8c70f64932170ca2d1ac0bfee526797f0b SHA512 ff6221fe4a1876a0f4c0677243d06c9e79cd08b504b20b958ce98194f0d269bdf2bedd3558af69d03d0dd24749c73999172c83c89643d362c6e095e54f55d73d
+AUX pipenv-2023.4.29-fix-toml-in-vendor.patch 2277 BLAKE2B cfead77e428f6e72d8e10d0779861ccda6d305efee4b24c0b81be92760484ba1f528540fe724ae6bb82ac7e35386e0e9b17fa5d6971f02380b55c4187666c5b8 SHA512 79827dd35c0c1d96f70d5223d9e797a0a3191d2088110fa8b4eacd4f5bfe17077c06ee81504d41cef19bcca479dba7fd0858b08b138226eb1fd4a4a5b2842368
+DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
+EBUILD pipenv-2023.4.29.ebuild 4109 BLAKE2B 684d81482a5155b84c37762b3d8ec91f76b5e779d637c48a28c4cf2256f2c14d3a9a6b6636764f55c125abfd1ce6e883523f95e12c0c48d1458e533d5439a72a SHA512 617c7367adccb957628d1e053d32d389dc46e9ea460bbce344fdfcab1cc97352c24f2e0e8b3be5dc0b770104ad6369f70158be66e41566c3175c7f86e2686f4d
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
index a5746fdb8ebe..25a9c604e5b4 100644
--- a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
@@ -1,12 +1,14 @@
-diff --git a/pipenv/core.py b/pipenv/core.py
-index e42f184d1..02f8994de 100644
---- a/pipenv/core.py
-+++ b/pipenv/core.py
-@@ -791,6 +791,12 @@ def batch_install_iteration(
+diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
+index 4b8b2bf8c..a3e1fbcf7 100644
+--- a/pipenv/routines/install.py
++++ b/pipenv/routines/install.py
+@@ -580,6 +580,14 @@ def batch_install_iteration(
          strip_extras_markers_from_requirement,
      )
  
-+    # Gentoo patch: install dependencies into the venv even if they exist in the system
++    # Gentoo patch:
++    # Install dependencies into the venv even if they exist
++    # in the system.
 +    # This is needed because pipenv imports the system packages to run.
 +    # It does not change your system's packages.
 +    if (extra_pip_args is not None) and ("-I" not in extra_pip_args):
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
new file mode 100644
index 000000000000..eeae85039e12
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
@@ -0,0 +1,31 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index 75ee7d401..ed43cf2bc 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -40,9 +40,11 @@ from pipenv.utils.shell import (
+     system_which,
+ )
+ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
+-from pipenv.vendor import click, plette, toml, tomlkit
++from pipenv.vendor import plette
+ from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
+ 
++import click, toml, tomlkit
++
+ try:
+     # this is only in Python3.8 and later
+     from functools import cached_property
+diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
+index 2e066eef2..9385689bf 100644
+--- a/pipenv/utils/environment.py
++++ b/pipenv/utils/environment.py
+@@ -1,7 +1,8 @@
+ import os
++import dotenv
++import click
+ 
+ from pipenv import environments
+-from pipenv.vendor import click, dotenv
+ 
+ 
+ def load_dot_env(project, as_dict=False, quiet=False):
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
new file mode 100644
index 000000000000..cb0f3f70d48b
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
@@ -0,0 +1,76 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index ed43cf2bc..903667639 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -13,6 +13,13 @@ import urllib.parse
+ from json.decoder import JSONDecodeError
+ from pathlib import Path
+ 
++import click, tomlkit
++
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from pipenv.cmdparse import Script
+ from pipenv.environment import Environment
+ from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
+diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
+index d4157d01c..27d9975ae 100644
+--- a/pipenv/utils/toml.py
++++ b/pipenv/utils/toml.py
+@@ -1,4 +1,9 @@
+-from pipenv.vendor import toml, tomlkit
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
++import tomlkit
+ 
+ 
+ def cleanup_toml(tml):
+diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
+index faaad2e8e..4c59474e9 100644
+--- a/pipenv/vendor/dparse/parser.py
++++ b/pipenv/vendor/dparse/parser.py
+@@ -10,6 +10,11 @@ from io import StringIO
+ from configparser import ConfigParser, NoOptionError
+ from pathlib import PurePath
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from .errors import MalformedDependencyFileError
+ from .regex import HASH_REGEX
+ 
+@@ -17,7 +22,6 @@ from .dependencies import DependencyFile, Dependency
+ from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
+     InvalidRequirement
+ from . import filetypes
+-import pipenv.vendor.toml as toml
+ from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
+ from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
+ import json
+diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
+index 7b7ba9a53..fe20a213f 100644
+--- a/pipenv/vendor/dparse/updater.py
++++ b/pipenv/vendor/dparse/updater.py
+@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
+ import re
+ import json
+ import tempfile
+-import pipenv.vendor.toml as toml
+ import os
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ 
+ class RequirementsTXTUpdater(object):
+     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"
diff --git a/dev-python/pipenv/pipenv-2022.12.19.ebuild b/dev-python/pipenv/pipenv-2023.4.29.ebuild
index 1f9dabc494e4..5fdc0ff53f40 100644
--- a/dev-python/pipenv/pipenv-2022.12.19.ebuild
+++ b/dev-python/pipenv/pipenv-2023.4.29.ebuild
@@ -20,7 +20,9 @@ KEYWORDS="~amd64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
-	"${FILESDIR}/pipenv-2022.12.19-append-always-install.patch"
+	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
+	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
+	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
 )
 
 RDEPEND="
@@ -32,6 +34,7 @@ RDEPEND="
 	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
 	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
@@ -60,7 +63,7 @@ distutils_enable_tests pytest
 src_prepare() {
 	local pkgName
 	local jobs=$(makeopts_jobs)
-	local packages=( attr attrs cerberus click colorama dotenv markupsafe \
+	local packages=( attr attrs cerberus colorama dotenv markupsafe \
 					 pexpect ptyprocess pyparsing requests urllib3 tomlkit )
 	for pkgName in ${packages[@]}; do
 		find ./ -type f -print0 | \
@@ -88,16 +91,9 @@ src_prepare() {
 		sed --in-place \
 			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
 
-	# remove tomlkit from vendoring
-	for fname in pipenv/utils/toml.py tests/integration/conftest.py; do
-		sed --in-place -e "s/from pipenv\.vendor import toml, tomlkit/from pipenv\.vendor import toml\\nimport tomlkit/g" $fname || die "Failed sed in $fname"
-	done
-	#for fname in "tests/unit/test_vendor.py "; do
-	#	sed --in-place -e "s/from pipenv\.vendor import tomlkit/import tomlkit/g" $fname || die "Failed sed in tomlkit"
-	#done
 	# remove python ruaml yaml
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruaml\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruaml\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
 
 	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"