From 6f583f0ebf698afcd5cc227f00aae83837f4047c Mon Sep 17 00:00:00 2001
From: Oz N Tiram <oz.tiram@gmail.com>
Date: Tue, 10 Aug 2021 10:34:49 +0200
Subject: [PATCH] dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram <oz.tiram@gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 ...1-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild  | 61 +++++++++++++++++++
 3 files changed, 61 insertions(+)
 rename dev-python/pipenv/files/{pipenv-2021-5-29-r1-remove-attr-vendor-import.patch => pipenv-2021-5-29-r2-remove-attr-vendor-import.patch} (100%)
 rename dev-python/pipenv/files/{pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch => pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch} (100%)
 create mode 100644 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild

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
similarity index 100%
rename from dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 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-r1-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 0000000000000..77de678dfaf30
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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//./-}-${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}]
+"
+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 version of PyYAML that is backported to Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	# 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
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}