gentoo auto-resync : 20:01:2023 - 17:40:46

4 files changed, 22 insertions, 97 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 8b3bff1660f4..1288b4310361 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,6 +1,5 @@
+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.11.30.gh.tar.gz 11120234 BLAKE2B 3d33475932a59dfb862869becb792aea420b8c9fffd9179866dc01eb5e0b2ba77a23c5de8be5570f9ed2e46f098bc000173d74766d42953f93ab2439c20d7f2c SHA512 a44409d41196388b05f2b9620b9d0f45f4af7f244f8243143278b62560e54063574670356e141e07807b56b1181ad27f701f84b91bc045bf47b5701455b36c66
-DIST pipenv-2022.9.24.gh.tar.gz 11543711 BLAKE2B e875068383c8ca55864bfcb53288ae9a02adc578c09ad7392bf50a7ebe07e2eb5944bc225cfefad2ca8265d8dcbb17af96b34e8c0fd51a709921148207021f2b SHA512 d29a728d914d8c762469fd2d72de7be41050165b4587c3304ebc03235a1946967f78473651e1834e5a69a35395d0cf9087e1515fd746450057774fc22e61e092
-EBUILD pipenv-2022.11.30.ebuild 4298 BLAKE2B 13ab38ac3d3d3d37748e49620fbc3df3d3a014aeed88d0821951fe021687c97bbbe42c37fe3943f3b690ad7428eec682c7fb99275720fb47805b89f2c8ed56ad SHA512 5cb62afac2d0f0f17ab509c4eac4480a7d6ffb9ac6d2ac4c31a73c25d6b1aa29d10d44db2cf6ccbcbcc9d28b88c2be01473410640dc36fccf44de2781e2012e9
-EBUILD pipenv-2022.9.24-r1.ebuild 3137 BLAKE2B 042b4a96a82264c1115de31dfe7e3191bc774b5c1ed6d96eddb0f48571e5b7fe57cad5a3c40e99400c85b052129af9fb2078ca012365882dadbc7ed9b07d607a SHA512 4bc4e4fbad054084c25d20dcfba291a946fc207fb427c3d214761c584797759abe6b6e36c0103e2fccefa17ec9c48bec16884f30af852f92159975aa1d26a0dc
+DIST pipenv-2022.12.19.gh.tar.gz 11118843 BLAKE2B 812aa7eacd2b1eaa42a586e64b73e7a13d2ac3ed4c2abf834e190ed5a8a4398d3d17999c1e196de6b01eb755f6771493967b8497710ac3fe20d73408f6251f80 SHA512 edd1e43cb3e91ed0001aff0a590f72e510f9b4c5f436a1c81d1e8a815d22f5bcf199254e5faf78dbdfec3ee0d4b51709b6de28163cf01e58d6f0de044ae99fdc
+EBUILD pipenv-2022.12.19.ebuild 4359 BLAKE2B bf055bd4b4d95e03f18dcf637460b2b34461232d5dd80a75e4cfe47eaa78ced3cdd73a96f4fc1168c9eb66179087628fe49933e86511ca2c8d445a53ddcfb38a SHA512 6990de3d26bd15ddf2925762f2f00cc23a61ed3b16c7824da665b8204f943ba90427ede9cf2139e30dae4dc110eba76e837bf77015dca7be6ac46e3384606e13
 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-2022.12.19-append-always-install.patch
new file mode 100644
index 000000000000..a5746fdb8ebe
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
@@ -0,0 +1,17 @@
+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(
+         strip_extras_markers_from_requirement,
+     )
+ 
++    # 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):
++        extra_pip_args.append("-I")
++
+     is_artifact = False
+     for dep in deps_to_install:
+         if dep.req.req:
diff --git a/dev-python/pipenv/pipenv-2022.11.30.ebuild b/dev-python/pipenv/pipenv-2022.12.19.ebuild
index 06cb8f923a98..1f9dabc494e4 100644
--- a/dev-python/pipenv/pipenv-2022.11.30.ebuild
+++ b/dev-python/pipenv/pipenv-2022.12.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
+	"${FILESDIR}/pipenv-2022.12.19-append-always-install.patch"
 )
 
 RDEPEND="
diff --git a/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild b/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild
deleted file mode 100644
index c46318b1b9c1..000000000000
--- a/dev-python/pipenv/pipenv-2022.9.24-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
-)
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( attr cerberus click colorama idna importlib_metadata \
-					 importlib_resources pexpect pyparsing requests toml tomli tomlkit urllib3 )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}