diff --git a/Manifest.files.gz b/Manifest.files.gz
index 004e45f81dbf..383ab0b5286e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index ab54c4d1f05e..973e1b3a9842 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index c7771af9cd8f..61a15bd1f53c 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -58,6 +58,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-as.patch
 )
 
+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to missing 16-bit assembly support: https://bugs.gentoo.org/729240. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1e19b441e71d..5f0e4b63a944 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 5ebcb4ee5c54..7776b73b67a8 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1 +1 @@
-DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
+DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index fc8e480e3b33..080c078b2222 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,25 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
+# upstream doesn't do tags much
+EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
 DESCRIPTION="A configurable HTML Minifier with safety features"
 HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests setup.py
 
 src_prepare() {
 	sed '/prune/d' -i MANIFEST.in || die
-	default
+	distutils-r1_src_prepare
 }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 663958e3e6fc..bdaa6825aabc 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.3.ebuild
similarity index 85%
rename from dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
rename to dev-db/pgxnclient/pgxnclient-1.3.ebuild
index 7b785a380af5..586f7287262e 100644
--- a/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -28,10 +28,8 @@ distutils_enable_tests pytest
 RDEPEND="dev-db/postgresql:*[server]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )
+DEPEND+="${RDEPEND}
+	test? (	dev-python/mock[${PYTHON_USEDEP}] )
 "
 
 src_prepare() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e7e535f88f0c..06a56064e576 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 3272c6292f4c..e93ea4a04f3a 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,3 +1,4 @@
 DIST django-otp-0.9.0.gh.tar.gz 60204 BLAKE2B c71b27e007580410fea3cf8110631801c8c08f7e325c3586cb5a41a9618b371b5d65e3b030a5b483cb6cda684fe837cd40aa1c5d04f54dc82cda750b8ba8aeb9 SHA512 dd3c99e928ebf1ba5b6f6b2f34fcf8a1f86ad64ece17a9bd97c56be239f165808f6d1025e2826a12a8eadc150fe49920a0b7ef398d83542cd97a4a6f391505fe
 DIST django-otp-0.9.1.gh.tar.gz 60230 BLAKE2B 1a912e35f8245d3411fc1a9b26dd53d99df5dba5f2a5f68003bc4d535365af336d8664f81cc42f140247bb0e7150c0a60a3308d96cda1e41681dc93520f112d2 SHA512 600286653c035527a2a7978f19c3b9683805ab4562f12afcc2140adf92705239b8f9141b9979a6c30110cf7f3cc13c67019f39448d3cb8db61c4e1b0cdbcee88
 DIST django-otp-0.9.2.gh.tar.gz 61366 BLAKE2B 5016e352db2cfd60d94cd38986185fddab84bf997b72ff5ec3b59cc5944afa74ef67deca7691fd78e28f2aa75bccb9b976707ab6822a6781e541157d4810d8cb SHA512 9634ab23d006d768cec8f3a6685a77e54f8bee89854af2d431eb99560819139518738eb9f1a124190633dbd99f47388f5fa9685bd199a0918f73b263894ea051
+DIST django-otp-0.9.3.gh.tar.gz 63488 BLAKE2B 186af524cdfa3084bfc14deab1a4422a2da2a61b94d85f6c84a01ca0876b68d3f4b478ab2ed37b7d73ca273a2cce3bf4a6ad16c07cc2961bb6e5a0f26c80b1aa SHA512 23e73c1fb0af43c9ba946af5bd1a4ea2dc5abd2b6e9e543a0b7ec37296f0132e9203e3df3d8d0a70448d63453b8111921343c04fc3f073c505d6dac332fc0042
diff --git a/dev-python/django-otp/django-otp-0.9.3.ebuild b/dev-python/django-otp/django-otp-0.9.3.ebuild
new file mode 100644
index 000000000000..b14eef63539e
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.9.3.ebuild
@@ -0,0 +1,35 @@
+# 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="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 710a335ff4e3..8aeea13a6f49 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,2 +1 @@
-DIST falcon-1.3.0.tar.gz 507250 BLAKE2B 3ba3a989f2e9eb281f519e36a24772fe329fee849097028f3183b0e0c7908b7e06dbf0a70ba28cf7570dccbe88fa87703c47d985ea3cf761ea7d6ec3d41ac04b SHA512 a92d0b641152f653f47c9cb9b2e368d643aae14dcabe7028450d190bd08b883d37116d23d3a1ae4e092207f15926f66b12f57e38dd2edd347f6f8df48baa65ce
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
deleted file mode 100644
index 4f9fc7b9191e..000000000000
--- a/dev-python/falcon/falcon-1.3.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=5
-
-# Python 2.6 is supported, but depends on ordereddict, which has been in
-# improvise for months and is a minimal package. If needed
-# please let me know. PyPy also works
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py \
-			|| die 'sed failed.'
-	fi
-
-	# fix tests installation : potential file collision
-	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
-	mv tests falcon/
-}
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
index f04883a8808b..59c7c7d3d1ac 100644
--- a/dev-python/flask-babel/flask-babel-1.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index 75210c43206e..b24481782f87 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-BabelEx"
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 42f669f664ff..978e75e8d1e3 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,23 +6,31 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
 HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
 SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
-S=${WORKDIR}/${MY_P}
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	sed -e 's:--pep8::' \
+		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 77e7430d0c46..01acbc3c6ea1 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1 +1,2 @@
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
+DIST Flask-HTMLmin-2.0.2.gh.tar.gz 12178 BLAKE2B 38d21e06058728be9f6a23c8b18dd0f209833723d63bdf07262f37ff0fd6ac0de810bc164bfb6e91ed446e6402f93f204468f9c2307cf45c3a1609361be33992 SHA512 ea863644baecdf54d6b0a920ad0cbd84880e6c029a7d5313f0964f03233a74b7d11b3e15431ecf02fc6c33b38241e472968ed1bcad5b8163d14001678a4833e2
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index 489947e8b23b..7c60730ff5b9 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -12,24 +12,18 @@ inherit distutils-r1
 DESCRIPTION="Minimize your flask rendered html"
 HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
