gentoo resync : 21.08.2021

4 files changed, 30 insertions, 4 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 5975a8e38d96..f46e0566b76a 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,7 +1,8 @@
-AUX pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
+AUX pipenv-2021-5-29-r2-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
+AUX pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch 506 BLAKE2B 30447546cbf87a99d7914340708ef7cb8c60247957f0ee41b2cead21a476e7b9a8238661376d39fc60569478571b365f19c27b489511f744f8387f24f51319fc SHA512 57eee158b006f44a8676bc870f940a1b98a95eee2c50c1ce127d99add129b8bc02a2e4cd98f49912629c376c9119b3234d8bf418b19452ae9c8c4080f4d53682
 DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
 EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
-EBUILD pipenv-2021.5.29-r1.ebuild 1427 BLAKE2B 62fc045ec96f38ba7adee831a3ea108b36b1f96868703aa04d50bdb88f15e91c8d835195d652e74b102f22919ef6b4f2af7f39197d74d3ac02b435002774f3e9 SHA512 3b45d3c1bd613d3212df52638cf4b20c23c306f14dac1f9e571dbed26dd34173fd3339e0c6056cc62e860abae4d48c98ad610c9df0409c92207234fb31a33eab
+EBUILD pipenv-2021.5.29-r2.ebuild 1680 BLAKE2B d510881c66e8b17e057b1cec72721f603e36c95ed63599ced8456db1aa9b425869aaec34f827b8db1573e00f0c4aca168010749883c7605e034af3a6f4ad70cc SHA512 e65004e4a88165179b4c48acd59c2f4870dbd79809b7d31d82e23e62d0c498e0cf51a9fcc770872a21b1521ce3c2345d7d8163de97e57ce096b3816444c61aab
 EBUILD pipenv-2021.5.29.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 MISC metadata.xml 642 BLAKE2B a652239b8d21d5c30d7893bb530bb89af62e0642824d4954bdd41719d1f1b8afee5e8ca4cdc7859995adca8fe0ddbca916e4876ed10104fa9e69f76147227f71 SHA512 f9d9c4433c8bdbe9bdb4c62f8da158d59afba2052a899eb14c245c1109cf82f690e513581aa6028b4ceebc836a32df5b8961672fed833a08b8ef2ac8a442a860
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
index 3437c2a2f33f..3437c2a2f33f 100644
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
new file mode 100644
index 000000000000..5c50788d0320
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r2-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-r2.ebuild
index 403619ae6073..77de678dfaf3 100644
--- a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..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/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}]
@@ -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
 }