gentoo Easter resync : 12.04.2020

5 files changed, 20 insertions, 25 deletions

diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index d77b30b2cdbb..b95f7d5cedec 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,11 +1,11 @@
 AUX flask-1.1.1-py38.patch 1134 BLAKE2B bc252d38ca5c49ac7a327b50ee62eccb26a81f041a81fb6996fba790a6ec0f11b004fe90917ef4d90238126a17bb9864f81843f41edc7e43795acfb382799482 SHA512 ce43cf60c59aa17c716802779c163231435310b1942dd02373da51658119922bd6707b910c23dea49a9727f5a6a82219893ad3918384e7ebe3b5025bb4f7a6db
 DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d1475af9153bf3d5234c33aa5c0ab415cbd254b711731cf8cffddac94b475f62d9fff2f9fe756b0fa30bb36d4343 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319
-DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52
 DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61
 DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178
+DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 EBUILD flask-0.12.2.ebuild 1852 BLAKE2B 227bbfee82cafded94dca9fbd8492c5b14fe4921bc9eee93bc7559bd2af90c510f76758ff9a323f26698266e76533448be0d48936c66a19afe58e360a5aeadcf SHA512 76caa706a286644af614cbdd39bf9ef6e609ac8f98d9e7e5951db84946ba105ae6defb64a73d5af1c3106b91b2155bd24c5b820c70340cf88199193deb496857
-EBUILD flask-1.0.2.ebuild 1560 BLAKE2B 9a6c26fd51921b29c8fefad6a09fc4a9d9a8c16bebd3431194b872893ecf0012457167d20bb0e8820fe6d8a5cb6b25e5f1ffa95b5c279d5a36a69cccfb1b7b9b SHA512 bb44972822e4e0d2b09cefce23ed5f9c9964fcee15db9279b7bb356789aaa29e5b45d6b98b033108710852eadc730bb7454054885cc7019e50aefd5de9d5f638
-EBUILD flask-1.0.4.ebuild 1566 BLAKE2B d4e6a59a03460c2050de9f4f4c1655948df2375671d3d6509eba08ceaec8915873c834e315c6b6b448934ec2fac7f350d3a7caaf25a78bd8f29abc43bb8895f0 SHA512 7e14a329956f2bae023af857b1ddbd53fab8d3e6effcfc4518a3127e3cbdbce0313a659bdd33eb9071edb7340aee74367f504b6c7a57e22995cc490b0431b98e
-EBUILD flask-1.1.1.ebuild 1422 BLAKE2B 828ebab7966aa9bbd6911cbf9f2c1048ec4066e709512316df1ff0438fc4afa03962698cf715d95e609d5a8509dd22ba8ad5a6fabef9fca00f19ba5ef917dbf5 SHA512 71ab8e8e705f461c2cb5d2236a19e45da36236bea5941625d86b535347599487d35ff345679c171ff2cb1afb09267cf7e16c131bb894d4ec9442961c5adda8aa
+EBUILD flask-1.0.4.ebuild 1560 BLAKE2B 3229629c8b52e9562e3e50cbc24b3a644d6b5b9e63451b0c769aaf4e8cd24c06f6e82a311c6c018e8a7ffac31e973be11d7ea43a7d8f54fca6ce3a88ec9a966b SHA512 6ea21804e025b9b7e24846d53108551accc5bf4e20a0cb6134504b9551f53747b5cfad12ba793a83123461243c787631862e837509e278660cd9355b217b102c
+EBUILD flask-1.1.1.ebuild 1429 BLAKE2B 73a728dd301b52f5cbfc875b29f6daccf0f7520e5e29c4cc06909e0b6c211b347a6047e41176eeb4042b53b0acbb63e10a4988dae9912238a1c6529eeb550ea4 SHA512 170eeda7ddc588f8916e09b8b0576b3b34fdc67e482e721abcd47394c854ab751875c4662ce709e7b8b98092660881ea4aa06d2e1ad7ed9778cad17711a7c47b
+EBUILD flask-1.1.2.ebuild 1371 BLAKE2B 5ec74ec89b552548ed5946746150df0262295d9b9ab12b469e46d960c02e07d9607a7706dc280444aa13410f8cf39d176dcb48bd77735e4ff112be35a175dd66 SHA512 5558d5569464af22ee5c230997dc721bd3c6f54b875d8327b86a5c51c26e3b97d6a9c51081d8716490e7baf084b77c998d8d8f54906d81c9ed2636af644f1736
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
-MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
+MISC metadata.xml 387 BLAKE2B 32096cb4f4a2e7b3e484224a6253f7f0ee52d73b9419c8ea3f76aca7d782408fdf2917ef1797057b32d1dffb17522d23cc26011fdde938d9a47046d0e9794769 SHA512 f70179503fe0651fe6ff288731f10821cce3b19d020c3817db2f6d846f66d5f013f52c168d75e3fec8070b19bdbd9c3b08670d56d8aa6158ba3547a70ae39b84
diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild
index 62cc1ea9b48d..a9d997e76f23 100644
--- a/dev-python/flask/flask-1.0.4.ebuild
+++ b/dev-python/flask/flask-1.0.4.ebuild
@@ -16,7 +16,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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index d3118ffdfd2d..49061bff4889 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -16,7 +16,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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flask/flask-1.0.2.ebuild b/dev-python/flask/flask-1.1.2.ebuild
index edaf31dd5b87..ad28fbc34576 100644
--- a/dev-python/flask/flask-1.0.2.ebuild
+++ b/dev-python/flask/flask-1.1.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -16,43 +17,36 @@ 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
 
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx docs
 
 python_test() {
 	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		py.test -v || die "Testing failed with ${EPYTHON}"
+		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( docs/_build/html/. )
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index 0d860934115e..5226bafc3906 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Flask</remote-id>
 		<remote-id type="github">mitsuhiko/flask</remote-id>