gentoo resync : 22.05.2021

4 files changed, 116 insertions, 16 deletions

diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index b6d7d4d9b6fc..dad54cdb30ad 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,8 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
+DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
+DIST Flask-2.0.0.tar.gz 624458 BLAKE2B 82f552cbe714ea4fd64b56f88ee747c292659181139eae5fe0e496457d1f33cb5d7b464ed5250b6087c859691d89cb72a885d8640855dd9dfe7ecc6083bb0c36 SHA512 3fc66aa1568f7dce67bb70b0113401b7535dda32e33ac784a42f08fa21e08b055214218fac06dc6fb4b8f975b2a91321a6c97203f6568efc6bfbbb8d4ef9ddc3
 EBUILD flask-1.1.2-r1.ebuild 1336 BLAKE2B 1d9cd737bd40369f5d8e7372376d69546d1979aaecf38bd22980a86e7b9f4027f42645d68aba5bee2ce099f37064bfd40495ccc6728fb35ad2d92f3ffa45e7f0 SHA512 f4c81fb1f96574a06a20a1d8ae7758f598b07d9957bd6c82faffe1415344ca5ddd482cea55dc54a83cc86990cd6afb1fbae25f93282e9efb0d238fad17814cad
-EBUILD flask-9999.ebuild 1296 BLAKE2B 78ee07fe3a1bbaed5da574ba3db1f735908aa83b0eeafc47b1d1683869a3756660134c6f6129397df5b27c7156221aafcb0bf414b76a09c8ac3121e86597782f SHA512 86fa9d9bfff0b5ecd2d3c9cb71ea8c4b4c320cd3dcd20da43a3afa9d1b69c601cbf980ff31738e2e30c0cba1559afec754fdb9af06255a80bbb54054a4531f35
+EBUILD flask-1.1.4.ebuild 1338 BLAKE2B 5058ffde76eb4b3066d2dab05b5d4d8e491519b89f0da39b45a3b5c7fc942246f541b183def35f6c675becfad2f2d8fb8594fd6569fcb992cc3dd0fd8e56098f SHA512 007beb976ed79d475841d321dd6fdf849a64acb1bf7409aab92f4839e621c9ec079c037bb9085a7127728e57884df1a0a35c309a72cffc184706252f24ad8d92
+EBUILD flask-2.0.0-r1.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
+EBUILD flask-9999.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-1.1.4.ebuild b/dev-python/flask/flask-1.1.4.ebuild
new file mode 100644
index 000000000000..8f8e828fbeef
--- /dev/null
+++ b/dev-python/flask/flask-1.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<dev-python/click-8[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	<dev-python/itsdangerous-2[${PYTHON_USEDEP}]
+	<dev-python/jinja-3[${PYTHON_USEDEP}]
+	<dev-python/werkzeug-2[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-2.0.0-r1.ebuild b/dev-python/flask/flask-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..aa5080465c2d
--- /dev/null
+++ b/dev-python/flask/flask-2.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 586061db9361..aa5080465c2d 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -16,33 +15,33 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_test() {
-	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+	epytest -p no:httpbin
 }
 
 python_install_all() {
 	use examples && dodoc -r examples
-
 	distutils-r1_python_install_all
 }