-	app-text/htmlmin
-	dev-python/flask
-"
-
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_P}"
-
-# Needs some kind of magic to actually test.
-RESTRICT="test"
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
new file mode 100644
index 000000000000..4a13092ac2d1
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
index 075238b8bd32..b65ef6f89e3c 100644
--- a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 9268034b9763..e8d56406bb8f 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-Mail"
@@ -12,32 +12,18 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Flask extension for sending email"
 HOMEPAGE="https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+BDEPEND="
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/speaklater[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs
+distutils_enable_tests nose
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index ac5c8e80ea8f..19c475d31766 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Identity management for flask"
@@ -14,15 +14,8 @@ SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-python_test() {
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index 349a0a18f98f..5544516760b3 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -31,8 +31,6 @@ RDEPEND=">=dev-python/flask-0.11[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
@@ -43,6 +41,11 @@ DEPEND="${RDEPEND}
 
 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-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
index 507179b7af31..49e218201e0f 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="Flask-WTF"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 85601f8bbf52..dde9d6f94ac5 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
 DIST pytest-asyncio-0.11.0.tar.gz 14070 BLAKE2B a97cc52a013e126c7aa48b21e8fdfb69c589efffefdfe0f1cef09ce98c1dd150f4298bfa9d707dfc264a6d48c71839847f929237204ba2a36e1bb1aae4e95cbe SHA512 db1d6a9c4b3f6f24014eacf3b108d76e5b2d6761d35260f20023638cd898b6f0b499dd475bc07abd58bc73bee2a88b565c3ebcced2460e619a1b375fa6a27a64
 DIST pytest-asyncio-0.12.0.tar.gz 14294 BLAKE2B f62bb025bd3e35b5b4571b232ae2dabe5ef42075fa98f2f5ba28f78f16d81eadeb68b7dcd11a9f8170c1077c331c7abbb0fadc02863458ef03d238b399e6f37d SHA512 2e69bfff3f0b35cc82381b841229749d309967ce1d36972933f5bc6d5dff45934608310ed3fa1805dc38ab41bf913a881493c28d6d0e9be733b624cd2fda97d3
+DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
new file mode 100644
index 000000000000..64dfa2878e8f
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0"
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index a4be1b707b27..43109320ceb5 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -14,6 +14,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">JoshData/python-email-validator</remote-id>
 		<remote-id type="pypi">email-validator</remote-id>
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
index d70287ef4b62..8cd9e9bd41e1 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index e2f29ab33f4d..cf0c6cd59504 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1 +1,2 @@
 DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
+DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
index cf11169d38f7..31cf61f76904 100644
--- a/dev-python/semantic_version/semantic_version-2.8.4.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
new file mode 100644
index 000000000000..cad82361d1cd
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 2be303dcc63a..d7bee32595a3 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
@@ -13,22 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare() {
+python_configure_all() {
 	# https://github.com/mitsuhiko/speaklater/issues/2
-	if python_is_python3; then
-		2to3 -n -w --no-diffs ${PN}.py || die
-		2to3 -d -n -w --no-diffs ${PN}.py || die
-		# fix unicode in doctests
-		sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
-	fi
+	2to3 -n -w --no-diffs ${PN}.py || die
+	2to3 -d -n -w --no-diffs ${PN}.py || die
+	# fix unicode in doctests
+	sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
 }
 
 python_test() {
-	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+	"${EPYTHON}" -m doctest -v speaklater.py ||
+		die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/virtualenv/virtualenv-20.0.23.ebuild b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
index a7fac541d104..6c1825d6e7d5 100644
--- a/dev-python/virtualenv/virtualenv-20.0.23.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.23.ebuild
@@ -40,23 +40,24 @@ RDEPEND="
 	' -2 python3_6 pypy3)"
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
-BDEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
+		${RDEPEND}
 		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' -3)
+		' 'python3*')
 	)"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/towncrier
-distutils_enable_tests pytest
 
 src_prepare() {
 	# we don't have xonsh
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index ac43b2663046..6c3ac689e936 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -2,3 +2,4 @@ DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ce
 DIST wcwidth-0.1.9.tar.gz 24764 BLAKE2B c7a5a50a8628649810dddd37b1af4c7ea52b2d0d2e516bd24e04675849e6f402e6ef4b7cea0fb507c5446b455d8725f497771bb30cd4d7eafa90cbb6fc2d01b4 SHA512 3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba
 DIST wcwidth-0.2.2.gh.tar.gz 46929 BLAKE2B 8dac0a793417b04aaccd2235bdd3dee30e18b068a41e515934d2e7b6efb354039adba767db011a2782c9e1f5b8d2568f4ef73ae09361bf8f608491d252bccc21 SHA512 e644a8f83ac5974174e7dae35784c4f9310e39fcfd49d98d6da0f59efd19a0734d5c65e252689843346eb6adad62edfef76658648b34779191fbcf0655188d52
 DIST wcwidth-0.2.4.gh.tar.gz 47355 BLAKE2B 152befc1f9e8630f407a78c70c9121dcbf27a9bc165ef82ec80a6e0793eda5fa89829542dc14959eedf9cc7676edb0212b29bac95c8f041b9f007d03d2a05852 SHA512 69123170421f7f37a9d09e44860cace29b303701b7be8941d7af403b0f4044b273c136da5726689f13c061587fda24f944ef1da918712bed0eda8c00c7a208c0
+DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
diff --git a/dev-python/wcwidth/wcwidth-0.2.5.ebuild b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
new file mode 100644
index 000000000000..00627f52df55
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	' -2)"
+
+distutils_enable_tests pytest
+
+DOCS=()
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	sed -i -e 's:test_package_version:_&:' tests/test_core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index af2b52ac4479..1946487d7fa2 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1 +1,2 @@
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
+DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B b51b5cb26c550a2502c8c70c1de91c7e6e320f60e2df3ab2b9a5cd755dbbb753d8d2fa05837657aa639929b380e8c65fd25182192538ccef837cae0869b19c80 SHA512 40b810d2d0ce6d2e7880615fb5c3b3e55cfade8e352be5d626d0de16f00a9ef4626ffa106b67d0cbef15e42513073db52ba1ceb04cb18146bba0ba9c26236fdd
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
index aeb0c540d6e9..e52ad989976d 100644
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6..9} )
 inherit distutils-r1
 
 MY_PN="WTForms"
@@ -22,8 +22,6 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/Babel[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -32,6 +30,8 @@ BDEPEND="
 	)
 "
 
+distutils_enable_sphinx docs
+
 python_prepare_all() {
 	# Extension-tests are written for an older version of Django
 	# Disable pep8 even when it is installed
@@ -43,17 +43,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
 python_test() {
 	"${EPYTHON}" tests/runtests.py -v || die
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wtforms/wtforms-2.3.1.ebuild b/dev-python/wtforms/wtforms-2.3.1.ebuild
new file mode 100644
index 000000000000..6651bb04febe
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="https://wtforms.readthedocs.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	# Disable pep8 even when it is installed
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-e "/import pep8/d" \
+		-e "s|has_pep8 = True|has_pep8 = False|" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9d169a0ddc78..aa6fe878dd1c 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 495b4bbf4f8b..b51cfd872394 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -4,3 +4,4 @@ DIST autoprefixer-rails-9.6.5.gem 221184 BLAKE2B 0a8d3dcd87cf4ad54252110bd60e86a
 DIST autoprefixer-rails-9.7.6.gem 226304 BLAKE2B 51481173acc0200e7287e8f448fa99f56f7548cf5df142705f6e4143f42bc079ab2c4d4459d4cbe62417b9f873b9e32d64a96ce61e0e8cdd7501203a33c0dae7 SHA512 4855843d270536607a705ab7a1fcb20fade8270ee957de3150b3892cf81442fecb5d501f07276761aba76c44edef15235d0f68e91ae76d2fe09dfa16179faa7c
 DIST autoprefixer-rails-9.8.1.gem 225280 BLAKE2B 8c6fac92414ba153fdeb974b5e82a9550bd2f18c00af1813984e5cc2b239ab961d597fe66dc8d7a160564f06597da5ac5415c77d73db3d6cfd966dc4cb94ab93 SHA512 5f9d514170551e0c657e5116e76745411d396a02815f44cd2bd0b6c45d7c85cca7af6705ecaa98f4ef069c9d68a941dc9b728d837e9158e56dd9aa9110043bad
 DIST autoprefixer-rails-9.8.2.gem 225280 BLAKE2B 50ba378c775c9781cc2fe5ac4e10cdb29848613a17f1f78811518dc1f58abee9176843a412703505d2ccf15c9dae6025c07f9a60b323db2878cc44e51f6be281 SHA512 6ab2d6106654a41095610dbf3eb383772eaf4c4e56e8790d8207ce2b9e218f276be00a011c6976c1b7b555f691366082d9a1fbeb53dae66e3599e67b2c3cb245
+DIST autoprefixer-rails-9.8.4.gem 224768 BLAKE2B 9d0d4691355c9d92e9e7f960549b40e19b10cf5024e7b23b6c36d99d6c48911237b289f191d0ecddf3e0cc2c12313f27ef5c4db047f5c6f6877c196b6bf75171 SHA512 3680da201cf4eb18eaeeeb8a9bc46af372f8aef035689525cf8354c362df23d329befa05c293d534d88eabedd984c510cf5b6753faba3184a6533a1a88cdbc5c
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
new file mode 100644
index 000000000000..bc06b1290578
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 62199d0286ea..16de94edfcb5 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,2 +1,3 @@
 DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d38964f08ef80c14a4fb6176504a39c2e074fb58fc5456214555461a18ae42dc04f371d85dd335b1cbc3dc SHA512 b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078
+DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( MIT Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 9245ab528174..dde640cb00f4 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index 5afdc1ed8c36..a9f44bfedca8 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1 +1,2 @@
 DIST guile-json-4.0.1.tar.gz 150225 BLAKE2B 343bc64876b35f2f8291635aa357df5ea85acec27b31fdf22a706530764323516bf64ca6edb4f96962e296e3522ee04ca1030487c75d9ee745ffafa1f5990c7c SHA512 45ec92489fec331d8f6e8b3398e09c663da96f41963f5e6f60c15dec19b3f12ebc8f344f023dd3c1f08177723672a2576fdcc41b5d9e441a96dc51b678da5998
+DIST guile-json-4.1.0.tar.gz 150870 BLAKE2B 9bfd3642b41221fbc7a308b06e69dfa16a652a30ae18e8d53612fed61d26ddf8d39686f81f363c1b02de98b58f0bf6c0ba7003ee93f6777332e9e3574743765f SHA512 ea8eef22d027968bd9faf3170eee7f781837e3a614a5523afe8f89c450408966de11e8082e7ebeacb6c3c50f52c1a033526b9c2491e1cb625ef985ad16eed9b2
diff --git a/dev-scheme/guile-json/guile-json-4.1.0.ebuild b/dev-scheme/guile-json/guile-json-4.1.0.ebuild
new file mode 100644
index 000000000000..93ef24df851b
--- /dev/null
+++ b/dev-scheme/guile-json/guile-json-4.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.0"
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_FLAGS_IGNORED='.*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a92f2d295f0f..b4d8c01f348b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index a198a3ea4444..59b1ec7bb617 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index f6762bcaa828..f4417ff09087 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,3 +1,4 @@
 DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
 DIST valgrind-3.16.0.tar.bz2 16267317 BLAKE2B 4ab7a248bc46a772a03fecdab4658b059e65dc328f422f51d23d116d658b8fcfe1dc4b3b26b43ca7bd824169b169506f67cd14a1db2b767b5b5a34c949687d25 SHA512 6c82a0121e0ffde79f84943ea0f5791159ad3e37a490c1a18ff23f41cd4de62b62110e9c4d48b95b06d542f2a6d638492ecaeba9fed48f7e909e959aa4b4856d
+DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
new file mode 100644
index 000000000000..33873a0e69c3
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 42e2bc7b44ed..1848609479c5 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index efccd70608c0..8065a8f5638e 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -260,6 +260,29 @@ kernel-install_test() {
 	EOF
 }
 
+# @FUNCTION: kernel-install_pkg_pretend
+# @DESCRIPTION:
+# Check for missing optional dependencies and output warnings.
+kernel-install_pkg_pretend() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if ! has_version -d sys-kernel/linux-firmware; then
+		ewarn "sys-kernel/linux-firmware not found installed on your system."
+		ewarn "This package provides various firmware files that may be needed"
+		ewarn "for your hardware to work.  If in doubt, it is recommended"
+		ewarn "to pause or abort the build process and install it before"
+		ewarn "resuming."
+
+		if use initramfs; then
+			elog
+			elog "If you decide to install linux-firmware later, you can rebuild"
+			elog "the initramfs via issuing a command equivalent to:"
+			elog
+			elog "    emerge --config ${CATEGORY}/${PN}"
+		fi
+	fi
+}
+
 # @FUNCTION: kernel-install_src_test
 # @DESCRIPTION:
 # Boilerplate function to remind people to call the tests.
@@ -330,7 +353,30 @@ kernel-install_pkg_postrm() {
 	fi
 }
 
+# @FUNCTION: kernel-install_pkg_config
+# @DESCRIPTION:
+# Rebuild the initramfs and reinstall the kernel.
+kernel-install_pkg_config() {
+	[[ -z ${ROOT} ]] || die "ROOT!=/ not supported currently"
+
+	mount-boot_pkg_preinst
+
+	local image_path=$(kernel-install_get_image_path)
+	if use initramfs; then
+		# putting it alongside kernel image as 'initrd' makes
+		# kernel-install happier
+		kernel-install_build_initramfs \
+			"${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \
+			"${PV}"
+	fi
+
+	kernel-install_install_kernel "${PV}" \
+		"${EROOT}/usr/src/linux-${PV}/${image_path}" \
+		"${EROOT}/usr/src/linux-${PV}/System.map"
+}
+
 _KERNEL_INSTALL_ECLASS=1
 fi
 
 EXPORT_FUNCTIONS src_test pkg_preinst pkg_postinst pkg_prerm pkg_postrm
+EXPORT_FUNCTIONS pkg_config pkg_pretend
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 644121a2a4e1..9c7918c65799 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bcc2c6d038bc..be1ab488440a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Jun 2020 20:08:20 +0000
+Wed, 24 Jun 2020 08:08:13 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index bcc2c6d038bc..d4046954972f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Jun 2020 20:08:20 +0000
+Wed, 24 Jun 2020 08:08:14 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index af8d9f5f4ce1..701727182403 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d7d4734c70a9..8d189f29bb6c 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index 4df0b2bea568..7548e79c86cd 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/unzip X? ( x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install prepare pretend
 DEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) gpm? ( sys-libs/gpm ) svga? ( media-libs/svgalib ) X? ( x11-base/xorg-proto )
 DESCRIPTION=DOS Emulator
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-libs/libX11 x11-libs/lib
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0379a2458025a2ee11405a088c6cbdc
+_md5_=834e9c07f5d52c7f851f3ef79e724742
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0430012ad307..ab477f35f447 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 2d87174fe659..1c2ee3a73000 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A configurable HTML Minifier with safety features
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mankyd/htmlmin
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=630d4ab3d1cc6a9495162785956bf42f
+SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3d9e9abc3ffcf72c98d036aa63dae46
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 0e3aec7d6cec..23d0c8af6a06 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3 b/metadata/md5-cache/dev-db/pgxnclient-1.3
new file mode 100644
index 000000000000..a2e464f6a7ae
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=PostgreSQL Extension Network Client
+EAPI=7
+HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2d6ad9e727804b32dff5def95c12af29
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r1
deleted file mode 100644
index f1f0b313b83e..000000000000
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=PostgreSQL Extension Network Client
-EAPI=7
-HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
-_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d00d587cf51e817029d6c58350e63e3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3f8c8f61119d..983a04dd39d2 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/django-otp-0.9.3 b/metadata/md5-cache/dev-python/django-otp-0.9.3
new file mode 100644
index 000000000000..68fd34cffae3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-otp-0.9.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
+EAPI=7
+HOMEPAGE=https://github.com/django-otp/django-otp/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/django-otp/django-otp/archive/v0.9.3.tar.gz -> django-otp-0.9.3.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a04956704f804ca582a6364ddfe03c39
diff --git a/metadata/md5-cache/dev-python/falcon-1.3.0 b/metadata/md5-cache/dev-python/falcon-1.3.0
deleted file mode 100644
index 777353f00837..000000000000
--- a/metadata/md5-cache/dev-python/falcon-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-mimeparse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] cython? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A supersonic micro-framework for building cloud APIs
-EAPI=5
-HOMEPAGE=http://falconframework.org/ https://pypi.org/project/falcon/
-IUSE=+cython test python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-mimeparse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] cython? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/racker/falcon/archive/1.3.0.tar.gz -> falcon-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4746271ddea53f4101e958dd1d9bfca
diff --git a/metadata/md5-cache/dev-python/flask-babel-1.0.0 b/metadata/md5-cache/dev-python/flask-babel-1.0.0
index 3c52c3ed29de..bc4ef0a748db 100644
--- a/metadata/md5-cache/dev-python/flask-babel-1.0.0
+++ b/metadata/md5-cache/dev-python/flask-babel-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flask-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flask-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=i18n and l10n support for Flask based on Babel and pytz
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Babel/ https://pypi.org/project/Flask-Babel/ https://github.com/python-babel/flask-babel/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-1.0.0.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40db3f784c0a420dab2204b7622ddefa
+_md5_=0905910dc9fdb3faf30fe0909ca1099a
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.4 b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
index f8484b1934fb..fe867c8002f0 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.4
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flask-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flask-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flask-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds i18n/l10n support to Flask applications
 EAPI=7
 HOMEPAGE=https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=611c11250ebf21724067eb4e9db557ec
+_md5_=052fa29892c4b8faa64d7c7a3d15a7dc
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index 61421665f5a1..3a88db0512f9 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Small extension for Flask to make usage of Gravatar service easy
 EAPI=6
 HOMEPAGE=https://github.com/zzzsochi/Flask-Gravatar/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71a136c00a370a8a0f8c744c1d7de208
+_md5_=2dc4926c5f80fc8504957da78486b693
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2 b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
index 64ba3da89e9b..d05d09aba4cf 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
@@ -1,16 +1,14 @@
 BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/htmlmin dev-python/flask dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Minimize your flask rendered html
 EAPI=7
 HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=app-text/htmlmin dev-python/flask python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=app-text/htmlmin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.5.2.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=399d586faf19cc84441a5280f435223c
+_md5_=fc23333e00d970ec63bd43b7d2e6bb41
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2 b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
new file mode 100644
index 000000000000..7a9c045316d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/htmlmin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minimize your flask rendered html
+EAPI=7
+HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-text/htmlmin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.0.2.tar.gz -> Flask-HTMLmin-2.0.2.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7b6a2d2d38ee20c78886a0c66a2faae
diff --git a/metadata/md5-cache/dev-python/flask-login-0.4.1-r1 b/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
index c87e0d6c731e..d3a821db832c 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/semantic_version[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/semantic_version[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Login session support for Flask
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-Login/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.4.1.tar.gz -> flask-login-0.4.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3355af94617616167821e76a7437ef03
+_md5_=51da9d8afd99a14f6f822313a3b9aa86
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index 762f0755572c..03ad836240e6 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -1,15 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/speaklater[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/speaklater[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Flask extension for sending email
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=353082a4e041b528bd695d8a844c075c
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f2de9e001dab9a0b483dbbfc1a4d9ce
diff --git a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1 b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
index dbf528d76726..f3364bf6f3a0 100644
--- a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Identity management for flask
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-0.4.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d87832bd1a7a7022922d53abf9e38b5
+_md5_=d2b1f3abc9cdf46a206389d29b98781c
diff --git a/metadata/md5-cache/dev-python/flask-security-3.0.0 b/metadata/md5-cache/dev-python/flask-security-3.0.0
index 8e4dc337f22e..e5224863cbe8 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-security-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-sqlalchemy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-mongoengine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-sqlalchemy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-mongoengine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Simple security for Flask apps
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Security/Flask-Security-3.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b420cbe9bb78b2852b53e56079c727e5
+_md5_=1c07498837549941a11da2034b7db0f2
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.3 b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
index 96e753129c54..7cee7b83788c 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.3
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.3.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51deea0e13193d643e142eef353d4b5f
+_md5_=a66ee7789b73cf27299b608b8300df3e
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
new file mode 100644
index 000000000000..f7aad9c752c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/async_generator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-3.64[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-5.4.0 >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for testing asyncio code with pytest
+EAPI=7
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-5.4.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.14.0.tar.gz -> pytest-asyncio-0.14.0.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=18b858337e7a19119fc5324d9d408bce
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.1 b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
index aa6ab76a9f12..d8c6717fe15f 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.1
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dnspython-1.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A robust email syntax and deliverability validation library
 EAPI=7
 HOMEPAGE=https://github.com/JoshData/python-email-validator
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
-RDEPEND=>=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dnspython-1.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.1.tar.gz -> python-email-validator-1.1.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41cd802b995c84b6a537cb78abab55d8
+_md5_=0c3f34bc32a2126d7c427fa02624b183
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.4 b/metadata/md5-cache/dev-python/semantic_version-2.8.4
index b5abba6ab8f0..52a7245e250c 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.4
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.4
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Python library providing a few tools handling SemVer in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/semantic_version/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.4.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cc2c07554f8909931f054f33275521d0
+_md5_=3303e15ff9aff162a501bc6439d7f24b
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.5 b/metadata/md5-cache/dev-python/semantic_version-2.8.5
new file mode 100644
index 000000000000..cecf830fea85
--- /dev/null
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.5
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library providing a few tools handling SemVer in Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/semantic_version/
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.5.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4c55b21dc824a3dfbd2108b96f54094d
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 9b0d89655084..f2036e7df453 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -1,15 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Lazy strings for Python
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mitsuhiko/speaklater
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd3a020685fd55e6e1c0d872b9252211
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05e05027257e07839a5e223efd95a5f2
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.23 b/metadata/md5-cache/dev-python/virtualenv-20.0.23
index bd377e85a8f6..70f6341e93ae 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.0.23
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.23
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/packaging-20.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( >=dev-python/packaging-20.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/packaging-20.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/packaging-20.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/packaging-20.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/towncrier[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/towncrier[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/towncrier[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/towncrier[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/towncrier[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/towncrier[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Virtual Python Environment builder
 EAPI=7
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-IUSE=test doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/20.0.23.tar.gz -> virtualenv-20.0.23.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25e3ba56a6df314a7eeb74ed36d1749a
+_md5_=daac07b21f8ca93547bcbc23c950dc61
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.5 b/metadata/md5-cache/dev-python/wcwidth-0.2.5
new file mode 100644
index 000000000000..e86e3b9a8f99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Measures number of Terminal column cells of wide-character codes
+EAPI=7
+HOMEPAGE=https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jquast/wcwidth/archive/0.2.5.tar.gz -> wcwidth-0.2.5.gh.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=355d109e7598e73b9fe3868ffaa5f014
diff --git a/metadata/md5-cache/dev-python/wtforms-2.2.1 b/metadata/md5-cache/dev-python/wtforms-2.2.1
index 1657d2a0020b..54517388d0b2 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.2.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flexible forms validation and rendering library for python web development
 EAPI=7
 HOMEPAGE=https://wtforms.readthedocs.io/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.2.1.tar.gz
 _eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ec31e01d67ec5558e9d8d37a10eaeefc
+_md5_=9dad24165d970520e21f940aa915efbe
diff --git a/metadata/md5-cache/dev-python/wtforms-2.3.1 b/metadata/md5-cache/dev-python/wtforms-2.3.1
new file mode 100644
index 000000000000..f52550d18db7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wtforms-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-email-validator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Flexible forms validation and rendering library for python web development
+EAPI=7
+HOMEPAGE=https://wtforms.readthedocs.io/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/W/WTForms/WTForms-2.3.1.tar.gz
+_eclasses_=distutils-r1	44725b3eb803b8abcd6978759c231210	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=979e18c7eeabfff08a7538a1debff715
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 630b88daf6e5..4eb035b8c48a 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4
new file mode 100644
index 000000000000..c55d9fc76c44
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec-rails[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=7
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=9
+SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.4.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54b810e92cd99ac4ed3a8f516297a5b9
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
new file mode 100644
index 000000000000..10e1524b4ec4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
+EAPI=7
+HOMEPAGE=https://github.com/halostatue/diff-lcs
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MIT Ruby GPL-2 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=233f3cf60a349be7cee0b65033e05f03
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 32f811b3af96..b3ec013f5151 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/guile-json-4.1.0 b/metadata/md5-cache/dev-scheme/guile-json-4.1.0
new file mode 100644
index 000000000000..432008c5ac0f
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-json-4.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=>=dev-scheme/guile-2.0.0
+DESCRIPTION=JSON module for Guile
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/guile-json/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-scheme/guile-2.0.0
+SLOT=0
+SRC_URI=http://download.savannah.nongnu.org/releases/guile-json/guile-json-4.1.0.tar.gz
+_md5_=a8fac702acd1476182e486c0bbd2f2e1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 383afe4465da..8b17dabdd8f3 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.2 b/metadata/md5-cache/dev-util/dejagnu-1.6.2
index 01d892794e97..ea1cd4c3f18d 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.2
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
 DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/tcl dev-tcltk/expect
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.2.tar.gz
-_md5_=ec42b33b7c54bc901477e6dbde3d8cd7
+_md5_=d6bdda6d6aa8be0d13e304c4877efa2e
diff --git a/metadata/md5-cache/dev-util/valgrind-3.16.1 b/metadata/md5-cache/dev-util/valgrind-3.16.1
new file mode 100644
index 000000000000..30b0e2ff99a3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.16.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi )
+DESCRIPTION=An open-source memory debugger for GNU/Linux
+EAPI=7
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96474c160c7abf4587e6c3539ec6098a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 2c49b24c962f..adc4211f48fa 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623
similarity index 95%
rename from metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611
rename to metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623
index 51b989cb7bad..017fc348503f 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200611
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200623
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200611.tar.xz
+SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200623.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8391cea5b78183e4ac3f15ff571923ba
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a5bd61d60bcf..33f87ff18258 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.103 b/metadata/md5-cache/sys-apps/portage-2.3.103
new file mode 100644
index 000000000000..db716df02b2a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.103
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.103.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.103.tar.bz2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	44725b3eb803b8abcd6978759c231210	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b213469f74128a65011b04e6e0766557
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index a6a2f42bdffc..9940c916e46e 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.11 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
index 9a9b043121be..bc414dd682c8 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Library for build EFI Applications
 EAPI=7
-HOMEPAGE=http://gnu-efi.sourceforge.net/
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
 IUSE=abi_x86_32 abi_x86_64 custom-cflags
 KEYWORDS=-* amd64 arm arm64 ~ia64 x86
 LICENSE=GPL-2+ BSD BSD-2
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.11.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e8dbc15d0e077befb74654f203d28e4
+_md5_=d7aff43531a431bd6e16f87ca5271c0b
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.12 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
new file mode 100644
index 000000000000..b8bd80d6cf05
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Library for build EFI Applications
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
+IUSE=abi_x86_32 abi_x86_64 custom-cflags
+KEYWORDS=-* amd64 arm arm64 ~ia64 x86
+LICENSE=GPL-2+ BSD BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.12.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d7aff43531a431bd6e16f87ca5271c0b
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 97ee8197b2ad..93964d8c48d6 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.7-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.7-r1
deleted file mode 100644
index 884043355d00..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/cpio >=dev-util/cmake-3.5.0 dev-util/gperf dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) radosgw? ( dev-libs/expat:= !libressl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) system-boost? ( || ( =dev-libs/boost-1.71*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.70*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.67*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.4:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx dev-util/cunit test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) radosgw? ( dev-libs/expat:= !libressl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) system-boost? ( || ( =dev-libs/boost-1.71*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.70*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.67*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.4:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] sys-fs/lsscsi virtual/awk dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.7.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	distutils-r1	44725b3eb803b8abcd6978759c231210	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	ace0a9a129fcfeaae542c0d15c07f36a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4d1ae7250fb935f502d863bdc167fd6
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 8592f421878a..6f7075cd7ca4 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
new file mode 100644
index 000000000000..b19ee129fa33
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
+EAPI=7
+HOMEPAGE=http://opendarwin.org
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=APSL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6711ea36ba21ffdc7b24c0e0bfe21485
diff --git a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14 b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
index 63f6b577c95d..37ebd011327a 100644
--- a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
+++ b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
@@ -5,11 +5,11 @@ DESCRIPTION=HFS FS Access utils
 EAPI=7
 HOMEPAGE=https://www.mars.org/home/rob/proj/hfs/
 IUSE=tcl tk
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~amd64 ~arm ppc ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
 REQUIRED_USE=tk? ( tcl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6.orig.tar.gz mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6-14.debian.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=edcde53600ca405ebfcc1050e8456715
+_md5_=5951135622c2e5a93d2fbe1b4b6e144a
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e5a0c7eafdfe..37b6ced4785a 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
index 67a1f845147e..e6cd53c4ef56 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.170
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.170-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.170-FC.01/kernel-4.14.170-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c3c83579bcbbfe51949c39debffccfab
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index fbf031f4500e..e390be7f30e7 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
index fe7a573b7a78..a2964ea5a412 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.38
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
 DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.38-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.38-FC.01/kernel-5.4.38-FC.01.tar.xz
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=094d32a5460cfeff0c856475320945df
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
index 63469b27eb6e..4b6683b06e21 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.40 !sys-kernel/vanilla-kernel-bin:5.4.40
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d20e359870a68c44a4822295e795f5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
index 7f3fff309877..47b3448179b1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.46
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.46 !sys-kernel/vanilla-kernel-bin:5.4.46
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-46.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
index c225864e8781..f96d59609b80 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.47
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.47 !sys-kernel/vanilla-kernel-bin:5.4.47
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-47.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
new file mode 100644
index 000000000000..ac11977a5014
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.48
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.48 !sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-48.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6687b692c6cd9dff848e7ba3127eca9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
index 7d6c8c362eb7..6ad468e4362b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.18
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-22.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
index 61045e9570b8..41fc1ad2f26b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.6.19
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.6-23.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32a04801cee0eaa444ac7c8e4ef66e65
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
index 8d5e81c22bd3..fcc0eb8c1f64 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.4
@@ -1,5 +1,5 @@
 BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-5.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
new file mode 100644
index 000000000000..d1139ddc9680
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.5
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.7.5 !sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-6.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b30674cc9ef5ecb5282df28b9affba31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
index e869b1d31001..0a1f1e5a96fb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.40 !sys-kernel/vanilla-kernel:5.4.40 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=9012e8c93bb1e67d607665e63c5ce47d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
index c12636ef394f..1dbcb625fa3f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.46
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.46 !sys-kernel/vanilla-kernel:5.4.46 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46-1.xpak -> gentoo-kernel-5.4.46-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46-1.xpak -> gentoo-kernel-5.4.46-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
index 2b76412cf68d..33c20440a8ce 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.47
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.47 !sys-kernel/vanilla-kernel:5.4.47 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.47-1.xpak -> gentoo-kernel-5.4.47-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.47-1.xpak -> gentoo-kernel-5.4.47-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
new file mode 100644
index 000000000000..f89e70c0ff0b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.48
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.48 !sys-kernel/vanilla-kernel:5.4.48 !sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48-1.xpak -> gentoo-kernel-5.4.48-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48-1.xpak -> gentoo-kernel-5.4.48-1.x86.xpak )
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
index e99bc7d920bb..d38f593de4b0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.18
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.18 !sys-kernel/vanilla-kernel:5.6.18 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18-1.xpak -> gentoo-kernel-5.6.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18-1.xpak -> gentoo-kernel-5.6.18-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
index 696ddc2084e3..96d1f5560774 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.6.19
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.6.19 !sys-kernel/vanilla-kernel:5.6.19 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.19-1.xpak -> gentoo-kernel-5.6.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.6.19-1.xpak -> gentoo-kernel-5.6.19-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
index 422ba8f14ad4..95635c5247f8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.4
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
 DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.4 !sys-kernel/vanilla-kernel:5.7.4 !sys-ke
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.4-1.xpak -> gentoo-kernel-5.7.4-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.4-1.xpak -> gentoo-kernel-5.7.4-1.x86.xpak )
-_eclasses_=kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
new file mode 100644
index 000000000000..2c39a3e19be1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.5
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.7.5 !sys-kernel/vanilla-kernel:5.7.5 !sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5-1.xpak -> gentoo-kernel-5.7.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5-1.xpak -> gentoo-kernel-5.7.5-1.x86.xpak )
+_eclasses_=kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
index f3fd0856ff83..62baef245bb4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.40 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.40.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
index 9ee3b075b736..1f3d68a3d191 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.46
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.46 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.46
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.46.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
index d40bc333b8e3..5cea33e59e05 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.47
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.47 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.47
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.47.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
new file mode 100644
index 000000000000..141f8b820b41
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.48
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.48 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.48
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.48.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
index 682c7792d107..c07fcd9049d4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.18
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.18
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
index f3f546490bc4..00746694cc20 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.6.19
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.6.19
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.19.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=7dcb86e3e6f24c6d5462c5c8d25c3fa09e7e9f55 -> linux-5.6.8-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=bc42cce2cca0d42b5cfeb8c6bcbf9f39430791f2 -> linux-5.6.8-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b67a2931ace6e1a590f8f352b2827b3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
index 6ad97342dbe8..d67aad929f42 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.4
@@ -1,5 +1,5 @@
 BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
 DESCRIPTION=Linux kernel built from vanilla upstream sources
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.4
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.4.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
-_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	cf187c45fd2f3df686a8a5d66e495c97	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
new file mode 100644
index 000000000000..17477881dd56
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.5
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.5
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.5.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7 -> linux-5.7.1-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=4f18a8a48e28656a98803890a0f6567b93fd5a77 -> linux-5.7.2-arch1.i686.config )
+_eclasses_=kernel-build	0838c235b14aab6141da8cf8d30dc240	kernel-install	f249f05d986438d38e46eec0431377e8	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b889b56bb362bbcd7e81876103820285
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.7.5 b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
new file mode 100644
index 000000000000..01007ba55dfe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The Zen Kernel Live Sources
+EAPI=6
+HOMEPAGE=https://github.com/zen-kernel
+IUSE=symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.7.5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.7.5-zen1/v5.7.5-zen1.patch.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	f818331411666c019e77dc2779a8ee31	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2148a6c5380c17b8ef37514d78fd60a1
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 3b7a80c84502..67c705c09fff 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-69.0.3686.36 b/metadata/md5-cache/www-client/opera-69.0.3686.36
new file mode 100644
index 000000000000..92aa97ac5dea
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-69.0.3686.36
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download2.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download3.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb https://download4.operacdn.com/pub/opera/desktop/69.0.3686.36/linux/opera-stable_69.0.3686.36_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=807ea2165349f373f6c075a66ed12235
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.12 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.12
deleted file mode 100644
index dc655b41eee9..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.12/linux/opera-beta_69.0.3686.12_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.21 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.21
deleted file mode 100644
index fea2287b2c47..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.21/linux/opera-beta_69.0.3686.21_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-69.0.3686.7 b/metadata/md5-cache/www-client/opera-beta-69.0.3686.7
deleted file mode 100644
index b73a80b8c69f..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-69.0.3686.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download2.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download3.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb https://download4.operacdn.com/pub/opera-beta/69.0.3686.7/linux/opera-beta_69.0.3686.7_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3693.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3693.0
deleted file mode 100644
index a92672c137fa..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3693.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3693.0/linux/opera-developer_70.0.3693.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3701.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3701.0
deleted file mode 100644
index 7b13dbe83a03..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3701.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3701.0/linux/opera-developer_70.0.3701.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3707.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3707.0
deleted file mode 100644
index 210434938ce0..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3707.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3707.0/linux/opera-developer_70.0.3707.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/opera-developer-70.0.3714.0 b/metadata/md5-cache/www-client/opera-developer-70.0.3714.0
deleted file mode 100644
index 88a7903b2cbe..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-70.0.3714.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/70.0.3714.0/linux/opera-developer_70.0.3714.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66378bbc5e882db180d17a7b964b18b
diff --git a/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1 b/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1
index 823129f24f56..969af78a83b9 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1
+++ b/metadata/md5-cache/www-client/vivaldi-3.1.1929.40_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
+KEYWORDS=-* amd64 ~arm ~arm64 x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_amd64.deb -> vivaldi-3.1.1929.40_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_arm64.deb -> vivaldi-3.1.1929.40_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_armhf.deb -> vivaldi-3.1.1929.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.40-1_i386.deb -> vivaldi-3.1.1929.40_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f144b1e6c9d6c200c4aa9ca786faefff
+_md5_=73a663b7d29ffe75f41cddd168c25245
diff --git a/metadata/md5-cache/www-client/vivaldi-3.1.1929.34_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_p1
similarity index 73%
rename from metadata/md5-cache/www-client/vivaldi-3.1.1929.34_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_p1
index 7af51cff0f3c..3dc19c5f5710 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.1.1929.34_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1957.9_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64 x86
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_amd64.deb -> vivaldi-3.1.1929.34_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_arm64.deb -> vivaldi-3.1.1929.34_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_armhf.deb -> vivaldi-3.1.1929.34_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.1.1929.34-1_i386.deb -> vivaldi-3.1.1929.34_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_amd64.deb -> vivaldi-snapshot-3.2.1957.9_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_arm64.deb -> vivaldi-snapshot-3.2.1957.9_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_armhf.deb -> vivaldi-snapshot-3.2.1957.9_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.2.1957.9-1_i386.deb -> vivaldi-snapshot-3.2.1957.9_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	5d5cc2632ef6b3c817019fa4fa3d8508	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	b5891c9326ad2e7905c011d44c927c34	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a663b7d29ffe75f41cddd168c25245
+_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ef1b2abbd4d6..0cfc1e468263 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/wmfs-99999999 b/metadata/md5-cache/x11-wm/wmfs-99999999
index 39d282241285..4263533becdd 100644
--- a/metadata/md5-cache/x11-wm/wmfs-99999999
+++ b/metadata/md5-cache/x11-wm/wmfs-99999999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 _eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a38a4ab673870bd54f0886d7ed97d99
+_md5_=1b8dad9a80b4a41fa32439099df03ac9
diff --git a/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt b/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt
index a55769a96daf..0c77c98637ba 100644
--- a/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt
+++ b/metadata/news/2020-06-23-upgrade-to-sys-libs_pam-1_4_0/2020-06-23-upgrade-to-sys-libs_pam-1_4_0.en.txt
@@ -1,4 +1,3 @@
-
 Title: sys-libs/pam-1.4.0 upgrade
 Author: Mikle Kolyada <zlogene@gentoo.org>
 Content-Type: text/plain
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index a32ade7f6272..bdb65ff564ba 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bcc2c6d038bc..d4046954972f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Jun 2020 20:08:20 +0000
+Wed, 24 Jun 2020 08:08:14 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index e205f8b91928..4fa5765ea4a2 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-63996ee103edf141eff11e3842d32002b514efda 1592937597 2020-06-23T18:39:57+00:00
+d8df9cf9777d186361d8261a7c9aac2a78b0eff4 1592985611 2020-06-24T08:00:11+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index a3b8484d8069..10305eccd306 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 23 Jun 2020 08:08:20 PM UTC
+Wed 24 Jun 2020 08:08:13 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b69a2d4a81cd..98c846c6f96a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Jun 2020 20:30:01 +0000
+Wed, 24 Jun 2020 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 241c0b54935b..ff6595ffba5d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d5c646aeadd922c759ca7b02ea7d1d2f8e65bef1 1592941506 2020-06-23T19:45:06+00:00
+9ac40a22f1f55dc848225872412c7db161b0198e 1592985617 2020-06-24T08:00:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 08db892890f0..9242e882b7c5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1592942701 Tue 23 Jun 2020 08:05:01 PM UTC
+1592985901 Wed 24 Jun 2020 08:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bcc2c6d038bc..be1ab488440a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 23 Jun 2020 20:08:20 +0000
+Wed, 24 Jun 2020 08:08:13 +0000
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 8f3f7f00b31b..a260b58d03ef 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index 79e36410f5f2..726c81103352 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1 +1 @@
-DIST wireguard-linux-compat-1.0.20200611.tar.xz 262892 BLAKE2B bf8441b3428a6d330fb7976695a4c70c3784550854b81cfb6e784dcd9fa1d32351652cab46d0b4dab51a5dbf9ec989cfb41a58b8632ae06571b6d57dcdb0e667 SHA512 b650115d64a4bd665fdc27918d3b8ee72578a2b9542eabbc9a9d99df87c6f4d26aa395b5ec6569becadcdf291662934061fec962a7949bb99679fe7b37e9fadc
+DIST wireguard-linux-compat-1.0.20200623.tar.xz 263156 BLAKE2B 2a45dea6d3a02f91f45ab4fcbbf5da4b24532afc3f775b2731e0360e949d8c689b4fd9e7351c337158bfcd33b09f6e94715b07532a3ebe9eaf40a3e4fff7142f SHA512 447a88d849cf81d83412adbe5aabf5ad44f878b7f64de56672d39b656a9c8053059ea71e5a965c55bacd33651bef2d9d677caf0586b0c7ee7807c69098e1942d
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200611.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200623.ebuild
similarity index 100%
rename from net-vpn/wireguard-modules/wireguard-modules-1.0.20200611.ebuild
rename to net-vpn/wireguard-modules/wireguard-modules-1.0.20200623.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 77f0dbd5b30c..be1223b703b6 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index d9730b28bd64..8d00e7454c07 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,33 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-24)
+# A thin wrapper to run pytest via setup.py that must not be used
+# in Gentoo packages.  Calling 'setup.py test' is deprecated upstream
+# anyway.  Just call 'pytest' directly.  The last revdep is last rited.
+# Removal in 30 days.  Bug #729376.
+dev-python/pytest-runner
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-23)
+# Python 2 only.
+#
+# Relax involves implementation conflicts between dependencies.  Even
+# if you can get past them, it requires Numdifftools, and...
+#
+# Numdifftools fails with modern versions of setuptools, most likely
+# because it uses pyscaffold that is broken.  There are newer versions
+# that removed pyscaffold support but they have new dependencies that
+# do not support py2 and porting them back is just not worth the effort.
+# Its only revdep is relax.
+#
+# Pyscaffold is just broken and required only by old versions
+# of Numdifftools.
+#
+# Removal in 30 days.  Bug #704032.
+dev-python/Numdifftools
+dev-python/pyscaffold
+sci-chemistry/relax
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-06-21)
 # virtual/libstdc++ has only one sys-libs/libstdc++-v3 provider.
 # Use that instead. Or even better use none of them. It's a
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a8eb3c8f5698..319c7a63d244 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2f465bc223a2..79c9fb425670 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,5 +3,6 @@ DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f0162
 DIST portage-2.3.101-revert2-bug-709746.patch 25365 BLAKE2B 84a451b3af5c6a79a99f7548fa920a888b76d31d4248d11592bf5e8ec8f26bd8e62f813cb69a684ff2816942c49a8661744c7ec9d0944aa256527cfa3b20323d SHA512 49a1f7e38cec1e06373154024a980eedf5bfacc9cc66e1f8c70e8cbb77c68b94a934b4cffe039acdc86179a8f44bd463771c3acecaab6ced3387fd47a312f69a
 DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
 DIST portage-2.3.102.tar.bz2 1051616 BLAKE2B e9158cd941d65575dab51e2f8cd768c5706ce2f7e6f37fb4c77bc615501b3b3893fdee0917780fe172307bf647a1e4e56e3d88a7c479e103b095fc295fe274e7 SHA512 08024707c552b5b5174a66825cc53bc459a3db2fbb36740713a4ac5834429550200bc458e1f4a2ea921aaf04f0632dc885ef9ab5ba2c3a22d48c031667ed23ca
+DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76bbc41511659abfa6ede12b5f9ecaf9d253ac816b0e1dc6b6a118d9efc80593b429ef179d9d01200333585498d44d9 SHA512 e5595ca3b12c35fb696dd86ed2f1a72e56c7bc6955a63e555e1f0a795415473e38363541495496464bdc4192e2708c8bff4192bd0c7dad7a527fac96deec2a4c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
diff --git a/sys-apps/portage/portage-2.3.103.ebuild b/sys-apps/portage/portage-2.3.103.ebuild
new file mode 100644
index 000000000000..6e1a8152761f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.103.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f274bed962dd..0f09269539f6 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 0e4ed33baf64..8a3d7d40cb86 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1 +1,2 @@
 DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b6f553ac0b2d8fdc83e49c69bec0dce1e2e8730705f70b3b7b0a61e4f065773667945ffc92a6f40eba381fcf6723 SHA512 1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a
+DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
index 27742adc9b20..8cf6e78f27e8 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
 SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 # inc/, lib/ dirs (README.efilib)
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
new file mode 100644
index 000000000000..8cf6e78f27e8
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* amd64 arm arm64 ~ia64 x86"
+IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.9-fix-clang-build.patch )
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD
+
+	if use custom-cflags; then
+		# https://bugs.gentoo.org/607992
+		filter-mfpmath sse
+
+		# https://bugs.gentoo.org/619628
+		append-flags $(test-flags-CC -mno-avx)
+	else
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2547e9d265b7..401ad65be32c 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 51b637eae73e..f3022f2a86fa 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,4 +1,3 @@
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
-DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
 DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
 DIST ceph-15.2.3.tar.gz 147807898 BLAKE2B ff5e9707cf05e22af718ee177cce87ea9913b1b78d7ba17589f2c7fdaea0a7a27dd1f7b8e9947a095ed74106b6b19258fd8be259100624032f3a6e8ce5243390 SHA512 0378365863bcb86e62d64a2eff91e39a91218eabfb126dae74185e1fe52b21a3d5113f885ddb8076551f2f069435e18b24417bf70f29f23e21fac7065e412912
diff --git a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild b/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
deleted file mode 100644
index f05b0b4f65b9..000000000000
--- a/sys-cluster/ceph/ceph-14.2.7-r1.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-COMMON_DEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-	radosgw? (
-		dev-libs/expat:=
-		!libressl? (
-			dev-libs/openssl:=
-			net-misc/curl:=[curl_ssl_openssl]
-		)
-		libressl? (
-			dev-libs/libressl:=
-			net-misc/curl:=[curl_ssl_libressl]
-		)
-	)
-	system-boost? (
-		|| (
-			=dev-libs/boost-1.71*[threads,context,python,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.70*[threads,context,python,${PYTHON_USEDEP}]
-			=dev-libs/boost-1.67*[threads,context,python,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:= )
-	${PYTHON_DEPS}
-"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-BDEPEND="
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	sys-fs/lsscsi
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	rabbitmq? ( radosgw )
-"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-14.2.5-boost-1.70.patch"
-	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
-	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
-	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-14.2.5-boost-sonames.patch"
-
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -e 's|Boost::|Boost_|g' -i || die
-
-		has_version '>=dev-libs/boost-1.70.0' || \
-			eapply "${FILESDIR}/ceph-14.2.5-boost-1.6-python-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_DPDK=$(usex spdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED="ON"
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		#-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch
deleted file mode 100644
index 693925e8825c..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.70.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index 82e2a45da6..8750c5648f 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -83,7 +83,8 @@ class StreamIO : public rgw::asio::ClientIO {
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
- 
- template <typename Stream>
--void handle_connection(RGWProcessEnv& env, Stream& stream,
-+void handle_connection(boost::asio::io_context& context,
-+                       RGWProcessEnv& env, Stream& stream,
-                        parse_buffer& buffer, bool is_ssl,
-                        SharedMutex& pause_mutex,
-                        rgw::dmclock::Scheduler *scheduler,
-@@ -160,7 +161,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
-                                   rgw::io::add_conlen_controlling(
-                                     &real_client))));
-       RGWRestfulIO client(cct, &real_client_io);
--      auto y = optional_yield{socket.get_io_context(), yield};
-+      auto y = optional_yield{context, yield};
-       process_request(env.store, env.rest, &req, env.uri_prefix,
-                       *env.auth_registry, &client, env.olog, y, scheduler);
-     }
-@@ -604,7 +605,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-           return;
-         }
-         buffer->consume(bytes);
--        handle_connection(env, stream, *buffer, true, pause_mutex,
-+        handle_connection(context, env, stream, *buffer, true, pause_mutex,
-                           scheduler.get(), ec, yield);
-         if (!ec) {
-           // ssl shutdown (ignoring errors)
-@@ -622,7 +623,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-         auto c = connections.add(conn);
-         auto buffer = std::make_unique<parse_buffer>();
-         boost::system::error_code ec;
--        handle_connection(env, s, *buffer, false, pause_mutex,
-+        handle_connection(context, env, s, *buffer, false, pause_mutex,
-                           scheduler.get(), ec, yield);
-         s.shutdown(tcp::socket::shutdown_both, ec);
-       });
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
-index 70487a5253..1d454acd2e 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.h
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
-   using Completion = async::Completion<Signature, async::AsBase<Request>>;
- 
-   using Clock = ceph::coarse_real_clock;
-+#if BOOST_VERSION < 107000
-   using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+  using Timer = boost::asio::basic_waitable_timer<Clock,
-+        boost::asio::wait_traits<Clock>, executor_type>;
-+#endif
-   Timer timer; //< timer for the next scheduled request
- 
-   CephContext *const cct;
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
-index d99a6ff68d..213fc238d2 100644
---- a/src/rgw/rgw_reshard.h
-+++ b/src/rgw/rgw_reshard.h
-@@ -183,7 +183,14 @@ class RGWReshardWait {
-   ceph::condition_variable cond;
- 
-   struct Waiter : boost::intrusive::list_base_hook<> {
--    boost::asio::basic_waitable_timer<Clock> timer;
-+#if BOOST_VERSION < 107000
-+    using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+    using Executor = boost::asio::io_context::executor_type;
-+    using Timer = boost::asio::basic_waitable_timer<Clock,
-+          boost::asio::wait_traits<Clock>, Executor>;
-+#endif
-+    Timer timer;
-     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
-   };
-   boost::intrusive::list<Waiter> waiters;
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d533c7b30c5b..71751392d095 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
new file mode 100644
index 000000000000..99913550e705
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="libressl"
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/diskdev_cmds-${PV}.patch
+	"${FILESDIR}"/${PN}-respect-cflags.patch
+	"${FILESDIR}"/${P}-AR.patch
+)
+
+src_compile() {
+	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	dosbin fsck_hfs.tproj/fsck_hfs
+	dosbin newfs_hfs.tproj/newfs_hfs
+	dosym newfs_hfs /sbin/mkfs.hfs
+	dosym newfs_hfs /sbin/mkfs.hfsplus
+	dosym fsck_hfs /sbin/fsck.hfs
+	dosym fsck_hfs /sbin/fsck.hfsplus
+	doman newfs_hfs.tproj/newfs_hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
+	doman fsck_hfs.tproj/fsck_hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
+}
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
new file mode 100644
index 000000000000..d1b3c6129f26
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
@@ -0,0 +1,11 @@
+--- a/fsck_hfs.tproj/dfalib/Makefile.lnx
++++ b/fsck_hfs.tproj/dfalib/Makefile.lnx
+@@ -9,7 +9,7 @@ CFILES = hfs_endian.c BlockCache.c\
+ OFILES = $(CFILES:.c=.o)
+ 
+ libdfa.a: $(OFILES)
+-	ar rc $@ $?
++	$(AR) rc $@ $?
+ 
+ clean:
+ 	$(RM) $(OFILES) libdfa.a
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 2b0a4b9725c3..685f6e0f25fd 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>ppc@gentoo.org</email>
-<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<longdescription lang="en">
-HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
-versions.
-</longdescription>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<longdescription lang="en">
+		HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
+		versions.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index a67f621eee70..f567083d9d1c 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 ~arm ppc ppc64 sparc ~x86"
 IUSE="tcl tk"
 
 DEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7f812a10c457..a48904bd84d3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 269283f361e9..ba74b05d64e5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,11 +4,15 @@ DIST gentoo-kernel-5.4.46-1.amd64.xpak 65041216 BLAKE2B 560936f45725977c85925cde
 DIST gentoo-kernel-5.4.46-1.x86.xpak 56466748 BLAKE2B 790e4df7a1908f260fc4a67989f2b37f6cd6a8b03c4f0b6ccb05af3109235391130a00d80b7f47980954807854d2cca74078b30e31d18f51f8c21c968a7a3fb8 SHA512 88552fc262137e46eccedcaf00db86402a07fae4811c6b48292d9ee147d343e7ba9d0970b3773ed1027c44aaa0a1c118dd6c2dd46171de2daa665d46c854e70d
 DIST gentoo-kernel-5.4.47-1.amd64.xpak 65062043 BLAKE2B aa2787856b778c67a82c5bd70f14c504e05889738768153d9ed6e9b21c805f5cf690470fd4105c469d6f0c5aad8db7605b0dd3543a43e314c5afb637bde3f2cc SHA512 458913dba2ed7bf627c1eb33b574088d5a3bb9a6083d8d0ec6cc2856decf8106ef3f582581174c5e91fc1148b4f34c25b478f3093616f22021ddbc0a763719dc
 DIST gentoo-kernel-5.4.47-1.x86.xpak 56466754 BLAKE2B 6b95a86f1f85191b663976327871b9229e3f11afccf7afe0b4179dac97f753c0b81cc5bb9fb1c52b0d03467f658a2601060f33c13628c69553a347e236d8c0ed SHA512 f275ca4b82f10db36e5df620fff39cbf21b5b00f8f313e98a87ed2464df46ac921ce0e14851cab49b75a897a37e98b7acb1779333e125877049df27367c9ec5e
+DIST gentoo-kernel-5.4.48-1.amd64.xpak 65029305 BLAKE2B b030304c6c461e5a95f60a49754533c36309458338fce95dcd130101c4fdd18bca34bd9e48ba22cf3e2a0bd36c4b70ef7c767f6a8de20187a2c45ea67974b47b SHA512 fd3ed996a6e1c2770a93afef0368f570e2f01e33cd7282f2735aae5316584cab07ba305ebf718c22378c42912129e12d9b721bc75a51298b145de7819c59f80a
+DIST gentoo-kernel-5.4.48-1.x86.xpak 56478804 BLAKE2B 0ca80b82e6f24891095de8472a5005b397db02fe85c5e5a32e05af37b9463c9ea6abe26cda3207af97c0f5b07df9ae9c5852c02168f09823004b9dce56ed8c24 SHA512 ccaad0fc9440ffb623defa8d570e9fd6eedad1f0e10d8868df0e1d14c40ff864fc1837d8654cce652b68f6f532c84b2b62e70b569b4f2defc68179e336a7dd1d
 DIST gentoo-kernel-5.6.18-1.amd64.xpak 66169658 BLAKE2B cb111eca2a88a6cde81e4eb80ab9a025ab5f66f780fdb6e04c16686f78ae80b6fac5ed5c511508411d24b5439503ba205f8bae287acfdde75aa6f7e609ef3a1e SHA512 ffb6aa3e0269bcb9fc159b9e8237f97c569b527ac2250722f342872b1a7d603309caef5a9a83ce4770838bcccfbbefa8bf77eea9b3e4680145aee1614cc86250
 DIST gentoo-kernel-5.6.18-1.x86.xpak 57553136 BLAKE2B 3a26cd459a99c42228bd942033b6abcc9d06ae77961a4591bbc27deecbadb895ac0344298877a9474dc3057cc854d5b3be495674f8b6c549f7d136417a568271 SHA512 36c10328587a784be5d5099b5a103a9603357a2e5228be2a3f24aeb325ee4cc7aafedb98eb9314ce3fd38e45dfc3034fbdc0776e4753642945421018e03e7371
 DIST gentoo-kernel-5.6.19-1.amd64.xpak 66175473 BLAKE2B 868b2b78a260be6cd98804fa93149a17898ea8d240bb1257da0ce5e0a63ea88051b470b581fae37b620e3ed5d5821527a2deb6ee9b04102f5b7c65e2b0345242 SHA512 26ba56467823824ceb91861726bf5b3c4bbcf70790740a3147cc5b1f767d5fd5bbb76d7f4983a6d4bbce0c24fdf2c4b759949aad2ae9525de039ceeb02351415
 DIST gentoo-kernel-5.6.19-1.x86.xpak 57562673 BLAKE2B e1856f9a06dbd639adda6c50aad664caf9e18f60fa3f9636585d446dbf3304676e5d765e243e8239c57cd18e32aeb2996706ac9de0ad6bd558415f818bdc078f SHA512 cc825891f2333498195c786471a9eee2dd45180760ba2c7ac0c19ba110220bedadfe5ca9ba7e95a3fb5a055c402016df6e438e91739a41e72a9374388aacc9a6
 DIST gentoo-kernel-5.7.4-1.amd64.xpak 66666235 BLAKE2B ea6b553f0225635048f1343e534abd0c502333a78aeb282d40b7ecb8009ab8e114e334527318ee6a27fab5093f554c092858559f8ebb58c3862e4c1429d309c5 SHA512 53daf01a621f9db18f173a1e57f5fb418ce202cf75a4ea9b8e3fc8243b64f75b1425895f5056cb212dd320d51142c847b62541488f1b9c8ba8ef9e2b0df943f7
 DIST gentoo-kernel-5.7.4-1.x86.xpak 57961274 BLAKE2B 653c4c24f748453c178f096cf89ac73299056f061ccc577318393fe6c46acaffae748a0ce661dbe1850fdd721ce73070c36d26d79b097dc3ad23c9f1a15329cb SHA512 d742778fdfd2a6e0caad5143664ef27faef9ec303ba3f13763ccaf4a7a0d6e077156ef3d9619078641c11289ddce0624eb7ac98ab19e30203a968115c1209ff1
+DIST gentoo-kernel-5.7.5-1.amd64.xpak 66667238 BLAKE2B 6aaa91c2dad0f6a1b0bcbf4242392bbe155b887160e05bb45b7a451d10072c826fe8836cb7fc3dc18b7c3610e1292ceca39cd519da0adbfd9df0f286ecc507b6 SHA512 bfb219695e88514cea934b6365fb0ffe68426193a878a15ed5956b6bd6c350e4e2ae94a345d31f08c2364d1ee2799ea7005a5f245843da872eb53b680b18c1e9
+DIST gentoo-kernel-5.7.5-1.x86.xpak 57968925 BLAKE2B 94ed367c444aac05ec682efdbffdbd5ce0c60d7029e6d9c68f666abf0a1f20fd9af082b003d0efe0e10a36a767c360abccfd32e0a201559e2442976ef7b53834 SHA512 a2d10c7a69e2e93df61b273f54dca4a81e650e52147ef7ed09a3ac0a1277651d4370a6b7bc921df5b9ed917fe911cba1ad8d922616de21afafdf529c7b0e4aa1
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.48.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.48.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.5.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 94af2b067078..ff95429cf886 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,12 +4,16 @@ DIST genpatches-5.4-46.base.tar.xz 1524648 BLAKE2B f51069d6f459762242f172f5bdd3d
 DIST genpatches-5.4-46.extras.tar.xz 1764 BLAKE2B 80470783d8e6f2fc3ef681e113bc51d8edb3093e0eaa5274412536b35fd23f486df5aaaf749bfc2f5cf6420c647fc96690718d78e10aea9b4bc0d0ee251fe84a SHA512 2c88f9edb3fe514676034b189bf239c7bffed9b4965b696099accf8b9c3d30c125e056772a6c327d2e4b00597d4c53901466fd15140f8815819bc3df5e3d47a4
 DIST genpatches-5.4-47.base.tar.xz 1555488 BLAKE2B 4662bd4c69d3c3f59c85620c2be6dcefdb31ebd76ecbd8e65f264fe6815c6f4619693329e9d2ae30aad7c4a2b7bd726be0bf3ba77bd35b489a964502feacbda7 SHA512 71a1dc9d9f3ad4ddcf323455ff0de17a8a7825d54edef4cda8c17809d213550f2cff2e7e181dd087a6cdaa96e038105a141273ed10fb5ea01d170352ee498a2f
 DIST genpatches-5.4-47.extras.tar.xz 1764 BLAKE2B e8e7f4b48c5b9d74f3a76d9dd07a9a549a96a402670207658e15e5f2c8f6f24f1e4f2f68ad8709f2d13d1b7931c421556eb2771b4854dce8d9fd579561f6d66b SHA512 d8b3daf929a7fbfb1623677f8295c70c7fb37c3a7cfe233cda909a39c429f62fd527400bda45e3956e937bbfdb607a2e155f1dc4942565d0b419e201c05d65ea
+DIST genpatches-5.4-48.base.tar.xz 1620972 BLAKE2B 45f358c85092ba422f8c411e91da90ccfc4b607f9c095dbe9ff02bc6adfbab4b35b03763316999810364d18ed3323fa613b70117e6f8454b2ba74744c1266b0e SHA512 b99974f5491b6103bb3e6b3b97e613322001bec40e49a4edc53893e94df66b7cc03370ca28af62d21dda995a477e395c16c22b8595ac96723ae66f2747fc9df4
+DIST genpatches-5.4-48.extras.tar.xz 1768 BLAKE2B 3f281c1c36c2a52e4fe2419592377baf4553c5fc61088911e50a901f96a1f4d89dc3e1b441b4b02575fca77ef6c371ccbecf8c55ff2eb9fbe14a7047451ae873 SHA512 9d2dbd829c53a310549811c2f133b19e4525c103827c5c5935cbd09d790eec105957dcbaee10cbe6409e0b7e00065c91b29a52e6d2bbf8e41859f5e4987de98a
 DIST genpatches-5.6-22.base.tar.xz 499020 BLAKE2B c6a9977f776a79a3da7b61dd57fbf76af7cb91069bd87cbf7189cefd207befdbec044c7bd440aad194245b93ef4254dda949f15a19d1c82e7aac44bc306e14b6 SHA512 c40c15088b75dc325712cb95468d84a4eb87616d634f51a479ac6a34e9515329c90f8360a3f7d7876ab5bb335c4d435d308e37c1562507fa6c57c88f9ecd775c
 DIST genpatches-5.6-22.extras.tar.xz 1764 BLAKE2B 64a589b498dfa1cc41b525a90b77a1524926a4ff9a2f9c1e2e7bd3d3750c531df3545e4af68a04fc7e3e641b6c8985a627190407f6eb85657eac960261f98ef6 SHA512 d0c11d9d5d2966ad3bf2da898e89f99b83f179f5ffda28c8ff4c0c0d0eb7a0e2553d1773ced53557fa54a58a85486802acd51f372ec3026862af58c09049a0f4
 DIST genpatches-5.6-23.base.tar.xz 540292 BLAKE2B f22ce1772f5ab80c9a20e6447a3874c7c664dfe8c1934202706e6d2e84fc378068dc98719796d45809392e7e32d6c0a2233693617f3c3ce84f42dfab00dcdbe7 SHA512 f5db5e258efc2fd0d29e1a772f03838d232b11b9fc22e9cc78ecab70cfcae819a9bc7c24234fbaf94c2b30b559f4fb88e493643e4a6e58169e62eb665564ee9c
 DIST genpatches-5.6-23.extras.tar.xz 1764 BLAKE2B e9dc2a6c1a326782aa1b58f37ad416b39348d30bc24ef2c7af9bac1d734e8c8f058a33a43150eb9cdf7dcc7323a509066082e79eecc582977ad320c5e34fb4a9 SHA512 1c9455a8d52304bf930c1618b98bad7e1c3af47d4984fa8e65ca5723d8120b3ce8ac9106b9e3ecb5824a3220be2706febe1abcdae7c5022a02d7ed5fe07cdf2a
 DIST genpatches-5.7-5.base.tar.xz 68572 BLAKE2B a5f975ae2fd61e1e732da8ccb364b969930563752f78fe0e0632edeb486312ca7d9a09fc1e57b99bada394e90cb3a3b76eb41ef8218f93ea0a4dc4f1f23ce012 SHA512 ef5c254b03edf280f3e38ff49d17a856b1d3898bafb8018d1874c1fca3ead90edc88799bbba1cadca34b2a0b2a55b7e7905910ae941e665f783fc3e355274fc0
 DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457ea2d8d8904fc5af94c6ce26990943bd7a61467e3386ccedff42cb4d6c51a2b477ebb89a763edba964995a61ba46f5f4f5 SHA512 8e716f61f988951f2b80e1e667752228067606275392a6084a564e9e4e051d86823458084cf7a3c17a0e56ae58253aeb01065e2329d480995d15b646eb5be761
+DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
+DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683bc5a93a9ff4df09901bb00cf275183f0a367999fd9416ec97d36cbad6351b119bf6fb347f2fb645d4e515f3e6548e9f96 SHA512 acc190f9c6efe34f5b29a86d787ec047bf8df1d8b7c726fb79279f77b2cdb7a0bc777f353c9ecadec7414797f15562c36734a69e6bb2d4a5f05acddb659c4d12
 DIST linux-5.4.15-arch1.amd64.config 241498 BLAKE2B 2ba5eab2455c909878c36c6084718331042d0f6ab42127868ffb1522f4b53de38879e5707328968e943d1fa44cc504626af52b733829e943532931b49a612834 SHA512 582577bfe4139a8f50c5881cd5a9f24dc3da3124e464756f9efc3d39894eac378483d052e1142730585e40a45641166d309b5e1b5e379f4a5ea2d5ebb2d3314b
 DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c71f3be730a15775b7e1d89cec2d72d28f1921987c63d95fe7bea6778efe0012ece6186449f07f6aca35ccf86805186c0f4c SHA512 187d88bdde7325d46b4bfee8d59ace88ab7dc377606b411e1249f9deee2b571ec42bac52c29d26d67bfadece2e77aad6d5e0255a95a84c200757cb05c69160a1
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.ebuild
new file mode 100644
index 000000000000..1412b2980be3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.48.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.4.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5.ebuild
new file mode 100644
index 000000000000..85bb9249b7c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.7.1-arch1
+AMD64_CONFIG_HASH=663b08666b269eeeeaafbafaee07fd03389ac8d7
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 529661be728a..ab149a7d3427 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,6 +3,7 @@ DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c
 DIST linux-5.4.40.tar.xz 109535980 BLAKE2B 4857f032d5333f3c16f0947f51d6fe632527cfd78e6c556b62f5356848ef3280244eef7ffaaa136589b10e151aad3087593f3518fd0fc6958d4647b786401169 SHA512 c8785d30f7b88f3a6e565789974ecf1a055900ab4b66e358070547506aecab57b5d34afb77140cb2aeb803498c407d34f7fc11c29fbba00f6d4dedea8dd8788a
 DIST linux-5.4.46.tar.xz 109542096 BLAKE2B 99c63fc28649fc7e75a18a8a6786ca81f46516979cae9dabfe604f3353ae8a145a1a2b7e6e2747af6ea7e11d52518e7ff4261ffce0cbbd7084318da56d429e2c SHA512 780d515dfb7490f3d0ea8683d4a8f7da88c2d027c1d94a0c76507f0a9b2aa3a898401eec6684206dafd281a886062c2537b8ab1865ed08a576bb1cd6c9c75f7c
 DIST linux-5.4.47.tar.xz 109535968 BLAKE2B 0c0226343b26d43a39c7188ead8c07b0e7bd4b5c237d5327f22b60462129914dd285d1205ff249be2a8820040a3f471530737a28103881b0b3e4e00fa7eb7b26 SHA512 58dfd71a49543582ef3ecd1406bb82348d21ac780a01a24a3270cc3564b94169f2838fe33309a0bb9de53b29bdf55bf676456b60bac110fa1b804f0a0446fe94
+DIST linux-5.4.48.tar.xz 109547096 BLAKE2B b4780040ea1e619ce84055332c23a53ec52add0030b0c089cfe642b382d76c2be1fd836256cef509ddbb0d3f9d57fbebab8e23268590937a9bb72cf1eafd7064 SHA512 9da99a8764941330b21bf575e513b06285a1331bae661c32a88ba12048fe8634b51ea6173e40053b884f388248e4afd6140a9eb90db65f48a67162591831b82e
 DIST linux-5.6.18.tar.xz 111817124 BLAKE2B a8c01860ac9e55b33709c450fb663815205260b5e62cd2bed224a47ccf1e249d2b02515f945d2508b83f1f59727d9fed29937fe584d5cfe42c5d035c020f3407 SHA512 4cef44b489b51bc4f826aafb36d0b767fc33adeb471c69c088d5e5f8a779a580a6992bcc0769800ecf658e77434dd513ed436813cbffa39d3f98f24ea8fcf1f3
 DIST linux-5.6.19.tar.xz 111829024 BLAKE2B 7c0afa0e3d322314992022272614973311a8dfb85de5e0710dd4c929b0abc0a2389b49938f7df4256ea5719bf2a56a7d6eed2eebb51c337fd5fb277747a6620a SHA512 0b3c64ab4f63431c2da6786b4f85237f20c86f20a1faa79440d9cbc2aa6101118b0f18b6688ca7ad27dbcc4978d197fae52886fc23a3e2deb3c0a1d9c82c386b
 DIST linux-5.6.8-arch1.amd64.config 246166 BLAKE2B e749472cf4bcd1fae509bf524367106c07111f5d385b5cacf335fe03188c30c184e3535603de2b855f81538fa6fb09cedfec16ff02db5b5583a90e5cb150dba5 SHA512 873275e0ba75fb5670ac7f90abfb16ab912b1a94e5f8f39845283230763118d244c1b02e33f1b05b5d86fce90cd274c944725465dabf2dd0e79fa735fabe4d4f
@@ -10,5 +11,6 @@ DIST linux-5.6.8-arch1.i686.config 245339 BLAKE2B 746b39cc8d8d880eadd3a04eaed7fa
 DIST linux-5.7.1-arch1.amd64.config 248550 BLAKE2B 438ddcb212ffd5c257da2ad00eb9425e21f938ec8958f781af067c6d4eb45077c27d6f2aaf952fa728fd0c381e6476d1839dbc1c2074796194669591c3a17ee2 SHA512 db854554b8b8138ac44488ed8656bc620a01f361f3a6006cf0b8c7e3513c0d7b0f2be8534694b063af33ccaacdf95bd1f824470f4509a274f7f52c5b67e0f723
 DIST linux-5.7.2-arch1.i686.config 247685 BLAKE2B 28f7e9cdada8876fb07523cf657a2cda175bfab7c3a57d7e5cba06b6158fde634efa4e59ff318fb21d63564245998bfe8c3b916985f078530ca57813c1d642e9 SHA512 6b16f1583739c4534b0ef3898f1bf02d47b6375867f34bf4a5171fac4cd19ce87b17ad430860e229740cf59661594890f32c42734584ddb7cdaca63cb3bc2336
 DIST linux-5.7.4.tar.xz 112684152 BLAKE2B 0cd2e4f22491709ec91c804add85a817464a90fab4118c7ee1d38cb019a687d719591db025ea83a1421d08ae6e870b813b14aac34692441236328534a691d04b SHA512 cbd4088816abace8f9c3687ea23836d3bc4084cdc8568b01bf9f41ac80a9b6acc0566246d272876f575a5d1b1f6791f7e2ba90bc39fa53a08bdc871d632ac392
+DIST linux-5.7.5.tar.xz 112700152 BLAKE2B 8b2bcb3c11a5bee4cef117dab558b82f06e818ec9d66cbb567b9d9118ac657f168eea84d5bbd67c9fd579f7537177e184b4d23e32a8314e4860c31b68ad3a923 SHA512 a7c1ff24adbcfc08828f257accc4da51582348a46bbec5339fbe3c62520650ed1b1cd0886d94a475e43c8a84dbd693cf44c9366532ff8435db3c176eedeba000
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.ebuild
new file mode 100644
index 000000000000..cc5e365bda59
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.48.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.4.15-arch1
+AMD64_CONFIG_HASH=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.15-arch1
+I686_CONFIG_HASH=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.5.ebuild
new file mode 100644
index 000000000000..721459c780bf
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.7.1-arch1
+AMD64_CONFIG_HASH=663b08666b269eeeeaafbafaee07fd03389ac8d7
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.7.2-arch1
+I686_CONFIG_HASH=4f18a8a48e28656a98803890a0f6567b93fd5a77
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 56ae9d0d1d25..2cab83876087 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -2,7 +2,11 @@ DIST genpatches-5.4-1.base.tar.xz 4564 BLAKE2B 0282bad95cd003c90e92d33d2f114ca9e
 DIST genpatches-5.4-1.extras.tar.xz 1736 BLAKE2B 57df5cf8b4d96378408460be4be64900771b876a23d1e5798c97449bfcd28bea8aaf31482c614e7844106f29c9ae376c6ebef26e6c18e00a3f64bcb4e360d944 SHA512 5b9b6276f6ad6ad7ac33e14c3b06dbe943c57019332b0ee545ebf7325b7d6313db3ed6d35c46434c3c38420fb372141e63528e980aca87b90c4a39339851e80f
 DIST genpatches-5.6-1.base.tar.xz 4760 BLAKE2B b46600526a6117176153b24cd168d92be86117d6bf5f2653a6cbb229812395043e6cd4c8033f62fc042b9559a5e24f4694985c46ecd6262d53cd6bd6b8852f91 SHA512 1d7aec1b018aa30156995890f743b042ba448db3cc0a7c28c2616b08fcf3824c0eee2130ac3d331af4da1a646226d788e321a9500a748e98f029f55423c9f45d
 DIST genpatches-5.6-1.extras.tar.xz 1740 BLAKE2B bef3294d3bf392d14b4d55644d5d363fe575e3f777b793a2ffd6c6a2654ebf5f89c436d600f04166dc45dd130f2bb7fcb75778bc4171984ede083137ba7a2a5e SHA512 7bb2a574b7d7e7533cb9983477ad9b9c58a25262d0331397c3bfd95f469ffa7abf6ae7bd5ed328095f7e7365912629a52cbbbad1e9939bb4ba7bba6cd0a0e3ea
+DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
+DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST v5.4.15-zen1.patch.xz 908592 BLAKE2B 93a1b8e46e28b20d2f465df04c597b7da9c368532a89fc02a8059769b5f39b24b6d64acbcc88dabaa7f320c9c89705a01b3a96f8b3baa287ec60e3db4d9e1dcd SHA512 5aa5a4435e125d09a463d692bba95f247498818db157d68d75899d9031deb2aaa053a352831a843afad1241e83c25dcc5caf0243ee132696328a0d5ddcaab428
 DIST v5.6.15-zen2.patch.xz 601992 BLAKE2B 079681771e83914d2b46020f077781af0ba3946c9f0ecceec62dac3f407edac39c1e9ad840560d71f44162a90151ebedd9e19b7975f62f73c2bbe450dbcb1496 SHA512 eaa0227301f83166a520429f26d8794a6921e9b042d45d74f1d2a1a5a7323ebe3edefbf4cef3317e621db49602641d37081607cba4269fa76b2844badb81b47b
+DIST v5.7.5-zen1.patch.xz 319880 BLAKE2B 9ccbf4a0dceac6b616a03f51bf65e1761c8701bc07f2ff591caddd87adfbc29bc2ea8796219be98ba44db1ba5dc7a8fb3e59b0ca99d83604ddb59ce8730d9023 SHA512 59442cef81678b2e40522afd70e7bbb1c3c1ab4071ca0f2ffe984127f0b8088c44c60f7ee314d01b1020867a8f4f2191f99d52405475ee48ba2ca99fe214537f
diff --git a/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild b/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild
new file mode 100644
index 000000000000..c3dce435487e
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-5.7.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/zen-kernel"
+IUSE=""
+
+DESCRIPTION="The Zen Kernel Live Sources"
+
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_setup() {
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2b5bdf75f7db..47f901823c74 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 210a2434e5bf..04139c696bad 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1 @@
-DIST opera-beta_69.0.3686.12_amd64.deb 66516048 BLAKE2B 3d8644a3c61d36c575fc3dad6bd920e8bee78ee4895374391dedee6455530b3f415dfc69b027611158fbde3c84dd7d2c1d14755df9d869b8786bb0950f0cb5f5 SHA512 d1ce815e9ba92a8795dd372d123c759734feca210fb311147aff1e33cdbc406b5df75827d50c57d0d7d29ff3bd45e2c4f86001345c8feb391145100b35ece553
-DIST opera-beta_69.0.3686.21_amd64.deb 66550336 BLAKE2B 0ee1ecbafade7a9c835dd0770e0ce838ecfa8861ac2a454a82e8a3538b50c843b7058b60a79f9ab416bc51bddb52e0b88330c3da615898fc422019e26ee7822b SHA512 f9c01baff92e71f34264fa00d2ec195a07a257230eb19d599d2c02badb14f472b46d327601789059311ca832aff106d8785a9121bd726d2434aa00a4c16c3c06
 DIST opera-beta_69.0.3686.30_amd64.deb 66554112 BLAKE2B a755afb1b5b381106c9a05a4b157581d23355d04d29177519663d6860d8add4ab2e58756c5826780c0dbe15f7dd158cf6c2f0f60a3543743c5ac73f371c07cfa SHA512 7d1268ad77ffc5df93deefa97f1e7af1b21961db7d3399288e0bd32e2bb2cc70cfd0803b5a02eb1837302d6686d59961fb398a00faecd50275f81cc03c784ca8
-DIST opera-beta_69.0.3686.7_amd64.deb 66514300 BLAKE2B 2f590713571a42a6b87d1c39ecc257b0dd19455e6a08f62887310031147ff05cbe9ca1b3aef1eb68373fa58453c6cc9d72754d746a94d5d10904ca274cc6f4ef SHA512 daec2ea81ae1790a1a0550a41b84bce6b036836ded4dae18a218104fbdf069fa5574797b7e7e21278d56de49686c6f6d7a155b53fe5489309ae0d6b61d8021cf
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.21.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild b/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-69.0.3686.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 0c552d9a1561..780c01fe5bd9 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,6 +1,2 @@
-DIST opera-developer_70.0.3693.0_amd64.deb 66336804 BLAKE2B 57c3d32bf6a21b87f85512b9bb295e9c8bc8b89d4812f27d118774810c59b8c6634ae98f9d6d93e7890809f55c330d01afe43ee849802bab51129bd42d244294 SHA512 8ed29d90a7fd6b3ed7be23035cdbcb1d43243c884e86416d5f4f1777c626cb9482772cb10a1045bbf31b8467f63df90da2096870eb9fc49956da8ac9d35174fa
-DIST opera-developer_70.0.3701.0_amd64.deb 66415456 BLAKE2B 6b9402b9cb6a33ea1da728547903c1788b1bb861c80d7c382cf299d0b091dce67a2db6026fa1b227d713c090b77f61f468e80ebca644c824c92c166c746bdb40 SHA512 1e4485f040b645789a9e4f81e9615a55f3a184e0e3675d563f4bf52471794d6c3f6e0298fbfafdccb925be142cd99796cfbda4843fe23a79cf83630add8ab46a
-DIST opera-developer_70.0.3707.0_amd64.deb 66703228 BLAKE2B 9d6f2588fbdf8803907b4e7cd235cf05fd46f9ca99e791300efa8533b6fc294f444f8dff9f2499f9ee45022729adbb398cf1bed7fdb55e048eeb24a522e8a4ed SHA512 3a6252a36b0599c7339320a975a22a9ed2a7083dcfda3694aa2f8f8f69cd66a39ff1d5108743d2a492426f8988425b38703b7e06e4506009f5d679da86a94d3e
-DIST opera-developer_70.0.3714.0_amd64.deb 67228556 BLAKE2B a2f7cf7bcacb706e5ea8eadd3fa47ca42c440307c54a937cba02b0c42193676a6dbbb28534dd2f1f860d6e9d35cc23f65500f4d5f2711074d37016ab1c92bcd3 SHA512 73447463572a72abee219d49711fc797570ffa9b933ad7b77b83c76af964f934f7a5f8850efab029284eca3e664878b98ed691e456cc81147040bb2d632be317
 DIST opera-developer_70.0.3721.0_amd64.deb 67339908 BLAKE2B 8165e55bb82c9a89581a52d9d887d931d29b0de5763c0320f1bebd930ecfec3057f97796ebf40bfa90897b8d3653989a2dbb8b2c1e88c3f930ab40be61a32f60 SHA512 bf35b6f7e94cf64312592df1764fe85b73a3f84712dcb73a48bd976c1d3a03d9578305170bec7480427e9c9e9db8a84c27f5a20aef98d1a4391fd1295f8881b9
 DIST opera-developer_70.0.3728.0_amd64.deb 67337716 BLAKE2B 408d699664de431777d38873e60fefa298b2e3dce1c1bc51fae5230cd172150753fd260459f3649c5563d34aa5c79ad7f79ba8e3607dc6f533d3e1471c7c7a8f SHA512 b055a320b92888295094d83f609ed6afd256c007fac108d979bf4f54569bebf6c39a7926f0ba44456590b77bf93452356638fc61d8323c0bab42aac7c7d5b2b6
diff --git a/www-client/opera-developer/opera-developer-70.0.3693.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3693.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3693.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3701.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3707.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild b/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
deleted file mode 100644
index 837674712eae..000000000000
--- a/www-client/opera-developer/opera-developer-70.0.3714.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 714471e3f563..a32f59067e73 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,2 +1,3 @@
 DIST opera-stable_68.0.3618.165_amd64.deb 67448160 BLAKE2B 8f0c70011898ccbbbf9badbf8ba2c792d6f6150af073e033bb2131e21cf3237d85d9c7ca7ebee0adaae7a587957be8d9cfc82cacfe9cc188e42c75574f2199c4 SHA512 7d62438f42df88593be51b60625045ef1b398ade01ee33cdefa780d96505e2b469609b684741f3f0884dce7068faeb38fb6887cb89a580e113bea528734620dc
 DIST opera-stable_68.0.3618.173_amd64.deb 67459012 BLAKE2B fcb37a6491f0174710a8bd22351ec01431b292039d2671cc91243cee406d0171d05ff1e9296746bc484507163c7d167deeb2852783a62464421b2c9714668924 SHA512 149f666465b13f3fd776c4889339e19face710101b134d69b8ab30c370f155692d0ee85593127dc3e72236b7956fc5dce4971afa1a65d9c9e8f5e5c73931906f
+DIST opera-stable_69.0.3686.36_amd64.deb 66189672 BLAKE2B d92b9aaeabcbe52b2d3f2adde7764d3a94dea78c003a5fe6748afbc2f9692ad8138b99637761f99379cb14f955df4012471f4457b1876028639bc314b4142ef0 SHA512 3a1aa77bccef2dcb21d6a81ddb4af534edb27f1a0002e523de1d44db810634b3b26cd8f3d9eb538ec81566c57afb5c9dd83d837c8c2da8801360c8ebfa1f015d
diff --git a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild b/www-client/opera/opera-69.0.3686.36.ebuild
similarity index 78%
rename from www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
rename to www-client/opera/opera-69.0.3686.36.ebuild
index 99905f624666..58c0be89c0ab 100644
--- a/www-client/opera-beta/opera-beta-69.0.3686.12.ebuild
+++ b/www-client/opera/opera-69.0.3686.36.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
 	zh-CN zh-TW
+
 "
 inherit chromium-2 multilib unpacker xdg-utils
 
@@ -19,13 +20,11 @@ SRC_URI_BASE="
 	https://download3.operacdn.com/pub/
 	https://download4.operacdn.com/pub/
 "
-SRC_URI="amd64? ("
 for uri in ${SRC_URI_BASE}; do
 SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-SRC_URI+=")"
 KEYWORDS="~amd64"
 
 RDEPEND="
@@ -33,7 +32,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
@@ -61,10 +59,6 @@ RDEPEND="
 QA_PREBUILT="*"
 S=${WORKDIR}
 
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
 src_unpack() {
 	unpack_deb ${A}
 }
@@ -72,22 +66,22 @@ src_unpack() {
 src_prepare() {
 	default
 
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
 	case ${ARCH} in
 		amd64)
 			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
 			rm -r usr/lib || die
 			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
 	esac
 
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
 	rm usr/bin/${PN} || die
 
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}"/localization > /dev/null || die
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
@@ -97,9 +91,10 @@ src_prepare() {
 }
 
 src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
 	mv * "${D}" || die
 	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
 }
 
 pkg_postrm() {
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index ebf17e9558d7..07537b2ce79a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -6,3 +6,7 @@ DIST vivaldi-snapshot-3.2.1952.3_p1-amd64.deb 71810008 BLAKE2B d050d8c1ef8aa6281
 DIST vivaldi-snapshot-3.2.1952.3_p1-arm64.deb 64091432 BLAKE2B 4825e2833b5a15ac1ff47e7b085fd24a5c7474f5af88db2a5a0327048fea39a63580e06279fa6c7426fce4c4a07a8bbb9cb152b65a2102d584b9c48be4e0521d SHA512 53f469d043bff2aca62bc97fc3272a786d15a5ac3c110ff4eec3fbb4e4d09dfb51755729d8793024e04cb03c0d61579e6e6974a1d42d3471272969049bf04243
 DIST vivaldi-snapshot-3.2.1952.3_p1-armhf.deb 63607868 BLAKE2B c0e8ca2afbd0967a6549f03b83fe3cbeda6f010385b15fde526685015a309aab818fd5318254900dc5d1a1390eea7abc4bef4c7a4489d77ef21f44fbdf7c8212 SHA512 f359b64968aaf1d8e6e4f3b1d44648c0de168504d59b70c622388a89355e2856ed516700daad986e65027717e354a20bd1b10ff065aab7a152e80f0336c6f9a9
 DIST vivaldi-snapshot-3.2.1952.3_p1-i386.deb 70126608 BLAKE2B 4eaa68846f1ec9f753c5e15b556106708b3236d10a87fab5e30372f8a47e75ef66709b436580ad83a61308271462e62df693a8fdcb074a116c86c1164da9054d SHA512 d859418867dd3f105269bc19e0592b46ec7d3a58249d91bd0ab9f2101c995f6e34b85b44cc7a74cfedff5902afb84f6b931ffa15b31c168e38846b015d66377b
+DIST vivaldi-snapshot-3.2.1957.9_p1-amd64.deb 71810384 BLAKE2B 30218a9333752d2fb15168aad039a4a4a2d584c5eb1836e1782a4527c17d2ec18fb31c2973e4ceba44819ba6e35aaf0ade349b74d1ce57c4886c72a88b1d08db SHA512 29e2972efd591539f89ed9f01ff2d292ad7a90a955c885e579c904692bc8db2f4606fad2ff0b257ca77a5f1ddb6f338049bd9eb14b6b25621dae3b60fb7786e1
+DIST vivaldi-snapshot-3.2.1957.9_p1-arm64.deb 63549412 BLAKE2B d08dca3583263f5f9ed3b1e809e404fb7a666da0871c5eb0d44efd72c2661ecd9bf33c033fc3c71c489267b7e33381a239937db87071cb3468c91221e94a1132 SHA512 350fbf9b736507cfbf97e6bf9598e6636124e6b9d561b39287c15eea437075fc17519922f33846d0d2bfe4a46aa4155be11d9a13581e59a62c9c4e22e0602d6b
+DIST vivaldi-snapshot-3.2.1957.9_p1-armhf.deb 63607628 BLAKE2B e9b6ccb128f3826d1dca0c218f7a7eecf1b154b3c0fb9e84cc241e3837950d94a92a46c8a341a6337fc1b0395bf96dc328931385bd38b27c78336c93ea879936 SHA512 a5f6e8c7417ff0496eab6bb7ba45c90815065f7491745496e8a49a762f72533c40d274314dfb0765cfccc07b9ba1d0b78ce265686d81d0b1ec155f01a700e950
+DIST vivaldi-snapshot-3.2.1957.9_p1-i386.deb 70135524 BLAKE2B 7af5206e09c2dd21dfccde2c29148f66cc9e485dbf8bc77fcf10216c731043bc2d1770a45b17778677624f0b963b566d0bd076b27daf61d98344ef19d72483e2 SHA512 04fc506f5c870378b5ceae858f8b89699ee312b8207e63c347b9c1f28173d407186947e92694b1dbcd1e8413f7ca6c0736e0794086c6e42880874aa2f4cb7308
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
similarity index 74%
rename from www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
index f28a5ac334d7..db3613b057e7 100644
--- a/www-client/vivaldi/vivaldi-3.1.1929.34_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.2.1957.9_p1.ebuild
@@ -10,14 +10,10 @@ CHROMIUM_LANGS="
 "
 inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
 
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
+VIVALDI_HOME="opt/${PN}"
 DESCRIPTION="A browser for our friends"
 HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
 SRC_URI="
 	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
 	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
@@ -27,7 +23,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
@@ -69,22 +65,17 @@ src_unpack() {
 }
 
 src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
 
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
 	chmod 0755 usr/share/doc/${PF} || die
 
 	gunzip usr/share/doc/${PF}/changelog.gz || die
 
 	rm \
 		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
+		etc/cron.daily/${PN} \
 		|| die
 	rmdir \
 		etc/cron.daily/ \
@@ -111,7 +102,7 @@ src_install() {
 	mv * "${D}" || die
 	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
 
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
 }
 
 pkg_postrm() {
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9e67b0030f16..7c1d0acf0743 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,7 +1,3 @@
-DIST vivaldi-3.1.1929.34_p1-amd64.deb 70991636 BLAKE2B 5452174dc7b63762a67840008be49db909614c9ce5ef23fa2d8b2f262b8a19d645113a021d5f8cd011ef7b681c057ab119e9dfb51071cb1b06224c16183f59ac SHA512 ea4ef7de3a1cc35b6e64aaa4fd8fbd1b069fa1962357118d380ca4be2fb7f83258b7fdc62f09512f778c97fb5fb05bf0204a9988579d8b075e5a378e7cc0d140
-DIST vivaldi-3.1.1929.34_p1-arm64.deb 63497152 BLAKE2B 6c075a3c6d12e784834d26b385a9e80760b8350caf7466a5982d2435308ff82433d1824e714720a9015b13f6767bb4a0952d4e1705bad6905b30313e898ca0c0 SHA512 7b8d3c5f373d05e70fbfe29750f6a7c684450beead9ef54b33758f8847f4bb3f736f323becdbf90fc24917caefb9087f6ece1b1ef7c013fc0480f1224eb05269
-DIST vivaldi-3.1.1929.34_p1-armhf.deb 62920496 BLAKE2B 45cdb93d10338054b55385c27ff0547e8047ac9d24fbd4dddd72e94f7d8ffc23a111e8fd632f87d13acc79a7c6598d3683735b067c7fcc8cbf6ef32beca296a3 SHA512 4c218e95b13886c96b6489095f406ee18f51fe45b4e092c8fcf15737707fcabbccfbbb1fb59c724eecd93e1e20e98be9dbed3761db44f5afd641b3d8babc37e9
-DIST vivaldi-3.1.1929.34_p1-i386.deb 69389876 BLAKE2B 1b378650a72c8c6bfc088ec22d5d654fae0251a7415932e16bd29e588680132e8d75dc34fe98a5edf45339f4ae7465e6196185d8314b0e8df9303c15652ab2b8 SHA512 12e1cd1539ba13cdebc49ce962c8e4dacf9695dbfb9791191771b3f98e1518b3750ab0164df2405b3601611a0986b70cdaea8b0aaa09b4b7545bcfbdd5fde8a1
 DIST vivaldi-3.1.1929.40_p1-amd64.deb 71036780 BLAKE2B b1f7f921bfa0983ac3f5d841ed005d6f0897a7cc2aa273816648964724111d0d646b3137644246e2efe5f0cf9068799c98ef2474a9702f9b8651b2d4e2ac7274 SHA512 3a2193f21f97df386943e4fd0b249c2fa53495261aef45081c4d837ade21c85ae4e4131d8fac2b09eadc4747f3fcafaf72924c03ecc848896c054c8c7235758e
 DIST vivaldi-3.1.1929.40_p1-arm64.deb 63485296 BLAKE2B cf9f6ea2c7a0094d5bc0d5bbfc0ab79f963cc225ae86215997c67990eaf7435262711f75a4ad2d1ed4fc90638f29699ce0d6aa08a77cfbb7f6266288ff871792 SHA512 6ea9a33279dbd1349ff1e4681f872d954d8c9e3a5b0e98121e9bde0bd5c2ed6fabbfcc1e8cf77fa090264f2b5033fc5adedf8c01c4bf32756de008b12a288f1d
 DIST vivaldi-3.1.1929.40_p1-armhf.deb 62935604 BLAKE2B 094181c43b86f35f1e897b2a4da10b2f294a87a1a73dffde54344b8ec0645b88a2272d6990ac14f8a3f36a0e6c375823f735ce8de5b01fb9f7de9dfaba5517af SHA512 be5f04d3ff3028b282a4e3c2c91dd7d41ac4f81fe3fc9601dc1528864de94828697f214f1e83781715699ecb992e28f92e2483218874a50d09980edcd7b73bfb
diff --git a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild b/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild
index a156328cef54..f28a5ac334d7 100644
--- a/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.1.1929.40_p1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 39173b75a5bd..09a9a1bd1985 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index a2a1959136ed..416f8f678db2 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-Debian.patch
 	"${FILESDIR}"/${PN}-99999999-desktop.patch
 	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+	"${FILESDIR}"/${PN}-99999999-strncat.patch
 )
 
 src_configure() {