gentoo resync : 06.04.2022

3 files changed, 74 insertions, 7 deletions

diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index a89816953022..84f4ca503a77 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,10 +2,12 @@ DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 DIST Flask-2.0.2.tar.gz 628479 BLAKE2B 13555ce0602e685b5fe29ba51e05534263d70440c56c9096e95e0893e010d877154d3d1db1bff47209e6b70e91612a71e8aed149a067465f9e3a11486d843a86 SHA512 341be4e453dd5f682e465af356ff85ffe76f52a62e529e6cd251f95199e73b0f93414af093f899f61721e9bb351f09972a433a55beacc972b5e577b86e003081
 DIST Flask-2.0.3.tar.gz 629304 BLAKE2B dae5ffb86b9f57ea95c682be4f858faec6432c877695c06fff40a056cd7eedff25cf120458435b634954f0e65e57ad6c22c3eb6b5ed751b6d7f5d4501358c240 SHA512 b759ada3ab610d4893cd48f6de070c23929ab2e37af863238912fa19246acfb399b1e67576bf6112c9bb56b00002792d28c7538c65b026f31bcc6f64305ae966
+DIST Flask-2.1.0.tar.gz 630852 BLAKE2B 6a67d4c0f67aebf326493d86baefcdfb5d1e1b36a3b6a2e818d8bd92d84267ca8762ee0af3e70254bd4ce53a4f781edc9560e6408adf8ac285b308cdf1103c0f SHA512 8d9da72e3ad7df378a32fc40290e9499bc79eb3167235e8497f8f2753ac2c9da170d34f0ae3e87db99ba8282c887a479a64b680818b668bc13e033e6e5603926
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
 EBUILD flask-2.0.1-r1.ebuild 1254 BLAKE2B 4905978df3fa82a8c6d823348dd93886d894ded96a7d2086d27365c7b0c87633a20fbd698866d1b5b7ff0df1bb234be3cf2c225a716531a0fe5bbdbc4fb4f2fa SHA512 6e8889540ba701ae776da1c2c72f95839ae09d6e3cb224e65fabcbf49f4b073b8ec5a26cb2c8638e8508a63b30370acaad68dcee78c5505ce25aa33cde024396
 EBUILD flask-2.0.1.ebuild 1157 BLAKE2B 0bc463ef16344809f4fc20924a286d45263be516a5ba31e7f2b5177c0e839398cb0d0ede26374cff1ae74a2bde6b112f7b3c0c3ccb44323bab9fe8fddd200f3f SHA512 eff0a6235f8a7e7dc98976dea47be68aa65ea5a8f2fdbeb873540adb781bfbccd7415686d045c58d3ce49e50e0ee18c4e106c6dd6c6edaf29b04311860a76cbf
 EBUILD flask-2.0.2.ebuild 1467 BLAKE2B f58ee8a015b45ec847061d6b4786a18f6e1d75216bcae7b6d135767549198d71b6e255fbdbe0cf6bae785406c8805d220daa0e6135d490101bd4d4085201e2f3 SHA512 45b312db1d2c806c2ab23d3e31ed3f7388bd2428c6ec8f26b709ea49f74063a7eb045a6896325ded7222c29783dc45a41ca66521e01029e895673d2a4aab8dcb
 EBUILD flask-2.0.3.ebuild 1306 BLAKE2B 552e9ef0c973d6973b68919e3a95086f763b08dedfec3b1324306a2629af118422130cae699248f4251bb7cf721c53af3ad17b56f2f4d17c27d8b3e12210c149 SHA512 2f11847c1ac1686b477901e021be64e4ed90c5d494f584305ac500dc863b0cfc60171b9595ce32505038b08df4e43551d5922a77c95e0783e0c063e6e74345d3
-EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
+EBUILD flask-2.1.0.ebuild 1417 BLAKE2B c29b9854806854948990c2cf2958f25e3fff0b0b63f2edd29498c55b5da72ef4a70c4acb2dd912a2124b81785ce90b26a022af0b379f16c669316b7ee6ce2bdf SHA512 d95c54d2f7dcdd7f369ddeac2d527966d1f2af88c76df2105127cd9d1a4988c2bd476b22030ab9b4f0af5d4dad491a04663a6e138de39ecfa56809e4598548b1
+EBUILD flask-9999.ebuild 1417 BLAKE2B c29b9854806854948990c2cf2958f25e3fff0b0b63f2edd29498c55b5da72ef4a70c4acb2dd912a2124b81785ce90b26a022af0b379f16c669316b7ee6ce2bdf SHA512 d95c54d2f7dcdd7f369ddeac2d527966d1f2af88c76df2105127cd9d1a4988c2bd476b22030ab9b4f0af5d4dad491a04663a6e138de39ecfa56809e4598548b1
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.1.0.ebuild b/dev-python/flask/flask-2.1.0.ebuild
new file mode 100644
index 000000000000..eec62df569de
--- /dev/null
+++ b/dev-python/flask/flask-2.1.0.ebuild
@@ -0,0 +1,58 @@
+# 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} 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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-8.0[${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}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log_cabinet
+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 feea1195fdd3..eec62df569de 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -15,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -24,14 +26,19 @@ SLOT="0"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${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}]"
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
 BDEPEND="
 	test? (
 		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
 	)"
 
 distutils_enable_sphinx docs \