gentoo resync : 07.05.2021

4 files changed, 2 insertions, 96 deletions

diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index eee7c3b76093..e845d484f052 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,9 +1,6 @@
 AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
-AUX flask-security-4.0.0-test-install.patch 590 BLAKE2B 54f4b8e174af28b875d937f727401dbc323a9326f98f7a045742448f227929246af6d1e1bfd3a45830618b433b5a3e60a1b01fcb0202e1bf01e3efb13b023fc0 SHA512 13da8c4eeb967e730ffff647ac9345a33fed7e2c8de2db21f6f10c9c10cfbdf8d263804032884298b528c00103705afccab81110839df95409635b78a139fc67
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
-DIST flask-security-4.0.0.gh.tar.gz 381592 BLAKE2B 62f8ceb5b6912839ad69a9f26793a831304f0d03cd40c73bd7c6701421d22955bec1e43713b2e07004ff9686591370378d9ff6e2e61e6bdc9a6472f18b28bfad SHA512 1d616121d0220bdef6081f4feb2c56b6feb346609548ad74c7bbbb60f4d65e9b3ec92a35fa9e077c35db9ab398d921461450594185956d05d5dda063fe972b72
 DIST flask-security-4.0.1.gh.tar.gz 389071 BLAKE2B 38e352dab5fe687211240011d844a1d5f6c0b5fcbb10752960f7ff5de14f5aa2e30ed9bdadda6684a3bc99e176edb7b8937d99322b4c131e22e87b273896c391 SHA512 ea541cb40679432dea67ffc0bc640147c518e07b7e83a01e3beacc156d0a9198a33da3f458a9219b04148c011f1a26f1a4019a216904239efea3b57e65f3cb45
 EBUILD flask-security-3.4.5.ebuild 2270 BLAKE2B b5e24c6713976774778e8c268b9967614676acdf1d906520889c9245ccd9d2a2960c02130c0135e4a891d3ae5859f20cc076be1fc6df5920df9925d39e5e9a59 SHA512 a07e3396fd9a886dd55b246da398939048e150e28bad6fb0399d2c877ecef399a4a470e603ff084fccd1707cde5c965f1420aa4107064603ad7d8c30f29a5c3e
-EBUILD flask-security-4.0.0.ebuild 2029 BLAKE2B 287f12129e09c067cf6b141ff17c29dbaf9b46da76ea99282be5ffaa18008d2bbf0c73098ee0fa7995e16605f0b536b0de22b8584fc7f4502ac635913147a6e8 SHA512 4c89375117a70735a474a39d2dec6c46c379ba120d4277b5535a69308dda519db247fa9944ada38b7e158136062e32ebc3bd191e52e72b56e83fef2baf74f3c8
-EBUILD flask-security-4.0.1.ebuild 2007 BLAKE2B 0d26c475ddc879de7ace5a1f74d0499b8aa65a2a6747cc77aed4e96711f15226706c70eda628cb0ee3e9a649f6aad4041c393d191a658c7eed4e053dec7f79ab SHA512 c7a521925e9bf0c783645573acb28ab59bdc61d63374938b195f3f3dbb736f5b4c0c1d542411953690be15e1d8bd9577e2265876407027eeb6306424e43fc9e4
+EBUILD flask-security-4.0.1.ebuild 2005 BLAKE2B a5a090de8e30e84266d74f0d22d73667710c8e1fc44e42c34d8c08c4c8d1e3dce0b2b6e3bbc8e7cc2ab46b766eae92bfc75fbfb466cc76d8f85cda96e6240273 SHA512 e53f081ccd0e60ce5b245747cc21094e535d5126a32d9ca7bf1689b899627ec1076015922c9170a403ab31f58330198c7befe471bb6dacb36d64e4b2f774493d
 MISC metadata.xml 416 BLAKE2B 1da613b370aed838bdfe6ffaa616c80aca54cab6030680212db38c0bf1ff783d24db11d8dd2056843621668b25ccba850b2c3d6d62b378ade78f88b263c5573d SHA512 3ab74e9f590c343323fd3d9438bf2a487b77019eeb986e4a0f461c991a00075a70246812cde79f27a337c6ba385e162148a4382063888ff7f2fcf8405bf9573a
diff --git a/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch b/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
deleted file mode 100644
index 8e78cf7b1116..000000000000
--- a/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 09fb542d472c863495a88c9cd73d692d86e86c22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 Jan 2021 10:50:08 +0100
-Subject: [PATCH] Do not install global-scope 'tests' package
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 1d832b7..7abc0f3 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ install_requires = [
-     "passlib>=1.7.2",
- ]
- 
--packages = find_packages()
-+packages = find_packages(exclude=['tests'])
- 
- setup(
-     name="Flask-Security-Too",
--- 
-2.30.0
-
diff --git a/dev-python/flask-security/flask-security-4.0.0.ebuild b/dev-python/flask-security/flask-security-4.0.0.ebuild
deleted file mode 100644
index c483d24d51a3..000000000000
--- a/dev-python/flask-security/flask-security-4.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/flask-security-4.0.0-test-install.patch
-)
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.0.1.ebuild b/dev-python/flask-security/flask-security-4.0.1.ebuild
index b78510e8f15d..e6b5dfd28265 100644
--- a/dev-python/flask-security/flask-security-4.0.1.ebuild
+++ b/dev-python/flask-security/flask-security-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]