[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     7d2579a842be44fd0d4ed5fe50c37820d2344348
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Mon Aug  9 11:40:29 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 13:33:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2579a8

dev-python/pipenv: fixed vendored packages

 * Fix missing deps on jinja and attr
 * Remove vendored colorama, add dep on system colorama
 * Enable Python-3.10

Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...nv-2021-5-29-r1-remove-colorama-vendor-import.patch | 18 ++++++++++++++++++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild           | 11 +++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
new file mode 100644
index 00000000000..5c50788d032
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
@@ -0,0 +1,18 @@
+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
+ 
+Submodule tests/pypi f5530013..1881ecb4 (rewind):
+  < Update setuptools version
+  < Add sha256 checksum files
+  < Update url reference
+  < Add pep 508 subdirectory fixtures

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
index 403619ae607..11e51647f26 100644
--- a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
@@ -20,11 +20,17 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+PATCHES=( 
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch"
+	)
 
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-python/attr[${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}]
@@ -45,6 +51,7 @@ 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/jinja2/" || die
 	distutils-r1_src_prepare
 }