gentoo resync : 12.05.2022

5 files changed, 92 insertions, 161 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index f7feedd0d0c7..1ee9c4d57443 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,10 +1,8 @@
-AUX pipenv-2021-11-9-remove-attr-vendor-import.patch 628 BLAKE2B 2f94b5d3a45cf4cf8eb01e8f73e920c21c6487357cfcab34d8ab13d4ff77f803c5b1da6ac737cf595a23c536bb07f4cd321ca38aa57bdb266a5c066c2227c7b6 SHA512 81be2f0a8eed43da73ee1dab43e7597702e6f01c539381a80ab1cf75aa9285a26d269cf3f36417184a4e2e2499ea2799bcfeb8bdb61bdfa145b2baf253405676
-AUX pipenv-2021-11-9-remove-colorama-vendor-import.patch 2310 BLAKE2B 8cb032ab0d1018f0ce047ef5cfdb6ab729a227f569d6e513dd7a8c9ac0548fbc5f6db6b59e33c03095684d918a34879f8163f6e3a0213a0a4ef009bb423687ed SHA512 e692c0b544639fc820c647e3c267b58cf5669a16ec3a7ee89dbee93036a2add027b41c39edad6b62aa4273f332678dea302e35896868fee7fb28ad105a963790
 AUX pipenv-2022-1-8-remove-first-vendor-import.patch 4988 BLAKE2B 4550cac73864b93b874be208f625fd3ecf825d7e5675cb61c1c151f0ac3af4790c0a797784296fceaef09c031d374c1a3c7e20a36c5f5ede5cbd634866fb7c13 SHA512 857de77a5a885c530f6a9f8b42aa65b38c5b703183cf4f4a6637c1e2afda2a560abf79364395baf60082e9f5622ce0131aef8600303030a26ea185aedd3653fc
 DIST pipenv-2021.11.23.tar.gz 11378116 BLAKE2B aa30c86aa3b20333d0bffc8c49761869cc9e86b69920abe5e58a0aa7ccf35a8faf6b8b29ce408c85239624a999ca4e67f4a687e1e9aa15271bea31a135acdb7d SHA512 3873a3e7de33677b63bb133e397f46030ec28a24479b38009a4c409d93277327e8f53694fa56fdb8120f9cd632e849fde6f4205e29d9f5704c8844101e8e8298
-DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189
 DIST pipenv-2022.1.8.tar.gz 11379235 BLAKE2B b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0 SHA512 9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0
+DIST pipenv-2022.4.8.tar.gz 11822017 BLAKE2B b647bf5dbbdb6a38ace41bc58c3178199c0c7cada826f18d0f58c6f3cd60290fa714ca434d19cf468cf316d51ac0895460cb007d677b53462a7efc86f3d3bb2e SHA512 8c0ed65b9431b785f86bc4fa0a0a55d96228ed2f9483805536fa3056853dbfabeac02578f694e9a3f2e00be579183d10dcbb957fb834d475e1621de6a05ebd2e
 EBUILD pipenv-2021.11.23.ebuild 2551 BLAKE2B 3633bd637db21a8830b388f1438d9531ffa2cf99fd43a1664ea9bdf9a555c695e29c84701d7b2241bdeafeb0ae449d8f709f1fd2a40ec137a97af8a7739e7be8 SHA512 03e32c60df6889d5d710d96fd84dbef61723c938337c8cd5684402517e90160b75a4aa14462c2a1cff22c8e9af0ca783e5d5894aeb3966bac697f2c102300a4c
