gentoo resync : 23.09.2020

4 files changed, 2 insertions, 130 deletions

diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 2045f023bcbb..bd0b436131dd 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,8 +1,4 @@
 AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
-DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
-DIST flask-security-3.4.3.gh.tar.gz 346540 BLAKE2B ab3b037282bc5b7777ceeaaaf869996f471bc3b954f0b2cf6d17ba44d4014c8c3ac8e34618bc7347bbd1cd6b1c649b49407cb05aad9bd748191c08b7326f679a SHA512 23ad8bc91df418361a556827ff8369777f3716dfd1c97fef6237ba9cb07813eac4033eb3fed80e9ebadeab4f2d2a956b5a652bec80825f939a9fc7d817aa3d90
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
-EBUILD flask-security-3.0.0.ebuild 1341 BLAKE2B fda0b3ef0eb3905478e61b3dd9b0728f974e090009af723aef9d5707196a875e992c0603f459cbc6c413ddae9bf4044ab6dbdf2dffe0f3deb5a02260eb28430c SHA512 9baf9297cc339569409cf9403bf9bf986433b236499e758406ecfb56751849fa3d1a2197da8e88f1aa64751224969c32330a6284def06806154f3a378774c90e
-EBUILD flask-security-3.4.3.ebuild 2135 BLAKE2B 170093c37ba951d2979b2fc2d686e35a859c761e2f41a27370614214f5847d2eda47c8a2c6820cae3054bad541df4017bfa900e657ac4513c6bdce480cbd9ddb SHA512 aab5fdc72c5a573db8adb11e5dc24aa8b335f3179ad1970cf8261adcb6e49692cbe57ddf0c3bab5c57b5711cfb2f6ccee1ef9ffb6bf1d32ec6c62fafa38398c5
-EBUILD flask-security-3.4.4.ebuild 2144 BLAKE2B 2aaf0c0290e6121c14325c1f4d158c646028ce871051f96d6027dffa095b035b20547e46cfdd11b9ba37bd8275e782c6eb64df75724f5243753c8dabeb3c47b9 SHA512 c1767593e7d093e61f94a8e36ab995debe7ba352d420412d8eff61a942bf2aff86b9753dfcde8d9487bfb212daa578e67a4c3b31a1b5c2eb3c610e28d980db13
+EBUILD flask-security-3.4.4.ebuild 2142 BLAKE2B ec9d9aba810b228ac39c65b151b6d89ad15f0749b2908fbde50cc4af7f5ab9fd41d000c9e93cfeb8e4f840757d26f70bc30ae19015a955602ae1df9e9ffa0ece SHA512 074acb81070b082e9bc7f31f316da2c0461688a6cbfef7bf3b16577f6582ccd6ac0322fee00ca3cffea4ee812bdb25feacf4113bdb708b09fc86503632aa952e
 MISC metadata.xml 341 BLAKE2B e33881ccf51b30de5fa6831f144035f0e895f2e1720ef7ca9360a1196b7d6c587f736d4d868afbdbd6678ea020f41164a41c0ab99069bdddd253b7e5b9d80d04 SHA512 ec87dffdadc946be52ca0a12d9265250f5a0e08e833c0cbd6deda1e8eb70354c2fea0bdfcdbe86fc16072138972881112cc5a5b08f4179b85f89695b5b22f30d
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
deleted file mode 100644
index 5544516760b3..000000000000
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-MY_PN="Flask-Security"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="https://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-# tests are foobar
-RESTRICT="test"
-
-RDEPEND=">=dev-python/flask-0.11[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-security/flask-security-3.4.3.ebuild b/dev-python/flask-security/flask-security-3.4.3.ebuild
deleted file mode 100644
index 835a9fab9ba0..000000000000
--- a/dev-python/flask-security/flask-security-3.4.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..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.2[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.0.5[${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-mongoengine-0.9.5[${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/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}]
-		$(python_gen_cond_dep '
-			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		' python3_{6,7})
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-deps.patch
-)
-
-src_prepare() {
-	sed -i -e '/setup_requires/d' setup.py || die
-	sed -e 's:--cov flask_security::' \
-		-e 's:--cov-report term-missing::' \
-		-e 's:--black::' \
-		-e 's:--flake8::' \
-		-e 's:--cache-clear::' \
-		-i pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-3.4.4.ebuild b/dev-python/flask-security/flask-security-3.4.4.ebuild
index 18073cabe061..acca5c68373b 100644
--- a/dev-python/flask-security/flask-security-3.4.4.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]