-EBUILD pipenv-2021.11.9.ebuild 1793 BLAKE2B e17672eacd26f09bd912adeb2fc5995cd28899a2e7f7e04b94d6af12a4468a1248897c1ce587a2f88c36d002de74d90447a0fcf9713398f36dc36d6965e077ba SHA512 e07d6ab4da4c1868cb412cf8987b23490c70665b3d71b4b603ff45fff812d66967cd91dac21333497eba9edc77a2516c2839eecb78707a6c7725ca6838fc1ba2
 EBUILD pipenv-2022.1.8.ebuild 3365 BLAKE2B b13df7340dfb388eae6a4cb7a831dc0472cb0678f38daf20a8c913403661543cefc94544b424dff01deee484ca26af0846c931c302bcb1e9ade43e3a36557d3f SHA512 fec8ff3224b567e354f23f07f1e49e8fab58db34030aaad611770b5ec61cebe353ad79b93e5f75628787061908dbefde19fd7e3a533a592d13bf2d077ceacc2f
+EBUILD pipenv-2022.4.8.ebuild 3170 BLAKE2B 8bfd4a89f8dc663d3afcc05c476b991024c988c9c323656c8ea3fe2837c7a3509559997f3b79a98649c15f8f821129940d305a03af86fb4f0367a71d7385a63b SHA512 7cfe956c7d25f9328a9e12cf711c64ccaa2c61b4155a30a40644c1b10e09e05c4f7a4d0174080899bb6b457631eff7f358cc9f7358937420f0a964a2509a8a4b
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram <oz.tiram@gmail.com>
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-
----
- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
---- a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-
diff --git a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram <oz.tiram@gmail.com>
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-
----
- pipenv/patched/crayons.py                                   | 2 +-
- pipenv/vendor/yaspin/core.py                                | 2 +-
- tasks/vendoring/patches/patched/crayons.patch               | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
-index d7644a21..19b0d695 100644
---- a/pipenv/patched/crayons.py
-+++ b/pipenv/patched/crayons.py
-@@ -13,7 +13,7 @@ import re
- import sys
- 
- from pipenv.vendor import shellingham
--from pipenv.vendor import colorama
-+import colorama
- 
- PY3 = sys.version_info[0] >= 3
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
---- a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
---- a/tasks/vendoring/patches/patched/crayons.patch
-+++ b/tasks/vendoring/patches/patched/crayons.patch
-@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
- -
- -import colorama
- +from pipenv.vendor import shellingham
--+from pipenv.vendor import colorama
-++import colorama
-  
- +PY3 = sys.version_info[0] >= 3
- +
-diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
-index 705650c3..95feb1c0 100644
---- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
-+++ b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
-@@ -6,7 +6,7 @@ index 76dc2439..d8a0716c 100644
-  from typing import List, Set, Union
-  
-  from termcolor import colored
--+from pipenv.vendor import colorama
-++import colorama
- +from pipenv.vendor.vistir import cursor
-  
-  from .base_spinner import Spinner, default_spinner
--- 
-2.32.0
-
diff --git a/dev-python/pipenv/pipenv-2021.11.9.ebuild b/dev-python/pipenv/pipenv-2021.11.9.ebuild
deleted file mode 100644
index 7fa754b6731a..000000000000
--- a/dev-python/pipenv/pipenv-2021.11.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-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}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${PV//./-}-remove-attr-vendor-import.patch"
-	"${FILESDIR}/${PN}-${PV//./-}-remove-colorama-vendor-import.patch"
-	)
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	dev-python/pip[${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/wheel-0.36.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# remove vendored versions
-	# see https://bugs.gentoo.org/717666
-	rm -vR "${S}/${PN}/vendor/attr/" || die
-	rm -vR "${S}/${PN}/vendor/colorama/" || die
-	rm -vR "${S}/${PN}/vendor/requests/" || die
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/jinja2/" || die
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}
diff --git a/dev-python/pipenv/pipenv-2022.4.8.ebuild b/dev-python/pipenv/pipenv-2022.4.8.ebuild
new file mode 100644
index 000000000000..c361313a4def
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.4.8.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/cached-property[${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/iso8601[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pip[${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-1.2.2[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	>=dev-python/zipp-3.6.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 cached_property click colorama idna iso8601 pexpect dateutil requests toml tomli urllib3 zipp )
+	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/
+}