diff --git a/Manifest.files.gz b/Manifest.files.gz index 1d4a95d2b43f..0af2d882d229 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz index 7e6b3f9942da..bd9af259c146 100644 Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ diff --git a/acct-user/pgbouncer/Manifest b/acct-user/pgbouncer/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-user/pgbouncer/metadata.xml b/acct-user/pgbouncer/metadata.xml new file mode 100644 index 000000000000..d6136db4ad3b --- /dev/null +++ b/acct-user/pgbouncer/metadata.xml @@ -0,0 +1,8 @@ + + + + + pgsql-bugs@gentoo.org + PostgreSQL and Related Package Development + + diff --git a/acct-user/pgbouncer/pgbouncer-0.ebuild b/acct-user/pgbouncer/pgbouncer-0.ebuild new file mode 100644 index 000000000000..91bdbd6630ff --- /dev/null +++ b/acct-user/pgbouncer/pgbouncer-0.ebuild @@ -0,0 +1,12 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="PgBouncer program user" +ACCT_USER_ID=463 +ACCT_USER_GROUPS=( postgres ) +acct-user_add_deps +SLOT="0" diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 41c0c8eae189..5e9f223df3ba 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible-base/ansible-base-2.10.2.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild index 9c150e299a92..50d24a14e2ee 100644 --- a/app-admin/ansible-base/ansible-base-2.10.2.ebuild +++ b/app-admin/ansible-base/ansible-base-2.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..8} ) inherit distutils-r1 eutils diff --git a/app-admin/ansible/ansible-2.10.0-r1.ebuild b/app-admin/ansible/ansible-2.10.0-r1.ebuild index 5190c5124e20..461ecf203b30 100644 --- a/app-admin/ansible/ansible-2.10.0-r1.ebuild +++ b/app-admin/ansible/ansible-2.10.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..8} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 eutils diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild index 546b4d203b3a..89c17e7f6e8a 100644 --- a/app-admin/ansible/ansible-9999.ebuild +++ b/app-admin/ansible/ansible-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..8} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 eutils diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild index cc686c970a01..59d45eafa340 100644 --- a/app-admin/gixy/gixy-0.1.20.ebuild +++ b/app-admin/gixy/gixy-0.1.20.ebuild @@ -1,16 +1,17 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6..9} ) inherit distutils-r1 DESCRIPTION="Nginx configuration static analyzer" HOMEPAGE="https://github.com/yandex/gixy" # Use GitHub source insted PyPi to get tarball with tests -SRC_URI="https://github.com/yandex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/yandex/gixy/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" @@ -24,7 +25,7 @@ RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}] >=dev-python/jinja-2.8[${PYTHON_USEDEP}] >=dev-python/six-1.1.0[${PYTHON_USEDEP}]" -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +BDEPEND=" test? ( dev-python/nose[${PYTHON_USEDEP}] ${RDEPEND} diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml index ae702b778adb..cb7f678034e9 100644 --- a/app-admin/gixy/metadata.xml +++ b/app-admin/gixy/metadata.xml @@ -1,8 +1,15 @@ - - - yandex/gixy - + + jakov.smolic@sartura.hr + Jakov Smolic + + + proxy-maint@gentoo.org + Proxy Maintainers + + + yandex/gixy + diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest index 52ddca91c897..c0262fe38f56 100644 --- a/app-admin/restart-services/Manifest +++ b/app-admin/restart-services/Manifest @@ -1,2 +1,3 @@ DIST restart-services-0.15.2.tgz 23688 BLAKE2B e043b872d55109ad176a6437006cf581a993e72e460bb034625ed612f9ceca85ef91a20e90f23bcecc964caa527cfa4bc39d97c52487b7bf92eec21dc2e35c48 SHA512 afe7c96aabf61d664460d5d68447df09b3d9a54098887727db796821220f5ddd5a3b5030d995d5a6c3128e4a2b8494b9a0a3b86b5c805d56c0e201058ad04327 DIST restart-services-0.16.0.tgz 24531 BLAKE2B fea233755d214a502096551226078a7fe15a75ccf937bbf8a75c78b7a294b5977da453f54f37e3d7e65f131e49e018bf08bec6245a3aa46ec6c3bec94019f5ad SHA512 57b3514132c02839cafbfd9152445a6482cf3591e22d18436a4d894061b59d2495863a912a87495559e9945a39715e7e798dca44dafd52c26b5412d749f37cc2 +DIST restart-services-0.16.1.tgz 24569 BLAKE2B 210ffebf321d9524ee3176ac8d56e2579c9e1686bd11d484be02600aab70347c522d5e7f8826b103ebd37f3e21c11130e0717f033ac0af3e938c4cece1a036bb SHA512 d4657120860ec26a2d9e6cdd935d720dac2bff50131fc9e8efd69b4768a5fd9afa4ee24b367a002122f3e1b335e9c99cc6b41c801c0285252e6f5e701d027de1 diff --git a/app-admin/restart-services/restart-services-0.16.1.ebuild b/app-admin/restart-services/restart-services-0.16.1.ebuild new file mode 100644 index 000000000000..874ac8f35520 --- /dev/null +++ b/app-admin/restart-services/restart-services-0.16.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Tool to manage OpenRC services that need to be restarted" +HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/" +SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND=" + app-admin/lib_users + sys-apps/openrc + app-portage/portage-utils +" + +src_install() { + dosbin restart-services + doman restart-services.1 + keepdir /etc/restart-services.d + insinto /etc + doins restart-services.conf + dodoc README CHANGES + + sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf + cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF + # You may put your local changes here or in any other *.conf file + # in this directory so you can leave /etc/restart-services.conf as is. + # Example: + # *extend* SV_ALWAYS to match 'myservice' + # SV_ALWAYS+=( myservice ) + EOF +} + +pkg_postinst() { + local MAJOR MINOR + # migrate config data for versions < 0.13.2 + if [[ $REPLACING_VERSIONS ]]; then + MAJOR=${REPLACING_VERSIONS%%.*} + MINOR=${REPLACING_VERSIONS%.*} + MINOR=${MINOR#*.} + + if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then + einfo "Checking for old config" + if [[ -f /etc/restart_services.conf ]]; then + ewarn "Old config file found: /etc/restart_services.conf" + ewarn "It will be ignored so please migrate settings to a file in" + ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf" + fi + if [[ -d /etc/restart_services.d ]]; then + ewarn "Old config directory found: /etc/restart_services.d" + ewarn "It will be ignored so please migrate files to /etc/restart-services.d" + ewarn "and/or remove /etc/restart_services.d" + fi + einfo "done" + fi + fi +} diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index cce4da3df149..c1bc1f00c3b1 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest index c8723d6327da..4f0623a73b85 100644 --- a/app-backup/rdiff-backup/Manifest +++ b/app-backup/rdiff-backup/Manifest @@ -1,3 +1,2 @@ DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec -DIST rdiff-backup-2.0.3.tar.gz 422823 BLAKE2B 0d4f3165abb8893dfe0619ae80f4c93e676012c4cc763c28cd1aac4eee84e6f8ae2717b5b9722c1b89a9599f3ce487580eac6780799e028f269ea1ce4a40deea SHA512 a4d517182ba1521195f46abde67e7963c7b44722b37d20a7f9afb446a1b90095deba1da9aaa940d174d5cf8dd01948619846d689e5675326b271141b355831fb DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild similarity index 96% rename from app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild rename to app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild index 61297c203a58..cfb5bf43938a 100644 --- a/app-backup/rdiff-backup/rdiff-backup-2.0.3.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="Local/remote mirroring+incremental backup" diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 5f12e0a400e1..d67086a2190b 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest index 840e9863bf61..78ffc8fd6eae 100644 --- a/app-crypt/acme/Manifest +++ b/app-crypt/acme/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56 +DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8 diff --git a/app-crypt/acme/acme-1.9.0.ebuild b/app-crypt/acme/acme-1.9.0.ebuild new file mode 100644 index 000000000000..9c58fbb71ad7 --- /dev/null +++ b/app-crypt/acme/acme-1.9.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python{3_6,3_7,3_8}) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + S=${WORKDIR}/certbot-${PV}/acme +fi + +inherit distutils-r1 + +DESCRIPTION="An implementation of the ACME protocol" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}] + >=dev-python/idna-2.0.0[${PYTHON_USEDEP}] + >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/requests-2.10[${PYTHON_USEDEP}] + >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] +" +DEPEND=" + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ) + test? ( + ${RDEPEND} + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +src_compile() { + python_foreach_impl run_in_build_dir default + distutils-r1_src_compile + if use doc ; then + cd docs || die + sphinx-build -b html -d _build/doctrees . _build/html + fi +} + +python_test() { + nosetests -w ${PN} || die +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all +} diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest index 840e9863bf61..78ffc8fd6eae 100644 --- a/app-crypt/certbot-apache/Manifest +++ b/app-crypt/certbot-apache/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56 +DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8 diff --git a/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild new file mode 100644 index 000000000000..e52584b7e0c7 --- /dev/null +++ b/app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python{3_6,3_7,3_8}) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S=${WORKDIR}/${PN%-apache}-${PV}/${PN} +fi + +inherit distutils-r1 + +DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}] + >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}] + dev-python/python-augeas[${PYTHON_USEDEP}] + dev-python/zope-component[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}]" diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild index 3a367b955f0a..e52584b7e0c7 100644 --- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild @@ -22,17 +22,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}] >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}] dev-python/python-augeas[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND="test? ( ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test || die -} diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest index 840e9863bf61..78ffc8fd6eae 100644 --- a/app-crypt/certbot-nginx/Manifest +++ b/app-crypt/certbot-nginx/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56 +DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8 diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild new file mode 100644 index 000000000000..383e16073c64 --- /dev/null +++ b/app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=(python{3_6,3_7,3_8}) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S=${WORKDIR}/${PN%-nginx}-${PV}/${PN} +fi + +inherit distutils-r1 + +DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RDEPEND=" + >=app-crypt/acme-1.4.0[${PYTHON_USEDEP}] + >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + >=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}]" diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index 840e9863bf61..78ffc8fd6eae 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -1,2 +1,3 @@ DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a DIST certbot-1.8.0.tar.gz 1425620 BLAKE2B 9cc0443fd067bf594f02a79c99defa250e656dbee00cd2717a4a747abfe80511ffcb800b6ac63e484a918192dad9465dc45335f358267fa998af16e966b8e2a6 SHA512 c6559fe1e5db6269942bda3738c00b1b550ec448288eaf911ba9c3967c7e949b34bdd8b77742398f0a512ce07929fa2f227c1202e40900151762f1db6ff9de56 +DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8 diff --git a/app-crypt/certbot/certbot-1.9.0.ebuild b/app-crypt/certbot/certbot-1.9.0.ebuild new file mode 100644 index 000000000000..e54440941505 --- /dev/null +++ b/app-crypt/certbot/certbot-1.9.0.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=(python{3_6,3_7,3_8}) +DISTUTILS_USE_SETUPTOOLS=rdepend + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi +S=${WORKDIR}/${P}/${PN} + +inherit distutils-r1 + +DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + >=app-crypt/acme-1.8.0[${PYTHON_USEDEP}] + >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.8[${PYTHON_USEDEP}] + >=dev-python/distro-1.0.1[${PYTHON_USEDEP}] + >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}] + >=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/zope-component[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}]" diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index 8496941da96c..e54440941505 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -21,11 +21,9 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" RDEPEND=" - >=app-crypt/acme-1.6.0[${PYTHON_USEDEP}] + >=app-crypt/acme-1.8.0[${PYTHON_USEDEP}] >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}] dev-python/configobj[${PYTHON_USEDEP}] >=dev-python/cryptography-2.8[${PYTHON_USEDEP}] @@ -36,11 +34,3 @@ RDEPEND=" dev-python/pytz[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest - -python_prepare_all() { - # required as deps of deps can trigger this too... - echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini - distutils-r1_python_prepare_all -} diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest index 991f079d09d4..8c45d833b9cc 100644 --- a/app-crypt/nwipe/Manifest +++ b/app-crypt/nwipe/Manifest @@ -1 +1 @@ -DIST nwipe-0.25.tar.gz 49608 BLAKE2B 3506093c3e93b4aa982dffdd2f922f525404b397d7b3469f9ccdbf6708f824e9d3a2e34590a34cb4e0411bb3a8a4555a1f5940b826d39d39c10c75b668a10d1d SHA512 1051f2565ad7acaac7c289e2db91aa4dee40c3bb9a9dda97b2dec047e94cd91e7d59fd61603806628cabeb009932f011e734638fc9191c22bb812d7b4b661b46 +DIST nwipe-0.28.tar.gz 849147 BLAKE2B de81c526edc9ce106d48297796e1d42689bafae20be8ac20f6a8eb6474c8202dffdfbad2f91c8282bf5f747921b90402a3a84e411d8a8b2adb0c2e785bfaf315 SHA512 2b6cb6dbcbb51960f726d8ec6c1629fb4675af4b3f7b39ee1fc91244fc9391f4ea23bae5c8794cc92a675ce202be60df900658b6d9a95b5bb399c0e6f009ce69 diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml index c2ed1ed608a0..0675dc705da7 100644 --- a/app-crypt/nwipe/metadata.xml +++ b/app-crypt/nwipe/metadata.xml @@ -1,8 +1,15 @@ - - - nwipe - + + jakov.smolic@sartura.hr + Jakov Smolic + + + proxy-maint@gentoo.org + Proxy Maintainers + + + martijnvanbrummelen/nwipe + diff --git a/app-crypt/nwipe/nwipe-0.25.ebuild b/app-crypt/nwipe/nwipe-0.28.ebuild similarity index 80% rename from app-crypt/nwipe/nwipe-0.25.ebuild rename to app-crypt/nwipe/nwipe-0.28.ebuild index 20ca201ff847..3c580a709883 100644 --- a/app-crypt/nwipe/nwipe-0.25.ebuild +++ b/app-crypt/nwipe/nwipe-0.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,12 +7,11 @@ inherit autotools DESCRIPTION="Securely erase disks using a variety of recognized methods" HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe/" -SRC_URI="https://github.com/martijnvanbrummelen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/martijnvanbrummelen/nwipe/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=">=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7:=" diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest index d5245f6c9e58..7877552ca0b9 100644 --- a/app-crypt/rainbowcrack/Manifest +++ b/app-crypt/rainbowcrack/Manifest @@ -1 +1,2 @@ DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb +DIST rainbowcrack-1.8-linux64.zip 220109 BLAKE2B 164894ccb07490756a0c9b297b1497d6305fade66b31fd712914261219dd957632cd285ab2e7ad7a683dd3c0a425eb1969676ea23136abf7d688fcde9e445e74 SHA512 84dbf3431605fb5dcc8e7cd305a43e9b239ebd6e5ef120edd951a3180c38498fe3a26157e3b55d114c6630f8ac1382a610d8e6230779c5b12cbc42c04e9aff57 diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild new file mode 100644 index 000000000000..7a4aba0ea140 --- /dev/null +++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit wrapper + +DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance" +HOMEPAGE="https://project-rainbowcrack.com/" +SRC_URI="https://project-${PN}.com/${P}-linux64.zip" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="" + +RESTRICT="bindist mirror" #444426 + +RAINBOW_DESTDIR="opt/${PN}" + +QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*" +QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*" + +DEPEND="app-arch/unzip" + +DOCS=( + readme.txt +) + +S="${WORKDIR}"/${P}-linux64 + +# rainbowcrack-1.8 zipfiles, including the ones for Linux, use backslashes as path separators. +# unzip handles it just fine but produces a warning, the side effect of which is that it exits +# with code 1 rather than 0. +# Don't bother with iterating over A, we already assume the file to be a .zip so we might as well +# assume there is only one. +src_unpack() { + unzip -qo "${DISTDIR}/${A}" + local unzip_retval="${?}" + case "${unzip_retval}" in + 0|1) + ;; + *) + die "Failed to unpack the source archive" + ;; + esac +} + +src_install() { + einstalldocs + + local bin bins=" + rcrack + rt2rtc + rtc2rt + rtgen + rtmerge + rtsort + " + + exeinto "/${RAINBOW_DESTDIR}" + doexe alglib0.so ${bins} + + for bin in ${bins}; do + make_wrapper ${bin} ./${bin} "/${RAINBOW_DESTDIR}" "/${RAINBOW_DESTDIR}" + done + + insinto "/${RAINBOW_DESTDIR}" + doins charset.txt +} diff --git a/app-crypt/rotix/files/rotix-0.83-locale.diff b/app-crypt/rotix/files/rotix-0.83-locale.diff deleted file mode 100644 index 844a452b8af1..000000000000 --- a/app-crypt/rotix/files/rotix-0.83-locale.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- rotix.c 2002-04-02 14:48:42.000000000 -0500 -+++ rotix.c.mine 2010-07-15 14:54:45.000000000 -0400 -@@ -38,6 +38,7 @@ - /* I18N */ - #ifdef I18N - #include -+#include - #define _(String) gettext (String) - #else - #define _(String) String diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch new file mode 100644 index 000000000000..7aae19c7c71f --- /dev/null +++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 3088817..d789ce9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [ + + add_hardened_c_flag([-Wall]) + add_hardened_c_flag([-Wextra]) +- add_hardened_c_flag([-Werror]) + + add_hardened_c_flag([-Wformat]) + add_hardened_c_flag([-Wformat-security]) diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild index eacca8899f54..6c4b3e11cd0a 100644 --- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild +++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} ) DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_REQ_USE="sqlite" -inherit distutils-r1 +inherit autotools distutils-r1 DESCRIPTION="A PKCS#11 interface for TPM2 hardware" HOMEPAGE="https://tpm2-software.github.io/" @@ -35,7 +35,18 @@ DEPEND="${RDEPEND}" BDEPEND="sys-devel/autoconf-archive virtual/pkgconfig" +PATCHES=( + "$FILESDIR/${PN}-1.3.2-Remove-WError.patch" +) + +src_prepare() { + default + eautoreconf +} + src_configure() { +# we need the default version of src_configure, not the one exported +# by distutils-r1 default } diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild index be28c64da7ec..c41eb8817ed0 100644 --- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild +++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} ) DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_REQ_USE="sqlite" -inherit distutils-r1 +inherit autotools distutils-r1 DESCRIPTION="A PKCS#11 interface for TPM2 hardware" HOMEPAGE="https://tpm2-software.github.io/" @@ -38,6 +38,15 @@ DEPEND="${RDEPEND}" BDEPEND="sys-devel/autoconf-archive virtual/pkgconfig" +PATCHES=( + "$FILESDIR/${PN}-1.3.2-Remove-WError.patch" +) + +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ $(use_enable fapi) diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index bb9cff375869..9f9afbc73bf0 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1 +1 @@ -DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4 SHA512 4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339 +DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee SHA512 4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8 diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch new file mode 100644 index 000000000000..caa3fac23bf4 --- /dev/null +++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 7b5c2196..d07d5433 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [ + + add_hardened_c_flag([-Wall]) + add_hardened_c_flag([-Wextra]) +- add_hardened_c_flag([-Werror]) + + add_hardened_c_flag([-Wformat]) + add_hardened_c_flag([-Wformat-security]) diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild similarity index 85% rename from app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild rename to app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild index ea91b076cb65..7ccea9899c4b 100644 --- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild +++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + DESCRIPTION="Tools for the TPM 2.0 TSS" HOMEPAGE="https://github.com/tpm2-software/tpm2-tools" SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" @@ -24,9 +26,15 @@ RDEPEND="net-misc/curl:= DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${P}-libressl.patch" + "${FILESDIR}/${PN}-4.2.1-libressl.patch" + "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch" ) +src_prepare() { + eautoreconf + default +} + src_configure() { econf \ $(use_enable fapi) \ diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index ba3e0d98af50..b5b3c797ce86 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index bb0bd2d399b0..be38441a134f 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,4 +1,3 @@ DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a -DIST nano-5.0.tar.gz 3034734 BLAKE2B 03ea59c97c0e421ed92f588a2e6991f968b2f341761db66fda077ab827d00b9eb13930f08011f0028010e2005bb912ead723928b482a0532e924f85757a75569 SHA512 7e650676a15a185a9695eb49ae5cf441e3d42ae13817a9d3e64cb347c795840712778ac464fd5c578cc6464132206ee06dba52a06a218bcc865485ce3502a4bb -DIST nano-5.1.tar.gz 2861977 BLAKE2B c826782683d26b4c27ffb82e8c4dabad543fe93f53d942bc6ad57b8acb7959595986216a1936d69b0a63b72da101de2c886995421db93c76ee842313799de78d SHA512 8007f40f27a1235d59f5559b6629a3a5a1a579a2356c8825dfef121f4ba7e6c5196e4cedea441c7e856f9add1e9739b14b4142a0a14dab90841110218149df11 DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3 +DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d diff --git a/app-editors/nano/nano-5.1.ebuild b/app-editors/nano/nano-5.1.ebuild deleted file mode 100644 index 86f22534c12f..000000000000 --- a/app-editors/nano/nano-5.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" - inherit git-r3 autotools -else - MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode" - -LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] - sys-libs/ncurses:0=[static-libs(+)] - magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE="!ncurses? ( slang? ( minimal ) )" - -src_prepare() { - default - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi -} - -src_configure() { - use static && append-ldflags -static - local myconf=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) - ) - econf "${myconf[@]}" -} - -src_install() { - default - # don't use "${ED}" here or things break (#654534) - rm -r "${D}"/trash || die - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - fi - - use split-usr && dosym ../../bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-5.0-r1.ebuild b/app-editors/nano/nano-5.3.ebuild similarity index 100% rename from app-editors/nano/nano-5.0-r1.ebuild rename to app-editors/nano/nano-5.3.ebuild diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 42fb3947c5cd..2b8c6bdbe50a 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index a966189f7e1d..e9cdf10eee65 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,5 +1,3 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 -DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69 -DIST free42-nologo-2.5.16.tgz 7412652 BLAKE2B bdea95adca140eecbb192706a5e611c1ad5d248b47aa609ac2733eb018ea74e7661a1797acf9458aa07b6015df7376b3ef329685cff984d364c2f5e26f7d213b SHA512 5adfe5ce09e3aecae7f05d3880234eb903eb48b36ee10e88be87a8941752323f97067b97cb85699fc03591fc355024eb6cd621f64c31e6e5c6dd4d5027f1ba34 -DIST free42-nologo-2.5.17.tgz 7412893 BLAKE2B ce8a06d290d4fcc12fd9b98c9bb80e12b3dc0a8d53b87cba874bce5798812d667c9e61ac4d990ace9828b10bf223adb1e32274ca11837ec50b4b0559fe8d92ac SHA512 64efdb93a33780095360eb987ca5fa192336b285dcf785a268db59fa4aa8cf2c8ce91b8242c9b4d5efa9c4556f5d688894f60056117e1c0774147894e59d32c9 DIST free42-nologo-2.5.18.tgz 7413195 BLAKE2B c3d7d92c2f9b527fb6932f46644cb306217ab103bde1ecfd52a2659a1a71eaef199abeda8b24977e338757bfd57c824c31bc3bf9aa396e3372629b04737e6232 SHA512 3543d0a0cc4dff9c96c1121f221dded40f2574fffbd4747ef179b0d5cf75a003f49bc548df554fb46504af787d9d2fdb434c23a420f4b3592c838f4d00ac7140 +DIST free42-nologo-2.5.20.tgz 7414358 BLAKE2B f1e0963e6a808121efc4d9bd82863d8c7898f65504d4c59f6a6beadc0c4e5c1335ce4c65d25550a3f4d5c080e1933ad30f6325661af4a513f69941c48adda1a5 SHA512 04a01f29ed5a3c9374de98ead6c54191dbde6b0e3d9923b5c89f18f868630b50235711820e751e4a1e3efc0600b1a7a105e8800f660d67124458a8f2826c840f diff --git a/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch deleted file mode 100644 index 8a8fa437ba2d..000000000000 --- a/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur free42-nologo-2.5.12.orig/gtk/Makefile free42-nologo-2.5.12/gtk/Makefile ---- free42-nologo-2.5.12.orig/gtk/Makefile 2019-11-28 20:11:51.000000000 +0100 -+++ free42-nologo-2.5.12/gtk/Makefile 2019-11-29 17:59:58.292516949 +0100 -@@ -15,7 +15,7 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ############################################################################### - --CFLAGS = -MMD \ -+CFLAGS := -MMD \ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -@@ -34,7 +34,8 @@ - -DDECIMAL_GLOBAL_ROUNDING=1 \ - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ -- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 -+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ -+ ${CFLAGS} - - ############################################################################### - ### Note that there are deprecation warnings while compiling shell_main.cc ### -@@ -46,10 +47,11 @@ - ### GTK+ 3.22 for testing. ### - ############################################################################### - --CXXFLAGS = $(CFLAGS) \ -+CXXFLAGS := $(CFLAGS) \ - -fno-exceptions \ - -fno-rtti \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CFLAGS} - - LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0) - -@@ -125,7 +127,7 @@ - - symlinks: - for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done -- sh ./build-intel-lib.sh -+ +sh ./build-intel-lib.sh - ln -s IntelRDFPMathLib20U1/TESTS/readtest.c - touch symlinks - diff --git a/app-emulation/free42/free42-2.5.14.ebuild b/app-emulation/free42/free42-2.5.14.ebuild deleted file mode 100644 index 4c3201919053..000000000000 --- a/app-emulation/free42/free42-2.5.14.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.12-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/free42bin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.5.17.ebuild b/app-emulation/free42/free42-2.5.17.ebuild deleted file mode 100644 index bd3148a0b387..000000000000 --- a/app-emulation/free42/free42-2.5.17.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/free42bin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.5.16.ebuild b/app-emulation/free42/free42-2.5.20.ebuild similarity index 100% rename from app-emulation/free42/free42-2.5.16.ebuild rename to app-emulation/free42/free42-2.5.20.ebuild diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index d0484121929d..d865d5950769 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,4 +1,2 @@ -DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4 -DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453 DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch deleted file mode 100644 index 738799533c69..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.0.0-do-not-use-sysconf.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index c9b5eeb..423a201 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -533,23 +533,6 @@ EXTRA_DIST += \ - $(SYSCONF_FILES) \ - $(OPENRC_CONF_FILES) - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- --uninstall-sysconfig: -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -- - OPENRC_CONF_DIR = $(sysconfdir)/conf.d - - install-openrc-conf: -@@ -615,14 +598,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index e7f8057..2449b20 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd --ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS -+ExecStart=@sbindir@/virtlockd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the locks is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index daff48e..4373619 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 9c8c54a..a042280 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -25,8 +25,7 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd --ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS -+ExecStart=@sbindir@/libvirtd - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 426a6ba..a65c91a 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -297,15 +297,6 @@ install-data-local: install-systemd install-nss \ - uninstall-local: uninstall-systemd uninstall-nss \ - uninstall-bash-completion - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- --uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -- - EXTRA_DIST += libvirt-guests.sh.in - - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -325,12 +316,12 @@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 10c6640..f0f417b 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 669b046..45b0b9e 100644 ---- a/tools/libvirt-guests.sysconf -+++ b/tools/libvirt-guests.sysconf -@@ -1,3 +1,10 @@ -+# -+# Warning: This configuration file is only sourced by the systemd -+# libvirt-guests.service unit. The coresponding openrc facility is in -+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd -+# -+ -+ - # URIs to check for running guests - # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' - #URIS=default diff --git a/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch deleted file mode 100644 index 02592ea4a5c3..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.1.0-fix-paths-for-apparmor.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 36bd280..07cebdf 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ - $(NULL) - - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ -+ security/apparmor/usr.libexec.virt-aa-helper.in \ - security/apparmor/usr.sbin.libvirtd.in \ - $(NULL) - -@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in - @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ --@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ --@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ -+@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - - @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: --@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : - - $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ -diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am -index 5f2f4c8..d457cc6 100644 ---- a/src/security/Makefile.inc.am -+++ b/src/security/Makefile.inc.am -@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ - $(NULL) - - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ -+ security/apparmor/usr.libexec.virt-aa-helper.in \ - security/apparmor/usr.sbin.libvirtd.in \ - $(NULL) - -@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" - install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ -- 'usr.lib.libvirt.virt-aa-helper'" \ -- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ 'usr.libexec.virt-aa-helper'" \ -+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - - uninstall-apparmor-local: -- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - - INSTALL_DATA_LOCAL += install-apparmor-local -diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in -similarity index 97% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -rename to src/security/apparmor/usr.libexec.virt-aa-helper.in -index dd18c8a..d06f9cb 100644 ---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in -@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { - /**.[iI][sS][oO] r, - /**/disk{,.*} r, - -- #include -+ #include - } diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch deleted file mode 100644 index 74b5954a0cf1..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch +++ /dev/null @@ -1,245 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -522,23 +522,6 @@ - $(SYSCONF_FILES) \ - $(OPENRC_CONF_FILES) - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- --uninstall-sysconfig: -- for f in $(SYSCONF_FILES:%.sysconf=%) ; \ -- do \ -- tgt=`basename $$f`; \ -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ -- done -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : -- - OPENRC_CONF_DIR = $(sysconfdir)/conf.d - - install-openrc-conf: -@@ -604,14 +587,14 @@ - BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) - DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - --install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig -+install-systemd: $(SYSTEMD_UNIT_FILES) - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - for f in $(SYSTEMD_UNIT_FILES); \ - do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ - done - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : - ---- a/src/interface/virtinterfaced.service.in -+++ b/src/interface/virtinterfaced.service.in -@@ -13,7 +13,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced - ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/libxl/virtxend.service.in -+++ b/src/libxl/virtxend.service.in -@@ -17,7 +17,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtxend - ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd --ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS -+ExecStart=@sbindir@/virtlockd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the locks is a really bad thing that will - # cause the machine to be fenced (rebooted), so make ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Loosing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make ---- a/src/lxc/virtlxcd.service.in -+++ b/src/lxc/virtlxcd.service.in -@@ -18,7 +18,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd - ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process ---- a/src/network/virtnetworkd.service.in -+++ b/src/network/virtnetworkd.service.in -@@ -16,7 +16,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd - ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/node_device/virtnodedevd.service.in -+++ b/src/node_device/virtnodedevd.service.in -@@ -13,7 +13,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd - ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/nwfilter/virtnwfilterd.service.in -+++ b/src/nwfilter/virtnwfilterd.service.in -@@ -13,7 +13,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd - ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/qemu/virtqemud.service.in -+++ b/src/qemu/virtqemud.service.in -@@ -18,7 +18,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud - ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -28,8 +28,7 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd --ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS -+ExecStart=@sbindir@/libvirtd - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process - Restart=on-failure ---- a/src/remote/virtproxyd.service.in -+++ b/src/remote/virtproxyd.service.in -@@ -13,7 +13,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd - ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/secret/virtsecretd.service.in -+++ b/src/secret/virtsecretd.service.in -@@ -13,7 +13,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd - ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/storage/virtstoraged.service.in -+++ b/src/storage/virtstoraged.service.in -@@ -15,7 +15,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged - ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/src/vbox/virtvboxd.service.in -+++ b/src/vbox/virtvboxd.service.in -@@ -14,7 +14,6 @@ - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd - ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -294,15 +294,6 @@ - uninstall-local: uninstall-systemd uninstall-nss \ - uninstall-bash-completion - --install-sysconfig: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig -- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ -- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- --uninstall-sysconfig: -- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests -- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -- - EXTRA_DIST += libvirt-guests.sh.in - - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -322,12 +313,12 @@ - SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system - - if LIBVIRT_INIT_SCRIPT_SYSTEMD --install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -+install-systemd: libvirt-guests.service libvirt-guests.sh - $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_DATA) libvirt-guests.service \ - $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - --uninstall-systemd: uninstall-sysconfig -+uninstall-systemd: - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service - rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: - ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start ---- a/tools/libvirt-guests.sysconf -+++ b/tools/libvirt-guests.sysconf -@@ -1,3 +1,9 @@ -+# -+# Warning: This configuration file is only sourced by the systemd -+# libvirt-guests.service unit. The coresponding openrc facility is in -+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd -+# -+ - # Customizations for the libvirt-guests.service systemd unit - - # URIs to check for running guests diff --git a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch deleted file mode 100644 index 97e50cd357c6..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.5.0-fix-paths-for-apparmor.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 36bd280..07cebdf 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ - $(NULL) - - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ -+ security/apparmor/usr.libexec.virt-aa-helper.in \ - security/apparmor/usr.sbin.libvirtd.in \ - $(NULL) - -@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in - @WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - @WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - @WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \ --@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \ --@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \ -+@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - - @WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local: --@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - @WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || : - - $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ -diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am -index 5f2f4c8..d457cc6 100644 ---- a/src/security/Makefile.inc.am -+++ b/src/security/Makefile.inc.am -@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ - $(NULL) - - SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \ -- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \ -+ security/apparmor/usr.libexec.virt-aa-helper.in \ - security/apparmor/usr.sbin.libvirtd.in \ - $(NULL) - -@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" - install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" - echo "# Site-specific additions and overrides for \ -- 'usr.lib.libvirt.virt-aa-helper'" \ -- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ 'usr.libexec.virt-aa-helper'" \ -+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - - uninstall-apparmor-local: -- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper" -+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper" - rmdir "$(APPARMOR_LOCAL_DIR)" || : - - INSTALL_DATA_LOCAL += install-apparmor-local -diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu -index 80986ae..d550d8c 100644 ---- a/src/security/apparmor/libvirt-qemu -+++ b/src/security/apparmor/libvirt-qemu -@@ -88,6 +88,7 @@ - /usr/share/sgabios/** r, - /usr/share/slof/** r, - /usr/share/vgabios/** r, -+ /usr/share/seavgabios/** r, - - # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) - /etc/pki/CA/ r, -diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in -similarity index 97% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -rename to src/security/apparmor/usr.libexec.virt-aa-helper.in -index dd18c8a..d06f9cb 100644 ---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in -@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { - /**.[iI][sS][oO] r, - /**/disk{,.*} r, - -- #include -+ #include - } diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild deleted file mode 100644 index f1d0b7f84561..000000000000 --- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild +++ /dev/null @@ -1,356 +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,8,9} ) - -inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" - SRC_URI="" - SLOT="0" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev +vepa - virtualbox virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - acct-user/qemu - policykit? ( acct-group/libvirt ) - app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-1.5.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - >=app-emulation/xen-4.6.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch - "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - default - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -my_src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with dtrace) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with iscsi-direct storage-iscsi-direct) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen libxl) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --localstatedir=/var - --with-runstatedir=/run - --enable-dependency-tracking - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" -} - -my_src_test() { - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check -} - -my_src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild deleted file mode 100644 index 182ff2489235..000000000000 --- a/app-emulation/libvirt/libvirt-6.5.0-r1.ebuild +++ /dev/null @@ -1,355 +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,8,9} ) - -inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" - SLOT="0" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev +vepa - virtualbox virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - acct-user/qemu - policykit? ( acct-group/libvirt ) - app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-1.5.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - >=app-emulation/xen-4.6.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.5.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - default - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -my_src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with dtrace) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with iscsi-direct storage-iscsi-direct) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen libxl) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --localstatedir=/var - --with-runstatedir=/run - --enable-dependency-tracking - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" -} - -my_src_test() { - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check -} - -my_src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/qemu/qemu-5.1.0.ebuild b/app-emulation/qemu/qemu-5.1.0.ebuild deleted file mode 100644 index 2ba4d0fe9447..000000000000 --- a/app-emulation/qemu/qemu-5.1.0.ebuild +++ /dev/null @@ -1,854 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -PYTHON_REQ_USE="ncurses,readline" - -PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN" - -FIRMWARE_ABI_VERSION="4.0.0-r50" - -inherit eutils linux-info toolchain-funcs multilib python-r1 \ - udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" - EGIT_SUBMODULES=( - tests/fp/berkeley-{test,soft}float-3 - ui/keycodemapdb - ) - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc - +fdt glusterfs gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg kernel_linux - kernel_FreeBSD lzo multipath - ncurses nfs nls numa opengl +oss +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static static-user systemtap test usb - usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen - xfs +xkb zstd" - -COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x - sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - avr lm32 moxie rx tricore unicore32" -IUSE_USER_TARGETS="${COMMON_TARGETS} - aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus - tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) - static-user? ( !plugins ) - virtfs? ( caps xattr ) - vte? ( gtk ) - plugins? ( !static !static-user ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - dev-libs/libxml2[static-libs(+)] - xkb? ( x11-libs/libxkbcommon[static-libs(+)] ) - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( - sys-fabric/libibumad:=[static-libs(+)] - sys-fabric/libibverbs:=[static-libs(+)] - sys-fabric/librdmacm:=[static-libs(+)] - ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:0=[unicode] - sys-libs/ncurses:0=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gbm] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-201905[binary] - ~sys-firmware/ipxe-1.0.0_p20190728[binary] - ~sys-firmware/seabios-1.12.0[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8[binary] - ) - !pin-upstream-blobs? ( - sys-firmware/edk2-ovmf - sys-firmware/ipxe - >=sys-firmware/seabios-1.10.2[seavgabios] - sys-firmware/sgabios - )" -PPC64_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.12.0[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] - ) -" - -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig - doc? ( dev-python/sphinx ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - ) -" -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} )" -RDEPEND="${CDEPEND} - acct-group/kvm - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 - "${FILESDIR}"/${PN}-4.2.0-cflags.patch - "${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB - export WINDRES=${CHOST}-windres - - # Verbose builds - MAKEOPTS+=" V=1" - - # Run after we've applied all patches. - handle_locales - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --with-confsuffix=/qemu - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable doc docs) - $(use_enable plugins) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_notuser jemalloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_notuser sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp slirp system) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser vhost-user-fs) - $(conf_notuser virgl virglrenderer) - $(conf_notuser virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - $(conf_notuser xkb xkbcommon) - $(conf_notuser zstd) - ) - - if [[ ${buildtype} == "user" ]] ; then - conf_opts+=( --disable-libxml2 ) - else - conf_opts+=( --enable-libxml2 ) - fi - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(printf "%s," "${audio_opts[@]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild index 2297b799d92f..d652192107af 100644 --- a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild +++ b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{7,8} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=no diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index ac8190266f63..f7d8ad6a55fd 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest index 4b9c0ca18e38..535bc72da3bf 100644 --- a/app-misc/go-jira/Manifest +++ b/app-misc/go-jira/Manifest @@ -55,6 +55,8 @@ DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod 45 BLAKE2B a7d3b1ffaf20 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.zip 19084 BLAKE2B 25ef98ad68b5c09f30a022e01b72b19a65d94227869dec715bfe4500da6e831775b45b1bf250b30f0d4d88c99b67e8cb82a7ac8021671060d067ab78e4a5a48a SHA512 2fdddfa840e46313407268423729c6d7886acf78f5aaa9de7d307a6e53c513a095bbbe50dabd49a10c48e43efffedf80f57a7bd715488100baab69cb58cfcd4f DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip 7444 BLAKE2B aa8d4a83365fb9de2c184015be855c1bb9a82772fc154390a13cf95bf5a755beb3544111e90e02121e5251729bbf0fe072de7b6f8f8ca6eccb2585430e88a839 SHA512 fcd99a4e9294362485d8f1f66283416c53b3079bbfdf3e9d1849fc1a9ebb61970563a9fe479f84fc9037f1fa7b820291026cf4072a3c81df2555876d02d99eb7 +DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.mod 49 BLAKE2B e24bba94c32d1da53c6ad3333da9292b3b7dbdf4407f9741c5dfd9b949f73bb48a863435daa6c7b0b23e56e391208f7ea73cf50265389e4435cc47a9a8d3e7a0 SHA512 01fd9da74a329cefac997f48f887a75e3b71c58ea66ac8df86e97cc2e086b3ffe21447ea4d1ad4fcfaf9b36b37f299e4bae52583f4aff385128942b2d4a1aef8 +DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.zip 3740 BLAKE2B 40fb0dba4182bb79505b7c951f364cbd9e210c469093d404f142a0ddc78af42014d0f3b2d24eca1b6439574bb2a704cdadf89b49c1c552d78d9ee7b6bfe2ca50 SHA512 157e3d27bef2a83469ee23214e5fe05a1af9b04db7d3287208e190760d835d1ecda31917f2e4d417a51299e2b3cc73f3c17a1568da07315022137946b591cc0a DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.mod 96 BLAKE2B 5f923f8ad64702df318058cc4caae206fc5d780e024b0fd3fc242aaa16f6372c980802134ac1244d61467b2ee6f7f470c538d5558afb5c7c6f2af84855dc5fea SHA512 ca249b01b9f5c81ca7818c1ec2c1527a5a615a255231ff9e2191033c8b48cdd60753a2a6a294e1358176c6f4b53ce7d6698ce15e6f30cccd42328595562816ca DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.zip 24724 BLAKE2B f2a763aadd785324adeac9bc1d69a80c6d7086b3e44219aa7d6bd11bf545da1b1de3f6fd63cefd5ddca71e652dfa9d496e8afb59afb9731d641d0174e5185a25 SHA512 c6a650cabf6d5f1b96f67f7ae703259b6b4976564255933d0643213d4ddeaac85f2760286fade3dda6aa8a28b700e1fb6290d3a22886fc739bdf552e67ebb143 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c @@ -75,6 +77,7 @@ DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.mod 30 DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip 7686 BLAKE2B b09bc829a9ff39c0985d8a02e7400e35dbd33a3c48ea22e8a07872fb120b10129f4c230b3ea87cafd56c7b1fdb7cf73c1919af0679e8607690a1122d6421b50d SHA512 33439b0b3e31496917695c9fcfff87b8206a66a77362ee54356d0272bdedb95d7b51e031ce44cb6e1ae105ba6bf2dd17033c544553613311c8e5b4f757955aa5 DIST go-jira-1.0.23.tar.gz 115977 BLAKE2B 0b5ff8bbe2b2faeedd729daadd0646a89e5a68e26c9acf8e22750f490c7bcbd592485c2b86378036a1bb199a73a0000775b56355731d42460f8d89339b49b820 SHA512 d3fcc223c96cfc1885c7ee54e50518c6d5826b8b2231afa280b8c90c01e6413ddb0569b308ee9eae6d26bf87e59fb0913425481e6aecb78cb339f14e01194f9c DIST go-jira-1.0.26.tar.gz 129521 BLAKE2B 9ab96e8c6838d6906050a0ad6d8b96a97b2ea08030910c4e25b7dad2cefa777667107ec1a677fb7c2aa0835f0bbc885a75da057d8030199d1225d66e3bba3d67 SHA512 04b22cdbf95331784177816a60ee6c915a21513d13185062b495c2fe98f5077f9b8e4847ed05f07f69f8dba27c7de8873e9cd1cc51532dc47e6f52d4513a3857 +DIST go-jira-1.0.27.tar.gz 129721 BLAKE2B 259cd38722b4c0c91ae377fb2d2244a416b70a5d8fbd47283812ec12c95957e2e56605124f991b0157711af58841cb98875bccc3261326491cdbcbedb0b65e66 SHA512 b6aed431b90fbedbf057d9c9a40545d475bfee9bf42ec24133d517ca3eb478a20f6205304b36ba1d2ac8983136328a52a1e29ba216a440ecebbca47f50a47603 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip 1744314 BLAKE2B 2c41a3aa7252043bb516dc4933165a1f4340d1bf215c7738dc6b06c80f4fd07dfa69b4a28c19753c86270237dc81dddf216eb02e60276b37d2f09986b4256366 SHA512 f565387ef2ef70d453910177afc66dee6fdf079e03946837f92108e19d29c510de26a647ee12c70f9bbb9d04c4b86007f0d41ca774caec85e597691eb698cd0c DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a diff --git a/app-misc/go-jira/go-jira-1.0.27.ebuild b/app-misc/go-jira/go-jira-1.0.27.ebuild new file mode 100644 index 000000000000..a0681893cc7c --- /dev/null +++ b/app-misc/go-jira/go-jira-1.0.27.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# bash-completion-r1 can be added once we can generate completion scripts +inherit go-module + +DESCRIPTION="A simple JIRA commandline client in Go" +HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira" + +EGO_SUM=( + "github.com/Masterminds/goutils v1.1.0" + "github.com/Masterminds/goutils v1.1.0/go.mod" + "github.com/Masterminds/semver v1.5.0" + "github.com/Masterminds/semver v1.5.0/go.mod" + "github.com/Masterminds/sprig v2.21.0+incompatible" + "github.com/Masterminds/sprig v2.21.0+incompatible/go.mod" + "github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b" + "github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc" + "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf" + "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" + "github.com/cheekybits/genny v1.0.0" + "github.com/cheekybits/genny v1.0.0/go.mod" + "github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df" + "github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod" + "github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d" + "github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod" + "github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e" + "github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod" + "github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1" + "github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1/go.mod" + "github.com/davecgh/go-spew v1.1.0" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/fatih/camelcase v1.0.0" + "github.com/fatih/camelcase v1.0.0/go.mod" + "github.com/google/go-cmp v0.5.2" + "github.com/google/go-cmp v0.5.2/go.mod" + "github.com/google/uuid v1.1.1" + "github.com/google/uuid v1.1.1/go.mod" + "github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3" + "github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod" + "github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c" + "github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod" + "github.com/huandu/xstrings v1.2.0" + "github.com/huandu/xstrings v1.2.0/go.mod" + "github.com/imdario/mergo v0.3.7" + "github.com/imdario/mergo v0.3.7/go.mod" + "github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3" + "github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" + "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" + "github.com/kr/pretty v0.1.0" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/pty v1.1.4" + "github.com/kr/pty v1.1.4/go.mod" + "github.com/kr/text v0.1.0" + "github.com/kr/text v0.1.0/go.mod" + "github.com/mattn/go-colorable v0.0.9" + "github.com/mattn/go-colorable v0.0.9/go.mod" + "github.com/mattn/go-isatty v0.0.3" + "github.com/mattn/go-isatty v0.0.3/go.mod" + "github.com/mattn/go-runewidth v0.0.6" + "github.com/mattn/go-runewidth v0.0.6/go.mod" + "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b" + "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod" + "github.com/mitchellh/go-wordwrap v1.0.1" + "github.com/mitchellh/go-wordwrap v1.0.1/go.mod" + "github.com/olekukonko/tablewriter v0.0.3" + "github.com/olekukonko/tablewriter v0.0.3/go.mod" + "github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15" + "github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15/go.mod" + "github.com/pkg/errors v0.8.0" + "github.com/pkg/errors v0.8.0/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/stretchr/testify v1.2.2" + "github.com/stretchr/testify v1.2.2/go.mod" + "github.com/theckman/go-flock v0.4.0" + "github.com/theckman/go-flock v0.4.0/go.mod" + "github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7" + "github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7/go.mod" + "github.com/tidwall/match v1.0.0" + "github.com/tidwall/match v1.0.0/go.mod" + "github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1" + "github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1/go.mod" + "golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb" + "golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod" + "golang.org/x/net v0.0.0-20171102191033-01c190206fbd" + "golang.org/x/net v0.0.0-20171102191033-01c190206fbd/go.mod" + "golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e" + "golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "gopkg.in/AlecAivazis/survey.v1 v1.6.1" + "gopkg.in/AlecAivazis/survey.v1 v1.6.1/go.mod" + "gopkg.in/alecthomas/kingpin.v2 v2.2.6" + "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127" + "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" + "gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153" + "gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153/go.mod" + "gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473" + "gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod" + "gopkg.in/yaml.v2 v2.2.2" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + ) +go-module_set_globals +SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}/jira-${PV}" + +src_compile() { + go build -o jira cmd/jira/main.go || die + # these cause failures. +# ./jira --completion-script-bash > jira.bash || die +# ./jira --completion-script-zsh > jira.zsh || die +} + +src_install() { + dobin jira + dodoc {CHANGELOG,README}.md + # This can be uncommented once we can generate completion scripts +# newbashcomp jira.bash jira +# insinto /usr/share/zsh/site-functions +# newins jira.zsh _jira +} diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz index 86963bbcf233..695188832aa5 100644 Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild index a1e76e62e3d0..b202581cd334 100644 --- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild +++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild @@ -4,6 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 prefix diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild index c832428a78a5..c8fa9ba8dd39 100644 --- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild +++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild @@ -4,6 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 diff --git a/app-portage/portpeek/portpeek-3.1.5.ebuild b/app-portage/portpeek/portpeek-3.1.5.ebuild index 9b066f889246..bff81b06ffc6 100644 --- a/app-portage/portpeek/portpeek-3.1.5.ebuild +++ b/app-portage/portpeek/portpeek-3.1.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit python-r1 diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild index ac8c1532d0ef..74e5a63301f4 100644 --- a/app-portage/repoman/repoman-9999.ebuild +++ b/app-portage/repoman/repoman-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..9} pypy3 ) PYTHON_REQ_USE='bzip2(+)' inherit distutils-r1 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git" S="${WORKDIR}/${P}/repoman" else - SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2" + SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -26,7 +26,7 @@ SLOT="0" IUSE="" RDEPEND=" - >=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}] + >=sys-apps/portage-3.0.4[${PYTHON_USEDEP}] >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] " diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 6bd0091469f7..649d1533b0f9 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild new file mode 100644 index 000000000000..3b1b1ba13b5d --- /dev/null +++ b/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Backend part of Paperwork (Python API, no UI)" +HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="app-text/poppler[introspection] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/natsort[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/python-levenshtein[${PYTHON_USEDEP}] + dev-python/simplebayes[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/whoosh[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index d2bcc97a48e4..beb8d79fbddf 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild index cd1b373613f2..f31a3318c20a 100644 --- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild +++ b/dev-cpp/glibmm/glibmm-2.64.2.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc debug test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/mm-common/mm-common-1.0.1.ebuild b/dev-cpp/mm-common/mm-common-1.0.1.ebuild index 3af71a919439..bcd55f9d0a26 100644 --- a/dev-cpp/mm-common/mm-common-1.0.1.ebuild +++ b/dev-cpp/mm-common/mm-common-1.0.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="" RDEPEND="" diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest index 7db715e0f9ac..45b840448118 100644 --- a/dev-cpp/prometheus-cpp/Manifest +++ b/dev-cpp/prometheus-cpp/Manifest @@ -1 +1,2 @@ +DIST prometheus-cpp-0.10.0.tar.gz 49694 BLAKE2B f14232e1dad0376ea8e90c89079c4a6d8f2e9f5661a399d38d6f5001506db6c628cb42a934b40139cbb0d904a63c4b4483e6ed92452f5393365ed4209a236247 SHA512 18938b30143ed29985ee56943fd69e0a221f9d25f04fc611554050ee2786e96d968f7db251cccefcbd0017b61bcd8a7ea05af8f217c8aacd9f0694a4702ddcff DIST prometheus-cpp-0.9.0.tar.gz 43924 BLAKE2B e2b26b257e44c63ae5bc2a703d0ee9247fd8f093ef58a3b00dec022af9cb56b18d20b74ccdb91899e2385b036c332b62d9959b9258082ca420fecf48926139d5 SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891 diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild new file mode 100644 index 000000000000..3cd755921597 --- /dev/null +++ b/dev-cpp/prometheus-cpp/prometheus-cpp-0.10.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Prometheus Client Library for Modern C++" +HOMEPAGE="https://github.com/jupp0r/prometheus-cpp" +SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/cppcodec + net-misc/curl + sys-libs/zlib + www-servers/civetweb[cxx]" +DEPEND="${RDEPEND} + test? ( + dev-cpp/benchmark + dev-cpp/gtest + )" + +src_configure() { + local mycmakeargs=( + -DENABLE_PULL=yes + -DENABLE_PUSH=yes + -DENABLE_COMPRESSION=$(usex zlib) + -DENABLE_TESTING=$(usex test) + -DUSE_THIRDPARTY_LIBRARIES=OFF + ) + + cmake_src_configure +} diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 0e0b9252332d..add410c15268 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index e71002b6cef1..1d9a00a2c70e 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,23 +1,20 @@ -DIST mariadb-10.1.38.tar.gz 63535685 BLAKE2B c179ea2f60287c2bc1c0d1c47ae989ac2653a24063e8344cef2f3062fc6798e18b969e8f9aa8287104ce2518e6c644cb8d3a4650b5a0bc5dfde973e76e618955 SHA512 184582f3a902a989ba3d9c4d21288c014c8b469adbbb4cbabc621c5006022cef29baed8c1140ed4476b124da83b76dfa414295ed0c3374be826e75aca953a77b -DIST mariadb-10.1.45-patches-04.tar.xz 8808 BLAKE2B 79b6ad86665b6ceea990813c1b60937283ccfd572e5aef095df9951fac0a35e10b7cab002a18adcdb4b643a4d881c57ed468a15fc2fe8f0b9755dc07c2c81fc6 SHA512 eba4c39a275a27faec01dcefd36635fb8ed4f9d651e244420ce0856932378196b9daa98c9de339dc84c3e07fb77fda27c2aa46930c741a1c4c53057b4f9b86c6 -DIST mariadb-10.1.45.tar.gz 63673824 BLAKE2B 002aedf61282244905256757fe18eebe67f8a05d45496eee4804e5fba9edf58ece15188d6537ed45245b9342bc514376727c91261ec3f3a3d809c569c84a63de SHA512 708daf6cf98a914ca378e3461f3431f13d6274e20ef37de239e5d90db58215c50bfbc450e6b3b00d847cc819ab9de2bc780831009581e43db38d63397a417ace DIST mariadb-10.1.46-patches-01.tar.xz 8824 BLAKE2B b30d1c6625d87605fc934007ebfbd449f327969b1f65bb22a1d432691a3927a3f20c55f646f9a4e8cbdcdcadf16a2518e05441ab0088bac876a81f87bb62b925 SHA512 93ef056f697d83ced4d585c31558dded94667447fc6785ed79b15dbbde4df4a3667cefec1f2007649dd0fed3c1cf86cfe5cf626588678d2a851f8c5f7b3d4092 -DIST mariadb-10.1.46.tar.gz 63741294 BLAKE2B 5a2ca06b7ac14896f874bb18a38dcfb2336d0b77160d3295e9a268ffaa6feec2319a5d4e5985851327f1122fa7650749a09c384eeba5ab9369fce993464702f8 SHA512 a45816edfcfb7f33fc4e316cd19d777069358b7cd0968be23922ffee886e9db8600568425e4d81a0e033a255b6c46441fefa4f5bc5da96579527b481a10a7213 +DIST mariadb-10.1.47.tar.gz 63751492 BLAKE2B 4e01a641e1c387c4d61b3fc8747685ce549628304da7ec4375a5dd3ec1e1b5ec67e501eff2f12c47d73e84cc8a6b78bb79a7b326951e3f58131d918495c55039 SHA512 68ca6471a3dca91b7c8cdb1fb19b5387d3ef29a3598eeae70428373dc319eab9371d73cc5d06582f8d14f53ee9c0d7c6969b379f3961c8960308717fa6070349 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b SHA512 cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2 DIST mariadb-10.2.32-patches-03.tar.xz 6048 BLAKE2B a6f8f25ec23d1d86d228d719927daa9131779239917b86eab9f82086744294c0a4f03b1a73a3baa599e367775457d6c345fa0820b89063b2e6379c0fb7076ad0 SHA512 324804f13f59593d26cc5fd8c1cdeac2f16cf55012ca65b0a7223512920e1ea94619991fdcb3d19184b6428e4a627fec75532c88ae8297f9b8398fcf730058a9 DIST mariadb-10.2.32.tar.gz 73646729 BLAKE2B 581906d67f0aada9e85aec7bfee03ed8927a4e836f0639fa5f31576f5df70ce2b6ed3da0b96ad616f5ed71d7717531a073cb911c6d92274f6724911e086104af SHA512 824aa94724b639337a5b4c2e86a1f5ceaeaa940eb234f852df1ba0aafd64e269335e2aca0b05d52164e090cfd6f7d14477df9e096473aa5d9286d47944a765b4 DIST mariadb-10.2.33-patches-01.tar.xz 6024 BLAKE2B cb4283a36b303b1422d53c454bc6390ce80f3a88c9f9cd459468cf9bff792a1af197a5e5b3f7e45376024ef78bc6049cecafd8654e1b767f741f35129624ab12 SHA512 ebe9c1295089c04e869516f3ef278673986c1227b92bb9cd96cc561b0392f22870200cf58db91fdfe7e113b04b5b6d66c904b2d1353011cbd89723a8ce83fec2 -DIST mariadb-10.2.33.tar.gz 73769891 BLAKE2B d5d564e6c51a6460247b999ae1d58433f15f5c7a4ffe7c676845857036c766aaf24e66cbbbaebc12cc55be97a22a4dec4916551bde65eac043cc036fc9e731b6 SHA512 336184931688beba5733d510db00d05eceb3909f8fcdf198189ea1fa96af6a401aa4f0b9e13e3fb0211f7be6c14aba8d0a9b245bd3c2a173e5b1f930a7a18460 +DIST mariadb-10.2.34.tar.gz 73758617 BLAKE2B e25e4a6ef9916e6ff88d445bb729a5d1a33913a8aef1ecae3d701917f91d091f6f831bf428ab99d9ff7360f600bb98fad57fbc4f053632ba5c33e7cfbc333264 SHA512 ace6132ec5d02c4857e8b30b11697eb9a8ca007d11843d0288a1d5b519c3203658b8b0a01620fdd20297474c577be3f967828077012e5e13e6ee63c30bb4e8b7 DIST mariadb-10.3.23-patches-03.tar.xz 5520 BLAKE2B 30bc247ed6d97aefaa1ed48f379fc9aab3df3409aa9a108728313c7c69ab0641b69ccb0289eda9539df367f85b2db494473d3836807dfbf60df1e0c832e57369 SHA512 64bff196d1651348d303571fd551a5666d9514c1ee17cd9296b9d420c4b3d7d9b339644a1cad029bae3c35a666b405d471a37846138f2551f3b1b88d99b80844 DIST mariadb-10.3.23.tar.gz 72582611 BLAKE2B 493605519f714cbe87b938f6ca3243d29189adbfcbb33c4e10a4a3f01b08d875f18b96b647dc92566b785c2cef9862ebacfd55954d13ab0a7a745606e40fb6e9 SHA512 535cd2ce80a95b6c0a1aa559cc3275dfcd559c3a4f958fab3382923190a16e6bc5b4ad79acaa518244512ff618568c239c0edef8a701d958362ede19a29c2986 DIST mariadb-10.3.24-patches-01.tar.xz 5508 BLAKE2B c3b75205ecec0b73c85696a3382dd9271d495389f05d1bff66548f5f316f6d5f2ee7204020f265a6dd7ee7c28e1a010d74b056b9c9ab244651ba417e496fb1a9 SHA512 d9d408e6ba08a8a321b9a6e72a6347c4317652e91ade0056ff8621dafbbaf398e33d6b15247e89a2d60b731021d30cba9611356ced2cf848d1807cb3d376c378 -DIST mariadb-10.3.24.tar.gz 72714002 BLAKE2B c25a1546369e8996dea2a4d00022a8a5a4f11727866cb3d377aa534b617b76540fe49871c92d38487b667db68885e7aabe22a7400015f513394f18fdd2899bcd SHA512 cfd0154d984ddc344554cd3df1d02b0811f8e35c90caf745532491688850736d079c67d40e9414daba83f2bd0c06569bfc99213d5280c63cf051c68abd7c56b5 +DIST mariadb-10.3.25.tar.gz 72710424 BLAKE2B 95029946e2ed04368beadf33b42121c612fa9d146e648fd584078e4df88e3c93f6373e1e996817644e06f3b2713a257e3079167434e9227db01dc1a2ad08aad0 SHA512 9504e401db3b65b2b2bd4d3c91a468d357e82fdafbf90d54539a291e46570c2bed66ae047b17b9da95e925f8970fa048d329ba06c2dd6de7d46d5a0f2aad1f4d DIST mariadb-10.4.13-patches-03.tar.xz 5520 BLAKE2B 949b7f6ee5a9a6077424264e53d2b7af8ceb56cb38b204800e1c3ec93fc929d57b201e075f8ed735364b5421a3b922ba45fc94ba006f1e6d94494efa17b521ef SHA512 042c3ca8a75ebbb1c2baa508603d4248a178f87b7126b439ef6894eaab979f01c47cd8fbea3c106cce2a951e9308c76e72b4e444dcbee09a991cb524f2b9fac8 DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B f32e1d383ffd99de431bc34c36101c71c5e631344527e96b80ca6bd0a68015b45a4c33d6f0518cb4aa2bcfd493b64b6607671450ca045243404c0d65ebbc66fd SHA512 201fe82cbcca705dba52b32405d463b5569d97a5ffd9fd2967ec7fc3c3ff305011b3d2c3c0e9f7c19aaac57b26661bd361f3b6da6f3812f25934ec18856c7051 -DIST mariadb-10.4.14.tar.gz 80789865 BLAKE2B fed455e906af9fe105f52cc7180a6b8d8839fdbffac079f2ced265741c2ab8010c78c0e75ff77740d45a2bd02a15c379bdb3a0237152848a0ce1a7aaac4cbf32 SHA512 c09817c1dd7962132bcf2886c97ad17ce43c00ee687724028e5f39f6a6a93877ae8695c2c795abba6a4f3bc40674f93a53d6d43f46788a4a8a42c4a65a22c91c +DIST mariadb-10.4.15.tar.gz 80777094 BLAKE2B 576e06c1d62b399851e13fe0ac55ea94c462889bbd16ec25a2358e174e2822521008ad0dc021d742b1a12c5b22424208b6df92c2c0fb698a083b6a67a771bd64 SHA512 d7090e9e2a2b6fc5611fe498c44b00dbcd02e04456aaff3dc4cef7ef8cd284523776d01511f6f25f717306f6c49fca3f914d298f80e1c920cb6f9f87abebc0ca DIST mariadb-10.5.5-patches-02.tar.xz 6060 BLAKE2B 185a2016836721f76c19228ca39c1c7610c34210e23b42f254e4c4fde34c74d9c77bb0d1a441175c14938ecafea3e9575fa3b7349db826aef63e7d7e7a21901a SHA512 8a26bdbec19d45739ef7accd3cea999bde465714141532d999500df2ebd93bb98a00b8b86b1e855ea4f0cba6984b21ff09beee75372f840282a91f5dc95db432 -DIST mariadb-10.5.5.tar.gz 86880268 BLAKE2B 58430dd4e7199d674bbd4f7381a56129e067ed1bb30c171545fe9fac3a83f7db2c57cc1b577ef242deb99dd69e17a1d3cbf756031711d27b04c97a7e93e14c60 SHA512 09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45 +DIST mariadb-10.5.6.tar.gz 86884252 BLAKE2B b0230acf43d54e976c4e757139dbaa2bb6ed992b0d056728142fc7fa41bd62539be22eae5aac614ea49acf220646ee57ecc67ff1373c6aa142434e6743a4d174 SHA512 c62bd6278d389baf179962bc6f617693cf3ba748382e96963b1ef5bbee8d1c9f0964025cf00fb7ff5de088a79362b65657ed30a8adbb61fe524bfd0d8d753421 DIST mariadb-5.5.68.tar.gz 45969389 BLAKE2B 5b3a647649c614825adccbc83faa40ba330dae0a1f8005b2297cc6a44fbc00bf817f2d854af315f995e1065bd4d14a2f21a9cec44b5c78402524467d876d8157 SHA512 3419790aa88a7e2a5d80e56ca94683d22ca2d5d817dfe19904d11454f34cfc3b9d55e603295ea58580a3c9fe96a6c6f9b650e1058c4e8f2f2e82f09165436865 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88df34b6a28bb781cfd88fd4479b43273aa15946e63c7ae43d5497207edc6cc53a72bd42b8ce2e2058dfb236afd940bd0282190e98 SHA512 8f7b39017efb08e1ae98c4c68728bc86f8427b88b2a22688abf6975c6706122086dc93289beb511bbaf17cd5a790c76406e81315a11830829efe9170ce4f6a42 diff --git a/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch new file mode 100644 index 000000000000..85d378f8232c --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.3-CVE-2020-15180.patch @@ -0,0 +1,75 @@ +https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842 + +--- a/sql/wsrep_sst.cc ++++ b/sql/wsrep_sst.cc +@@ -1726,24 +1726,65 @@ static int sst_donate_other (const char* method, + return arg.err; + } + ++/* return true if character can be a part of a filename */ ++static bool filename_char(int const c) ++{ ++ return isalnum(c) || (c == '-') || (c == '_') || (c == '.'); ++} ++ ++/* return true if character can be a part of an address string */ ++static bool address_char(int const c) ++{ ++ return filename_char(c) || ++ (c == ':') || (c == '[') || (c == ']') || (c == '/'); ++} ++ ++static bool check_request_str(const char* const str, ++ bool (*check) (int c)) ++{ ++ for (size_t i(0); str[i] != '\0'; ++i) ++ { ++ if (!check(str[i])) ++ { ++ WSREP_WARN("Illegal character in state transfer request: %i (%c).", ++ str[i], str[i]); ++ return true; ++ } ++ } ++ ++ return false; ++} ++ + wsrep_cb_status_t wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx, + const void* msg, size_t msg_len, + const wsrep_gtid_t* current_gtid, + const char* state, size_t state_len, + bool bypass) + { +- /* This will be reset when sync callback is called. +- * Should we set wsrep_ready to FALSE here too? */ +- +- wsrep_config_state->set(WSREP_MEMBER_DONOR); +- + const char* method = (char*)msg; + size_t method_len = strlen (method); ++ ++ if (check_request_str(method, filename_char)) ++ { ++ WSREP_ERROR("Bad SST method name. SST canceled."); ++ return WSREP_CB_FAILURE; ++ } ++ + const char* data = method + method_len + 1; + ++ if (check_request_str(data, address_char)) ++ { ++ WSREP_ERROR("Bad SST address string. SST canceled."); ++ return WSREP_CB_FAILURE; ++ } ++ + char uuid_str[37]; + wsrep_uuid_print (¤t_gtid->uuid, uuid_str, sizeof(uuid_str)); + ++ /* This will be reset when sync callback is called. ++ * Should we set wsrep_ready to FALSE here too? */ ++ wsrep_config_state->set(WSREP_MEMBER_DONOR); ++ + wsp::env env(NULL); + if (env.error()) + { diff --git a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch new file mode 100644 index 000000000000..9658669c6e61 --- /dev/null +++ b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch @@ -0,0 +1,62 @@ +https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842 + +--- a/sql/wsrep_sst.cc ++++ b/sql/wsrep_sst.cc +@@ -1822,6 +1822,35 @@ static int sst_donate_other (const char* method, + return arg.err; + } + ++/* return true if character can be a part of a filename */ ++static bool filename_char(int const c) ++{ ++ return isalnum(c) || (c == '-') || (c == '_') || (c == '.'); ++} ++ ++/* return true if character can be a part of an address string */ ++static bool address_char(int const c) ++{ ++ return filename_char(c) || ++ (c == ':') || (c == '[') || (c == ']') || (c == '/'); ++} ++ ++static bool check_request_str(const char* const str, ++ bool (*check) (int c)) ++{ ++ for (size_t i(0); str[i] != '\0'; ++i) ++ { ++ if (!check(str[i])) ++ { ++ WSREP_WARN("Illegal character in state transfer request: %i (%c).", ++ str[i], str[i]); ++ return true; ++ } ++ } ++ ++ return false; ++} ++ + int wsrep_sst_donate(const std::string& msg, + const wsrep::gtid& current_gtid, + const bool bypass) +@@ -1833,8 +1862,21 @@ int wsrep_sst_donate(const std::string& msg, + + const char* method= msg.data(); + size_t method_len= strlen (method); ++ ++ if (check_request_str(method, filename_char)) ++ { ++ WSREP_ERROR("Bad SST method name. SST canceled."); ++ return WSREP_CB_FAILURE; ++ } ++ + const char* data= method + method_len + 1; + ++ if (check_request_str(data, address_char)) ++ { ++ WSREP_ERROR("Bad SST address string. SST canceled."); ++ return WSREP_CB_FAILURE; ++ } ++ + wsp::env env(NULL); + if (env.error()) + { diff --git a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild deleted file mode 100644 index b205f74ad1b3..000000000000 --- a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild +++ /dev/null @@ -1,892 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20190305-2052Z" -SUBSLOT="18" - -JAVA_PKG_OPT_USE="jdbc" - -# Keeping eutils in EAPI=6 for emktemp in pkg_config - -inherit eutils systemd flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user cmake-utils multilib-build - -SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz " - -# Gentoo patches to MySQL -if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then - SRC_URI="${SRC_URI} - mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 - https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 - https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 - https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" -fi - -HOMEPAGE="https://mariadb.org/" -DESCRIPTION="An enhanced, drop-in replacement for MySQL" -LICENSE="GPL-2" -SLOT="10.1/${SUBSLOT:-0}" -IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos - innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam - +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup - systemd systemtap static static-libs tcmalloc test tokudb xml yassl" - -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests -RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )" - -REQUIRED_USE="jdbc? ( extraengine server !static ) - server? ( tokudb? ( jemalloc !tcmalloc ) ) - ?? ( tcmalloc jemalloc ) - static? ( yassl !pam )" - -KEYWORDS="ppc ppc64" - -# Shorten the path because the socket path length must be shorter than 107 chars -# and we will run a mysql server during test phase -S="${WORKDIR}/mysql" - -if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then - MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" - inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" - EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras" - EGIT_CLONE_TYPE=shallow -else - MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" -fi - -PATCHES=( - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch - "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch - "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.37-enable-numa.patch - "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch -) - -# Be warned, *DEPEND are version-dependant -# These are used for both runtime and compiletime -COMMON_DEPEND=" - kernel_linux? ( - sys-process/procps:0= - dev-libs/libaio:0= - ) - >=sys-apps/sed-4 - >=sys-apps/texinfo-4.7-r1 - jemalloc? ( dev-libs/jemalloc:0= ) - tcmalloc? ( dev-util/google-perftools:0= ) - systemtap? ( >=dev-util/systemtap-1.3:0= ) - !yassl? ( - !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) - libressl? ( dev-libs/libressl:0= ) - ) - >=sys-libs/zlib-1.2.3:0= - sys-libs/ncurses:0= - !bindist? ( - sys-libs/binutils-libs:0= - >=sys-libs/readline-4.1:0= - ) - server? ( - backup? ( app-arch/libarchive:0= ) - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - sys-libs/zlib[minizip] - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - kerberos? ( virtual/krb5 ) - mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) - numa? ( sys-process/numactl ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( sys-libs/pam:0= ) - systemd? ( sys-apps/systemd:= ) - tokudb? ( app-arch/snappy ) - ) - !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) - >=dev-libs/libpcre-8.41-r1:3= - !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] ) -" -DEPEND="virtual/yacc - static? ( sys-libs/ncurses[static-libs] ) - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) - ${COMMON_DEPEND}" -RDEPEND="selinux? ( sec-policy/selinux-mysql ) - client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) - !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster - !dev-db/mariadb:0 - !dev-db/mariadb:5.5 - !dev-db/mariadb:10.2 - !dev-db/mariadb:10.3 - !dev-db/mariadb:10.4 - !dev-db/mariadb:10.5 - server? ( !prefix? ( dev-db/mysql-init-scripts ) ) - ${COMMON_DEPEND} - server? ( galera? ( - sys-apps/iproute2 - =sys-cluster/galera-25* - sst-rsync? ( sys-process/lsof ) - sst-mariabackup? ( net-misc/socat[ssl] ) - sst-xtrabackup? ( net-misc/socat[ssl] ) - ) ) - perl? ( !dev-db/mytop - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes ) - server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) -" -# For other stuff to bring us in -# dev-perl/DBD-mysql is needed by some scripts installed by MySQL -# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) - server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - fi - java-pkg-opt-2_pkg_setup - if has test ${FEATURES} && \ - use server && ! has userpriv ${FEATURES} ; then - eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - - # This should come after all of the die statements - enewgroup mysql 60 || die "problem adding 'mysql' group" - enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} - -pkg_postinst() { - # Make sure the vars are correctly initialized - mysql_init_vars - - # Create log directory securely if it does not exist - [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" - - if use server ; then - if use pam; then - einfo - elog "This install includes the PAM authentication plugin." - elog "To activate and configure the PAM plugin, please read:" - elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" - einfo - fi - - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - einfo - elog "You might want to run:" - elog "\"emerge --config =${CATEGORY}/${PF}\"" - elog "if this is a new install." - elog - elog "If you are switching server implentations, you should run the" - elog "mysql_upgrade tool." - einfo - else - einfo - elog "If you are upgrading major versions, you should run the" - elog "mysql_upgrade tool." - einfo - fi - - einfo - elog "Be sure to edit the my.cnf file to activate your cluster settings." - elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" - elog "The first time the cluster is activated, you should add" - elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." - elog "This option should then be removed for subsequent starts." - einfo - fi -} - -src_unpack() { - unpack ${A} - # Grab the patches - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack - - mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die -} - -src_prepare() { - _disable_engine() { - echo > "${S%/}/storage/${1}/CMakeLists.txt" || die - } - - _disable_plugin() { - echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die - } - - if use tcmalloc; then - echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die - fi - - # Don't build bundled xz-utils for tokudb - echo > "${S%/}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die - sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die - sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die - - local plugin - local server_plugins=( handler_socket auth_socket feedback metadata_lock_info - locale_info qc_info server_audit semisync sql_errlog ) - local test_plugins=( audit_null auth_examples daemon_example fulltext ) - if ! use server; then # These plugins are for the server - for plugin in "${server_plugins[@]}" ; do - _disable_plugin "${plugin}" - done - fi - - if ! use test; then # These plugins are only used during testing - for plugin in "${test_plugins[@]}" ; do - _disable_plugin "${plugin}" - done - fi - - # Collides with mariadb-connector-c bug 655980 - _disable_plugin auth_dialog - - # Avoid useless library checks - use mroonga || _disable_engine mroonga - use oqgraph || _disable_engine oqgraph - _disable_engine example - - cmake-utils_src_prepare - java-pkg-opt-2_src_prepare -} - -src_configure() { - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - # Bug #114895, bug #110149 - filter-flags "-O" "-O[01]" - - append-cxxflags -felide-constructors - - # bug #283926, with GCC4.4, this is required to get correct behavior. - append-flags -fno-strict-aliasing - - CMAKE_BUILD_TYPE="RelWithDebInfo" - - # debug hack wrt #497532 - mycmakeargs=( - -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" - -DINSTALL_BINDIR=bin - -DINSTALL_DOCDIR=share/doc/${PF} - -DINSTALL_DOCREADMEDIR=share/doc/${PF} - -DINSTALL_INCLUDEDIR=include/mysql - -DINSTALL_INFODIR=share/info - -DINSTALL_LIBDIR=$(get_libdir) - -DINSTALL_MANDIR=share/man - -DINSTALL_MYSQLSHAREDIR=share/mariadb - -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') - -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" - -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" - -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" - -DWITH_UNIT_TESTS=$(usex test ON OFF) - -DWITH_ZLIB=system - -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_DEFAULT_COMPILER_OPTIONS=0 - -DWITH_DEFAULT_FEATURE_SET=0 - -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" - # The build forces this to be defined when cross-compiling. We pass it - # all the time for simplicity and to make sure it is actually correct. - -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) - -DWITHOUT_CLIENTLIBS=YES - -DWITH_READLINE=$(usex bindist 1 0) - -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - -DENABLE_DTRACE=$(usex systemtap) - -DWITH_SSL=$(usex yassl bundled system) - ) - - if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins - if ! use extraengine ; then - mycmakeargs+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - mycmakeargs+=( - -DWITH_JEMALLOC=$(usex jemalloc system) - -DWITH_PCRE=system - -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DCONNECT_WITH_JDBC=$(usex jdbc) - # Build failure and autodep wrt bug 639144 - -DCONNECT_WITH_MONGO=OFF - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) - -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) - -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO - -DWITH_MARIABACKUP=$(usex backup ON OFF) - -DWITH_LIBARCHIVE=$(usex backup ON OFF) - -DWITH_SYSTEMD=$(usex systemd yes no) - -DWITH_NUMA=$(usex numa ON OFF) - -DINSTALL_SQLBENCHDIR='' - ) - - if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then - ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" - ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." - ewarn "You MUST file bugs without these variables set." - - mycmakeargs+=( - -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} - -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} - ) - - elif ! use latin1 ; then - mycmakeargs+=( - -DDEFAULT_CHARSET=utf8 - -DDEFAULT_COLLATION=utf8_general_ci - ) - else - mycmakeargs+=( - -DDEFAULT_CHARSET=latin1 - -DDEFAULT_COLLATION=latin1_swedish_ci - ) - fi - mycmakeargs+=( - -DEXTRA_CHARSETS=all - -DMYSQL_USER=mysql - -DDISABLE_SHARED=$(usex static YES NO) - -DWITH_DEBUG=$(usex debug) - -DWITH_EMBEDDED_SERVER=OFF - -DENABLED_PROFILING=$(usex profiling) - ) - - if use static; then - mycmakeargs+=( -DWITH_PIC=1 ) - fi - - if use jemalloc || use tcmalloc ; then - mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) - fi - - # Storage engines - mycmakeargs+=( - -DWITH_ARCHIVE_STORAGE_ENGINE=1 - -DWITH_BLACKHOLE_STORAGE_ENGINE=1 - -DWITH_CSV_STORAGE_ENGINE=1 - -DWITH_HEAP_STORAGE_ENGINE=1 - -DWITH_INNOBASE_STORAGE_ENGINE=1 - -DWITH_MYISAMMRG_STORAGE_ENGINE=1 - -DWITH_MYISAM_STORAGE_ENGINE=1 - -DWITH_PARTITION_STORAGE_ENGINE=1 - ) - - else - mycmakeargs+=( - -DWITHOUT_SERVER=1 - -DWITH_EMBEDDED_SERVER=OFF - -DEXTRA_CHARSETS=none - -DINSTALL_SQLBENCHDIR= - -DWITH_SYSTEMD=no - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${ED}/usr/include/mysql/server/private/config.h" || die - fi - - # Make sure the vars are correctly initialized - mysql_init_vars - - # Convenience links - einfo "Making Convenience links for mysqlcheck multi-call binary" - dosym "mysqlcheck" "/usr/bin/mysqlanalyze" - dosym "mysqlcheck" "/usr/bin/mysqlrepair" - dosym "mysqlcheck" "/usr/bin/mysqloptimize" - - # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir - if [[ -d "${ED}/usr/data" ]] ; then - rm -Rf "${ED}/usr/data" || die - fi - - # Unless they explicitly specific USE=test, then do not install the - # testsuite. It DOES have a use to be installed, esp. when you want to do a - # validation of your database configuration after tuning it. - if ! use test ; then - rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" - fi - - # Configuration stuff - einfo "Building default configuration ..." - insinto "${MY_SYSCONFDIR#${EPREFIX}}" - [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf - local mycnf_src="my.cnf-5.6-r1" - sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ - "${FILESDIR}/${mycnf_src}" \ - > "${TMPDIR}/my.cnf.ok" || die - use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" - if use latin1 ; then - sed -i \ - -e "/character-set/s|utf8|latin1|g" \ - "${TMPDIR}/my.cnf.ok" || die - fi - eprefixify "${TMPDIR}/my.cnf.ok" - newins "${TMPDIR}/my.cnf.ok" my.cnf - - if use server ; then - einfo "Including support files and sample configurations" - docinto "support-files" - local script - for script in \ - "${S}"/support-files/magic - do - [[ -f "$script" ]] && dodoc "${script}" - done - - docinto "scripts" - for script in "${S}"/scripts/mysql* ; do - [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" - done - # Manually install supporting files that conflict with other packages - # but are needed for galera and initial installation - exeinto /usr/libexec/mariadb - doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" - fi - - #Remove mytop if perl is not selected - [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" -} - -# Official test instructions: -# USE='extraengine perl server' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -src_test() { - - _disable_test() { - local rawtestname reason - rawtestname="${1}" ; shift - reason="${@}" - ewarn "test '${rawtestname}' disabled: '${reason}'" - echo ${rawtestname} : ${reason} >> "${T}/disabled.def" - } - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if ! use server ; then - einfo "Skipping server tests due to minimal build." - return 0 - fi - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - - # Run CTest (test-units) -# cmake-utils_src_test -# retstatus_unit=$? - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might run out of order - mkdir -p "${T}"/var-tests{,/log} || die - - # Run mysql tests - pushd "${TESTDIR}" > /dev/null || die - - touch "${T}/disabled.def" - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - - local t - for t in plugins.cracklib_password_check plugins.two_password_validations ; do - _disable_test "$t" "False positive due to varying policies" - done - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - rpl.rpl_semi_sync_uninstall_plugin \ - main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do - _disable_test "$t" "False positives in Gentoo" - done - - if ! use client-libs ; then - _disable_test main.plugin_auth "Needs client libraries built" - fi - - _disable_test sys_vars.sysvars_server_notembedded "Broken test" # bug #661700 required profiling always on - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" - retstatus_tests=$? - - popd > /dev/null || die - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - local failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" -} - -mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} - - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR="" - if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then - MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ - | sed -ne '/datadir/s|^--datadir=||p' \ - | tail -n1` - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ - | sed -e 's/.*=\s*//' \ - | tail -n1` - fi - fi - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR="${MY_LOCALSTATEDIR}" - einfo "Using default MY_DATADIR" - fi - elog "MySQL MY_DATADIR is ${MY_DATADIR}" - - if [[ -z "${PREVIOUS_DATADIR}" ]] ; then - if [[ -e "${MY_DATADIR}" ]] ; then - # If you get this and you're wondering about it, see bug #207636 - elog "MySQL datadir found in ${MY_DATADIR}" - elog "A new one will not be created." - PREVIOUS_DATADIR="yes" - else - PREVIOUS_DATADIR="no" - fi - export PREVIOUS_DATADIR - fi - else - if [[ ${EBUILD_PHASE} == "config" ]]; then - local new_MY_DATADIR - new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ - | sed -ne '/datadir/s|^--datadir=||p' \ - | tail -n1` - - if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then - ewarn "MySQL MY_DATADIR has changed" - ewarn "from ${MY_DATADIR}" - ewarn "to ${new_MY_DATADIR}" - MY_DATADIR="${new_MY_DATADIR}" - fi - fi - fi - - export MY_SHAREDSTATEDIR MY_SYSCONFDIR - export MY_LOCALSTATEDIR MY_LOGDIR - export MY_DATADIR -} - -pkg_config() { - _getoptval() { - local mypd="${EROOT}"/usr/bin/my_print_defaults - local section="$1" - local flag="--${2}=" - local extra_options="${3}" - "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" - } - local old_MY_DATADIR="${MY_DATADIR}" - local old_HOME="${HOME}" - # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX}/root - - # Make sure the vars are correctly initialized - mysql_init_vars - - [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" - if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then - die "Minimal builds do NOT include the MySQL server" - fi - - if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then - local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" - MY_DATADIR_s="${MY_DATADIR_s%%/}" - local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" - old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" - - if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then - if [[ -d "${MY_DATADIR_s}" ]]; then - ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" - ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" - else - elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" - mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ - || die "Moving MY_DATADIR failed" - fi - else - ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" - if [[ -d "${MY_DATADIR_s}" ]]; then - ewarn "Attempting to use ${MY_DATADIR_s}" - else - eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" - die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" - fi - fi - fi - - local pwd1="a" - local pwd2="b" - local maxtry=15 - - if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then - local tmp_mysqld_password_source= - - for tmp_mysqld_password_source in mysql client; do - einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." - MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" - if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then - if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then - ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" - MYSQL_ROOT_PASSWORD= - continue - fi - - einfo "Found password in '${tmp_mysqld_password_source}' section!" - break - fi - done - - # Sometimes --show is required to display passwords in some implementations of my_print_defaults - if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then - MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" - fi - - unset tmp_mysqld_password_source - fi - MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)" - # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)" - MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)" - MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} - - if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then - einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" - fi - if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then - einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" - fi - if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then - einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" - fi - - if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then - ewarn "You have already a MySQL database in place." - ewarn "(${ROOT}/${MY_DATADIR}/*)" - ewarn "Please rename or delete it if you wish to replace it." - die "MySQL database already exists!" - fi - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then - - einfo "Please provide a password for the mysql 'root' user now" - einfo "or through the ${HOME}/.my.cnf file." - ewarn "Avoid [\"'\\_%] characters in the password" - read -rsp " >" pwd1 ; echo - - einfo "Retype the password" - read -rsp " >" pwd2 ; echo - - if [[ "x$pwd1" != "x$pwd2" ]] ; then - die "Passwords are not the same" - fi - MYSQL_ROOT_PASSWORD="${pwd1}" - unset pwd1 pwd2 - fi - - local options - local sqltmp="$(emktemp)" - - # Fix bug 446200. Don't reference host my.cnf, needs to come first, - # see https://bugs.mysql.com/bug.php?id=31312 - use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" - - # Figure out which options we need to disable to do the setup - local helpfile="${TMPDIR}/mysqld-help" - "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null - for opt in grant-tables host-cache name-resolve networking slave-start \ - federated ssl log-bin relay-log slow-query-log external-locking \ - log-slave-updates \ - ; do - optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" - egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" - done - - einfo "Creating the mysql database and setting proper permissions on it ..." - - # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it - PID_DIR="${EROOT}/var/run/mysqld" - if [[ ! -d "${PID_DIR}" ]]; then - install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" - fi - - if [[ ! -d "${MY_DATADIR}" ]]; then - install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" - fi - - pushd "${TMPDIR}" &>/dev/null || die - - # Filling timezones, see - # https://dev.mysql.com/doc/mysql/en/time-zone-support.html - "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null - - local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) - [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) - cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) - einfo "Command: ${cmd[*]}" - su -s /bin/sh -c "${cmd[*]}" mysql \ - >"${TMPDIR}"/mysql_install_db.log 2>&1 - if [ $? -ne 0 ]; then - grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" - fi - popd &>/dev/null || die - [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ - || die "MySQL databases not installed" - - use prefix || options="${options} --user=mysql" - - local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" - local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" - local mysqld="${EROOT}/usr/sbin/mysqld \ - ${options} \ - --log-warnings=0 \ - --basedir=${EROOT}/usr \ - --datadir=${ROOT}/${MY_DATADIR} \ - --max_allowed_packet=8M \ - --net_buffer_length=16K \ - --socket=${socket} \ - --pid-file=${pidfile} \ - --tmpdir=${ROOT}/${MYSQL_TMPDIR}" - #einfo "About to start mysqld: ${mysqld}" - ebegin "Starting mysqld" - einfo "Command ${mysqld}" - ${mysqld} & - rc=$? - while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do - maxtry=$((${maxtry}-1)) - echo -n "." - sleep 1 - done - eend $rc - - if ! [[ -S "${socket}" ]]; then - die "Completely failed to start up mysqld with: ${mysqld}" - fi - - ebegin "Setting root password" - # Do this from memory, as we don't want clear text passwords in temp files - local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" - "${EROOT}/usr/bin/mysql" \ - "--socket=${socket}" \ - -hlocalhost \ - -e "${sql}" - eend $? - - if [[ -n "${sqltmp}" ]] ; then - ebegin "Loading \"zoneinfo\", this step may require a few seconds" - "${EROOT}/usr/bin/mysql" \ - "--socket=${socket}" \ - -hlocalhost \ - -uroot \ - --password="${MYSQL_ROOT_PASSWORD}" \ - mysql < "${sqltmp}" - rc=$? - eend $? - [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" - fi - - # Stop the server and cleanup - einfo "Stopping the server ..." - kill $(< "${pidfile}" ) - rm -f "${sqltmp}" - wait %1 - einfo "Done" -} diff --git a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild deleted file mode 100644 index 616c340d5a83..000000000000 --- a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild +++ /dev/null @@ -1,925 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -SUBSLOT="18" - -JAVA_PKG_OPT_USE="jdbc" - -# Keeping eutils in EAPI=6 for emktemp in pkg_config - -inherit eutils systemd flag-o-matic prefix toolchain-funcs \ - multiprocessing java-pkg-opt-2 cmake-utils multilib-build - -# Patch version -PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.1.45-patches-04.tar.xz" - -SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz - ${PATCH_SET}" - -HOMEPAGE="https://mariadb.org/" -DESCRIPTION="An enhanced, drop-in replacement for MySQL" -LICENSE="GPL-2" -SLOT="10.1/${SUBSLOT:-0}" -IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos - innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam - +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup - systemd systemtap static static-libs tcmalloc test tokudb xml yassl" - -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )" - -REQUIRED_USE="jdbc? ( extraengine server !static ) - server? ( tokudb? ( jemalloc !tcmalloc ) ) - ?? ( tcmalloc jemalloc ) - static? ( yassl !pam )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# Shorten the path because the socket path length must be shorter than 107 chars -# and we will run a mysql server during test phase -S="${WORKDIR}/mysql" - -# Be warned, *DEPEND are version-dependant -# These are used for both runtime and compiletime -COMMON_DEPEND=" - kernel_linux? ( - sys-process/procps:0= - dev-libs/libaio:0= - ) - >=sys-apps/sed-4 - >=sys-apps/texinfo-4.7-r1 - jemalloc? ( dev-libs/jemalloc:0= ) - tcmalloc? ( dev-util/google-perftools:0= ) - systemtap? ( >=dev-util/systemtap-1.3:0= ) - !yassl? ( - !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) - libressl? ( dev-libs/libressl:0= ) - ) - >=sys-libs/zlib-1.2.3:0= - sys-libs/ncurses:0= - !bindist? ( - sys-libs/binutils-libs:0= - >=sys-libs/readline-4.1:0= - ) - server? ( - backup? ( app-arch/libarchive:0= ) - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - sys-libs/zlib[minizip] - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - kerberos? ( virtual/krb5 ) - mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) - numa? ( sys-process/numactl ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( sys-libs/pam:0= ) - systemd? ( sys-apps/systemd:= ) - tokudb? ( app-arch/snappy ) - ) - !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) - >=dev-libs/libpcre-8.41-r1:3= - !client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] ) -" -DEPEND="virtual/yacc - static? ( sys-libs/ncurses[static-libs] ) - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - server? ( - extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) - test? ( acct-group/mysql acct-user/mysql ) - ) - ${COMMON_DEPEND}" -RDEPEND="selinux? ( sec-policy/selinux-mysql ) - client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) - !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster - !dev-db/mariadb:0 - !dev-db/mariadb:5.5 - !dev-db/mariadb:10.2 - !dev-db/mariadb:10.3 - !dev-db/mariadb:10.4 - !dev-db/mariadb:10.5 - ${COMMON_DEPEND} - server? ( - galera? ( - sys-apps/iproute2 - =sys-cluster/galera-25* - sst-rsync? ( sys-process/lsof ) - sst-mariabackup? ( net-misc/socat[ssl] ) - sst-xtrabackup? ( net-misc/socat[ssl] ) - ) - !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) - extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) - ) - perl? ( - !dev-db/mytop - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes - ) -" -# For other stuff to bring us in -# dev-perl/DBD-mysql is needed by some scripts installed by MySQL -# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) - server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" - -mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} - - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR="" - if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then - MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ - | sed -ne '/datadir/s|^--datadir=||p' \ - | tail -n1) - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ - | sed -e 's/.*=\s*//' \ - | tail -n1) - fi - fi - if [[ -z "${MY_DATADIR}" ]] ; then - MY_DATADIR="${MY_LOCALSTATEDIR}" - einfo "Using default MY_DATADIR" - fi - elog "MySQL MY_DATADIR is ${MY_DATADIR}" - - if [[ -z "${PREVIOUS_DATADIR}" ]] ; then - if [[ -e "${MY_DATADIR}" ]] ; then - # If you get this and you're wondering about it, see bug #207636 - elog "MySQL datadir found in ${MY_DATADIR}" - elog "A new one will not be created." - PREVIOUS_DATADIR="yes" - else - PREVIOUS_DATADIR="no" - fi - export PREVIOUS_DATADIR - fi - else - if [[ ${EBUILD_PHASE} == "config" ]]; then - local new_MY_DATADIR - new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \ - | sed -ne '/datadir/s|^--datadir=||p' \ - | tail -n1) - - if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then - ewarn "MySQL MY_DATADIR has changed" - ewarn "from ${MY_DATADIR}" - ewarn "to ${new_MY_DATADIR}" - MY_DATADIR="${new_MY_DATADIR}" - fi - fi - fi - - export MY_SHAREDSTATEDIR MY_SYSCONFDIR - export MY_LOCALSTATEDIR MY_LOGDIR - export MY_DATADIR -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - - if has test ${FEATURES} ; then - # Bug #213475 - MySQL _will_ object strenuously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if ! has userpriv ${FEATURES} ; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - fi - fi - - java-pkg-opt-2_pkg_setup -} - -src_unpack() { - unpack ${A} - - mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die -} - -src_prepare() { - eapply "${WORKDIR}"/mariadb-patches - - eapply_user - - _disable_engine() { - echo > "${S%/}/storage/${1}/CMakeLists.txt" || die - } - - _disable_plugin() { - echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die - } - - if use tcmalloc; then - echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die - fi - - # Don't build bundled xz-utils for tokudb - echo > "${S%/}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die - sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die - sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die - - # Fix -fno-common error - sed -i -e '/^datasink_t datasink_buffer;$/d' extra/mariabackup/xbstream.c || die - - local plugin - local server_plugins=( handler_socket auth_socket feedback metadata_lock_info - locale_info qc_info server_audit semisync sql_errlog ) - local test_plugins=( audit_null auth_examples daemon_example fulltext ) - if ! use server; then # These plugins are for the server - for plugin in "${server_plugins[@]}" ; do - _disable_plugin "${plugin}" - done - fi - - if ! use test; then # These plugins are only used during testing - for plugin in "${test_plugins[@]}" ; do - _disable_plugin "${plugin}" - done - fi - - # Collides with mariadb-connector-c bug 655980 - _disable_plugin auth_dialog - - # Avoid useless library checks - use mroonga || _disable_engine mroonga - use oqgraph || _disable_engine oqgraph - _disable_engine example - - cmake-utils_src_prepare - java-pkg-opt-2_src_prepare -} - -src_configure() { - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - # Bug #114895, bug #110149 - filter-flags "-O" "-O[01]" - - append-cxxflags -felide-constructors - - # bug #283926, with GCC4.4, this is required to get correct behavior. - append-flags -fno-strict-aliasing - - CMAKE_BUILD_TYPE="RelWithDebInfo" - - # debug hack wrt #497532 - mycmakeargs=( - -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" - -DINSTALL_BINDIR=bin - -DINSTALL_DOCDIR=share/doc/${PF} - -DINSTALL_DOCREADMEDIR=share/doc/${PF} - -DINSTALL_INCLUDEDIR=include/mysql - -DINSTALL_INFODIR=share/info - -DINSTALL_LIBDIR=$(get_libdir) - -DINSTALL_MANDIR=share/man - -DINSTALL_MYSQLSHAREDIR=share/mariadb - -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') - -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin - -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" - -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" - -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" - -DWITH_UNIT_TESTS=$(usex test ON OFF) - -DWITH_ZLIB=system - -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" - -DWITH_DEFAULT_COMPILER_OPTIONS=0 - -DWITH_DEFAULT_FEATURE_SET=0 - -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" - # The build forces this to be defined when cross-compiling. We pass it - # all the time for simplicity and to make sure it is actually correct. - -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) - -DWITHOUT_CLIENTLIBS=YES - -DWITH_READLINE=$(usex bindist 1 0) - -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - -DENABLE_DTRACE=$(usex systemtap) - -DWITH_SSL=$(usex yassl bundled system) - -DPLUGIN_CLIENT_ED25519=NO - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO - ) - - if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins - if ! use extraengine ; then - mycmakeargs+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - mycmakeargs+=( - -DWITH_JEMALLOC=$(usex jemalloc system) - -DWITH_PCRE=system - -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DCONNECT_WITH_JDBC=$(usex jdbc) - # Build failure and autodep wrt bug 639144 - -DCONNECT_WITH_MONGO=OFF - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) - -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) - -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO) - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO) - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO - -DWITH_MARIABACKUP=$(usex backup ON OFF) - -DWITH_LIBARCHIVE=$(usex backup ON OFF) - -DWITH_SYSTEMD=$(usex systemd yes no) - -DWITH_NUMA=$(usex numa ON OFF) - -DINSTALL_SQLBENCHDIR='' - ) - - if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then - ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" - ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." - ewarn "You MUST file bugs without these variables set." - - mycmakeargs+=( - -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} - -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} - ) - - elif ! use latin1 ; then - mycmakeargs+=( - -DDEFAULT_CHARSET=utf8 - -DDEFAULT_COLLATION=utf8_general_ci - ) - else - mycmakeargs+=( - -DDEFAULT_CHARSET=latin1 - -DDEFAULT_COLLATION=latin1_swedish_ci - ) - fi - mycmakeargs+=( - -DEXTRA_CHARSETS=all - -DMYSQL_USER=mysql - -DDISABLE_SHARED=$(usex static YES NO) - -DWITH_DEBUG=$(usex debug) - -DWITH_EMBEDDED_SERVER=OFF - -DENABLED_PROFILING=$(usex profiling) - ) - - if use static; then - mycmakeargs+=( -DWITH_PIC=1 ) - fi - - if use jemalloc || use tcmalloc ; then - mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) - fi - - # Storage engines - mycmakeargs+=( - -DWITH_ARCHIVE_STORAGE_ENGINE=1 - -DWITH_BLACKHOLE_STORAGE_ENGINE=1 - -DWITH_CSV_STORAGE_ENGINE=1 - -DWITH_HEAP_STORAGE_ENGINE=1 - -DWITH_INNOBASE_STORAGE_ENGINE=1 - -DWITH_MYISAMMRG_STORAGE_ENGINE=1 - -DWITH_MYISAM_STORAGE_ENGINE=1 - -DWITH_PARTITION_STORAGE_ENGINE=1 - ) - - else - mycmakeargs+=( - -DWITHOUT_SERVER=1 - -DWITH_EMBEDDED_SERVER=OFF - -DEXTRA_CHARSETS=none - -DINSTALL_SQLBENCHDIR= - -DWITH_SYSTEMD=no - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -# Official test instructions: -# USE='extraengine perl server' \ -# FEATURES='test userpriv' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -src_test() { - _disable_test() { - local rawtestname bug reason - rawtestname="${1}" ; shift - bug="${1}" ; shift - reason="${@}" - ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" - echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def" - } - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if ! use server ; then - einfo "Skipping server tests due to minimal build." - return 0 - fi - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - - if [[ -z "${MTR_PARALLEL}" ]] ; then - local -x MTR_PARALLEL=$(makeopts_jobs) - - if [[ ${MTR_PARALLEL} -gt 4 ]] ; then - # Running multiple tests in parallel usually require higher ulimit - # and fs.aio-max-nr setting. In addition, tests like main.multi_update - # are known to hit timeout when system is busy. - # To avoid test failure we will limit MTR_PARALLEL to 4 instead of - # using "auto". - local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" - info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" - einfo "${info_msg}" - unset info_msg - MTR_PARALLEL=4 - fi - else - einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" - fi - - # Try to increase file limits to increase test coverage - if ! ulimit -n 16500 1>/dev/null 2>&1 ; then - # Upper limit comes from parts.partition_* tests - ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." - - if ! ulimit -n 4162 1>/dev/null 2>&1 ; then - # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' - ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." - - if ! ulimit -n 3000 1>/dev/null 2>&1 ; then - ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." - else - einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." - fi - else - einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." - fi - else - einfo "Will run test suite with open file limit set to 16500 (best test coverage)." - fi - - # create directories because mysqladmin might run out of order - mkdir -p "${T}"/var-tests{,/log} || die - - cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die - - local -a disabled_tests - disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" ) - disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" ) - disabled_tests+=( "main.func_time;0;Dependent on time test was written" ) - disabled_tests+=( "main.grant;0;Sporadically failing test" ) - disabled_tests+=( "main.join_cache;0;Sporadically failing test" ) - disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" ) - disabled_tests+=( "main.stat_tables;0;Sporadically failing test" ) - disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" ) - disabled_tests+=( "mariabackup.*;0;Broken test suite" ) - disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" ) - disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" ) - disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" ) - disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" ) - - if ! use latin1 ; then - disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" ) - disabled_tests+=( "main.information_schema;0;Requires USE=latin1" ) - disabled_tests+=( "main.mysql;0;Requires USE=latin1" ) - disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" ) - fi - - if ! use profiling ; then - disabled_tests+=( "sys_vars.sysvars_server_notembedded;0;Requires USE=profiling" ) - fi - - local test_infos_str test_infos_arr - for test_infos_str in "${disabled_tests[@]}" ; do - IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" - - if [[ ${#test_infos_arr[@]} != 3 ]] ; then - die "Invalid test data set, not matching format: ${test_infos_str}" - fi - - _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" - done - unset test_infos_str test_infos_arr - - # run mysql-test tests - pushd "${TESTDIR}" &>/dev/null || die - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" - retstatus_tests=$? - - popd &>/dev/null || die - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - local failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" -} - -src_install() { - cmake-utils_src_install - - # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${ED}/usr/include/mysql/server/private/config.h" || die - fi - - # Make sure the vars are correctly initialized - mysql_init_vars - - # Convenience links - einfo "Making Convenience links for mysqlcheck multi-call binary" - dosym "mysqlcheck" "/usr/bin/mysqlanalyze" - dosym "mysqlcheck" "/usr/bin/mysqlrepair" - dosym "mysqlcheck" "/usr/bin/mysqloptimize" - - # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir - if [[ -d "${ED}/usr/data" ]] ; then - rm -Rf "${ED}/usr/data" || die - fi - - # Unless they explicitly specific USE=test, then do not install the - # testsuite. It DOES have a use to be installed, esp. when you want to do a - # validation of your database configuration after tuning it. - if ! use test ; then - rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test" - fi - - # Configuration stuff - einfo "Building default configuration ..." - insinto "${MY_SYSCONFDIR#${EPREFIX}}" - [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf - local mycnf_src="my.cnf-5.6-r1" - sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ - "${FILESDIR}/${mycnf_src}" \ - > "${TMPDIR}/my.cnf.ok" || die - use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR}/my.cnf.ok" - if use latin1 ; then - sed -i \ - -e "/character-set/s|utf8|latin1|g" \ - "${TMPDIR}/my.cnf.ok" || die - fi - eprefixify "${TMPDIR}/my.cnf.ok" - newins "${TMPDIR}/my.cnf.ok" my.cnf - - if use server ; then - einfo "Including support files and sample configurations" - docinto "support-files" - local script - for script in \ - "${S}"/support-files/magic - do - [[ -f "$script" ]] && dodoc "${script}" - done - - docinto "scripts" - for script in "${S}"/scripts/mysql* ; do - [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" - done - # Manually install supporting files that conflict with other packages - # but are needed for galera and initial installation - exeinto /usr/libexec/mariadb - doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" - fi - - #Remove mytop if perl is not selected - [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} - -pkg_postinst() { - # Make sure the vars are correctly initialized - mysql_init_vars - - # Create log directory securely if it does not exist - [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" - - if use server ; then - if use pam; then - einfo - elog "This install includes the PAM authentication plugin." - elog "To activate and configure the PAM plugin, please read:" - elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/" - einfo - fi - - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - einfo - elog "You might want to run:" - elog "\"emerge --config =${CATEGORY}/${PF}\"" - elog "if this is a new install." - elog - elog "If you are switching server implentations, you should run the" - elog "mysql_upgrade tool." - einfo - else - einfo - elog "If you are upgrading major versions, you should run the" - elog "mysql_upgrade tool." - einfo - fi - - einfo - elog "Be sure to edit the my.cnf file to activate your cluster settings." - elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" - elog "The first time the cluster is activated, you should add" - elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." - elog "This option should then be removed for subsequent starts." - einfo - fi -} - -pkg_config() { - _getoptval() { - local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults - local section="$1" - local flag="--${2}=" - local extra_options="${3}" - "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp" - } - local old_MY_DATADIR="${MY_DATADIR}" - local old_HOME="${HOME}" - # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX}/root - - # Make sure the vars are correctly initialized - mysql_init_vars - - [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR" - if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then - die "Minimal builds do NOT include the MySQL server" - fi - - if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then - local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" - MY_DATADIR_s="${MY_DATADIR_s%%/}" - local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" - old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" - - if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then - if [[ -d "${MY_DATADIR_s}" ]]; then - ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" - ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" - else - elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}" - mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \ - || die "Moving MY_DATADIR failed" - fi - else - ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist" - if [[ -d "${MY_DATADIR_s}" ]]; then - ewarn "Attempting to use ${MY_DATADIR_s}" - else - eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" - die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" - fi - fi - fi - - local pwd1="a" - local pwd2="b" - local maxtry=15 - - if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then - local tmp_mysqld_password_source= - - for tmp_mysqld_password_source in mysql client; do - einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." - MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" - if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then - if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then - ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" - MYSQL_ROOT_PASSWORD= - continue - fi - - einfo "Found password in '${tmp_mysqld_password_source}' section!" - break - fi - done - - # Sometimes --show is required to display passwords in some implementations of my_print_defaults - if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then - MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" - fi - - unset tmp_mysqld_password_source - fi - MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)" - # These are dir+prefix - MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)" - MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} - MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)" - MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} - - if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then - einfo "Creating MySQL tmpdir $MYSQL_TMPDIR" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR" - fi - if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then - einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN" - fi - if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then - einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG" - install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG" - fi - - if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then - ewarn "You have already a MySQL database in place." - ewarn "(${ROOT}/${MY_DATADIR}/*)" - ewarn "Please rename or delete it if you wish to replace it." - die "MySQL database already exists!" - fi - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then - - einfo "Please provide a password for the mysql 'root' user now" - einfo "or through the ${HOME}/.my.cnf file." - ewarn "Avoid [\"'\\_%] characters in the password" - read -rsp " >" pwd1 ; echo - - einfo "Retype the password" - read -rsp " >" pwd2 ; echo - - if [[ "x$pwd1" != "x$pwd2" ]] ; then - die "Passwords are not the same" - fi - MYSQL_ROOT_PASSWORD="${pwd1}" - unset pwd1 pwd2 - fi - - local options - local sqltmp="$(emktemp)" - - # Fix bug 446200. Don't reference host my.cnf, needs to come first, - # see https://bugs.mysql.com/bug.php?id=31312 - use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" - - # Figure out which options we need to disable to do the setup - local helpfile="${TMPDIR}/mysqld-help" - "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null - for opt in grant-tables host-cache name-resolve networking slave-start \ - federated ssl log-bin relay-log slow-query-log external-locking \ - log-slave-updates \ - ; do - optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" - egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" - done - - einfo "Creating the mysql database and setting proper permissions on it ..." - - # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it - PID_DIR="${EROOT}/var/run/mysqld" - if [[ ! -d "${PID_DIR}" ]]; then - install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory" - fi - - if [[ ! -d "${MY_DATADIR}" ]]; then - install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory" - fi - - pushd "${TMPDIR}" &>/dev/null || die - - # Filling timezones, see - # https://dev.mysql.com/doc/mysql/en/time-zone-support.html - "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null - - local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" ) - [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" ) - cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ) - einfo "Command: ${cmd[*]}" - su -s /bin/sh -c "${cmd[*]}" mysql \ - >"${TMPDIR}"/mysql_install_db.log 2>&1 - if [ $? -ne 0 ]; then - grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" - fi - popd &>/dev/null || die - [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ - || die "MySQL databases not installed" - - use prefix || options="${options} --user=mysql" - - local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" - local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" - local mysqld="${EROOT}/usr/sbin/mysqld \ - ${options} \ - --log-warnings=0 \ - --basedir=${EROOT}/usr \ - --datadir=${ROOT}/${MY_DATADIR} \ - --max_allowed_packet=8M \ - --net_buffer_length=16K \ - --socket=${socket} \ - --pid-file=${pidfile} \ - --tmpdir=${ROOT}/${MYSQL_TMPDIR}" - #einfo "About to start mysqld: ${mysqld}" - ebegin "Starting mysqld" - einfo "Command ${mysqld}" - ${mysqld} & - rc=$? - while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do - maxtry=$((${maxtry}-1)) - echo -n "." - sleep 1 - done - eend $rc - - if ! [[ -S "${socket}" ]]; then - die "Completely failed to start up mysqld with: ${mysqld}" - fi - - ebegin "Setting root password" - # Do this from memory, as we don't want clear text passwords in temp files - local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES" - "${EROOT}/usr/bin/mysql" \ - "--socket=${socket}" \ - -hlocalhost \ - -e "${sql}" - eend $? - - if [[ -n "${sqltmp}" ]] ; then - ebegin "Loading \"zoneinfo\", this step may require a few seconds" - "${EROOT}/usr/bin/mysql" \ - "--socket=${socket}" \ - -hlocalhost \ - -uroot \ - --password="${MYSQL_ROOT_PASSWORD}" \ - mysql < "${sqltmp}" - rc=$? - eend $? - [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" - fi - - # Stop the server and cleanup - einfo "Stopping the server ..." - kill $(< "${pidfile}" ) - rm -f "${sqltmp}" - wait %1 - einfo "Done" -} diff --git a/dev-db/mariadb/mariadb-10.1.46.ebuild b/dev-db/mariadb/mariadb-10.1.47.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-10.1.46.ebuild rename to dev-db/mariadb/mariadb-10.1.47.ebuild diff --git a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.2.32-r2.ebuild rename to dev-db/mariadb/mariadb-10.2.32-r3.ebuild index 7476d450f208..7dec09850927 100644 --- a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild +++ b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild @@ -232,6 +232,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mariadb-patches + eapply "${FILESDIR}"/mariadb-10.3-CVE-2020-15180.patch eapply_user diff --git a/dev-db/mariadb/mariadb-10.2.33.ebuild b/dev-db/mariadb/mariadb-10.2.34.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-10.2.33.ebuild rename to dev-db/mariadb/mariadb-10.2.34.ebuild diff --git a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.3.23-r2.ebuild rename to dev-db/mariadb/mariadb-10.3.23-r3.ebuild index 815d86f66db1..fdadccc6415f 100644 --- a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild +++ b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild @@ -238,6 +238,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mariadb-patches + eapply "${FILESDIR}"/mariadb-10.3-CVE-2020-15180.patch eapply_user diff --git a/dev-db/mariadb/mariadb-10.3.24.ebuild b/dev-db/mariadb/mariadb-10.3.25.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-10.3.24.ebuild rename to dev-db/mariadb/mariadb-10.3.25.ebuild diff --git a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild similarity index 99% rename from dev-db/mariadb/mariadb-10.4.13-r2.ebuild rename to dev-db/mariadb/mariadb-10.4.13-r3.ebuild index f879d6f9a0ef..d87c5a8beba6 100644 --- a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild +++ b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild @@ -223,6 +223,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mariadb-patches + eapply "${FILESDIR}"/mariadb-10.4-CVE-2020-15180.patch eapply_user diff --git a/dev-db/mariadb/mariadb-10.4.14.ebuild b/dev-db/mariadb/mariadb-10.4.15.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-10.4.14.ebuild rename to dev-db/mariadb/mariadb-10.4.15.ebuild diff --git a/dev-db/mariadb/mariadb-10.5.5.ebuild b/dev-db/mariadb/mariadb-10.5.6.ebuild similarity index 100% rename from dev-db/mariadb/mariadb-10.5.5.ebuild rename to dev-db/mariadb/mariadb-10.5.6.ebuild diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz index 26f2789150d4..6c4e5eaf5ef3 100644 Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild index bf869183a40e..d4fb704a32a0 100644 --- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild +++ b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -17,7 +17,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-haskell/binary-0.4:=[profile?] - >=dev-lang/ghc-6.10.4:=" +RDEPEND=">=dev-lang/ghc-7.4.1:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild index e4a2f8f9a1f0..bb40bc69477e 100644 --- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild +++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -18,6 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="dev-haskell/data-default-class:=[profile?] - >=dev-lang/ghc-6.10.4:=" + >=dev-lang/ghc-7.4.1:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild index d22380bc7c60..6fbc7ae0ea60 100644 --- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild +++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="dev-haskell/data-default-class:=[profile?] - dev-haskell/dlist:=[profile?] - >=dev-lang/ghc-6.10.4:=" + dev-haskell/dlist:=[profile?] + >=dev-lang/ghc-7.4.1:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild index f07bbb601702..c10b95079d9d 100644 --- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild +++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.5.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal diff --git a/dev-haskell/data-default/Manifest b/dev-haskell/data-default/Manifest index 431e11d74cd2..d3907f2f17a0 100644 --- a/dev-haskell/data-default/Manifest +++ b/dev-haskell/data-default/Manifest @@ -1 +1 @@ -DIST data-default-0.5.3.tar.gz 1623 BLAKE2B 365de6448edfdaec1b852e89eb31faa323f0ab5f6fc101247f0a16d76680f98fea751c524fa3fe5b697c927eac3cf4c778a37eb5ff0fbcf0daf8bb3ab27f4220 SHA512 57cb632ccc6c9b0973594c7c5944574f4e7e78f980194d4205bb14a6e5aa1bd3e92723f3b80cfeac301ae663b2a22925503a03ecb5311ebc08077fe06022817e +DIST data-default-0.7.1.1.tar.gz 1627 BLAKE2B 3d711bbc04c00c1918377d15fefaf394bf69ae877d828f00a17c20b08fa635a6be40582222a5973d2c56b96c81d89175af9f05f66ef3c12bddab29859bb09f88 SHA512 a31260c71178641e41f16fc504620f19ad04a44d2d095c96225b6027184c01ec0bf47effab5344816e438d7c37e34189255a9d3a5d643219b37054dde679d1bd diff --git a/dev-haskell/data-default/data-default-0.5.3.ebuild b/dev-haskell/data-default/data-default-0.7.1.1.ebuild similarity index 55% rename from dev-haskell/data-default/data-default-0.5.3.ebuild rename to dev-haskell/data-default/data-default-0.7.1.1.ebuild index 56020670cb80..290d9ff69506 100644 --- a/dev-haskell/data-default/data-default-0.5.3.ebuild +++ b/dev-haskell/data-default/data-default-0.7.1.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -17,11 +17,12 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -RDEPEND="dev-haskell/data-default-class:=[profile?] - dev-haskell/data-default-instances-base:=[profile?] - dev-haskell/data-default-instances-containers:=[profile?] - dev-haskell/data-default-instances-dlist:=[profile?] - dev-haskell/data-default-instances-old-locale:=[profile?] - >=dev-lang/ghc-6.10.4:=" +RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?] + dev-haskell/data-default-instances-containers:=[profile?] + dev-haskell/data-default-instances-dlist:=[profile?] + dev-haskell/data-default-instances-old-locale:=[profile?] + >=dev-lang/ghc-7.4.1:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild index cb9557f7a1e5..0977eafb57c5 100644 --- a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild +++ b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.5.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild index 5f08f8c4b4fb..afead2b93813 100644 --- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild +++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.4.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild index 7bc5f390a18b..1f99ae213b17 100644 --- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild +++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.9999 +# ebuild generated by hackport 0.6.6.9999 -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" +CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Data encoding library" diff --git a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild index e0236bc18c74..5f0a6a09eddb 100644 --- a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild +++ b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.2.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -17,6 +17,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-lang/ghc-6.10.4:=" +RDEPEND=">=dev-lang/ghc-7.4.1:= +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8" + >=dev-haskell/cabal-1.8 +" diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild index b4c7d1999a00..45b7a198e8d7 100644 --- a/dev-haskell/digest/digest-0.0.1.2.ebuild +++ b/dev-haskell/digest/digest-0.0.1.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.3.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -17,7 +17,9 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=">=dev-lang/ghc-6.10.4:= - sys-libs/zlib" +RDEPEND=">=dev-lang/ghc-7.4.1:= + sys-libs/zlib +" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6" + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/digest/metadata.xml b/dev-haskell/digest/metadata.xml index 06e7bab845b7..b7878815d80d 100644 --- a/dev-haskell/digest/metadata.xml +++ b/dev-haskell/digest/metadata.xml @@ -5,9 +5,4 @@ haskell@gentoo.org Gentoo Haskell - - This package provides efficient cryptographic hash implementations for - strict and lazy bytestrings. For now, CRC32 and Adler32 are supported; - they are implemented as FFI bindings to efficient code from zlib. - diff --git a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild index 9ec58982482f..1d0e064b63b4 100644 --- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild +++ b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.7.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild index e31f460a78d0..2af6d2945e1d 100644 --- a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild +++ b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.4.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal @@ -20,9 +20,8 @@ IUSE="" RDEPEND="dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] - dev-haskell/transformers:=[profile?] - >=dev-lang/ghc-7.4.1:= + >=dev-lang/ghc-7.8.2:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 + >=dev-haskell/cabal-1.18.1.3 " diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml index 927e4b37372f..b7878815d80d 100644 --- a/dev-haskell/djinn-ghc/metadata.xml +++ b/dev-haskell/djinn-ghc/metadata.xml @@ -5,9 +5,4 @@ haskell@gentoo.org Gentoo Haskell - - Djinn uses an theorem prover for intuitionistic propositional logic - to generate a Haskell expression when given a type. - This is the bridge from djinn-lib to GHC API. - diff --git a/dev-haskell/drbg/drbg-0.5.5.ebuild b/dev-haskell/drbg/drbg-0.5.5.ebuild index 9437a37de532..092def8c5f83 100644 --- a/dev-haskell/drbg/drbg-0.5.5.ebuild +++ b/dev-haskell/drbg/drbg-0.5.5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -# ebuild generated by hackport 0.4.6.9999 +# ebuild generated by hackport 0.6.6.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -35,8 +35,7 @@ RDEPEND=">=dev-haskell/cereal-0.5:=[profile?] /dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - # Note: we explicitly install docs into: - # /usr/share/doc/${PF}/{doc,lib,erts-*} - # To maintain that layout we gather everything in 'html-docs'. - # See bug #684376. - mkdir html-docs || die - mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r2 epmd - newconfd "${FILESDIR}"/epmd.confd-r2 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest index 5fd39c22ef4a..43b1e8d6ceac 100644 --- a/dev-lang/nasm/Manifest +++ b/dev-lang/nasm/Manifest @@ -1,2 +1 @@ -DIST nasm-2.15.03.tar.xz 984060 BLAKE2B f6d6e7618e23d1b6ab89620ed37b3539e18dc5d4c800796afea0242250e9148eb7a59cbc9a9633a971fe4d000373b9f362c2be2bd7b08fc69a61dd7e31368298 SHA512 be98e8e0a3b5f5296bc941a7bbcbf44c4084c65d11aed60d17a803b9647d59bd14ec06e780ac22c4bbe8869625eb8e6139d18a88e25310edfce0fe0fc0172950 DIST nasm-2.15.05.tar.xz 995732 BLAKE2B a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35 SHA512 512f90a2584f1c5811429274b97c64a2cedf37b9fdeffb1bcd0ea64afd9ecc19a2d7877ca8f1e05393aa324153fc9f39ea51dacbf8d25a7d5a2d7728c925dba7 diff --git a/dev-lang/nasm/nasm-2.15.03.ebuild b/dev-lang/nasm/nasm-2.15.03.ebuild deleted file mode 100644 index c8a16b87337d..000000000000 --- a/dev-lang/nasm/nasm-2.15.03.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="groovy little assembler" -HOMEPAGE="https://www.nasm.us/" -SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND="" -DEPEND="" -# [fonts note] doc/psfonts.ph defines ordered list of font preference. -# Currently 'media-fonts/source-pro' is most preferred and is able to -# satisfy all 6 font flavours: tilt, chapter, head, etc. -BDEPEND=" - dev-lang/perl - doc? ( - app-text/ghostscript-gpl - dev-perl/Font-TTF - dev-perl/Sort-Versions - media-fonts/source-pro - virtual/perl-File-Spec - ) -" - -S=${WORKDIR}/${P/_} - -PATCHES=( - "${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch -) - -src_compile() { - default - use doc && emake doc -} - -src_install() { - default - emake DESTDIR="${D}" install_rdf $(usex doc install_doc '') -} diff --git a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild index d3de9261865a..9efe3a6bb1ea 100644 --- a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild +++ b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar LICENSE="BSD-2" SLOT="2" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Internal Python project hack. Do not copy it. Ever. IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" diff --git a/dev-lang/python/python-2.7.18-r4.ebuild b/dev-lang/python/python-2.7.18-r4.ebuild index a8bfd3ff223b..3dc59779b569 100644 --- a/dev-lang/python/python-2.7.18-r4.ebuild +++ b/dev-lang/python/python-2.7.18-r4.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 47c537d2155c..cea4f9086695 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index 70200d967785..74f9cdbfcb00 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,3 +1,3 @@ DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089 DIST efl-1.24.4.tar.xz 72283172 BLAKE2B 4e21b21108337fdf3fa7be55e804f25f32dd8dc6a1743819910d83da713bae28cb4771f2f0df5d392a6f542158ed3c48566fef8d8dfaad9c65747f9a8ee1560a SHA512 5796b33152e0375196d54557803db5928bfc45267250b80406043157193773084c39482bca40dc6811f4a3dd53d416b0d3b8317405923add0560debb24a3a385 -DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f +DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8 diff --git a/dev-libs/efl/efl-1.25.0-r1.ebuild b/dev-libs/efl/efl-1.25.1.ebuild similarity index 98% rename from dev-libs/efl/efl-1.25.0-r1.ebuild rename to dev-libs/efl/efl-1.25.1.ebuild index be750ab8e3a4..ae3174cf3a5c 100644 --- a/dev-libs/efl/efl-1.25.0-r1.ebuild +++ b/dev-libs/efl/efl-1.25.1.ebuild @@ -133,8 +133,8 @@ BDEPEND="virtual/pkgconfig pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0 - /usr/$(get_libdir)/libefreet_mime.so.1.25.0" + QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1 + /usr/$(get_libdir)/libefreet_mime.so.1.25.1" } src_prepare() { diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index 4a7831178ecf..667f015eed5a 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1 +1,2 @@ DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0 +DIST libinput-1.16.2.tar.xz 595632 BLAKE2B 0010ee7495e35d093d9cff72195433cfd571fb0b6d2bfbfa61b19eb6baa6cf6d00728673408d9d2427c3cb948e146ffd5a0184fe9a7ca3cc9bf8889b64a55115 SHA512 3394faeb0cdb0a543624e150f04a98f3bce8d67438e47455808bde8eec8ea9cdafb86056e5f8d3431352ae33714e490c55edeb51e0af1972c68fca07c1ef1daa diff --git a/dev-libs/libinput/libinput-1.16.2.ebuild b/dev-libs/libinput/libinput-1.16.2.ebuild new file mode 100644 index 000000000000..e2ae19212794 --- /dev/null +++ b/dev-libs/libinput/libinput-1.16.2.ebuild @@ -0,0 +1,88 @@ +# Copyright 2014-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit meson python-any-r1 udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput" +SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/10" +[[ "$(ver_cut 3)" -gt 900 ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc input_devices_wacom test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( + $(python_gen_any_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}] + ') + >=app-doc/doxygen-1.8.3 + >=media-gfx/graphviz-2.38.0 + ) +" +# test? ( dev-util/valgrind ) +RDEPEND=" + input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) + >=dev-libs/libevdev-1.3 + >=sys-libs/mtdev-1.1 + virtual/libudev:= + virtual/udev +" +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.9.10 )" + +python_check_deps() { + has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \ + has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \ + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ + has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + default + sed "s@, '-Werror'@@" -i meson.build || die #744250 +} + +src_configure() { + # gui can be built but will not be installed + local emesonargs=( + -Ddebug-gui=false + $(meson_use doc documentation) + $(meson_use input_devices_wacom libwacom) + $(meson_use test tests) + -Dudev-dir="${EPREFIX}$(get_udevdir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + if use doc ; then + docinto html + dodoc -r "${BUILD_DIR}"/Documentation/. + fi +} + +pkg_postinst() { + pkgname="dev-python/python-libevdev" + if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then + einfo "${pkgname} must be installed to use the" + einfo "libinput measure and libinput replay tools." + fi + + udevadm hwdb --update --root="${ROOT}" +} diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild index f9366ae1ce03..594c6195e8b8 100644 --- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild +++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/ LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch new file mode 100644 index 000000000000..fe17f898f5e6 --- /dev/null +++ b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 1bb45d1..147aa84 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -283,7 +283,7 @@ if test "x$enable_hardening" != "xno"; then + AC_SUBST([HARDENING_LDFLAGS]) + fi + +-CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign" ++CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign" + LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS" + + AC_CONFIG_FILES(Makefile \ diff --git a/dev-libs/libtpms/libtpms-0.7.3.ebuild b/dev-libs/libtpms/libtpms-0.7.3.ebuild index 1daf31882dc5..e11a466ade7a 100644 --- a/dev-libs/libtpms/libtpms-0.7.3.ebuild +++ b/dev-libs/libtpms/libtpms-0.7.3.ebuild @@ -17,6 +17,10 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-0.7.3-Remove-WError.patch" +) + src_prepare() { default eautoreconf @@ -24,9 +28,9 @@ src_prepare() { src_configure() { econf \ - --disable-static \ - --with-openssl \ - --with-tpm2 + --disable-static \ + --with-openssl \ + --with-tpm2 } src_install() { diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest index c743b666335a..9f57e0c9b368 100644 --- a/dev-libs/pigpio/Manifest +++ b/dev-libs/pigpio/Manifest @@ -1,2 +1,3 @@ DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3 DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c +DIST pigpio-78.tar.gz 2900959 BLAKE2B 71a7ed89b247292718229955bf69bec1b7798040fb69b3d9d19a1143cd4fc6565b61deb6ed3bc40eb643a7987f88809125b4368b80aab2fe03bfbaa5fd665274 SHA512 893eefc4a5ab054d56df2c439539ab32a292050aa1fe4b062ba535921f1b12aeac9d509756d08986cd18ed512f52517fa64822422ea3f4dbf6e41fd364a75c3f diff --git a/dev-libs/pigpio/pigpio-78.ebuild b/dev-libs/pigpio/pigpio-78.ebuild new file mode 100644 index 000000000000..a47a53d9b909 --- /dev/null +++ b/dev-libs/pigpio/pigpio-78.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=( python3_{6,7,8} ) + +inherit distutils-r1 systemd toolchain-funcs + +DESCRIPTION="A library for the Raspberry which allows control of the GPIOs" +HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio" +SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~arm" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" ) + +src_compile() { + emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=: + use python && distutils-r1_src_compile +} + +src_install() { + emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \ + libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \ + mandir="${EPREFIX}/usr/share/man" install + einstalldocs + newinitd "${FILESDIR}"/pigpiod.initd pigpiod + newconfd "${FILESDIR}"/pigpiod.confd pigpiod + systemd_newunit "${S}"/util/pigpiod.service pigpiod.service + use python && distutils-r1_src_install +} diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild index 694cf3233f0a..8a6dc27d5ba9 100644 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" fi LICENSE="LGPL-2.1" diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest index 352c96a33a5e..294f633159b2 100644 --- a/dev-libs/uthash/Manifest +++ b/dev-libs/uthash/Manifest @@ -1 +1,2 @@ DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7 +DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0 diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch new file mode 100644 index 000000000000..588ec26078c0 --- /dev/null +++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch @@ -0,0 +1,11 @@ +--- uthash-2.1.0/tests/Makefile ++++ uthash-2.1.0/tests/Makefile +@@ -18,7 +18,7 @@ + CFLAGS += -I$(HASHDIR) + #CFLAGS += -DHASH_BLOOM=16 + #CFLAGS += -O2 +-CFLAGS += -g ++#CFLAGS += -g + #CFLAGS += -Wstrict-aliasing=2 + CFLAGS += -Wall + #CFLAGS += -Wextra diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild new file mode 100644 index 000000000000..49f42356561e --- /dev/null +++ b/dev-libs/uthash/uthash-2.1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="An easy-to-use hash implementation for C programmers" +HOMEPAGE="https://troydhanson.github.io/uthash/index.html" +SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-lang/perl )" + +PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) + +src_test() { + cd tests || die + emake CC="$(tc-getCC)" +} + +src_install() { + doheader src/*.h + dodoc doc/*.txt +} diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz index 74a444afc2a7..19114a682a17 100644 Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest index f07ccef25789..c9465e59a278 100644 --- a/dev-ml/llvm-ocaml/Manifest +++ b/dev-ml/llvm-ocaml/Manifest @@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc6.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc6.ebuild new file mode 100644 index 000000000000..575154be6047 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc6.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OCaml bindings for LLVM" +HOMEPAGE="https://llvm.org/" +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals + +# Keep in sync with sys-devel/llvm +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0/${PV}" +KEYWORDS="" +IUSE="debug test ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.00.0:0= + dev-ml/ocaml-ctypes:= + ~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?] + !sys-devel/llvm[ocaml(-)]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + dev-ml/findlib + test? ( dev-ml/ounit ) + ${PYTHON_DEPS}" + +pkg_setup() { + LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_OCAML_OUT_OF_TREE=ON + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + # disable various irrelevant deps and settings + -DLLVM_ENABLE_FFI=OFF + -DLLVM_ENABLE_TERMINFO=OFF + -DHAVE_HISTEDIT_H=NO + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + + -DLLVM_HOST_TRIPLE="${CHOST}" + + # disable go bindings + -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + + # TODO: ocamldoc + ) + + use test && mycmakeargs+=( + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" + cmake_src_configure + + local llvm_libdir=$(llvm-config --libdir) + # an ugly hack; TODO: figure out a way to pass -L to ocaml... + cd "${BUILD_DIR}/${libdir}" || die + ln -s "${llvm_libdir}"/*.so . || die + + if use test; then + local llvm_bindir=$(llvm-config --bindir) + # Force using system-installed tools. + sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \ + "${BUILD_DIR}"/test/lit.site.cfg.py || die + fi +} + +src_compile() { + cmake_build ocaml_all +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check-llvm-bindings-ocaml +} + +src_install() { + DESTDIR="${D}" \ + cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die + + dodoc bindings/ocaml/README.txt +} diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.240.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.240.0.ebuild new file mode 100644 index 000000000000..8a5333fa953a --- /dev/null +++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.240.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_AUTHOR=RURBAN +DIST_VERSION=4.24 +DIST_EXAMPLES=("eg/*") +inherit perl-module + +DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/perl-Math-BigInt-1.160.0 + virtual/perl-Carp + >=virtual/perl-Encode-1.980.100 + virtual/perl-Exporter + virtual/perl-XSLoader + >=virtual/perl-podlators-2.80.0 +" +BDEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Data-Dumper + virtual/perl-Test + virtual/perl-Test-Simple + virtual/perl-Time-Piece + ) +" +src_compile() { + mymake=( + "OPTIMIZE=${CFLAGS}" + ) + perl-module_src_compile +} +src_test() { + ewarn "Comprehensive testing may require manual installation of dependencies" + ewarn " See: https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Tests" + perl-module_src_test +} +pkg_postinst() { + ewarn "This package provides 'cpanel_json_xs' in PATH, which includes optional features" + ewarn "otherwise not automatically made available yet. If you desire to use these," + ewarn "please consult:" + ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Optional_Features" +} diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest index 71d9d306669b..e7c8021b0d08 100644 --- a/dev-perl/Cpanel-JSON-XS/Manifest +++ b/dev-perl/Cpanel-JSON-XS/Manifest @@ -1,3 +1,4 @@ DIST Cpanel-JSON-XS-4.19.tar.gz 251461 BLAKE2B fa22192d017fc41327e71b84f47e3939765b0c48586cc31876f744c2a51a93b36f6d41b8c9f92bba04875123604efe3fed6a486839dbfb39623cb2a4a4064087 SHA512 c67b62e8f95900cb3626357cfa9976f1553f84ffd10a977d47839ca3b317014473c3a6e48f6680478b89bbdc2ac177b22441ad5e49e7e8eb0344ef14a3c52b10 DIST Cpanel-JSON-XS-4.21.tar.gz 253372 BLAKE2B ad090f758d4b7b1f81ee01cb7860a952ca25c028c8043e33898593eb4818e5746d56eed0101656d95b68be54d68589ee7bb174e09e990d4a139448b422e8c542 SHA512 1408fed400e3e792af156695a5437e479a30cafb7d0597afc80c04de9b46882b67f75920f5f32047ed498bf088c9430108cea6863cfd2e6314765688f2c610e0 DIST Cpanel-JSON-XS-4.23.tar.gz 253594 BLAKE2B e9cb66c58015f6b83f00f588e9afc7c360182b67ceffcb90a76c2ebb1ad922250a5f2cec1049a79aea03789248d89669b4c787017bfdb6710f8576ab1e5b2948 SHA512 1c0d70ff85a2217c2b326c8002766e237966e0fcdac447fbb5108a5ba98b2771db17731853f2f7bedf85c337c7f6e18333c2c235830a17e152e7838bd168d0f9 +DIST Cpanel-JSON-XS-4.24.tar.gz 254008 BLAKE2B 4449d0d562388c547ab26e87048b49d2e77e7508c8bc2c4db4af562ecfed768452cea1daca60e8ce59ed464b9d4ceca17d73326a16bec3e3a6d42bd6e13df7fe SHA512 311746bd6d686f758db4507c1219675b262205a8d798662b8f5521d3f9c7d76678580a30e26281b461647763d552cb76fdbbcf4aa1737dc7c7416364179741bb diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz index a5f7094d2f18..0fed1851bd11 100644 Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index f843f97d059f..a435f93557db 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 867daa3743b1..90222564325d 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -7,6 +7,7 @@ DIST boto3-1.15.10.tar.gz 336021 BLAKE2B 71a8bcfd115c0066931e616d1d3678d51ba0946 DIST boto3-1.15.11.tar.gz 336108 BLAKE2B 9fdc00c194698c047ba7e42dbe8eedd3952fdb65f089deffa1ddb3468102c24b12cd000ed50793dbe2df492e93d12fa697b6541bddda917be80899a65fb2185a SHA512 4fbd08f5479de86aa95463c4d8c23e7d5a3af05effa752214968b9ea9ea652ce74b727206140eac46bc096f5e013a99223ce0820972872b24fcb447a6c28a806 DIST boto3-1.15.12.tar.gz 336150 BLAKE2B c6817e39fb19cd40f7cdcf6140303bd1993ec115e4ed9d0379d3fb05d31115abb964df86d5532cf3325a313957006565718945c2b07fb482d241e45a61659134 SHA512 a12cbfdd7664263ce1a2cba40d13b8a1b82fda9acf113c547e660adba46c31f382cce018ebc47686d5c65763ba5507757504ef00a4c5f2f12d3ff161b5badb14 DIST boto3-1.15.13.tar.gz 336233 BLAKE2B d82c38c4021c4f76ba5aa37c2b6328cd4870c3d64b343d2ccf4d441c231243ff369d91ec56b45380ca19b1b35a3934c548bca41a61832a7ca519e4119911c383 SHA512 5e50a212f1b47c79e75d3f2dc6ace0984c82041c11a8c87c831cf3ed2452234089b3f91be05af5342893ae377ad3e119e5e2b5f329cf200a877a46f418b55cc1 +DIST boto3-1.15.14.tar.gz 336351 BLAKE2B 61e4ee1b235c07dc3d0d961a3e4b6138c79ee49a9d9e80b15d68d9f1d3bf7eaddc3f993f7de914d2f8ba939d0508875a912b87c58570f91e726a5b44198c2adb SHA512 a40c123b017d45dc100d70d66a2cd7850dbfe5cf3fca715d3f6226e23423c7710a157ec7567d9d9f45311bbb764b47b281c9a3757e9910c4453451bec385383a DIST boto3-1.15.2.tar.gz 335231 BLAKE2B f1eb144da7afc1cf630cdc1f61880d094186a37d46556ae361da278fd3045a119dcb09c3d08387a019ca88d6502fa8710a5e5733cd9dc9056676ef17853d76e2 SHA512 6866e0d6a50d11495e5f2a33a392b0edbe1ff6625235b26b5d6028f7c2c7089d78febe17b982f65dc2564254800a23409247ac09716b099f09f3751c5b7f47b5 DIST boto3-1.15.3.tar.gz 335286 BLAKE2B 05c9ef757b8d227ae06a22e78d978821ff50da719f122ac025940b2e1ac5728d6bac044d4bfab95c56ac8c363efd7abfe3de2b3fd65d423ab53dbdfc60b910da SHA512 dfecfc075896ce84fd58d0437b84a6a794af69ff3e598b35b43f83b2b5ef57b88f96ef62a0d6505d5fe7fef0401513c8ecf0dfcaa22e4575510acd3ece191901 DIST boto3-1.15.4.tar.gz 335401 BLAKE2B 42ee1f2cf1e82338ea59a40b95aa5c76abae51aacf325ae845f407ccbc3caf1b3901bca48036889ad6307f96c257259cce39784a3f52ec6ff03c0c6c5633c654 SHA512 14626faa3943b65a215b8f1bce24f217e69421cdfd40caaf7de0fec13ca9b5b25c5e290c27672b2a6bc41316917224209110e2efd5be817de7273f93ae5764ce diff --git a/dev-python/boto3/boto3-1.15.14.ebuild b/dev-python/boto3/boto3-1.15.14.ebuild new file mode 100644 index 000000000000..ccc99e1c2415 --- /dev/null +++ b/dev-python/boto3/boto3-1.15.14.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index f59c49fa93c0..83e1b48052eb 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -7,6 +7,7 @@ DIST botocore-1.18.10.tar.gz 6899351 BLAKE2B 4de11277fd8df8436818cd50d946e7e5319 DIST botocore-1.18.11.tar.gz 6903038 BLAKE2B 07115ca9106997f9185fe84ef0ce8dd415e7d3c00cddddf28302cd97ecc9a13161de3285f1a959998feb4ff3f8643d056f7ac511edfebe71d6e3267c04e3f34e SHA512 bfd6cc012df3599889979bb1771f6c37b35eec9c5b0c909ab13593764839292b044edfc9557a351e4b380b398fba2e1b169c4e7ad1b12acec07eb45efd853ace DIST botocore-1.18.12.tar.gz 6913367 BLAKE2B 243b30d32e229d72d659ebf2b27b57a69042f488c8ca43e00f82e6b64e2c09665e129894b972ce806ea0bd0a89a295d0545d1d53e0cd3246d2dafcdb2e43f56c SHA512 173e5b3ed7de93362ea69e581b236b551dfeec7f8a57652ca04347f334e5163f5adf52acd20a2aef0cfe20f157d0a5b13f09ca4c92bf603f6a3f22d517cf6306 DIST botocore-1.18.13.tar.gz 6919052 BLAKE2B 52ef86c31e0b92221058ad2eb43eafe2953c59d1ed21d033f855961b409f43a77cfd72cce297b9752e230cb9953ed55febd3b0bdf44c99733472868b7e3db8dc SHA512 b3cf534d679533e43dee05d6c6e89271b88bd11185abf3790effe8df3b698e1d79a96d3d23b51f943861f975a3c883d9318e085b8ceda8d9dc454f6f0c50b9e7 +DIST botocore-1.18.14.tar.gz 6924624 BLAKE2B 78aa481a792cdd54712730189808df3627c5475e0f86a6927978eeb4c0056ed8f5f65d35949094164fba5be31b05664418b1c9368af265af5bd52c95a159c9a8 SHA512 dcc790b786634a308676b8f43b3bc9fbf4c84ac455a547b2240eb48bf93592fd30f68616efa562be0f1b59fa1a8b5dcefa1d5453ffaaf21804a282a5fcb56f47 DIST botocore-1.18.2.tar.gz 6843154 BLAKE2B 77f4cbccd6a686cfbdb2f25fafb9f2210c0e23de72fb40403f905711ec5d073b92cfd003d39406d273feb0bfb90e2ab594f2bb9c1564b5b0879efdf3bcfa47e3 SHA512 f4fec4caf3b4ebca8a593d58827fb4377c2458b7ebccb53ccd830df5423a2021ecebd534d2fe276662f8d8e91078bb5adbf611a52baa29c8ab3526d9c7b975ac DIST botocore-1.18.3.tar.gz 6846755 BLAKE2B 3f6709cac832dff1ba07c2e8b4c235b5bcdf305c9851eedea2ce5f7847d0be93d7e9cbcb1765add47aaec1d0c1c31cdd2c88542a984af570140ffb7fe30d8388 SHA512 a8831b1549a768cea9d550dc2dc3c1c8afc03e018d2ce246569bed35cb9ce25bcb18689d066dc5b6e6dcc69db93e0b0957b32cb68c101127e01cfe3fbfa9fe08 DIST botocore-1.18.4.tar.gz 6850892 BLAKE2B 013319b1055db5a65f25b4d11c0ae97e6eb58a8976eafea98c80a33c756b8715d69fddb86c900e9c3c1a6447d05a7afd2f11a155db5f6cbcefc5f80fccbf680c SHA512 c84b7c5dcb78101d6d04bea2a4453e2c47711133bf4ee1e96c6bea18a0b3de7c41021bfe5ac501eeb2b35d50bfe8782ee29d931adf79ae77a45a2f3b117716df diff --git a/dev-python/botocore/botocore-1.18.14.ebuild b/dev-python/botocore/botocore-1.18.14.ebuild new file mode 100644 index 000000000000..ba67bf7ac94b --- /dev/null +++ b/dev-python/botocore/botocore-1.18.14.ebuild @@ -0,0 +1,59 @@ +# 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="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest index f07ccef25789..c9465e59a278 100644 --- a/dev-python/clang-python/Manifest +++ b/dev-python/clang-python/Manifest @@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/dev-python/clang-python/clang-python-11.0.0_rc6.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc6.ebuild new file mode 100644 index 000000000000..6d7cb294e651 --- /dev/null +++ b/dev-python/clang-python/clang-python-11.0.0_rc6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit llvm.org python-r1 + +DESCRIPTION="Python bindings for sys-devel/clang" +HOMEPAGE="https://llvm.org/" +LLVM_COMPONENTS=( clang/bindings/python ) +llvm.org_set_globals + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +# The module is opening libclang.so directly, and doing some blasphemy +# on top of it. +RDEPEND=" + >=sys-devel/clang-${PV}:* + !sys-devel/llvm:0[clang(-),python(-)] + !sys-devel/clang:0[python(-)] + ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +python_test() { + "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" +} + +src_test() { + python_foreach_impl python_test +} + +src_install() { + python_foreach_impl python_domodule clang +} diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest index 4091d45c8f3c..ab9aba84810d 100644 --- a/dev-python/graphviz/Manifest +++ b/dev-python/graphviz/Manifest @@ -1 +1,2 @@ DIST graphviz-0.14.1.zip 183737 BLAKE2B f4dd100d6fcdfcfc266a7dc77f89b8647ac16d4d56629555ec94b54347b0d91b531ec25ac7ed9c13b0470f6bc49c68a9101791e5fe8b815ab0cd18a9c6f93e7d SHA512 ce2731acecee823afaf086955b316aba956a666b5d528c1ecdee388bf26ee02f502d48d650ed3a8aebcb75ecbff750049c1ca50e27644f74f57fb34b65e42c9a +DIST graphviz-0.14.2.zip 184157 BLAKE2B 668c200964867f416e2b15454793fdd0673a110461a85764699727b0430c812e18fb4285e031f5f611ff86bd205cbf927c695015d55ac169a594e616ab74067a SHA512 a8bcf395ebed7c43f5355bc167aae157c6eddb127860a6fb58eba0d882235e04a33a5bcf589245f484e3af9dce5eff8a5893ced73203901c92afd92c4f5b05be diff --git a/dev-python/graphviz/graphviz-0.14.2.ebuild b/dev-python/graphviz/graphviz-0.14.2.ebuild new file mode 100644 index 000000000000..3700d1003cf8 --- /dev/null +++ b/dev-python/graphviz/graphviz-0.14.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit distutils-r1 + +DESCRIPTION="Simple Python interface for Graphviz" +HOMEPAGE="https://graphviz.readthedocs.io/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +SLOT="0" + +RDEPEND="media-gfx/graphviz" +BDEPEND=" + app-arch/unzip + test? ( ${RDEPEND} + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + sed -e 's:--cov --cov-report=term --cov-report=html::' \ + -i setup.cfg || die + distutils-r1_src_prepare +} diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest index a5ae81b192f2..20884982c2fb 100644 --- a/dev-python/libvirt-python/Manifest +++ b/dev-python/libvirt-python/Manifest @@ -1,4 +1,2 @@ -DIST libvirt-python-6.2.0.tar.gz 196971 BLAKE2B e11c82bd98c62072c14992c485339337bcc3639bbd56154185834c145f76984ced9f09f7f05c302609ce6629a8d13db77debd6f3d85e8fdb00c818bbe51cc552 SHA512 91f6940f60670221c914ee7ffc8d89a74222bcacbbf1afd5f679479f1e1bcec563f297a8e8359d6f51a1eee29162e39e2a276f5277fcec551d50f112e304a947 -DIST libvirt-python-6.5.0.tar.gz 198753 BLAKE2B 90951af538c664f5da20cfced6b81dc2b06d36e723b3c41a0b2763bf0d73d3036d7e84a2db57f20fa2bd1ede8fb01c45dad9e5097a9f6008579dae319f825898 SHA512 a69c75b615f674bbb89fdb3e5cfc3dddfde68adffd0599e9d03f1552bb765823dc003859fe713ac0a324835c61f909bd43518571ddde8f99c37bee2416f094eb DIST libvirt-python-6.7.0.tar.gz 208597 BLAKE2B 335bd89133b688586a55193635b4b75dabe6dd4a741a450e49067ac8a9b9d9da54787b50c23bc6d5322a7fecbe513422f02450e09d541cb112ccfd499ce18101 SHA512 7d5a7f87abc01285c2030c9408838d4e1496d0d0316b9ab775749e49719fa66c20114aad2bd281d6783e2cb4d47ceac5ac60ac584e881288d0b0d9cc76d5b2cb DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af diff --git a/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild deleted file mode 100644 index 4f6663eb583d..000000000000 --- a/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild +++ /dev/null @@ -1,47 +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,8} ) - -MY_P="${P/_rc/-rc}" - -inherit distutils-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git" - SRC_URI="" - KEYWORDS="amd64 x86" - RDEPEND="app-emulation/libvirt:=[-python(-)]" -else - SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - RDEPEND="app-emulation/libvirt:0/${PV}" -fi -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="libvirt Python bindings" -HOMEPAGE="https://www.libvirt.org" -LICENSE="LGPL-2" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test -} - -python_install_all() { - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild deleted file mode 100644 index d6867cec6ffc..000000000000 --- a/dev-python/libvirt-python/libvirt-python-6.5.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -DISTUTILS_USE_SETUPTOOLS=no - -MY_P="${P/_rc/-rc}" - -inherit distutils-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git" - RDEPEND="app-emulation/libvirt:=[-python(-)]" -else - SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - RDEPEND="app-emulation/libvirt:0/${PV}" -fi -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="libvirt Python bindings" -HOMEPAGE="https://www.libvirt.org" -LICENSE="LGPL-2" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -DEPEND="virtual/pkgconfig" -BDEPEND="test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] -)" - -distutils_enable_tests setup.py - -python_install_all() { - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest index f07ccef25789..c9465e59a278 100644 --- a/dev-python/lit/Manifest +++ b/dev-python/lit/Manifest @@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/dev-python/lit/lit-11.0.0_rc6.ebuild b/dev-python/lit/lit-11.0.0_rc6.ebuild new file mode 100644 index 000000000000..eafbdc683987 --- /dev/null +++ b/dev-python/lit/lit-11.0.0_rc6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-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 llvm.org + +DESCRIPTION="A stand-alone install of the LLVM suite testing tool" +HOMEPAGE="https://llvm.org/" +LLVM_COMPONENTS=( llvm/utils/lit ) +llvm.org_set_globals + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +RESTRICT="!test? ( test )" + +# Tests require 'FileCheck' and 'not' utilities (from llvm) +BDEPEND=" + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + sys-devel/llvm )" + +# TODO: move the manpage generation here (from sys-devel/llvm) + +src_prepare() { + cd "${WORKDIR}" || die + distutils-r1_src_prepare +} + +python_test() { + local -x LIT_PRESERVES_TMP=1 + local litflags=$(get_lit_flags) + ./lit.py ${litflags//;/ } tests || die +} diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest index 55adf34a7a05..f365e761b8c8 100644 --- a/dev-python/markdown/Manifest +++ b/dev-python/markdown/Manifest @@ -1,3 +1,4 @@ DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090 DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c +DIST Markdown-3.3.tar.gz 315253 BLAKE2B 35fbe7f03b9261e1506bb5b2ebb19cfd37e6f1ad2ad6f5464b90c850bec642a5518a6470db640bbf6ded8b589bdfbd83bd0482724b6be6e89dba133d0122d721 SHA512 3f6e29b917135638fba703c3711c8f7baec544293a93bcf3554cad7dbd6a9678a49408c202e70f2cd41813f6a7ec0ff856e1c3888355b1321eb2801eb9552a1c diff --git a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch new file mode 100644 index 000000000000..be94fe028755 --- /dev/null +++ b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch @@ -0,0 +1,89 @@ +From c2904eac1a6daf8a3aaef6af0791b101e1971544 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 7 Oct 2020 15:01:07 +0200 +Subject: [PATCH] Update tests for pygments-2.7.1 + +Closes #1030 +--- + .../extensions/test_code_hilite.py | 22 +++++++++---------- + .../extensions/test_fenced_code.py | 2 +- + tox.ini | 2 +- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/test_syntax/extensions/test_code_hilite.py b/tests/test_syntax/extensions/test_code_hilite.py +index 8d5512d..3e36ae5 100644 +--- a/tests/test_syntax/extensions/test_code_hilite.py ++++ b/tests/test_syntax/extensions/test_code_hilite.py +@@ -205,7 +205,7 @@ class TestCodeHiliteClass(TestCase): + def test_codehilite_linenos_inline(self): + if has_pygments: + expected = ( +- '
1 plain text\n'
++                '
1plain text\n'
+                 '
'
+             )
+         else:
+@@ -259,7 +259,7 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenostart(self):
+         if has_pygments:
+             expected = (
+-                '
42 plain text\n'
++                '
42plain text\n'
+                 '
'
+             )
+         else:
+@@ -274,9 +274,9 @@ class TestCodeHiliteClass(TestCase):
+         if has_pygments:
+             expected = (
+                 '
'
+-                '1 line 1\n'
+-                '2 line 2\n'
+-                '3 line 3\n'
++                '1line 1\n'
++                '2line 2\n'
++                '3line 3\n'
+                 '
'
+             )
+         else:
+@@ -291,9 +291,9 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenos_linenostep(self):
+         if has_pygments:
+             expected = (
+-                '
  line 1\n'
+-                '2 line 2\n'
+-                '  line 3\n'
++                '
 line 1\n'
++                '2line 2\n'
++                ' line 3\n'
+                 '
'
+             )
+         else:
+@@ -308,9 +308,9 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenos_linenospecial(self):
+         if has_pygments:
+             expected = (
+-                '
1 line 1\n'
+-                '2 line 2\n'
+-                '3 line 3\n'
++                '
1line 1\n'
++                '2line 2\n'
++                '3line 3\n'
+                 '
'
+             )
+         else:
+diff --git a/tests/test_syntax/extensions/test_fenced_code.py b/tests/test_syntax/extensions/test_fenced_code.py
+index e5de0b7..8fa75f7 100644
+--- a/tests/test_syntax/extensions/test_fenced_code.py
++++ b/tests/test_syntax/extensions/test_fenced_code.py
+@@ -629,7 +629,7 @@ class TestFencedCode(TestCase):
+         if self.has_pygments:
+             expected = (
+                 '
'
+-                '
'
++                '
'
+                 '# Some python code\n'
+                 '
'
+             )
+-- 
+2.28.0
+
diff --git a/dev-python/markdown/markdown-3.3.ebuild b/dev-python/markdown/markdown-3.3.ebuild
new file mode 100644
index 000000000000..4d10f26b4526
--- /dev/null
+++ b/dev-python/markdown/markdown-3.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	https://python-markdown.github.io/
+	https://pypi.org/project/Markdown/
+	https://github.com/Python-Markdown/markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+# importlib_metadata is only necessary for  None:
++    parser.addoption('--bench', action='store_true', default=False,
++                     help='Enable the benchmark test runs')
diff --git a/dev-python/mypy/files/mypy-0.782-py39-fixes.patch b/dev-python/mypy/files/mypy-0.782-py39-fixes.patch
new file mode 100644
index 000000000000..16c12daecae5
--- /dev/null
+++ b/dev-python/mypy/files/mypy-0.782-py39-fixes.patch
@@ -0,0 +1,138 @@
+From 13ae58ffe8bedb7da9f4c657297f0d61e681d671 Mon Sep 17 00:00:00 2001
+From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
+Date: Sun, 30 Aug 2020 18:11:57 -0700
+Subject: [PATCH] mypy: get CI green for py39 (#9376)
+
+Due to Python 3.9's new parser, this has a different (and better) error
+message on Python 3.9.
+
+This is effectively a test of typed_ast / ast, so I don't think it
+matters too much. I'm happy to alternatively just get rid of the test
+altogether, or if people feel strongly, come up with a way to run the
+test when run with older Pythons.
+
+Co-authored-by: hauntsaninja <>
+---
+ .travis.yml                        | 3 ---
+ mypy/test/testcheck.py             | 2 ++
+ test-data/unit/check-kwargs.test   | 7 -------
+ test-data/unit/check-python39.test | 9 +++++++++
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+ create mode 100644 test-data/unit/check-python39.test
+
+diff --git a/mypy/test/testcheck.py b/mypy/test/testcheck.py
+index 49a85861b6..39a35c7280 100644
+--- a/mypy/test/testcheck.py
++++ b/mypy/test/testcheck.py
+@@ -94,6 +94,8 @@
+ # Tests that use Python 3.8-only AST features (like expression-scoped ignores):
+ if sys.version_info >= (3, 8):
+     typecheck_files.append('check-python38.test')
++if sys.version_info >= (3, 9):
++    typecheck_files.append('check-python39.test')
+ 
+ # Special tests for platforms with case-insensitive filesystems.
+ if sys.platform in ('darwin', 'win32'):
+diff --git a/test-data/unit/check-kwargs.test b/test-data/unit/check-kwargs.test
+index 1dd450caae..a587be3e06 100644
+--- a/test-data/unit/check-kwargs.test
++++ b/test-data/unit/check-kwargs.test
+@@ -53,13 +53,6 @@ f(b=[], a=A())
+ class A: pass
+ [builtins fixtures/list.pyi]
+ 
+-[case testGivingSameKeywordArgumentTwice]
+-import typing
+-def f(a: 'A', b: 'B') -> None: pass
+-f(a=A(), b=B(), a=A()) # E: keyword argument repeated
+-class A: pass
+-class B: pass
+-
+ [case testGivingArgumentAsPositionalAndKeywordArg]
+ import typing
+ def f(a: 'A', b: 'B' = None) -> None: pass
+diff --git a/test-data/unit/check-python39.test b/test-data/unit/check-python39.test
+new file mode 100644
+index 0000000000..0e9ec683ae
+--- /dev/null
++++ b/test-data/unit/check-python39.test
+@@ -0,0 +1,9 @@
++[case testGivingSameKeywordArgumentTwice]
++# This test was originally in check-kwargs.test
++# Python 3.9's new parser started producing a different error message here. Since this isn't the
++# most important test, to deal with this we'll only run this test with Python 3.9 and later.
++import typing
++def f(a: 'A', b: 'B') -> None: pass
++f(a=A(), b=B(), a=A()) # E: "f" gets multiple values for keyword argument "a"
++class A: pass
++class B: pass
+From da4430119255ac9205c96d54deb2e2ebed0ce8ce Mon Sep 17 00:00:00 2001
+From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
+Date: Fri, 31 Jul 2020 09:58:15 -0700
+Subject: [PATCH] mypyc: ignore deprecation (#9107)
+
+PyUnicode_AsUnicodeAndSize has been deprecated since 3.3
+
+Python 3.9 has compiler warnings for this deprecated function, and we
+compile with Werror, causing Python 3.9 builds to fail.
+
+I've just copied over the relevant deprecation ignoring code from the
+original getargs.c (including the TODO, but I can remove that)
+
+Co-authored-by: hauntsaninja <>
+---
+ mypyc/lib-rt/getargs.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/mypyc/lib-rt/getargs.c b/mypyc/lib-rt/getargs.c
+index 32b387c8ab..e6b1a0c937 100644
+--- a/mypyc/lib-rt/getargs.c
++++ b/mypyc/lib-rt/getargs.c
+@@ -18,6 +18,29 @@
+  *    and is responsible for decrefing them.
+  */
+ 
++// These macro definitions are copied from pyport.h in Python 3.9 and later
++// https://bugs.python.org/issue19569
++#if defined(__clang__)
++#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push")
++#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
++    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
++#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop")
++#elif defined(__GNUC__) \
++    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
++#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push")
++#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
++    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
++#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop")
++#elif defined(_MSC_VER)
++#define _Py_COMP_DIAG_PUSH __pragma(warning(push))
++#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996))
++#define _Py_COMP_DIAG_POP __pragma(warning(pop))
++#else
++#define _Py_COMP_DIAG_PUSH
++#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS
++#define _Py_COMP_DIAG_POP
++#endif
++
+ #include "Python.h"
+ #include "pythonsupport.h"
+ 
+@@ -756,6 +779,9 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
+     case 'u': /* raw unicode buffer (Py_UNICODE *) */
+     case 'Z': /* raw unicode buffer or None */
+     {
++        // TODO: Raise DeprecationWarning
++_Py_COMP_DIAG_PUSH
++_Py_COMP_DIAG_IGNORE_DEPR_DECLS
+         Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
+ 
+         if (*format == '#') {
+@@ -795,6 +821,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
+                                   arg, msgbuf, bufsize);
+         }
+         break;
++_Py_COMP_DIAG_POP
+     }
+ 
+     case 'e': {/* encoded string */
diff --git a/dev-python/mypy/files/mypy-0.782-pytest-6.patch b/dev-python/mypy/files/mypy-0.782-pytest-6.patch
new file mode 100644
index 000000000000..0252d1138807
--- /dev/null
+++ b/dev-python/mypy/files/mypy-0.782-pytest-6.patch
@@ -0,0 +1,210 @@
+From 3e77959eacf3d445a0cb4db5a4bc6dcf606fc040 Mon Sep 17 00:00:00 2001
+From: Lawrence Chan 
+Date: Tue, 4 Aug 2020 18:14:55 -0500
+Subject: [PATCH] Use pytest Node.from_parent if available (#9263)
+
+* Use pytest Node.from_parent if available
+
+* Use pytest Node.from_parent unconditionally (requires pytest 5.4+)
+
+* Bump pytest test requirements
+
+* Require pytest 6.0 and remove unused type ignores
+
+* Make flake8 happy
+---
+ mypy/test/data.py            | 37 ++++++++++++++++++++++--------------
+ mypy/test/helpers.py         |  2 +-
+ mypy/test/testfinegrained.py |  2 +-
+ mypy/test/testipc.py         |  2 +-
+ mypy/test/testparse.py       |  2 +-
+ mypy/test/testpep561.py      |  2 +-
+ mypy/test/testpythoneval.py  |  2 +-
+ mypyc/test/testutil.py       |  2 +-
+ pytest.ini                   |  3 +--
+ test-requirements.txt        |  9 ++++-----
+ 10 files changed, 35 insertions(+), 28 deletions(-)
+
+diff --git a/mypy/test/data.py b/mypy/test/data.py
+index 5484fd99e9..a4f2d798b1 100644
+--- a/mypy/test/data.py
++++ b/mypy/test/data.py
+@@ -9,7 +9,7 @@
+ from abc import abstractmethod
+ import sys
+ 
+-import pytest  # type: ignore  # no pytest in typeshed
++import pytest
+ from typing import List, Tuple, Set, Optional, Iterator, Any, Dict, NamedTuple, Union
+ 
+ from mypy.test.config import test_data_prefix, test_temp_dir, PREFIX
+@@ -160,9 +160,12 @@ def parse_test_case(case: 'DataDrivenTestCase') -> None:
+     case.expected_fine_grained_targets = targets
+ 
+ 
+-class DataDrivenTestCase(pytest.Item):  # type: ignore  # inheriting from Any
++class DataDrivenTestCase(pytest.Item):
+     """Holds parsed data-driven test cases, and handles directory setup and teardown."""
+ 
++    # Override parent member type
++    parent = None  # type: DataSuiteCollector
++
+     input = None  # type: List[str]
+     output = None  # type: List[str]  # Output for the first pass
+     output2 = None  # type: Dict[int, List[str]]  # Output for runs 2+, indexed by run number
+@@ -266,7 +269,7 @@ def repr_failure(self, excinfo: Any, style: Optional[Any] = None) -> str:
+             # call exit() and they already print out a stack trace.
+             excrepr = excinfo.exconly()
+         else:
+-            self.parent._prunetraceback(excinfo)
++            self.parent._prunetraceback(excinfo)  # type: ignore[no-untyped-call]
+             excrepr = excinfo.getrepr(style='short')
+ 
+         return "data: {}:{}:\n{}".format(self.file, self.line, excrepr)
+@@ -510,7 +513,9 @@ def pytest_pycollect_makeitem(collector: Any, name: str,
+             # Non-None result means this obj is a test case.
+             # The collect method of the returned DataSuiteCollector instance will be called later,
+             # with self.obj being obj.
+-            return DataSuiteCollector(name, parent=collector)
++            return DataSuiteCollector.from_parent(  # type: ignore[no-untyped-call]
++                parent=collector, name=name
++            )
+     return None
+ 
+ 
+@@ -535,19 +540,23 @@ def split_test_cases(parent: 'DataSuiteCollector', suite: 'DataSuite',
+     for i in range(1, len(cases), 6):
+         name, writescache, only_when, platform_flag, skip, data = cases[i:i + 6]
+         platform = platform_flag[1:] if platform_flag else None
+-        yield DataDrivenTestCase(parent, suite, file,
+-                                 name=add_test_name_suffix(name, suite.test_name_suffix),
+-                                 writescache=bool(writescache),
+-                                 only_when=only_when,
+-                                 platform=platform,
+-                                 skip=bool(skip),
+-                                 data=data,
+-                                 line=line_no)
++        yield DataDrivenTestCase.from_parent(
++            parent=parent,
++            suite=suite,
++            file=file,
++            name=add_test_name_suffix(name, suite.test_name_suffix),
++            writescache=bool(writescache),
++            only_when=only_when,
++            platform=platform,
++            skip=bool(skip),
++            data=data,
++            line=line_no,
++        )
+         line_no += data.count('\n') + 1
+ 
+ 
+-class DataSuiteCollector(pytest.Class):  # type: ignore  # inheriting from Any
+-    def collect(self) -> Iterator[pytest.Item]:  # type: ignore
++class DataSuiteCollector(pytest.Class):
++    def collect(self) -> Iterator[pytest.Item]:
+         """Called by pytest on each of the object returned from pytest_pycollect_makeitem"""
+ 
+         # obj is the object for which pytest_pycollect_makeitem returned self.
+diff --git a/mypy/test/helpers.py b/mypy/test/helpers.py
+index 46c01114c4..91c5ff6ab2 100644
+--- a/mypy/test/helpers.py
++++ b/mypy/test/helpers.py
+@@ -10,7 +10,7 @@
+ from mypy import defaults
+ import mypy.api as api
+ 
+-import pytest  # type: ignore  # no pytest in typeshed
++import pytest
+ 
+ # Exporting Suite as alias to TestCase for backwards compatibility
+ # TODO: avoid aliasing - import and subclass TestCase directly
+diff --git a/mypy/test/testfinegrained.py b/mypy/test/testfinegrained.py
+index 596391da44..d4ed18cab0 100644
+--- a/mypy/test/testfinegrained.py
++++ b/mypy/test/testfinegrained.py
+@@ -35,7 +35,7 @@
+ from mypy.config_parser import parse_config_file
+ from mypy.find_sources import create_source_list
+ 
+-import pytest  # type: ignore  # no pytest in typeshed
++import pytest
+ 
+ # Set to True to perform (somewhat expensive) checks for duplicate AST nodes after merge
+ CHECK_CONSISTENCY = False
+diff --git a/mypy/test/testipc.py b/mypy/test/testipc.py
+index 1d4829d561..7dd829a590 100644
+--- a/mypy/test/testipc.py
++++ b/mypy/test/testipc.py
+@@ -3,7 +3,7 @@
+ 
+ from mypy.ipc import IPCClient, IPCServer
+ 
+-import pytest  # type: ignore
++import pytest
+ import sys
+ import time
+ 
+diff --git a/mypy/test/testparse.py b/mypy/test/testparse.py
+index e990a403a5..e9ff6839bc 100644
+--- a/mypy/test/testparse.py
++++ b/mypy/test/testparse.py
+@@ -2,7 +2,7 @@
+ 
+ import sys
+ 
+-from pytest import skip  # type: ignore[import]
++from pytest import skip
+ 
+ from mypy import defaults
+ from mypy.test.helpers import assert_string_arrays_equal, parse_options
+diff --git a/mypy/test/testpep561.py b/mypy/test/testpep561.py
+index a8eabd7702..aadf01ae5f 100644
+--- a/mypy/test/testpep561.py
++++ b/mypy/test/testpep561.py
+@@ -1,6 +1,6 @@
+ from contextlib import contextmanager
+ import os
+-import pytest  # type: ignore
++import pytest
+ import re
+ import subprocess
+ from subprocess import PIPE
+diff --git a/mypy/test/testpythoneval.py b/mypy/test/testpythoneval.py
+index 7586a3854e..e7e9f16183 100644
+--- a/mypy/test/testpythoneval.py
++++ b/mypy/test/testpythoneval.py
+@@ -18,7 +18,7 @@
+ import sys
+ from tempfile import TemporaryDirectory
+ 
+-import pytest  # type: ignore  # no pytest in typeshed
++import pytest
+ 
+ from typing import List
+ 
+diff --git a/mypyc/test/testutil.py b/mypyc/test/testutil.py
+index 18ab39a103..c1ce8626ba 100644
+--- a/mypyc/test/testutil.py
++++ b/mypyc/test/testutil.py
+@@ -7,7 +7,7 @@
+ import shutil
+ from typing import List, Callable, Iterator, Optional, Tuple
+ 
+-import pytest  # type: ignore[import]
++import pytest
+ 
+ from mypy import build
+ from mypy.errors import CompileError
+diff --git a/pytest.ini b/pytest.ini
+index 81586a2370..ed76809091 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,6 +1,5 @@
+ [pytest]
+-# testpaths is new in 2.8
+-minversion = 2.8
++minversion = 6.0.0
+ 
+ testpaths = mypy/test mypyc/test
+ 
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index a24960ff0e93..5965190b13e4 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -5,8 +5,15 @@
 		ikelos@gentoo.org
 		Mike Auty
 	
+	
+		python@gentoo.org
+		Python
+	
 	
 	
 		python/mypy
+		mypy
+		https://github.com/python/mypy/issues
+		https://mypy.readthedocs.io/
 	
 
diff --git a/dev-python/mypy/mypy-0.782.ebuild b/dev-python/mypy/mypy-0.782.ebuild
new file mode 100644
index 000000000000..f6931385e1e7
--- /dev/null
+++ b/dev-python/mypy/mypy-0.782.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index fc26165850fd..cbf0ae76d45e 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,2 +1,3 @@
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
new file mode 100644
index 000000000000..fda0608d401c
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
@@ -0,0 +1,53 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
new file mode 100644
index 000000000000..9de7bbb7b27e
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
@@ -0,0 +1,46 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
new file mode 100644
index 000000000000..b9f96b9946de
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
@@ -0,0 +1,59 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index fc26165850fd..cbf0ae76d45e 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,2 +1,3 @@
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
new file mode 100644
index 000000000000..a228d2e2d075
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
@@ -0,0 +1,51 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionview/actionview-6.0.3.4.ebuild b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
new file mode 100644
index 000000000000..a6b9c0c833ab
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
@@ -0,0 +1,67 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activejob/activejob-6.0.3.4.ebuild b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
new file mode 100644
index 000000000000..e34fafaa96cd
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
@@ -0,0 +1,47 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
new file mode 100644
index 000000000000..1494c493a78d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
@@ -0,0 +1,42 @@
+# 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_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
new file mode 100644
index 000000000000..1194b35b4808
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
new file mode 100644
index 000000000000..6181b336ee05
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
@@ -0,0 +1,59 @@
+# 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_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
new file mode 100644
index 000000000000..bf4536107f91
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
@@ -0,0 +1,73 @@
+# 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_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	dev-ruby/i18n:1
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.1.8:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index e5b370c242c1..e0dfbe7ba8bc 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.gem 6656 BLAKE2B 36519aed8bc34ed303125857ebcc4cbc860b530f6de1
 DIST rails-5.2.4.4.gem 6656 BLAKE2B 232562c858d2f487cec1916d1c8afa229028262c7c58cb1f8e021f90ec4f4a309b1cb3c4e91d22f1cad3ea83a78ec7a3e16d83c623060da48545c49f9a87a2f6 SHA512 01c2ae7537afef84a583d42b610791a6c1bfecf3f45b9dcf1295f60978fe60a4cbc286a3f091430144c7fc5e4c89d3c3616fba9045188d53010abf199cee869b
 DIST rails-6.0.3.2.gem 6656 BLAKE2B 080846459db9ad58650852acb60eab1474cb8eefb7f4720dc83ac0562dd1bfecd4c98ea0c9165d3c6d578edfed6a45088ee4c223e33fb02d26510ad9ccfd74ff SHA512 288f48bd20f4a5ed485a127ddb9e307a69d3ee00198a168ed1d2581b0e200e0fa14b02811b4c72cc20eedf616b10cd46b38dbbed5fcf44125bda25e1aae41b44
 DIST rails-6.0.3.3.gem 6656 BLAKE2B ea87053cb20859b63a2c4f33e9454bc618b9b213a6c983f1bdff1c6c19e0d3406d99265bcd729163fbd9a3f0ca4cb617280386714059f07fae2661ccba7c897a SHA512 b50b690bc89638d9f22bdcf57f6fb68595f1d19e2dc8b380e9519e0266087eaaa258d5bd1f3692d0a4437bef8b92552aa01a0913cbab4ba460be6d3e5f1c2dfd
+DIST rails-6.0.3.4.gem 6656 BLAKE2B c2b1d1573a6555073441baa02bd7f06a3151ea39e4b4845a6323efe9834236e1ac1f4731014f8fce7563300917449f3d1c92d5ff169b951164b8a17c4ca16e53 SHA512 6206864e3d70870a6b9a31e63cc05d7d58eb5eaa3df78ad96de7adbf1c884c2f28bf62291a8cc628d8d702c67b4080ea7389fd7518f1bc59b72ae403824bf83b
diff --git a/dev-ruby/rails/rails-6.0.3.4.ebuild b/dev-ruby/rails/rails-6.0.3.4.ebuild
new file mode 100644
index 000000000000..3be9b73306e0
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 81f2b1316909..fddc7b5d96ab 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -2,3 +2,4 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
+DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/railties/railties-6.0.3.4.ebuild b/dev-ruby/railties/railties-6.0.3.4.ebuild
new file mode 100644
index 000000000000..ac2c8ddd992c
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.3.4.ebuild
@@ -0,0 +1,71 @@
+# 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_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 04d839c2d7d9..d3a27e718f13 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cargo-c/cargo-c-0.6.2.ebuild b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
index 9977f3dc4fad..8888aa47a35b 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -153,7 +153,7 @@ RESTRICT="mirror"
 # use cargo-license for a more accurate license picture
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="libressl"
 
 DEPEND=""
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 36c77024458b..6da6528a11db 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1 +1 @@
-DIST clion-2020.2.tar.gz 554215003 BLAKE2B 06ba16f3d2a3ebb4731e4ce40ec2ee56d3e823520d9b477a4ca7013391adb3e3c3e59b478810fa0ac9896e5277ec71642190e37be516990b0cbddd3178d2e245 SHA512 3b48a95a071919e3122e8bd8104202e07cf9cc9362df19f75003571771a134d4d5ec4520147c43b4fbd3144de8f67ddb904dbf88ef51714ec4d4882796b1272b
+DIST clion-2020.2.3.tar.gz 553585955 BLAKE2B 5bfa5da56a3dc79034ff8b4f1c66107f5143a502643d5c21289e87fd2b0510e84445366e870fd5cc5c02387d3db696bf07ad848f890d3e2438335ce5e64eded5 SHA512 f7b282dbee516249175572cb3b3910d1437c9f6720fd94aaaeb148e4ceb0eeea82428b4b83af6af142dee8ba749c3baa16e71cf5e9bced7e803f8d425b9a0d2c
diff --git a/dev-util/clion/clion-2020.2.ebuild b/dev-util/clion/clion-2020.2.3.ebuild
similarity index 100%
rename from dev-util/clion/clion-2020.2.ebuild
rename to dev-util/clion/clion-2020.2.3.ebuild
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index 95e57fdafa69..2714fd704bc0 100644
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index b14e2ee30e8e..d13c6aa13994 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,6 @@
 DIST ideaIC-2.1.202.6948.69.tar.gz 529563846 BLAKE2B df3771c8ca85a276a1ed9db5e9483f922a98f25ab82061cc54dee791f84d44dcd7d813180d587a3a9f3cd91d10b83881a3d42da11ecee3be77dccbe2ee7e98c5 SHA512 bc32e01297785bfcf2a57f97e697b7ec8f894f49c5f27959ed3fd5bab6ade0cff8f0091847809f7ee5f7b7299c2bda3e4bdb83cadc68a7a3056242dd83c1c4b9
 DIST ideaIC-2.2.202.7319.50.tar.gz 529375561 BLAKE2B 08a77a1326b81e9d6299779bf48fb0b9be389572143bd92591bcdf6ede79ecf86b725dde634e1b8bd412dc0b886bde29169bb236fbc902ba509b468e79073e90 SHA512 f68fe18a824fd47b3b21f0a3dcd172652858aafa9f81d1db908b3adc82f925677d2ce48d0a06ad58354c06b30e01c36fff910b4eb7d5ec89c408a6a1ff017e8e
+DIST ideaIC-2.3.202.7660.26.tar.gz 529860795 BLAKE2B 6704910e1ab456dde957eb14545ae2b6a0f9007091b875b65329b3e3ac354ddce326cdc5f0820ef3340cb291ffd2f40ac8f35fcfe6a042e3c4947c6e5a9f9852 SHA512 71ba86615024af4bd3c5ff61598c08122d0c2a7f093766e22e9ed65f1fed73ae7e7eeb8e57cb9c0021e20a268811e8c0a08eace0d4c3e370c092a92e7d572dc2
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
diff --git a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild b/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
new file mode 100644
index 000000000000..97ec35a8801d
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-9*"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	default_src_unpack
+	if use jbr11 ; then
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
+}
+
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	if use jbr8; then
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	fi
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 66a1db925f61..2f4e2138fedd 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,3 +1,5 @@
 DIST jenkins-bin-2.235.5.war 66477424 BLAKE2B d4917468af085358c98bd5cfe9c31232584a18a74d01e962d594dc2ea3db75d4efabf411dbf568837b56e8230d831f3c88ea4e54f1a965f570772265989a9be7 SHA512 2c9d720dfb87f68dc57e5b2b750d2cbeb24efe65decfee13f4e96b578d3b460e0e00e713a90ee9a32dc1e5c2976455f3598f1c023a279da50b0622284529487e
 DIST jenkins-bin-2.249.1.war 67394283 BLAKE2B c63120bd478d6cdc772935445c37e222ef274f5108023e18a598fb131e380aa5fb17baeab7d7d1cc0d01b776cb5693d28e0f2fa1d48b253ff490e66f0131cec5 SHA512 19a7d0e496b257c9b2c0d7862cff2c9c6221fc87cfa8da6064d316c4fb81a51a10f67a4fb10d30ba645c5f97346d440d45389a8de13c7854474fc816bf23aaac
+DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
 DIST jenkins-bin-2.252.war 67396384 BLAKE2B 6476b03a8dcc73f61f151c6187ebd275ed3fb8f352478e0e135406d9dcab150a360ba6b7b9a8ca82d0ed24e5294bd77755497ba7ec9df72b0487f8341eb9d9e5 SHA512 c9a0b1676155f66e0cfbc97762c663ce4d968d2be296e03aa29d4670dfcea6e432340bf424076951c268b28766fbba84efaff397b2ba50fadb9ca04f5bb52236
+DIST jenkins-bin-2.260.war 67242153 BLAKE2B 3d454bb987b39a3e214ff3dc61648d0533724766bf0eb7a40b5d6b208d0e2baa4f083a559a51b468f920d352b52d55a614eb8551d148bdadd9c3efaf73be8205 SHA512 38da0ddae2dde6e4d26a7a49f952073838574282d68169f5d2d0359a9c906f5d294cf58dfe930cac2585018b5e89dfbd59c7525d396b2a88c26bbb8485275353
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
new file mode 100644
index 000000000000..8ab8d5db213a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.260.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.260.ebuild
new file mode 100644
index 000000000000..231d58c8748f
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.260.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-util/lldb/lldb-11.0.0_rc6.ebuild b/dev-util/lldb/lldb-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..4b16c5b83278
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.0_rc6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!=sys-apps/systemd-183:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -46,7 +44,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.23.2
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -80,8 +77,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -119,8 +116,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
 		ewarn "gnome-session won't be able to correctly track and manage your session."
 	fi
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
index 44a8e800324b..0feb7789d569 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
@@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -30,7 +29,6 @@ DEPEND="
 
 	systemd? ( >=sys-apps/systemd-183:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -78,8 +75,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -117,8 +114,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
 		ewarn "gnome-session won't be able to correctly track and manage your session."
 	fi
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
index 4f42ede4e067..cabaad73f1e8 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
@@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc elogind systemd"
+IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
-# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -30,7 +29,6 @@ DEPEND="
 
 	systemd? ( >=sys-apps/systemd-183:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
-	consolekit? ( >=dev-libs/dbus-glib-0.76 )
 "
 
 # Pure-runtime deps from the session files should *NOT* be added here.
@@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
 	>=gnome-base/gnome-settings-daemon-3.35.91
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	sys-apps/dbus[X]
-	consolekit? ( sys-auth/consolekit )
 
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-user-dirs-gtk
@@ -78,8 +75,8 @@ src_configure() {
 		$(meson_use systemd)
 		-Dsystemd_session=$(usex systemd default disable)
 		$(meson_use systemd systemd_journal)
-		$(meson_use consolekit)
 		$(meson_use doc docbook)
+		-Dconsolekit=false
 		-Dman=true
 	)
 	meson_src_configure
@@ -117,8 +114,8 @@ pkg_postinst() {
 		ewarn "make sure that the commands in the xinitrc.d scripts are run."
 	fi
 
-	if ! use systemd && ! use elogind && ! use consolekit; then
-		ewarn "You are building without systemd, elogind and/or consolekit support."
+	if ! use systemd && ! use elogind; then
+		ewarn "You are building without systemd or elogind support."
 		ewarn "gnome-session won't be able to correctly track and manage your session."
 	fi
 }
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 0a5d0e69d176..7b4ca44a6603 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -6,7 +6,6 @@
 	Gentoo GNOME Desktop
 
 
-	Support sys-auth/consolekit for session tracking
 	Support sys-auth/elogind for session tracking
 
 
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index be8d9aa97cdb..357b14a57de9 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index ae7a9feaf7e2..737368ae90b2 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,2 +1,2 @@
-DIST waybar-0.8.0.tar.gz 112019 BLAKE2B b3b61e02a104599e8f9047f9e2f76ec57ef7dd164edca2afd7b0afbb6b2c2341e20d6175905eba525337df9215473afa6cf017f736bb2de24e4daa169a5af3ee SHA512 c670fd21a7d29396d8bbe1b7540ddbbe44a98f7fb49f8518e0cc302aa57e5bb993ff8306973a7b8ca4ec000a7ecc311872762a0782ce19e4bf4cff8ea09caccb
 DIST waybar-0.9.3.tar.gz 135024 BLAKE2B d7b0090d0d7e25701ba7b76353737451e4ff8f145998b1a395e4c57e845be319380ac41b1a464bc7b5cc4d9ce037151bc9e7f37763ed1c0f42e945503668f1df SHA512 19dba92c5e430ce71567f149e5d208d594928a1d642584f606d55779d0a336ec4587e8a2e15698a25bdf0d26525f771d0a73b193f948bf9c1dfba5be350d4e78
+DIST waybar-0.9.4.tar.gz 137409 BLAKE2B 99dabdbb4f846823d3244a21ce51c4ebb2d9449f6c7a0f4c8c1db643d503f106988ab5e732d096109799a175df7c5168b9a1d60958e258c2ef8acb7fe2c318b7 SHA512 601eb9597089491d95bd5e055d9bffb0e33d637351ad41f9177fd4dd915b2a12587e96f922314aa7a009ccb4c1b5cf8da0553710b5ea84a9ba25c5755b9fa61a
diff --git a/gui-apps/waybar/waybar-0.8.0.ebuild b/gui-apps/waybar/waybar-0.9.4.ebuild
similarity index 76%
rename from gui-apps/waybar/waybar-0.8.0.ebuild
rename to gui-apps/waybar/waybar-0.9.4.ebuild
index 8cd23063c51d..10d0e981326b 100644
--- a/gui-apps/waybar/waybar-0.8.0.ebuild
+++ b/gui-apps/waybar/waybar-0.9.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit meson
 
-DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors."
+DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors"
 HOMEPAGE="https://github.com/Alexays/Waybar"
 
 if [[ ${PV} == 9999 ]]; then
@@ -15,16 +15,16 @@ else
 	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
+S="${WORKDIR}/${PN^}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="mpd network pulseaudio tray +udev"
+IUSE="mpd network popups pulseaudio tray +udev"
 
 BDEPEND="
 	>=app-text/scdoc-1.9.2
 	virtual/pkgconfig
 "
-
 DEPEND="
 	dev-cpp/gtkmm:3.0
 	dev-libs/jsoncpp:=
@@ -32,26 +32,28 @@ DEPEND="
 	dev-libs/libsigc++:2
 	>=dev-libs/libfmt-5.3.0:=
 	>=dev-libs/spdlog-1.3.1:=
+	dev-libs/date:=
 	dev-libs/wayland
 	dev-libs/wayland-protocols
 	gui-libs/wlroots
+	x11-libs/gtk+:3[wayland]
 	mpd? ( media-libs/libmpdclient )
 	network? ( dev-libs/libnl:3 )
+	popups? ( gui-libs/gtk-layer-shell )
 	pulseaudio? ( media-sound/pulseaudio )
-	tray? ( dev-libs/libdbusmenu[gtk3] )
+	tray? (
+		dev-libs/libdbusmenu[gtk3]
+		dev-libs/libappindicator
+	)
 	udev? ( virtual/libudev:= )
 "
-
 RDEPEND="${DEPEND}"
 
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/${PN^}-${PV}"
-fi
-
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
 		$(meson_feature network libnl)
+		$(meson_feature popups gtk-layer-shell)
 		$(meson_feature pulseaudio)
 		$(meson_feature tray dbusmenu-gtk)
 		$(meson_feature udev libudev)
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index aa169394f9ec..6ed332483943 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/attica-5.74.0.ebuild b/kde-frameworks/attica/attica-5.74.0.ebuild
index ed5efee16e17..c243f8266e46 100644
--- a/kde-frameworks/attica/attica-5.74.0.ebuild
+++ b/kde-frameworks/attica/attica-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/baloo/baloo-5.74.0.ebuild b/kde-frameworks/baloo/baloo-5.74.0.ebuild
index 20e948f5d407..a7188f534ea5 100644
--- a/kde-frameworks/baloo/baloo-5.74.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for searching and managing metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.74.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.74.0.ebuild
index 2c8ed97c91be..2dda232b5163 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.74.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.74.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.74.0.ebuild
index f0d03ab97903..c846d053b553 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.74.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.74.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.74.0.ebuild
index c1315a9a7d2a..275d9de76021 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.74.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake kde.org xdg-utils
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild
index 2da5be3efcbe..9348c8a5348e 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
index c354f0023573..ec2f39237581 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.74.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.74.0.ebuild
index a56bcf969469..af1251355d76 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.74.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities/kactivities-5.74.0.ebuild b/kde-frameworks/kactivities/kactivities-5.74.0.ebuild
index 44a40223df3f..28efb286e87b 100644
--- a/kde-frameworks/kactivities/kactivities-5.74.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kapidox/kapidox-5.74.0.ebuild b/kde-frameworks/kapidox/kapidox-5.74.0.ebuild
index 85d92994880a..45f2e9e66d15 100644
--- a/kde-frameworks/kapidox/kapidox-5.74.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/karchive/karchive-5.74.0.ebuild b/kde-frameworks/karchive/karchive-5.74.0.ebuild
index 38ac7f582aeb..e0cf280e5458 100644
--- a/kde-frameworks/karchive/karchive-5.74.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.74.0.ebuild
@@ -7,7 +7,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kauth/kauth-5.74.0.ebuild b/kde-frameworks/kauth/kauth-5.74.0.ebuild
index 07af3e190a07..295a08a101b3 100644
--- a/kde-frameworks/kauth/kauth-5.74.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls +policykit"
 
 BDEPEND="
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.74.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.74.0.ebuild
index d7bb96e9337b..60a14bc4d95b 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.74.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
index 41086080cab2..c63c59e2c202 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kcmutils/kcmutils-5.74.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.74.0.ebuild
index c952a39f1570..cceef0edffad 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.74.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to work with KDE System Settings modules"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
index 209fa2f3b75a..145ab6e8751e 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for manipulating strings using various encodings"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
index e0892ce26198..d7d4771d1c2b 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kconfig/kconfig-5.74.0.ebuild b/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
index 3367ed9f181d..4d5c0b4a1ccb 100644
--- a/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="dbus nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
index e7d3f7fd753a..7d98a79ccf6f 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kcontacts/kcontacts-5.74.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.74.0.ebuild
index 6a1657d46329..43e25664cb87 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.74.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
index 334b607959a4..b088fd4f6978 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org xdg-utils
 
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="fam nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcrash/kcrash-5.74.0.ebuild b/kde-frameworks/kcrash/kcrash-5.74.0.ebuild
index 71360752f9b4..45b423a2a7d1 100644
--- a/kde-frameworks/kcrash/kcrash-5.74.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for intercepting and handling application crashes"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 # requires running kde environment
diff --git a/kde-frameworks/kdav/kdav-5.74.0.ebuild b/kde-frameworks/kdav/kdav-5.74.0.ebuild
index 00d4a38fdbbb..76d914b92d3e 100644
--- a/kde-frameworks/kdav/kdav-5.74.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.74.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/frameworks/kdav/html/index.html"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
index 6ca2a4dcdc7a..a200c3d74e38 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
index b2102a6e3eb1..d4bb82bf2ae3 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-frameworks/kded/kded-5.74.0.ebuild b/kde-frameworks/kded/kded-5.74.0.ebuild
index f7ca70be062c..1ac8bb46e191 100644
--- a/kde-frameworks/kded/kded-5.74.0.ebuild
+++ b/kde-frameworks/kded/kded-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Central daemon of KDE workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild
index 05224a0572a8..7fd625e26c3d 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="libressl X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.74.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.74.0.ebuild
index 30f3d5c221bf..69dbb71db3f3 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.74.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kdesu/kdesu-5.74.0.ebuild b/kde-frameworks/kdesu/kdesu-5.74.0.ebuild
index 2f7d72217dd6..93a02c7eae13 100644
--- a/kde-frameworks/kdesu/kdesu-5.74.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to handle super user actions"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.74.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.74.0.ebuild
index 5bbf7a1f7ebc..52fbabf44081 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.74.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing KDE integration of QtWebKit"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="designer"
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/kdnssd-5.74.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.74.0.ebuild
index 92cd5472cc24..daad2e500ae3 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.74.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls zeroconf"
 
 BDEPEND="
diff --git a/kde-frameworks/kdoctools/kdoctools-5.74.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.74.0.ebuild
index ec660c778a5f..63ad193f63da 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.74.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kemoticons/kemoticons-5.74.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.74.0.ebuild
index 204366d6ce8c..2c76a3228d08 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.74.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for converting text emoticons to graphical representations"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
index 301d7941f34f..89e93e7c273e 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org optfeature python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
 
 BDEPEND="
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.74.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.74.0.ebuild
index c6674bb06028..a5146831b323 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.74.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.74.0.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 IUSE="nls"
 
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
index 518c08cdae6f..230b31a31a07 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing assorted high-level user interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kholidays/kholidays-5.74.0.ebuild b/kde-frameworks/kholidays/kholidays-5.74.0.ebuild
index 1dc1578cdf7b..4f18261f489c 100644
--- a/kde-frameworks/kholidays/kholidays-5.74.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/khtml/khtml-5.74.0.ebuild b/kde-frameworks/khtml/khtml-5.74.0.ebuild
index ab3f9648db3a..0fe26e9ad098 100644
--- a/kde-frameworks/khtml/khtml-5.74.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="libressl X"
 
 BDEPEND="
diff --git a/kde-frameworks/ki18n/ki18n-5.74.0.ebuild b/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
index 1e4907175595..2cb5f041aa15 100644
--- a/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.74.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.74.0.ebuild
index c3d55a6c26b0..c4613f215379 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.74.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kidletime/kidletime-5.74.0.ebuild b/kde-frameworks/kidletime/kidletime-5.74.0.ebuild
index ebb72bc1e100..ba227d833994 100644
--- a/kde-frameworks/kidletime/kidletime-5.74.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/kimageformats-5.74.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.74.0.ebuild
index 151d1c9d17ee..cc92ac98afd7 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.74.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="eps openexr"
 
 DEPEND="
diff --git a/kde-frameworks/kinit/kinit-5.74.0.ebuild b/kde-frameworks/kinit/kinit-5.74.0.ebuild
index 0363bd67bc9e..61f95b79f845 100644
--- a/kde-frameworks/kinit/kinit-5.74.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+caps +man X"
 
 BDEPEND="
diff --git a/kde-frameworks/kio/kio-5.74.1-r1.ebuild b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
index 67c8861aa8c7..567730714e54 100644
--- a/kde-frameworks/kio/kio-5.74.1-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org xdg-utils
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
index 7bd58620cbe3..bf28cdcaad5a 100644
--- a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
index d367d60b09de..fb3379cbfd1d 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="qml"
 
 RDEPEND="
diff --git a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
index e365ae76706a..b27c0d305a9b 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
index 818eab631da4..17f9fa543293 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kjs/kjs-5.74.0.ebuild b/kde-frameworks/kjs/kjs-5.74.0.ebuild
index 85245f7fc30a..3b9eab2cd3ae 100644
--- a/kde-frameworks/kjs/kjs-5.74.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="ECMAScipt compatible parser and engine"
 LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kjsembed/kjsembed-5.74.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.74.0.ebuild
index 9dc4f08f5f2b..5b0dabbf5f8b 100644
--- a/kde-frameworks/kjsembed/kjsembed-5.74.0.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework binding JavaScript objects to QObjects"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild
index 1f1c7671fb30..f9fde16ec25e 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing a common interface for KParts that can play media files"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild
index 5d68acc7623c..eae6157af3d7 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/knotifications-5.74.0.ebuild b/kde-frameworks/knotifications/knotifications-5.74.0.ebuild
index 50f02fa78d97..1e316004a7c8 100644
--- a/kde-frameworks/knotifications/knotifications-5.74.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="dbus nls phonon speech X"
 
 BDEPEND="
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild
index 7c6b0d5fe9fe..24f950e2f420 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="phonon"
 
 DEPEND="
diff --git a/kde-frameworks/kpackage/kpackage-5.74.0.ebuild b/kde-frameworks/kpackage/kpackage-5.74.0.ebuild
index 0137a0c0333b..396a714eac63 100644
--- a/kde-frameworks/kpackage/kpackage-5.74.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to install and load packages of non binary content"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="man"
 
 BDEPEND="
diff --git a/kde-frameworks/kparts/kparts-5.74.0.ebuild b/kde-frameworks/kparts/kparts-5.74.0.ebuild
index ed58b1f9d6da..81a2b37d0d4d 100644
--- a/kde-frameworks/kparts/kparts-5.74.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing elaborate user-interface components"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/kpeople-5.74.0.ebuild b/kde-frameworks/kpeople/kpeople-5.74.0.ebuild
index 92fd21d46e99..ff4c69a64a48 100644
--- a/kde-frameworks/kpeople/kpeople-5.74.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.74.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kplotting/kplotting-5.74.0.ebuild b/kde-frameworks/kplotting/kplotting-5.74.0.ebuild
index 4e0e6dcf4a85..5bd696dc150b 100644
--- a/kde-frameworks/kplotting/kplotting-5.74.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing easy data-plotting functions"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpty/kpty-5.74.0.ebuild b/kde-frameworks/kpty/kpty-5.74.0.ebuild
index 58cd5972529e..a94241e56fe9 100644
--- a/kde-frameworks/kpty/kpty-5.74.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild
index 79ce5ad3e982..9bf60b12e087 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="QtQuick plugin providing high-performance charts"
 HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kross/kross-5.74.0.ebuild b/kde-frameworks/kross/kross-5.74.0.ebuild
index 126966edd48c..093aa466f2b0 100644
--- a/kde-frameworks/kross/kross-5.74.0.ebuild
+++ b/kde-frameworks/kross/kross-5.74.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for embedding scripting into applications"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/krunner/krunner-5.74.0.ebuild b/kde-frameworks/krunner/krunner-5.74.0.ebuild
index aa2b89cf6184..81a3f92367c9 100644
--- a/kde-frameworks/krunner/krunner-5.74.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for providing different actions given a string query"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kservice/kservice-5.74.0.ebuild b/kde-frameworks/kservice/kservice-5.74.0.ebuild
index d2648dee34f8..80ab82cac6e8 100644
--- a/kde-frameworks/kservice/kservice-5.74.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Advanced plugin and service introspection"
 
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.74.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.74.0.ebuild
index b3a28f19dbff..47d2f7ee6765 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.74.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+editorconfig git"
 
 BDEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.74.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.74.0.ebuild
index 5b779fa3a69f..a4728a7add92 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.74.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.74.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.74.0.ebuild
index 68b6f33e8a36..c8ee6ef74baa 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.74.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for converting units"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
index 3ea50bbe8d95..ad0116bc7be8 100644
--- a/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org optfeature
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gpg +man"
 
 BDEPEND="
diff --git a/kde-frameworks/kwayland/kwayland-5.74.0.ebuild b/kde-frameworks/kwayland/kwayland-5.74.0.ebuild
index c26d99d7d717..05e34d43f7fa 100644
--- a/kde-frameworks/kwayland/kwayland-5.74.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.74.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
index 4476cbb40c31..347978006bbc 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.74.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.74.0.ebuild
index f03a2ebbe445..2c1631b93930 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.74.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
index 9153e10d6376..2c06e087a0e0 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 IUSE=""
 
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.74.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.74.0.ebuild
index 13c3629454bd..999a9c3efa05 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.74.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.74.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.74.0.ebuild
index 1bc99a7be8be..3f2cc5646b6b 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.74.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.74.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.74.0.ebuild
index 1d7b8c3dc19b..8ba8591d5751 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.74.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.74.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="teamd"
 
 BDEPEND="
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild
index 6a216f785637..ae9b63f2caf6 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit cmake kde.org xdg-utils
 DESCRIPTION="Oxygen SVG icon theme"
 
 LICENSE="LGPL-3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
index b27e6cbe2c60..214f69e939ba 100644
--- a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only wayland X"
 
 BDEPEND="
diff --git a/kde-frameworks/prison/prison-5.74.0.ebuild b/kde-frameworks/prison/prison-5.74.0.ebuild
index baa652eeee59..c23283e73928 100644
--- a/kde-frameworks/prison/prison-5.74.0.ebuild
+++ b/kde-frameworks/prison/prison-5.74.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://invent.kde.org/frameworks/prison"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="qml"
 
 RDEPEND="
diff --git a/kde-frameworks/purpose/purpose-5.74.0.ebuild b/kde-frameworks/purpose/purpose-5.74.0.ebuild
index bca0efdad26b..d92e581d64f8 100644
--- a/kde-frameworks/purpose/purpose-5.74.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.74.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org optfeature xdg-utils
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +dolphin +kaccounts"
 
 DEPEND="
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
index 1be5884bab34..ca7de8049c8f 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/solid/solid-5.74.0.ebuild b/kde-frameworks/solid/solid-5.74.0.ebuild
index cc570778f2a6..ce6736862ed9 100644
--- a/kde-frameworks/solid/solid-5.74.0.ebuild
+++ b/kde-frameworks/solid/solid-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org optfeature
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/sonnet/sonnet-5.74.0.ebuild b/kde-frameworks/sonnet/sonnet-5.74.0.ebuild
index 8904fd96ae08..c227ce5d9110 100644
--- a/kde-frameworks/sonnet/sonnet-5.74.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 BDEPEND="
diff --git a/kde-frameworks/syndication/syndication-5.74.0.ebuild b/kde-frameworks/syndication/syndication-5.74.0.ebuild
index 2ceefac62ed0..23ed1d195948 100644
--- a/kde-frameworks/syndication/syndication-5.74.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild
index 207888a945f4..0103a86f2ae5 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/threadweaver/threadweaver-5.74.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.74.0.ebuild
index 62e48be000b0..91cd03721b6e 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.74.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.74.0.ebuild
@@ -7,7 +7,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 0715737a867c..d63884088918 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
index e3ac4201c628..956170632240 100644
--- a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
index a5f8cde3adc8..4c4e78b0a1a6 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
index 4d2cb06daca2..8b0c8bd547d6 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
index 3327c8b0d4dc..5484406c9070 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
index a8ff17fa3aae..89b650b1f4f1 100644
--- a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/discover-5.19.5.ebuild b/kde-plasma/discover/discover-5.19.5.ebuild
index 94427a31cc08..48dfafd990e1 100644
--- a/kde-plasma/discover/discover-5.19.5.ebuild
+++ b/kde-plasma/discover/discover-5.19.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
index 4d06fae14c37..dad96335a28e 100644
--- a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
index dd82bc2d73f1..c925697828a2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
index 0431f556ace0..231d15c17e77 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
index 6f7ee881c2c4..84d17cd8b3f4 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
index 8af85419e36d..329199112f30 100644
--- a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
index 4bbced6d59b9..5fe105d32ea5 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kgamma/kgamma-5.19.5.ebuild b/kde-plasma/kgamma/kgamma-5.19.5.ebuild
index 6e679a57b188..3d850099431c 100644
--- a/kde-plasma/kgamma/kgamma-5.19.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
index dc0bc315721e..3a4fd854f704 100644
--- a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
index 465040931313..8efe0163f1dc 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
index 948fd6c64fbd..b92ffa235734 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.19.5.ebuild b/kde-plasma/kscreen/kscreen-5.19.5.ebuild
index e6a1ceb98874..a338848cb431 100644
--- a/kde-plasma/kscreen/kscreen-5.19.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
index 19e9593c5b98..209457e8c183 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
index 06256f6ebd55..92cb90f82a19 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
index 26f3a8cdd55d..0d99bed5a51b 100644
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="lm-sensors pcap"
 
 RESTRICT+=" test" # bug 727848
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
index f3aee013f0db..fc43479c7a8c 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
index 1c140a908f24..225a89330e9f 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
index d8a1ad1bc7fa..feb358f16c17 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kwin/kwin-5.19.5-r1.ebuild b/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
index 687b38b06b83..fc1182510000 100644
--- a/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="caps gles2-only multimedia"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-5.19.5.ebuild b/kde-plasma/kwrited/kwrited-5.19.5.ebuild
index 990fbf2c8a56..b324563b7fdc 100644
--- a/kde-plasma/kwrited/kwrited-5.19.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
index 07f5462cd664..f1338d76cf04 100644
--- a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
index c7f24e44e56f..cf0bfe42b844 100644
--- a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
index 0257e5c9c039..ccb11d117c2b 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/milou/milou-5.19.5.ebuild b/kde-plasma/milou/milou-5.19.5.ebuild
index 90bfd4269dc0..724be14a7ba4 100644
--- a/kde-plasma/milou/milou-5.19.5.ebuild
+++ b/kde-plasma/milou/milou-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.19.5.ebuild b/kde-plasma/oxygen/oxygen-5.19.5.ebuild
index da2f48a41643..f856859339e9 100644
--- a/kde-plasma/oxygen/oxygen-5.19.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
index 061929d3125e..91ada7c65102 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
index 2e444761f4a3..c3f9e924568f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji +fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
index d4f648250e5c..ad56b885e448 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
index 0eadcf507b75..18a7aeba6379 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +browser-integration crypt +desktop-portal discover
 +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray
 +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
index 88b420bbcba2..69089da378c5 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
index ba15ef03c38f..224c7bd36a81 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
index f69a57f7cb74..9aa04126da84 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
index 3d2eb4cde187..8d48bdb0e505 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
index 3d85e7d2e54f..56aeacaf1b52 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
index ffb0fe76c1d7..472f6c66c2de 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
index 303d16136d8e..01b5e879921a 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
index 3ae4d51c8f88..d46955297ea3 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
index 8f546100a5e7..e2c03a38d2cc 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
index ad9e8382dae0..c5aa154aac7d 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
index 2452e482dfec..f14cde3ad190 100644
--- a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/user-manager/user-manager-5.19.5.ebuild b/kde-plasma/user-manager/user-manager-5.19.5.ebuild
index 5a995234a707..280dbedb3e7c 100644
--- a/kde-plasma/user-manager/user-manager-5.19.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple system settings module to manage the users of your system"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
index c3030f9c61dd..ccd6c0f879a8 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="screencast"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
index 6a85ef32c1a9..22ed031a9156 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e66b4d33ade9..605d2e94f085 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 31a2bd1b901e..7b2fbeee7132 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
 DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
+DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd-9999-unbundle-hiredis.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-hiredis.patch
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd-9999-unbundle-lua.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
diff --git a/mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch b/mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd-9999-unbundle-zstd.patch
rename to mail-filter/rspamd/files/rspamd-2.6-unbundle-zstd.patch
diff --git a/mail-filter/rspamd/rspamd-2.6.ebuild b/mail-filter/rspamd/rspamd-2.6.ebuild
new file mode 100644
index 000000000000..4c166ee4b01a
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake pax-utils systemd tmpfiles
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+
+RDEPEND="
+	acct-group/rspamd
+	acct-user/rspamd
+	app-arch/zstd
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/hiredis:=
+	dev-libs/icu:=
+	dev-libs/libev
+	dev-libs/libsodium
+	dev-libs/snowball-stemmer
+	net-libs/libnsl
+	sys-apps/file
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? (
+		dev-lang/luajit:2
+		dev-lua/lpeg[luajit]
+	)
+	!jit? (
+		dev-lang/lua:*
+		dev-lua/lpeg[-luajit]
+		dev-lua/LuaBitOp
+	)
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -vrf contrib/{hiredis,lua-{bit,lpeg},snowball,zstd} || die
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index cad053757027..4c166ee4b01a 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -58,10 +58,10 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-9999-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-9999-unbundle-zstd.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-zstd.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-	"${FILESDIR}/rspamd-9999-unbundle-hiredis.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-hiredis.patch"
 )
 
 src_prepare() {
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 99a387860e81..abf78e67b5e8 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index afb6bb7c37b4..1c7bd19ea981 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,3 @@
 DIST postfix-3.5.6.tar.gz 4613310 BLAKE2B b7d236677cc698bb7028b39a25441c1163e65112573756da6c17b3ef64d0917f86fdcb96ab4a20f13ccee0381420301b57e1e41c3fad11d28c7ad70bd2e1f7e3 SHA512 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c
 DIST postfix-3.5.7.tar.gz 4613756 BLAKE2B 9fa7de3e6d7d20c549c6f26d77d9a0973e789f1b6650a13be08ddc35d047b0ba6e7e75dcb5749e0772cd1e821a9e2f40891c0422bc47a90be166cc937050bc52 SHA512 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2
-DIST postfix-3.6-20200925.tar.gz 4657429 BLAKE2B d759c9153a8bb240d1e2571e373f4213dfb1db2cd28d244fd1d1267f4a25ec451985102dbf8e9233aeb7876b7edeef0a03417cfdd8712c62308eda8870d3e925 SHA512 d1a6c1ac837932efb1acf2bbfa3b686a58345736201c5691e60126d385c9682c00b5ba9f592a62a41908e5a01cfe3a419e3950298c5e6472bbf74914bc2b7ce8
+DIST postfix-3.6-20201003.tar.gz 4653315 BLAKE2B 283b9cebd0dbf5695a18e256eb97dd73562214e13a825801e76a8f0c7bf04270e547ae9f39bb3b57190141aed17915bf9310ac53f4e170ab5da5a4b28c40154b SHA512 4a6e144abb153f68d943c618b4d752c1b20b2deabc0dbaec556647b3547e8d384147f01f117484a45c387af1c278d7a511ea7796377cbac3c3d0f2e3ba994b6c
diff --git a/mail-mta/postfix/postfix-3.6_pre20200925.ebuild b/mail-mta/postfix/postfix-3.6_pre20201003.ebuild
similarity index 98%
rename from mail-mta/postfix/postfix-3.6_pre20200925.ebuild
rename to mail-mta/postfix/postfix-3.6_pre20201003.ebuild
index 8d6649b9d231..05a166047960 100644
--- a/mail-mta/postfix/postfix-3.6_pre20200925.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20201003.ebuild
@@ -15,10 +15,14 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
-DEPEND=">=dev-libs/libpcre-3.4
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	>=dev-libs/libpcre-3.4
 	dev-lang/perl
 	berkdb? ( >=sys-libs/db-3.2:* )
 	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
@@ -38,9 +42,6 @@ DEPEND=">=dev-libs/libpcre-3.4
 	)"
 
 RDEPEND="${DEPEND}
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
 	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	!mail-mta/courier
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9bb9a15b2d0d..64b579f01bb2 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 117a1e8633a4..4a20108dc534 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,2 +1,3 @@
 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
+DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
diff --git a/media-gfx/gimp/gimp-2.10.22.ebuild b/media-gfx/gimp/gimp-2.10.22.ebuild
new file mode 100644
index 000000000000..bfe5f500c7e6
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.22.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=media-libs/babl-0.1.78
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.26:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 0a82b991ba0e..407baff7ace1 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,3 +1,3 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.7.0.tar.xz 468752 BLAKE2B d8f41842c16ff54fff180d2ecaab3fb09c4b7c4d2eac8ba4b6cd2703cca4538844389af8151eaeac030f5962df7ce9192e60c0515f78d2d8aa9aa0ec2973fb97 SHA512 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
 DIST gscan2pdf-2.8.1.tar.xz 476880 BLAKE2B c54e318fa00670f6b2f996791477fd61076abdfe57f2d924cad1fa9092a8796851c9ab503aabb7831ac374e390a19a821a5c7a8b996235deb7d7781b8b47f76c SHA512 2a9f52ce53030f2871d2430b6aab6b06bb1d4e2efbde25ad24196cfa99ad7b13342ff0f2827526020f5c12079e156bc430f891bdb6ffa9545a210bf1cba29be5
+DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
similarity index 85%
rename from media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
rename to media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
index 904dffb20a89..85acaa59b85c 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-perl/HTML-Parser
 	dev-perl/Image-Sane
 	dev-perl/List-MoreUtils
+	dev-perl/Locale-Codes
 	dev-perl/Locale-gettext
 	dev-perl/Log-Log4perl
 	dev-perl/PDF-API2
@@ -57,7 +58,7 @@ BDEPEND="
 		app-text/poppler[utils]
 		app-text/tesseract[-opencl,osd(+),tiff]
 		app-text/unpaper
-		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/imagemagick[djvu,png,tiff,perl,postscript]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
@@ -84,6 +85,15 @@ pkg_postrm() {
 }
 
 src_test() {
+	echo "Using:"
+	echo "  $(best_version app-text/djvu)"
+	echo "  $(best_version app-text/poppler)"
+	echo "  $(best_version app-text/tesseract)"
+	echo "  $(best_version dev-perl/Image-Sane)"
+	echo "  $(best_version media-gfx/imagemagick)"
+	echo "  $(best_version media-gfx/sane-backends)"
+	echo "  $(best_version media-libs/tiff)"
+
 	local confdir="${HOME}/.config/ImageMagick"
 	mkdir -p "${confdir}" || die
 	cat > "${confdir}/policy.xml" <<-EOT || die
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index fdd5434d27f1..17d952a18c89 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,4 +1,2 @@
-DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
-DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
diff --git a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch
deleted file mode 100644
index ad0e5a2758ea..000000000000
--- a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
-
-From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
-From: Peter-Levine 
-Date: Wed, 31 May 2017 04:49:36 -0400
-Subject: [PATCH] Don't allow throw() in destructors (#1182)
-
----
- toonz/sources/image/3gp/tiio_3gp_proxy.cpp | 2 --
- toonz/sources/image/mov/tiio_mov_proxy.cpp | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-index d1bd79717..03140f695 100644
---- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-@@ -138,8 +138,6 @@ TLevelWriter3gp::~TLevelWriter3gp() {
-   QString res;
- 
-   stream << (msg << QString("$closeLW3gp") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
-diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-index 260bbb196..6be067c01 100644
---- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
-+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-@@ -206,8 +206,6 @@ TLevelWriterMov::~TLevelWriterMov() {
-   QString res;
- 
-   stream << (msg << QString("$closeLWMov") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
deleted file mode 100644
index ced01576533d..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/freeglut:=
-	media-libs/freetype:2=
-	media-libs/glew:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2:=
-	sci-libs/blas-reference:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	$RDEPEND
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch )
-
-src_configure()
-{
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst()
-{
-	elog "It is supposedly optional but some files are"
-	elog "actually required to run the executable properly."
-	elog
-	elog "The .config/OpenToonz/ directory in your home folder"
-	elog "will contain your settings, work and other files."
-	elog
-	elog "We need to create it from the command-line:"
-	elog
-	elog "$ mkdir -p \$HOME/.config/OpenToonz"
-	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
-}
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
deleted file mode 100644
index b1aa0a87358e..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2=
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut:=
-	media-libs/freetype:2=
-	media-libs/glew:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:=
-	media-libs/libsdl2:=
-	sci-libs/cblas-reference:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	$RDEPEND
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure()
-{
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst()
-{
-	elog "It is supposedly optional but some files are"
-	elog "actually required to run the executable properly."
-	elog
-	elog "The .config/OpenToonz/ directory in your home folder"
-	elog "will contain your settings, work and other files."
-	elog
-	elog "We need to create it from the command-line:"
-	elog
-	elog "$ mkdir -p \$HOME/.config/OpenToonz"
-	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
-}
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
deleted file mode 100644
index 74922af17dc9..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	media-libs/libsdl2
-	sci-libs/cblas-reference
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 84aa20b29e6d..db2d6d741f71 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b63767947c76..27e2af060816 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,2 +1,3 @@
 DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
 DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
+DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
diff --git a/media-libs/gegl/gegl-0.4.26.ebuild b/media-libs/gegl/gegl-0.4.26.ebuild
new file mode 100644
index 000000000000..8a755723d7e1
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.26.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild b/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
index 4c9e3146130b..cc0900b1c3fb 100644
--- a/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.2-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 736a10582a9e..628d2992e3af 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1 +1,2 @@
 DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a
+DIST libpgf-7.19.3.zip 1303189 BLAKE2B 129ec655241f0a152814b412c1ee5d40fc5b89daef172d1e73985e49f8ffec22ce87c6aa893dbf330b5176370d985ffd0c6a015adfbb9faf72131bc63cf0c94d SHA512 68f9734b51372f7bb39b35cf99425bac6f9cf29f0351dba8813742c41f62f394798c92f674803d1315456a9337c7af03479d43455a9e611c07f5cf47ab3e5b58
diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild
new file mode 100644
index 000000000000..494a98b72c9f
--- /dev/null
+++ b/media-libs/libpgf/libpgf-7.19.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
+HOMEPAGE="https://www.libpgf.org/"
+SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}-latest/libPGF-codec-and-console-src.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+BDEPEND="
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/libPGF-codec-and-console-src/PGF/Codec"
+
+src_prepare() {
+	default
+
+	# configure.ac has wrong version number
+	sed -i 's/7.15.32/7.19.3/g' configure.ac || die
+
+	if ! use doc; then
+		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
diff --git a/media-libs/mesa/mesa-20.2.0.ebuild b/media-libs/mesa/mesa-20.2.0.ebuild
index 7e2bd851871f..402d1049c184 100644
--- a/media-libs/mesa/mesa-20.2.0.ebuild
+++ b/media-libs/mesa/mesa-20.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7e2bd851871f..402d1049c184 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit llvm meson multilib-minimal python-any-r1 linux-info
 
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
index 53d4bd8e6f39..81c82774fc00 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-9.1.23.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 3f4b2dfa9bbf..3d877b29106e 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,4 +2,7 @@ DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
+DIST opencv-4.4.0.tar.gz 88887103 BLAKE2B 87838e2c837074c445eeead11b76b0ab6f433873195169fe288dfb5e4844f27b13126ef9c0d973857693c77db82168826df698ee7f34bc10eec3bda869b30d32 SHA512 ce4bada7b57c1a00439eca02abcba262732d5eabfd26090f6f83642d747a9a1a7908230bcd01a2b999c509e0c43c8b0dcb2b93ac824518b79cffe533f22652bb
+DIST opencv-4.4.0_contrib.tar.gz 59968818 BLAKE2B 2e2c1bf776fef0b4d9f92406665adfbce96e6185a4b5fda82cfdd1e7899b3ca7e7615c4dce508082fcf94a10cfa160154ac0aa7a90ce2635f566a65176678dcd SHA512 d1a29a4a343f55fe2ae04966d2fc2d20765de719619bea68b84ee72f432777062727d8105b0aa168f359e468544b2ea930b1a4f8dc059e51de27d8af229c6b6b
+DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
diff --git a/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch
new file mode 100644
index 000000000000..89ac1ff47ca1
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch
@@ -0,0 +1,26 @@
+ cmake/OpenCVCompilerOptimizations.cmake | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake
+index 970dd28903..b56892bb12 100644
+--- a/cmake/OpenCVCompilerOptimizations.cmake
++++ b/cmake/OpenCVCompilerOptimizations.cmake
+@@ -156,12 +156,12 @@ if(";${CPU_BASELINE};" MATCHES ";NATIVE;" OR ";${CPU_BASELINE};" MATCHES ";HOST;
+   set(_add_native_flag ON)
+ elseif(";${CPU_BASELINE};" MATCHES ";DETECT;")
+   set(CPU_BASELINE_DETECT ON)
+-elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ")
+-  if(DEFINED CPU_BASELINE)
+-    message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.")
+-  endif()
+-  set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}")
+-  set(CPU_BASELINE_DETECT ON)
++#elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ")
++#  if(DEFINED CPU_BASELINE)
++#    message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.")
++#  endif()
++#  set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}")
++#  set(CPU_BASELINE_DETECT ON)
+ endif()
+ 
+ if(X86 OR X86_64)
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 98984a7467b5..ad1fde1b865e 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -18,6 +18,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		Enable features2d module
 		Enable support for sci-libs/gdal library
 		Enable x11-libs/gtk+:3 support
+		Build using Link Time Optimizations (LTO)
 		Enable compilation with opencvapps
 		Use Google's C++ argument parsing library
 		Use Google's C++ loggin library
@@ -26,6 +27,8 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		DNN module contrib requires tiny dnn
 		HDF module requires sci-libs/hdf5
 		SFM module requires eigen, gflags, and glog
+		Enable Drawing UTF-8 strings with freetype/harfbuzz
+		Enable Ogre vision module support
 		Download dnn caffeemodel samples
 		Add support for OpenCL
 		Use Google's OCR Engine
diff --git a/media-libs/opencv/opencv-4.4.0.ebuild b/media-libs/opencv/opencv-4.4.0.ebuild
new file mode 100644
index 000000000000..783f97e3a22d
--- /dev/null
+++ b/media-libs/opencv/opencv-4.4.0.ebuild
@@ -0,0 +1,546 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/${PV}.tar.gz -> ${P}_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="BSD"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+	cuda? ( tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	lapack? ( virtual/lapack )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-${PV}" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+	done
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR=${orig_BUILD_DIR}
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm -rf CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -rf modules/python2 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openexr/openexr-2.5.2.ebuild b/media-libs/openexr/openexr-2.5.2-r1.ebuild
similarity index 97%
rename from media-libs/openexr/openexr-2.5.2.ebuild
rename to media-libs/openexr/openexr-2.5.2-r1.ebuild
index 8741703f3082..63da2483c2cb 100644
--- a/media-libs/openexr/openexr-2.5.2.ebuild
+++ b/media-libs/openexr/openexr-2.5.2-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	media-libs/ilmbase:=
+	media-libs/ilmbase:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
index d9be98b4afb0..19ab38252646 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
index 1d88e48af04f..5f29407c5d98 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 90b455c38ac5..eb4a52913e6b 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch b/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch
new file mode 100644
index 000000000000..2f253cb0ac52
--- /dev/null
+++ b/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/708520
+https://github.com/carlobaldassi/gimp-lqr-plugin/issues/7
+--- a/src/interface_aux.c	2013-08-05 06:06:03.000000000 -0700
++++ b/src/interface_aux.c	2020-10-06 10:44:45.349564022 -0700
+@@ -48,11 +48,11 @@
+ 
+ gint dialog_aux_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ 
+ /***  Public functions  ***/
+ 
+--- a/src/interface_I.c	2013-08-05 06:06:03.000000000 -0700
++++ b/src/interface_I.c	2020-10-06 10:44:45.349564022 -0700
+@@ -65,13 +65,13 @@
+ 
+ gint dialog_I_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
+-gboolean features_are_sensitive;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
++extern gboolean features_are_sensitive;
+ InterfaceIData interface_I_data;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ GtkWidget *coordinates;
+ 
+ gulong size_changed = 0;
+--- a/src/main.c	2013-08-05 06:06:03.000000000 -0700
++++ a/src/main.c	2020-10-06 10:44:45.349564022 -0700
+@@ -179,7 +179,7 @@
+   {GIMP_PDB_INT32, "resize_aux_layers",
+    "Whether to resize auxiliary layers"},
+   {GIMP_PDB_INT32, "resize_canvas", "Whether to resize canvas"},
+-  {GIMP_PDB_INT32, "output target", "Output target (same layer, new layer, new image)"},
++  {GIMP_PDB_INT32, "output_target", "Output target (same layer, new layer, new image)"},
+   {GIMP_PDB_INT32, "seams", "Whether to output the seam map"},
+   {GIMP_PDB_INT32, "nrg_func", "Energy function to use"},
+   {GIMP_PDB_INT32, "res_order", "Resize order"},
diff --git a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
index cd048f5af6a8..d040db2f7e36 100644
--- a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
+++ b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}-plugin-${PV}"
 
 DESCRIPTION="Content-aware resizing for the GIMP"
 HOMEPAGE="http://liquidrescale.wikidot.com/"
 SRC_URI="http://liquidrescale.wikidot.com/local--files/en:download-page-sources/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	>=media-gfx/gimp-2.8
 	media-libs/liblqr"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.2-gcc-10-fno-common.patch"
+)
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 852e05a47035..815994a50652 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -2,3 +2,4 @@ DIST kodi-pvr-stalker-3.4.10.tar.gz 115715 BLAKE2B f1d0f5a756c17df7a84b24637a557
 DIST kodi-pvr-stalker-3.4.8.tar.gz 115254 BLAKE2B 865ac0123b54369bbe73e67855d915efbd3af82d9cac5669099895efec8410eee7acf8d20f6904a0b939bdbba0feab8ec7aa3e953d816914407673c2bebd3c05 SHA512 f4fd2965199a0a5a31b37c2afa60e3cd6746c25dcfa80d8ddbedb2236b92f3c243dddfdff92fd9e6ffafd434c53124b89b8bd2c636856c62cb78b84e446a3292
 DIST kodi-pvr-stalker-3.4.9.tar.gz 115275 BLAKE2B bd9df715d3f5e630d4a47fe24f24515085f8a6a151545c27d5bc6b3bf4e4876672cddbd7c2d6fbd6a999b285afc6a48a29030ac72b4ed32cf10e8448235ef0b1 SHA512 16107f60529b4ef3730f7a3deb5a7cd9ee645678647248d2fff01dbc94dc7a53029a67a3709955a9be8483a13e13048dadf73a32489725b60b5c07c3a0b6a979
 DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa8187014aad9451e05727cf8b8b705ec936b10b39e62c82f451c6b4049bc70c70708beae2228cb0b5ced71b34de53b497c137076 SHA512 99b9c2a2876023efe510a9970e0520804180e138d63ed1a13fb94e86b346d09c252c8edf12f3c3a7d2610d80d25cc74e938b35ecd925846f6adf648430b0938e
+DIST kodi-pvr-stalker-6.0.1.tar.gz 114575 BLAKE2B cb42fcd4ecc7c65bac75eb12579d0dcdb5827312c275a9db998953366c6a59a1033d7d26cc9db91c909d694340bb0eaf53e9d982604ec45b8cb349c4210565c4 SHA512 e71e37e7b440cb2d4e6f72400cdb457fbcdcc39893cbe70144b9ac1941429f45b00dbf7516b25a8ac874ae471a14335ce74c845239a444446b1fda97361b0757
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild
new file mode 100644
index 000000000000..72e70d8feae4
--- /dev/null
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's Stalker client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/jsoncpp
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
index 134a230b5aca..fc4ddf88443e 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 	~media-tv/kodi-9999
 	dev-libs/jsoncpp
 	dev-libs/tinyxml
-	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a8b50086e222..b83166b2faf7 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 2586c579c1ec..64cd425a9321 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,3 @@
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
+DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
new file mode 100644
index 000000000000..df7176498fdf
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib-build qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	insinto /usr/$(get_libdir)/${PN}
+	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
+
+	newdoc README.Linux README
+	dodoc CHANGES
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 2586c579c1ec..64cd425a9321 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,2 +1,3 @@
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
+DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
new file mode 100644
index 000000000000..17d28a117c43
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
+
+if [[ "${PV}" == *9999 ]] ; then
+	# Required for the mkini.sh script which calls perl multiple times
+	BDEPEND+="
+		dev-lang/perl
+	"
+fi
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw \n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]] ; then
+		pushd scripts &>/dev/null || die
+		./mkini.sh || die
+		popd &>/dev/null || die
+	fi
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+	# Adjust systemd service file to our config location #689208
+	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-i scripts/${PN}.service || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir="$(usex debug debug release)"
+	dobin "${dir}"/murmurd
+
+	local etcdir="/etc/murmur"
+	insinto ${etcdir}
+	newins scripts/${PN}.ini.system ${PN}.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur ${etcdir}/murmur.ini
+	fperms 640 ${etcdir}/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5b4807e358d1..5f3debc34b9c 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a6066b59fb83..22616f7c4ca3 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,4 +2,3 @@ DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
-DIST ffmpeg-4.3.tar.bz2 11297005 BLAKE2B 41b4752aa2c1a937e4e82ec76ca38f48c1dcca633cb77f100aeb6c56f0acc218a39621d8b1046d38f65b3fa5b0871fea7ace16348266ca1244dd889620bc73ab SHA512 fdccd281407d5bed0f673ad01ddc9134cd9a31f040b55e30f3b27913b877732b9d19c6ceeda96afb360e1ff49f4930f6c320747b240cf38d541df81a8ef4272f
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index e1d995bd1cf5..38f0b02a308c 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -327,6 +327,7 @@ S=${WORKDIR}/${P/_/-}
 PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
 	"${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
+	"${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-4.3.ebuild b/media-video/ffmpeg/ffmpeg-4.3.ebuild
deleted file mode 100644
index b519b9bd21cb..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.3.ebuild
+++ /dev/null
@@ -1,557 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	libaribb24? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
-		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
-		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
-		X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar libaom
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
-PPC_CPU_REQUIRED_USE="
-	cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
-	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
-"
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${PPC_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
-	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
-	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
-"
-
-DEPEND="${RDEPEND}
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	>=sys-devel/make-3.81
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
-	test? ( net-misc/wget sys-devel/bc )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	rubberband? ( gpl )
-	vidstab? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-	)
-"
-REQUIRED_USE="
-	cuda? ( video_cards_nvidia )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	!test? ( test )
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r1.patch
-	"${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-	use opencl
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use libaribb24 && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
-		myconf+=( --disable-gnutls )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--nm="$(tc-getNM)" \
-		--ranlib="$(tc-getRANLIB)" \
-		--pkg-config="$(tc-getPKG_CONFIG)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}" \
-		${EXTRA_FFMPEG_CONF}
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--disable-opencl
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Compiling for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Installing for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-
-				# When not built separately, libffmpeg has no code of
-				# its own so this QA check raises a false positive.
-				QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
-			fi
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch
new file mode 100644
index 000000000000..40e7f9161726
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch
@@ -0,0 +1,23 @@
+Fixes build on ppc.
+https://trac.ffmpeg.org/attachment/ticket/8750/ffmpeg_altivec_yuv2rgb_novsx.patch
+diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
+index 536545293d..930ef6b98f 100644
+--- a/libswscale/ppc/yuv2rgb_altivec.c
++++ b/libswscale/ppc/yuv2rgb_altivec.c
+@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
+  * ------------------------------------------------------------------------------
+  */
+
++#if !HAVE_VSX
++static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
++{
++    const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
++    vector unsigned char align_perm = vec_lvsl(offset, addr);
++
++    return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
++}
++#endif /* !HAVE_VSX */
++
+ #define DEFCSP420_CVT(name, out_pixels)                                       \
+ static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
+                             int *instrides, int srcSliceY, int srcSliceH,     \
diff --git a/media-video/pipewire/pipewire-0.3.10.ebuild b/media-video/pipewire/pipewire-0.3.10.ebuild
index 08a1bbf37d92..4e3f50346a9e 100644
--- a/media-video/pipewire/pipewire-0.3.10.ebuild
+++ b/media-video/pipewire/pipewire-0.3.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/rav1e/rav1e-0.3.3.ebuild b/media-video/rav1e/rav1e-0.3.3.ebuild
index 8837e73fc6dc..60e89eda3d92 100644
--- a/media-video/rav1e/rav1e-0.3.3.ebuild
+++ b/media-video/rav1e/rav1e-0.3.3.ebuild
@@ -179,7 +179,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 27955cbababe..bbbca5935181 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 24361248e9b6..197a7573e11a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Oct 2020 12:38:35 +0000
+Thu, 08 Oct 2020 13:38:36 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 24361248e9b6..197a7573e11a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Oct 2020 12:38:35 +0000
+Thu, 08 Oct 2020 13:38:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c7f56136c7e6..dc4504a04b55 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index caf0151a3c53..a9cd8d522d1d 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/pgbouncer-0 b/metadata/md5-cache/acct-user/pgbouncer-0
new file mode 100644
index 000000000000..d559a5f9dbcc
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pgbouncer-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=PgBouncer program user
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/postgres
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=520fef38f21adc79848ca43748e86b02
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 6ac56c95c672..9d94baf90f5c 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.0-r1 b/metadata/md5-cache/app-admin/ansible-2.10.0-r1
index 5ae8ac30f574..19020d9d34e0 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.0-r1
+++ b/metadata/md5-cache/app-admin/ansible-2.10.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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=>=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-admin/ansible-base doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DEPEND=>=dev-python/packaging-16.6[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(-)] app-admin/ansible-base doc? ( dev-python/sphinx[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/sphinx-notfound-page[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/pygments-2.4.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(-)] ) test? ( dev-python/paramiko[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/pyyaml[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/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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/mock-1.0.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/passlib[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/coverage[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/unittest2[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-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/paramiko[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/pyyaml[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/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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/a/ansible/ansible-2.10.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e7e2be5ed93fd33bd1f7934339ece1b
+_md5_=233d56ef5fa1fd0619952bf1f849722f
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 19db7224edaf..c3f155bcd175 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,15 +1,15 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[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-python/sphinx[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/sphinx-notfound-page[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/pygments-2.4.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(-)] ) test? ( dev-python/paramiko[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/pyyaml[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/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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/mock-1.0.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/passlib[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/coverage[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/unittest2[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-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/paramiko[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/pyyaml[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/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dc6bf23b1629652d7f967257135eba1a
+_md5_=b64cd10d472f3831c597e7d89aa7b446
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.2 b/metadata/md5-cache/app-admin/ansible-base-2.10.2
index 44ec4e1e6276..568c08920a43 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.2
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.2
@@ -1,16 +1,16 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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=!=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh !=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DEPEND=!=dev-python/packaging-16.6[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-python/sphinx[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/sphinx-notfound-page[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/pygments-2.4.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(-)] ) test? ( dev-python/paramiko[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/pyyaml[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(-)] dev-python/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !=dev-python/mock-1.0.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/passlib[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/coverage[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/unittest2[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-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[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/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh !=dev-lang/python-exec-2:=[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 )
+RDEPEND=dev-python/paramiko[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/pyyaml[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(-)] dev-python/cryptography[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/httplib2[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/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(-)] dev-python/netaddr[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/pexpect[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(-)] net-misc/sshpass virtual/ssh !=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=https://releases.ansible.com/ansible-base/ansible-base-2.10.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a9daefd875dd3b5feacafbf77cc24cf
+_md5_=96a258393f74c5dbe6712219485faff4
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index 535e2de76af9..48a2e5be752c 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -1,15 +1,15 @@
-BDEPEND=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/pyparsing-1.5.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/cached-property-1.2.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/configargparse-0.11.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/jinja-2.8[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/six-1.1.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/nose[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/pyparsing-1.5.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/cached-property-1.2.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(-)] >=dev-python/configargparse-0.11.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(-)] >=dev-python/jinja-2.8[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/six-1.1.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=Nginx configuration static analyzer
 EAPI=7
 HOMEPAGE=https://github.com/yandex/gixy
-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 ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pyparsing-1.5.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/cached-property-1.2.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/configargparse-0.11.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/jinja-2.8[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/six-1.1.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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pyparsing-1.5.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/cached-property-1.2.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(-)] >=dev-python/configargparse-0.11.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(-)] >=dev-python/jinja-2.8[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/six-1.1.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(-)]
+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/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f1ee36197df1935416dc0c16292d1ea
+_md5_=7291b120ec2213b34fb2c76d3ba5152d
diff --git a/metadata/md5-cache/app-admin/restart-services-0.16.1 b/metadata/md5-cache/app-admin/restart-services-0.16.1
new file mode 100644
index 000000000000..aa0d206f132a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/restart-services-0.16.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Tool to manage OpenRC services that need to be restarted
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-admin/lib_users sys-apps/openrc app-portage/portage-utils
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-0.16.1.tgz
+_md5_=2477af33ef3d32c7277f9ddd072ecd7d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index bc12025da141..36385e66e276 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.3 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
similarity index 87%
rename from metadata/md5-cache/app-backup/rdiff-backup-2.0.3
rename to metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
index 0a9ef24e5f16..5c46dff5cc86 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.3
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/rdiff-backup/rdiff-backup
 IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
-RDEPEND=dev-python/pylibacl[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/pyxattr[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(-)] >=net-libs/librsync-1.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_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=dev-python/pylibacl[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/pyxattr[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(-)] >=net-libs/librsync-1.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_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 )
 SLOT=0
-SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.3/rdiff-backup-2.0.3.tar.gz
+SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.5/rdiff-backup-2.0.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0dc741037fce6ee5340ddb83f9a5ae22
+_md5_=ab1548b179ee5d7ab807956b390c6b7a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 1da0271e7f92..bbbf8e0075f9 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-1.9.0 b/metadata/md5-cache/app-crypt/acme-1.9.0
new file mode 100644
index 000000000000..4a17c4fe698a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-1.9.0
@@ -0,0 +1,16 @@
+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=doc? ( dev-python/sphinx[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/sphinx_rtd_theme[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/cryptography-1.3.4[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/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/josepy-1.1.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/pyopenssl-0.15.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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-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/six-1.9.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/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/pytest[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-xdist[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=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[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/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/josepy-1.1.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/pyopenssl-0.15.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/pyrfc3339[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/pytz[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/requests-2.10[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/requests-toolbelt-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/six-1.9.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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3c79f4dbd37b6a53cde8718c29a419df
diff --git a/metadata/md5-cache/app-crypt/certbot-1.9.0 b/metadata/md5-cache/app-crypt/certbot-1.9.0
new file mode 100644
index 000000000000..8eb3130eb2b9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.9.0
@@ -0,0 +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
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.8.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/configargparse-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/configobj[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/cryptography-2.8[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/distro-1.0.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/josepy-1.1.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/parsedatetime-1.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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9142ae085c0d45b37fa2dee53751e32b
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index f04fe05bc123..f88aa1b8cd46 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,14 +1,13 @@
-BDEPEND=test? ( >=app-crypt/acme-1.6.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/configargparse-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/configobj[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/cryptography-2.8[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/distro-1.0.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/josepy-1.1.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/parsedatetime-1.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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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(-)] ) >=dev-vcs/git-1.8.2.1[curl] 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-vcs/git-1.8.2.1[curl] 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 unpack
 DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test 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
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-1.6.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/configargparse-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/configobj[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/cryptography-2.8[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/distro-1.0.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/josepy-1.1.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/parsedatetime-1.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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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(-)]
+RDEPEND=>=app-crypt/acme-1.8.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/configargparse-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/configobj[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/cryptography-2.8[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/distro-1.0.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/josepy-1.1.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/parsedatetime-1.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/pyrfc3339[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/pytz[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/zope-component[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/zope-interface[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 )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=195b52483a663108f44aaf2cc4e2c70b
+_md5_=9142ae085c0d45b37fa2dee53751e32b
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.9.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.9.0
new file mode 100644
index 000000000000..5fd847c957d5
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.9.0
@@ -0,0 +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
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[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/zope-component[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/zope-interface[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 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9c718e6edba0230678716e783e7f15f8
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 9ed2b506a2f6..3db9ce948c0d 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -1,15 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] 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 unpack
-DEPEND=test? ( >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[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/zope-component[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/zope-interface[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[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=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-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
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-1.6.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/python-augeas[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/zope-component[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/zope-interface[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 )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75c1497632e433274d382a925688bda2
+_md5_=9c718e6edba0230678716e783e7f15f8
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
new file mode 100644
index 000000000000..86a05b6121c7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
@@ -0,0 +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
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.4.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(-)] >=app-crypt/certbot-1.6.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/pyopenssl[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/pyparsing-1.5.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/zope-interface[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 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b1d125567354906c41ba169406610d5e
diff --git a/metadata/md5-cache/app-crypt/nwipe-0.25 b/metadata/md5-cache/app-crypt/nwipe-0.28
similarity index 91%
rename from metadata/md5-cache/app-crypt/nwipe-0.25
rename to metadata/md5-cache/app-crypt/nwipe-0.28
index ba28ddaac868..a4d77cac0bb8 100644
--- a/metadata/md5-cache/app-crypt/nwipe-0.25
+++ b/metadata/md5-cache/app-crypt/nwipe-0.28
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-block/parted-2.3 >=sys-libs/ncurses-5.7-r7:=
 SLOT=0
-SRC_URI=https://github.com/martijnvanbrummelen/nwipe/archive/v0.25.tar.gz -> nwipe-0.25.tar.gz
+SRC_URI=https://github.com/martijnvanbrummelen/nwipe/archive/v0.28.tar.gz -> nwipe-0.28.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3fb212456d4b6ccacb8aac75549929d4
+_md5_=26de560a38df7795c85382faa470fec5
diff --git a/metadata/md5-cache/app-crypt/rainbowcrack-1.8 b/metadata/md5-cache/app-crypt/rainbowcrack-1.8
new file mode 100644
index 000000000000..3f8580f4249d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/rainbowcrack-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Hash cracker that precomputes plaintext - ciphertext pairs in advance
+EAPI=7
+HOMEPAGE=https://project-rainbowcrack.com/
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://project-rainbowcrack.com/rainbowcrack-1.8-linux64.zip
+_eclasses_=wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3fa099f2c61d72a53cb765ac47ae0fe2
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.3.2 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.3.2
index 125a922c3b84..97799dd289cd 100644
--- a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.3.2
+++ b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.3.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig >=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 python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools app-crypt/tpm2-tss dev-db/sqlite:3 dev-libs/openssl dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A PKCS#11 interface for TPM2 hardware
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.3.2/tpm2-pkcs11-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a20aa07ca5d6a40f0629aa3d6800474
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d4e4ee3bd184dd4858ebc97621d80918
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.4.0 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.4.0
index 6b59d1796ef5..aa0260c6a1cf 100644
--- a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.4.0
+++ b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig >=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 python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-crypt/p11-kit app-crypt/tpm2-abrmd app-crypt/tpm2-tools[fapi?] !fapi? ( app-crypt/tpm2-tss ) fapi? ( >=app-crypt/tpm2-tss-3.0.0[fapi] ) dev-db/sqlite:3 dev-libs/openssl dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A PKCS#11 interface for TPM2 hardware
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.4.0/tpm2-pkcs11-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8b7b7963d2e025f35a055b34b16732a8
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9aef8e85fce7af96166a5a25495a969c
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-4.2.1-r1 b/metadata/md5-cache/app-crypt/tpm2-tools-4.3.0
similarity index 50%
rename from metadata/md5-cache/app-crypt/tpm2-tools-4.2.1-r1
rename to metadata/md5-cache/app-crypt/tpm2-tools-4.3.0
index f0dd77353520..cc9b0e1d0ffb 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tools-4.2.1-r1
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-4.3.0
@@ -1,5 +1,5 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
+BDEPEND=virtual/pkgconfig >=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 prepare
 DEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-2.4.0:=[fapi?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Tools for the TPM 2.0 TSS
 EAPI=7
@@ -10,5 +10,6 @@ LICENSE=BSD
 RDEPEND=net-misc/curl:= >=app-crypt/tpm2-tss-2.4.0:=[fapi?] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/4.2.1/tpm2-tools-4.2.1.tar.gz
-_md5_=bb7077f13069f8b9a5b59243acd00862
+SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/4.3.0/tpm2-tools-4.3.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f2239d63feb9df404aa25acd538c6ce7
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b30fbced7860..509e8274d4a5 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/nano-5.1 b/metadata/md5-cache/app-editors/nano-5.1
deleted file mode 100644
index 8449f1370358..000000000000
--- a/metadata/md5-cache/app-editors/nano-5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=7
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-IUSE=debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
-REQUIRED_USE=!ncurses? ( slang? ( minimal ) )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb4012add878cf4309752359a79664af
diff --git a/metadata/md5-cache/app-editors/nano-5.0-r1 b/metadata/md5-cache/app-editors/nano-5.3
similarity index 96%
rename from metadata/md5-cache/app-editors/nano-5.0-r1
rename to metadata/md5-cache/app-editors/nano-5.3
index 8eff020d1ffc..af651cfbf38e 100644
--- a/metadata/md5-cache/app-editors/nano-5.0-r1
+++ b/metadata/md5-cache/app-editors/nano-5.3
@@ -10,6 +10,6 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 REQUIRED_USE=!ncurses? ( slang? ( minimal ) )
 SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.0.tar.gz
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb4012add878cf4309752359a79664af
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 244494c509b9..71db592c23eb 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/free42-2.5.14 b/metadata/md5-cache/app-emulation/free42-2.5.14
deleted file mode 100644
index e79ef58a96a3..000000000000
--- a/metadata/md5-cache/app-emulation/free42-2.5.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
-DESCRIPTION=An HP-42S Calculator Simulator
-EAPI=7
-HOMEPAGE=https://thomasokken.com/free42/
-IUSE=+alsa
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
-SLOT=0
-SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.14.tgz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00f9a1b58c79523ce9759b706ddbd44e
diff --git a/metadata/md5-cache/app-emulation/free42-2.5.16 b/metadata/md5-cache/app-emulation/free42-2.5.16
deleted file mode 100644
index 16c3457451de..000000000000
--- a/metadata/md5-cache/app-emulation/free42-2.5.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
-DESCRIPTION=An HP-42S Calculator Simulator
-EAPI=7
-HOMEPAGE=https://thomasokken.com/free42/
-IUSE=+alsa
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
-SLOT=0
-SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.16.tgz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4968186cb53d3e83aeb0167333ed0b2
diff --git a/metadata/md5-cache/app-emulation/free42-2.5.17 b/metadata/md5-cache/app-emulation/free42-2.5.20
similarity index 98%
rename from metadata/md5-cache/app-emulation/free42-2.5.17
rename to metadata/md5-cache/app-emulation/free42-2.5.20
index f4d769e1081a..ad1f5f15fbb2 100644
--- a/metadata/md5-cache/app-emulation/free42-2.5.17
+++ b/metadata/md5-cache/app-emulation/free42-2.5.20
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
 SLOT=0
-SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.17.tgz
+SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.20.tgz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4968186cb53d3e83aeb0167333ed0b2
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2 b/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2
deleted file mode 100644
index 734c6bd71887..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-6.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/6.2.0
-SRC_URI=https://libvirt.org/sources/libvirt-6.2.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58694b1916fc782b68c4cd4addf56afb
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.5.0-r1 b/metadata/md5-cache/app-emulation/libvirt-6.5.0-r1
deleted file mode 100644
index 856fba16d631..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-6.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=https://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/6.5.0
-SRC_URI=https://libvirt.org/sources/libvirt-6.5.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e469776799e787b6a6ac891fff0e9dd
diff --git a/metadata/md5-cache/app-emulation/qemu-5.1.0 b/metadata/md5-cache/app-emulation/qemu-5.1.0
deleted file mode 100644
index c5bd2a6a53d6..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] xkb? ( x11-libs/libxkbcommon[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=7
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
-KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( x11-libs/libxkbcommon ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qemu.org/qemu-5.1.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f572075c0e4fb222527449679157e963
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
index 6077e90b31e2..379265551385 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/libvirt-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=!app-emulation/virtinst python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/libvirt-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
-IUSE=gtk policykit sasl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=gtk policykit sasl python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/libvirt-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=!app-emulation/virtinst python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/libvirt-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0f9424e0fa4cdf51b99e877aa6a4e79
+_md5_=e508293b1980d4e53b50246dc07783c5
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 589ab1632303..8ef09cac5c64 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.27 b/metadata/md5-cache/app-misc/go-jira-1.0.27
new file mode 100644
index 000000000000..23c778393f46
--- /dev/null
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.27
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A simple JIRA commandline client in Go
+EAPI=7
+HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-jira/jira/archive/v1.0.27.tar.gz -> go-jira-1.0.27.tar.gz mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.21.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.21.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180928190340-9d1f4485533b.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180928190340-9d1f4485533b.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/coryb/figtree/@v/v0.0.0-20180728224503-071d1ef303df.zip -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.zip mirror://goproxy//github.com/coryb/figtree/@v/v0.0.0-20180728224503-071d1ef303df.mod -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.mod mirror://goproxy//github.com/coryb/figtree/@v/v1.0.1-0.20190907170512-58176d03ef0d.zip -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.zip mirror://goproxy//github.com/coryb/figtree/@v/v1.0.1-0.20190907170512-58176d03ef0d.mod -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.mod mirror://goproxy//github.com/coryb/kingpeon/@v/v0.0.0-20180107011214-9a669f143f2e.zip -> github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.zip mirror://goproxy//github.com/coryb/kingpeon/@v/v0.0.0-20180107011214-9a669f143f2e.mod -> github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.mod mirror://goproxy//github.com/coryb/oreo/@v/v0.0.0-20180804211640-3e1b88fc08f1.zip -> github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.zip mirror://goproxy//github.com/coryb/oreo/@v/v0.0.0-20180804211640-3e1b88fc08f1.mod -> github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/guelfey/go.dbus/@v/v0.0.0-20131113121618-f6a3a2366cc3.zip -> github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.zip mirror://goproxy//github.com/guelfey/go.dbus/@v/v0.0.0-20131113121618-f6a3a2366cc3.mod -> github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180809195222-d55458df857c.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180809195222-d55458df857c.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/jinzhu/copier/@v/v0.0.0-20180308034124-7e38e58719c3.zip -> github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.zip mirror://goproxy//github.com/jinzhu/copier/@v/v0.0.0-20180308034124-7e38e58719c3.mod -> github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.3.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.3.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20170505125900-c90ca0c84f15.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20170505125900-c90ca0c84f15.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/theckman/go-flock/@v/v0.4.0.zip -> github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/theckman/go-flock/@v/v0.4.0.mod -> github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/tidwall/gjson/@v/v0.0.0-20180711011033-ba784d767ac7.zip -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.zip mirror://goproxy//github.com/tidwall/gjson/@v/v0.0.0-20180711011033-ba784d767ac7.mod -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.mod mirror://goproxy//github.com/tidwall/match/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/match/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/keyring/@v/v0.0.0-20171121202319-839169085ae1.zip -> github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip mirror://goproxy//github.com/tmc/keyring/@v/v0.0.0-20171121202319-839169085ae1.mod -> github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180723164146-c126467f60eb.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180723164146-c126467f60eb.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20171102191033-01c190206fbd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20171102191033-01c190206fbd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180727230415-bd9dbc187b6e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180727230415-bd9dbc187b6e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gopkg.in/!alec!aivazis/survey.v1/@v/v1.6.1.zip -> gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.zip mirror://goproxy//gopkg.in/!alec!aivazis/survey.v1/@v/v1.6.1.mod -> gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/coryb/yaml.v2/@v/v2.0.0-20180616071044-0e40e46f7153.zip -> gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.zip mirror://goproxy//gopkg.in/coryb/yaml.v2/@v/v2.0.0-20180616071044-0e40e46f7153.mod -> gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.mod mirror://goproxy//gopkg.in/op/go-logging.v1/@v/v1.0.0-20160211212156-b2cb9fa56473.zip -> gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.zip mirror://goproxy//gopkg.in/op/go-logging.v1/@v/v1.0.0-20160211212156-b2cb9fa56473.mod -> gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=4e48ed5263f9b018d22598c6a57ac1cb
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 9edfbb13c9fa..c4a21ca94090 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
index 96e7f146520f..830f230f3f94 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=bson? ( dev-python/pymongo[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(-)] ) git? ( dev-vcs/git ) sys-apps/portage[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=bson? ( dev-python/pymongo[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(-)] ) git? ( dev-vcs/git ) sys-apps/portage[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(-)]
 DESCRIPTION=framework for ebuild generators
 EAPI=6
 HOMEPAGE=https://github.com/jauhien/g-sorcery
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb91dbd283100282551b2697eb3932a7
+_md5_=0d2846ec63d6000e072b131b04b90ece
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
index 23e149312f65..22654f808dd8 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-portage/g-sorcery[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(-)] dev-python/sexpdata[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_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=app-portage/g-sorcery[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(-)] dev-python/sexpdata[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_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(-)]
 DESCRIPTION=g-sorcery backend for elisp packages
 EAPI=6
 HOMEPAGE=https://github.com/jauhien/gs-elpa
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba9600e24c632b12a46554411a07a4af
+_md5_=91d24ade616d2da18fc246eef2a71aa2
diff --git a/metadata/md5-cache/app-portage/portpeek-3.1.5 b/metadata/md5-cache/app-portage/portpeek-3.1.5
index 7bb97ebfd6e0..1614f8aea187 100644
--- a/metadata/md5-cache/app-portage/portpeek-3.1.5
+++ b/metadata/md5-cache/app-portage/portpeek-3.1.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install
-DEPEND=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
 EAPI=7
 HOMEPAGE=https://www.mpagano.com/blog/?page_id=3
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-portage/gentoolkit-0.5.0 || ( >=sys-apps/portage-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-portage/gentoolkit-0.5.0 || ( >=sys-apps/portage-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.mpagano.com/downloads/portpeek-3.1.5.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7fe572b0e2d31ce076ac277716525bff
+_md5_=c661e081799ee434b9baffe64b36aaae
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index eabc9c29e331..8e49fe6657b3 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -1,13 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-apps/portage-3.0.4[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/lxml-3.6.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/pyyaml[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=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[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 )
+RDEPEND=>=sys-apps/portage-3.0.4[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/lxml-3.6.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/pyyaml[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=[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=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
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab539ade68e4328df8ac935e6606d88d
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b63c54ab3bdc718918c08323a647b0c1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 173be0ede42d..f462455ada3a 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/paperwork-backend-1.3.1-r1 b/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
new file mode 100644
index 000000000000..93b7f649932f
--- /dev/null
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
@@ -0,0 +1,15 @@
+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/poppler[introspection] dev-python/distro[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/natsort[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/pillow[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/pycairo[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/pycountry[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/pyenchant[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/pygobject: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/python-levenshtein[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/simplebayes[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/termcolor[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/whoosh[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=Backend part of Paperwork (Python API, no UI)
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/poppler[introspection] dev-python/distro[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/natsort[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/pillow[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/pycairo[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/pycountry[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/pyenchant[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/pygobject: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/python-levenshtein[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/simplebayes[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/termcolor[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/whoosh[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 )
+SLOT=0
+SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0234cea9feb861d67ec49a0cd0d3c8a7
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 3f41779b00e3..50f3e00be1ee 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.64.2 b/metadata/md5-cache/dev-cpp/glibmm-2.64.2
index f9d455570e37..54b210afeb44 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.64.2
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.64.2
@@ -5,11 +5,11 @@ DESCRIPTION=C++ interface for glib2
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.61.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.64/glibmm-2.64.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e45d2bc79c8f21085491c9de3032281a
+_md5_=ca6c6ee066789ededed8c92df0a157c0
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.1 b/metadata/md5-cache/dev-cpp/mm-common-1.0.1
index 2f2abc0cede1..e4ffbb703f45 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.1
+++ b/metadata/md5-cache/dev-cpp/mm-common-1.0.1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=7
 HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4724beb26684824ce11630f8f6fcc559
+_md5_=69dfbf31425698eb81944ed7edad2bce
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0
new file mode 100644
index 000000000000..e91a0e264ac1
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.10.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
+DESCRIPTION=Prometheus Client Library for Modern C++
+EAPI=7
+HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
+IUSE=test zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.10.0.tar.gz -> prometheus-cpp-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f94cb98af0024e3c531be714dfb972a
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8b49a9d73171..0a74a686424c 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/mariadb-10.1.38-r2 b/metadata/md5-cache/dev-db/mariadb-10.1.38-r2
deleted file mode 100644
index 29ce56737114..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.38-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup systemd systemtap static static-libs tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=ppc ppc64
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
-RESTRICT=!bindist? ( bindist ) !test? ( test ) libressl? ( test )
-SLOT=10.1/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.38/source/mariadb-10.1.38.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=427b38f7a0d5e177e30573f03749c064
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.45-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.45-r1
deleted file mode 100644
index 0fd89643430e..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.45-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) virtual/pkgconfig jdbc? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=https://mariadb.org/
-IUSE=+backup bindist client-libs cracklib debug extraengine galera jdbc jemalloc kerberos innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc oqgraph pam +perl profiling selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup systemd systemtap static static-libs tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) kerberos? ( virtual/krb5 ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) !yassl? ( !libressl? ( !>=dev-libs/openssl-1.1.0 ) ) >=dev-libs/libpcre-8.41-r1:3= !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
-RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
-SLOT=10.1/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.45/source/mariadb-10.1.45.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.45-patches-04.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b980a2e86ce7a4a2cb39820864a13261
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.46 b/metadata/md5-cache/dev-db/mariadb-10.1.47
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.1.46
rename to metadata/md5-cache/dev-db/mariadb-10.1.47
index 9573247d4574..05fe5a37cc32 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.46
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.47
@@ -12,6 +12,6 @@ RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mysql-conne
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.1/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.46/source/mariadb-10.1.46.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.46-patches-01.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.47/source/mariadb-10.1.47.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.46-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=880dc34953cc262047031d1c6729e388
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.32-r2 b/metadata/md5-cache/dev-db/mariadb-10.2.32-r3
similarity index 99%
rename from metadata/md5-cache/dev-db/mariadb-10.2.32-r2
rename to metadata/md5-cache/dev-db/mariadb-10.2.32-r3
index 012b40a3aded..81cfe0e773ff 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.32-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.32-r3
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.32/source/mariadb-10.2.32.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.32-patches-03.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=675dbc9855687dcf7e9f307e70a3693f
+_md5_=ef2077a66e7841b953c279d8a52ce688
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.33 b/metadata/md5-cache/dev-db/mariadb-10.2.34
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.2.33
rename to metadata/md5-cache/dev-db/mariadb-10.2.34
index 3e0367ed2f67..b9e28cb03f7b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.33
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.34
@@ -12,6 +12,6 @@ RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-gale
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.2/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.33/source/mariadb-10.2.33.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.33-patches-01.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.34/source/mariadb-10.2.34.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.33-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0166b359944a4f0181a215fcff12a70d
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.23-r2 b/metadata/md5-cache/dev-db/mariadb-10.3.23-r3
similarity index 99%
rename from metadata/md5-cache/dev-db/mariadb-10.3.23-r2
rename to metadata/md5-cache/dev-db/mariadb-10.3.23-r3
index f5fac3c5da17..8386b9719598 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.23-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.23-r3
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.23-patches-03.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e81b021d0cc08d05f424bfe7a407ed2
+_md5_=f3b0199472b66eaafbe4dae99060eab2
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.24 b/metadata/md5-cache/dev-db/mariadb-10.3.25
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.3.24
rename to metadata/md5-cache/dev-db/mariadb-10.3.25
index 633cb8ae543e..d8af0b9c4c44 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.24
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.25
@@ -12,6 +12,6 @@ RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-gale
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.3/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.24/source/mariadb-10.3.24.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.24-patches-01.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.25/source/mariadb-10.3.25.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.24-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d612acf4cedbed602c5eb5fa290afd4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.13-r2 b/metadata/md5-cache/dev-db/mariadb-10.4.13-r3
similarity index 99%
rename from metadata/md5-cache/dev-db/mariadb-10.4.13-r2
rename to metadata/md5-cache/dev-db/mariadb-10.4.13-r3
index 12e3b7ea2d6c..2e92317a398e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.13-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.13-r3
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.13/source/mariadb-10.4.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.13-patches-03.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e64ae67abb26076f9bf58dd5b41fe28
+_md5_=7b13240731aa1c54ddd8d1bd15feba99
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.14 b/metadata/md5-cache/dev-db/mariadb-10.4.15
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.4.14
rename to metadata/md5-cache/dev-db/mariadb-10.4.15
index 0a64c3e939bb..72eb5298add6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.15
@@ -12,6 +12,6 @@ RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-gale
 REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.14/source/mariadb-10.4.14.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.14-patches-01.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.15/source/mariadb-10.4.15.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.14-patches-01.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bc15b13d95c38a0e4125918b3c7f7cd
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.5 b/metadata/md5-cache/dev-db/mariadb-10.5.6
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.5.5
rename to metadata/md5-cache/dev-db/mariadb-10.5.6
index 1c881789b1d8..3f0498e205ca 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.6
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/libpcre-8.41-r1:3= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1
 REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.5/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.5/source/mariadb-10.5.5.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.5-patches-02.tar.xz
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.6/source/mariadb-10.5.6.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.5-patches-02.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=384d63fe513bf5541399033948f2b8bf
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 1356f9cedd31..f8a908efcaee 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
index ecf3016438f0..531c8914c92c 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parser/Serialiser for IEEE-754 floating-point values
-EAPI=5
+EAPI=7
 HOMEPAGE=https://john-millikin.com/software/data-binary-ieee754/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/binary-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/data-binary-ieee754-0.4.4/data-binary-ieee754-0.4.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ae875aa677bfc13ee0b1c60d480465b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=11e45aea46fa6ca8e1524abfd05aa8a9
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.5.3 b/metadata/md5-cache/dev-haskell/data-default-0.5.3
deleted file mode 100644
index 36e0e0971542..000000000000
--- a/metadata/md5-cache/dev-haskell/data-default-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/data-default-instances-base:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A class for types with a default value
-EAPI=5
-HOMEPAGE=https://hackage.haskell.org/package/data-default
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/data-default-instances-base:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.5.3
-SRC_URI=https://hackage.haskell.org/package/data-default-0.5.3/data-default-0.5.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cec848a56b5874fc1dc4b8796cdbdd46
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1 b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
new file mode 100644
index 000000000000..2b38aa742523
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class for types with a default value
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/data-default
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.7.1.1
+SRC_URI=https://hackage.haskell.org/package/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a625f41a75f2a78af01680de39143ab2
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
index 4bacf8099aa4..0529294bb3d5 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in containers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-containers
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc614d96482c89353c195edd3b9eb9e0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b0d76b03dbfa587ae5c0e06240cc9141
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
index 39611df6d221..58ddc5d500ca 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in dlist
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-dlist
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bea3ad4206ee88dbc8001a04026da130
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=81742c85f11db84865d1e0cd2e6e9375
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
index 516ab58f02bb..4fcd541755ba 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in old-locale
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-old-locale
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f6eb8f735589bbab34ba358c6dbc80b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=68a37185bd443a804492881f32f644be
diff --git a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1 b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
index d36b7f94f4a8..27aaab445af3 100644
--- a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Combinators for building fast hashing functions
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-hash
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/data-hash-0.2.0.1/data-hash-0.2.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6c1d3806715ca21e5ba5f4d62376d1f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e13bda262f3f4bc38e56e811c0a5212c
diff --git a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0 b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
index a5876c63d760..19146cb3e896 100644
--- a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+++ b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Set and bag operations on ordered lists
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-ordlist
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.0
 SRC_URI=https://hackage.haskell.org/package/data-ordlist-0.4.7.0/data-ordlist-0.4.7.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d34097bf667870befba70f6fe2535f5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e9f5bce11791280ddd18679e62c1ceb9
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index abf1d10bf9a0..fc6b02ae97a0 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] dev-haskell/test-framework-th:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Data encoding library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Library/Data_encoding
 IUSE=test doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0.7
 SRC_URI=https://hackage.haskell.org/package/dataenc-0.14.0.7/dataenc-0.14.0.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d847d61aa285576a78bbeced9a011184
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=153ac382ddb425a81209898627daa2f7
diff --git a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1 b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
index 5dbb7ab98f6a..e7a82697c3fa 100644
--- a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Date cacher
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/date-cache
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/date-cache-0.3.0/date-cache-0.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fee7279dd05d40b3cbeddcc26051aa74
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=266114897f337b735adbb39dc429cd4a
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index e40308e3b3cd..8e4b894c3ba7 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/digest
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
+RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=https://hackage.haskell.org/package/digest-0.0.1.2/digest-0.0.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1843633b6ccad3a20bef8b360a055000
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=85bbc5f11ed1448fcd64c8de1bf59fe9
diff --git a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1 b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
index b75751fb93e7..06d6b6d9c4ad 100644
--- a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Retrieve information about disk space usage
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/redneb/disk-free-space
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/disk-free-space-0.1.0.1/disk-free-space-0.1.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=475aa591b724b9469d0c427dc1806227
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=33f69d00969c4ae0d1aaa9a423e44bda
diff --git a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3 b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
index 1eb21e9a80bb..c7bcf7edd89b 100644
--- a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
+++ b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate Haskell code from a type. Bridge from Djinn to GHC API
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/djinn-ghc
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.2.3
 SRC_URI=https://hackage.haskell.org/package/djinn-ghc-0.0.2.3/djinn-ghc-0.0.2.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7d39142e1299bc9dd304dee0d89e4f7
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6ff44c14b83fbb2e232a13afb6dead6e
diff --git a/metadata/md5-cache/dev-haskell/drbg-0.5.5 b/metadata/md5-cache/dev-haskell/drbg-0.5.5
index 3658496d15b7..1fa8425cc9c6 100644
--- a/metadata/md5-cache/dev-haskell/drbg-0.5.5
+++ b/metadata/md5-cache/dev-haskell/drbg-0.5.5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cereal-0.5:=[profile?] =dev-haskell/cipher-aes128-0.6:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] =dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/binary dev-haskell/crypto-api-tests dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cereal-0.5:=[profile?] =dev-haskell/cipher-aes128-0.6:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] =dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/crypto-api-tests dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/DRBG
 IUSE=test doc hscolour profile test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.5:=[profile?] =app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=7
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/23.0.2
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.2.tar.gz -> erlang-23.0.2.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=f9ed637583f845dd9eec29a3386e83ce
diff --git a/metadata/md5-cache/dev-lang/nasm-2.15.03 b/metadata/md5-cache/dev-lang/nasm-2.15.03
deleted file mode 100644
index b01fb9993316..000000000000
--- a/metadata/md5-cache/dev-lang/nasm-2.15.03
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec )
-DEFINED_PHASES=compile install
-DESCRIPTION=groovy little assembler
-EAPI=7
-HOMEPAGE=https://www.nasm.us/
-IUSE=doc
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.15.03/nasm-2.15.03.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68e5c09d7877eaef0d68d0240b39a978
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18-r4 b/metadata/md5-cache/dev-lang/python-2.7.18-r4
index 3eba5d25c018..82c8a412dd66 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18-r4
+++ b/metadata/md5-cache/dev-lang/python-2.7.18-r4
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f4e4b64a99bb2bab2e3fdda1e368f98e
+_md5_=72cd2d5d4f341322ebc69ed2673c7458
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2 b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
index 0effbe53c473..0c0559c24a3e 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Python script wrapper
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!<=dev-lang/python-2.7.18-r3:2.7
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2ab061afdd74454f2b4226fff9b9b1b
+_md5_=738b12b41200b9291b07486fc3fdb36d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 042b60521b4c..e24f1482d79d 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.0-r1 b/metadata/md5-cache/dev-libs/efl-1.25.1
similarity index 99%
rename from metadata/md5-cache/dev-libs/efl-1.25.0-r1
rename to metadata/md5-cache/dev-libs/efl-1.25.1
index 8a0d2ef97085..fa50639023b7 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.0-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1
@@ -11,6 +11,6 @@ RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sy
 REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2-only opengl ) ?? ( fbcon tslib ) ^^ ( lua luajit ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl || ( elogind systemd ) ) xim? ( X ) xpresent? ( X )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.0.tar.xz
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4d438ca1929e118c04f8fc89e460102
+_md5_=88242e1a91885dd0f49555b4a8f3d2db
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.2 b/metadata/md5-cache/dev-libs/libinput-1.16.2
new file mode 100644
index 000000000000..64adda575a96
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.16.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.2.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=3ae02da1ceb031d5c3baa39a2a538d22
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.3 b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
index d6d70253b9d9..e9094ba77f85 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.3
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.10.3
@@ -4,10 +4,10 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=6
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.3.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61730bbf83ec8408710e78c908e34ffe
+_md5_=67484dabdd75e4ca6f9ed925893ba726
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.7.3 b/metadata/md5-cache/dev-libs/libtpms-0.7.3
index e822ae99ef40..b8e151fa1053 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.7.3
+++ b/metadata/md5-cache/dev-libs/libtpms-0.7.3
@@ -11,4 +11,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.7.3.tar.gz -> libtpms-0.7.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=497c06abd819572008c08a1da4f2fed4
+_md5_=90307205152999c60bb37136db417d23
diff --git a/metadata/md5-cache/dev-libs/pigpio-78 b/metadata/md5-cache/dev-libs/pigpio-78
new file mode 100644
index 000000000000..12924c5c8418
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pigpio-78
@@ -0,0 +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(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
+EAPI=7
+HOMEPAGE=http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio
+IUSE=python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~arm
+LICENSE=Unlicense
+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? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/joan2937/pigpio/archive/v78.tar.gz -> pigpio-78.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c051105b149a593a97dbd033e2f4c08b
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
index bbf978ec818d..6eaae1f059c4 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma Specific Protocols for Wayland
 EAPI=7
 HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.1.1/plasma-wayland-protocols-1.1.1.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e0fae3b0760588a6bde8ae097fd2674
+_md5_=2b79ee1a6a9f965bf5373c0d1f2b35a2
diff --git a/metadata/md5-cache/dev-libs/uthash-2.1.0 b/metadata/md5-cache/dev-libs/uthash-2.1.0
new file mode 100644
index 000000000000..577dde639eea
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uthash-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( dev-lang/perl )
+DESCRIPTION=An easy-to-use hash implementation for C programmers
+EAPI=7
+HOMEPAGE=https://troydhanson.github.io/uthash/index.html
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/troydhanson/uthash/archive/v2.1.0.tar.gz -> uthash-2.1.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a525f8326ca154e258f0a611c6414285
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c6a2f1883885..58335d09ee1c 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc6 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc6
new file mode 100644
index 000000000000..8bfafcfb13d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc6
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0_rc6:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)] !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0_rc6:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/11.0.0_rc6
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90921f4cd69c8d88f750bc9e4e63ccc0
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.240.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.240.0
new file mode 100644
index 000000000000..6e65df616d1a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.240.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Test virtual/perl-Test-Simple virtual/perl-Time-Piece ) dev-lang/perl
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.24.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=8deff37fa0d8115dc516ebc933b87f61
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 69d065ab9f6e..964d7a538083 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 364a5ae11546..d17424bff832 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/boto3-1.15.14 b/metadata/md5-cache/dev-python/boto3-1.15.14
new file mode 100644
index 000000000000..f22ba986c9c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.14
@@ -0,0 +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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.14[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/jmespath-0.7.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/s3transfer-0.3.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(-)] >=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
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.14[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/jmespath-0.7.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/s3transfer-0.3.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(-)]
+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/boto/boto3/archive/1.15.14.tar.gz -> boto3-1.15.14.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.14 b/metadata/md5-cache/dev-python/botocore-1.18.14
new file mode 100644
index 000000000000..1b6ea53c2687
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.14
@@ -0,0 +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/jsonschema[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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( 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(-)] dev-python/jmespath[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/python-dateutil[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/urllib3[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
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=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(-)] dev-python/jmespath[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/python-dateutil[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/urllib3[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/b/botocore/botocore-1.18.14.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/clang-python-11.0.0_rc6 b/metadata/md5-cache/dev-python/clang-python-11.0.0_rc6
new file mode 100644
index 000000000000..95f5d3081900
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-11.0.0_rc6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-11.0.0_rc6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] 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(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-11.0.0_rc6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] 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/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/graphviz-0.14.2 b/metadata/md5-cache/dev-python/graphviz-0.14.2
new file mode 100644
index 000000000000..8954d17c1020
--- /dev/null
+++ b/metadata/md5-cache/dev-python/graphviz-0.14.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip test? ( media-gfx/graphviz >=dev-python/mock-2.0.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(-)] >=dev-python/pytest-mock-1.8[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? ( media-gfx/graphviz >=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 Python interface for Graphviz
+EAPI=7
+HOMEPAGE=https://graphviz.readthedocs.io/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=media-gfx/graphviz 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/g/graphviz/graphviz-0.14.2.zip
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a854cbd6156fc99d4eb1b17c64c8f38d
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.2.0 b/metadata/md5-cache/dev-python/libvirt-python-6.2.0
deleted file mode 100644
index f74bc365bfef..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-6.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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-emulation/libvirt:0/6.2.0 virtual/pkgconfig test? ( dev-python/lxml[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(-)] )
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/6.2.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_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 )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-6.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0fe05c5429a1e65dc174a7e62c2edc9a
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.5.0 b/metadata/md5-cache/dev-python/libvirt-python-6.5.0
deleted file mode 100644
index e66ff101f3da..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-6.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[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[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? ( app-emulation/libvirt:0/6.5.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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/6.5.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(-)]
-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=https://libvirt.org/sources/python/libvirt-python-6.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63c9d57f59ed79540bb884d26870d838
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0_rc6 b/metadata/md5-cache/dev-python/lit-11.0.0_rc6
new file mode 100644
index 000000000000..2ef47bfbe5aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-11.0.0_rc6
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[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(-)] sys-devel/llvm ) 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 unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95c6c42106d8f76add19500f1a394c09
diff --git a/metadata/md5-cache/dev-python/markdown-3.3 b/metadata/md5-cache/dev-python/markdown-3.3
new file mode 100644
index 000000000000..2e6a02656a8d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/markdown-3.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pygments[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/pytidylib[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/pyyaml[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? ( python_targets_pypy3? ( dev-python/importlib_metadata[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_6? ( dev-python/importlib_metadata[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_7? ( dev-python/importlib_metadata[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_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 implementation of the markdown markup language
+EAPI=7
+HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
+IUSE=doc test python_targets_pypy3 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[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_6? ( dev-python/importlib_metadata[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_7? ( dev-python/importlib_metadata[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_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=mirror://pypi/M/Markdown/Markdown-3.3.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=41913c2dbb4c9f781f841c20f8ca5fda
diff --git a/metadata/md5-cache/dev-python/mypy-0.782 b/metadata/md5-cache/dev-python/mypy-0.782
new file mode 100644
index 000000000000..86313576ca66
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mypy-0.782
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-18.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(-)] >=dev-python/lxml-4.4.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(-)] >=dev-python/pytest-6.0.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(-)] >=dev-python/pytest-xdist-1.18[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/py-1.5.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/virtualenv-16.0.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(-)] ) 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(+)] ) ) ) test? ( !dev-util/stubgen >=dev-python/psutil-4[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/typed-ast-1.4.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(-)] =dev-python/typing-extensions-3.7.4[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/mypy_extensions-0.4.3[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=Optional static typing for Python
+EAPI=7
+HOMEPAGE=http://www.mypy-lang.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[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/typed-ast-1.4.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(-)] =dev-python/typing-extensions-3.7.4[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/mypy_extensions-0.4.3[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-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=mirror://pypi/m/mypy/mypy-0.782.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=334ecb6b16dc28e9985591f8eadb8b81
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.1.1 b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
index 375e2f9de588..5e1b3135fbb8 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-5.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
@@ -1,16 +1,15 @@
-BDEPEND=test? ( dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-pep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tox[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python docstring style checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/
-IUSE=test python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.1.1.tar.gz -> pydocstyle-5.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4911e68f3ec177597de029ae33f7b58e
+_md5_=ddf7f2f1d1edda744cccb7adb8ef4614
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
new file mode 100644
index 000000000000..193291fd26b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) 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(+)] ) ) ) test? ( >=dev-python/mccabe-0.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyflakes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code audit tool for python
+EAPI=7
+HOMEPAGE=https://github.com/klen/pylama
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/mccabe-0.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyflakes[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6710d015f276063336271ff94646a45
diff --git a/metadata/md5-cache/dev-python/pylast-4.0.0 b/metadata/md5-cache/dev-python/pylast-4.0.0
new file mode 100644
index 000000000000..b57b6ee636ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylast-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[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/flaky[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/six[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=Python interface to last.fm and other api-compatible websites
+EAPI=7
+HOMEPAGE=https://github.com/pylast/pylast
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[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/pylast/pylast/archive/4.0.0.tar.gz -> pylast-4.0.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05ee9f09bc48f0660fbc675494eb4ebd
diff --git a/metadata/md5-cache/dev-python/pytest-qt-3.3.0 b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
index 420aaa26fa1c..08dbfc60ff5c 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-3.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-qt https://github.com/pytest-dev/pytest-qt
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-3.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=42d76dfa861219e6aec11bfc8981ca0a
+_md5_=d4f73c9bd57a8cf3ed6dfbb25146c5f5
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.34.1 b/metadata/md5-cache/dev-python/python-language-server-0.34.1
index 15a0aa161588..8380b51262b1 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.34.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.34.1
@@ -5,7 +5,7 @@ DESCRIPTION=An implementation of the Language Server Protocol for Python
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-language-server
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/python-jsonrpc-server-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/ujson-1.35[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.34.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=98bb5be55f895b99dbefd2b6a1ebd2b9
+_md5_=afa6edc380910f780724075e2e5a442f
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.7.2 b/metadata/md5-cache/dev-python/qtawesome-0.7.2
index 7f4ce9f7ec8a..253f1e5f9bba 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.7.2
+++ b/metadata/md5-cache/dev-python/qtawesome-0.7.2
@@ -5,7 +5,7 @@ DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
 IUSE=test doc python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-fonts/fontawesome dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.7.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=85820011a913b159b086d26d70a533ad
+_md5_=4d42e774deea823d9402e39fcc9b65f0
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.0.0 b/metadata/md5-cache/dev-python/qtawesome-1.0.0
new file mode 100644
index 000000000000..331a49ac1902
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtawesome-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-fonts/fontawesome dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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(+)] ) ) ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest-qt[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
+IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-fonts/fontawesome dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui] 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.0.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=1f2e5a9c2e273abeb87eb27fec1755ea
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1 b/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
index d79f7903ba8e..a01f445b38fe 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Manage versions by scm tags via setuptools
 EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 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(-)] >=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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-4.1.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a14f6bfaa941b03f37e9bf306e45f338
+_md5_=5913efa8d771865b5200f49d35ee96c9
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
index 3e527fc0254e..961385b0dfb5 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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/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(-)]
 DESCRIPTION=a simple S-expression parser/serializer
 EAPI=6
 HOMEPAGE=https://github.com/tkf/sexpdata
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tkf/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b03a71313ecbd70b2dc72862d6df904
+_md5_=e9261def2ceb4bdee45a98841cae4787
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.0 b/metadata/md5-cache/dev-python/sqlparse-0.4.0
new file mode 100644
index 000000000000..5bfc366d95bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=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/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=A non-validating SQL parser module for Python
+EAPI=7
+HOMEPAGE=https://github.com/andialbrecht/sqlparse
+IUSE=doc test 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.4.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40c2f605c478d55d1b1a8cf7700b9bd1
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.2-r1 b/metadata/md5-cache/dev-python/texttable-1.6.2-r1
deleted file mode 100644
index 302f1ef958f4..000000000000
--- a/metadata/md5-cache/dev-python/texttable-1.6.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/wcwidth[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 postinst prepare test
-DESCRIPTION=Module for creating simple ASCII tables
-EAPI=7
-HOMEPAGE=https://github.com/foutaise/texttable https://pypi.org/project/texttable/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/wcwidth[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/foutaise/texttable/archive/v1.6.2.tar.gz -> texttable-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d7a8b175ef663fe7df2faaf4c728ddf6
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.3 b/metadata/md5-cache/dev-python/texttable-1.6.3
index e4cad2ff944e..9898748bf5ed 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.3
+++ b/metadata/md5-cache/dev-python/texttable-1.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Module for creating simple ASCII tables
 EAPI=7
 HOMEPAGE=https://github.com/foutaise/texttable https://pypi.org/project/texttable/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.3.tar.gz -> texttable-1.6.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a46010c87232515153fc41a7dbfd1c6b
+_md5_=d7a8b175ef663fe7df2faaf4c728ddf6
diff --git a/metadata/md5-cache/dev-python/tqdm-4.50.1 b/metadata/md5-cache/dev-python/tqdm-4.50.1
new file mode 100644
index 000000000000..8afde0039897
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.50.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[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=Add a progress meter to your loops in a second
+EAPI=7
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 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=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=mirror://pypi/t/tqdm/tqdm-4.50.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b80c3587d565a909078d4aad9e9373dd
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.0 b/metadata/md5-cache/dev-python/ujson-4.0.0
new file mode 100644
index 000000000000..5372220176e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ujson-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=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
+DEPEND=dev-python/setuptools_scm[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/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(-)] )
+DESCRIPTION=Ultra fast JSON encoder and decoder for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ujson/
+IUSE=test 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 ~amd64-linux ~x86-linux
+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 ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/ujson/ujson-4.0.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7fae640d1d3f43dc98dec044efdf4fdc
diff --git a/metadata/md5-cache/dev-python/xarray-0.16.0 b/metadata/md5-cache/dev-python/xarray-0.16.0
index d3254e8faa49..87ebb1b04a0f 100644
--- a/metadata/md5-cache/dev-python/xarray-0.16.0
+++ b/metadata/md5-cache/dev-python/xarray-0.16.0
@@ -4,7 +4,7 @@ DESCRIPTION=N-D labeled arrays and datasets in Python
 EAPI=7
 HOMEPAGE=https://xarray.pydata.org/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.15[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/pandas-0.25[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-41.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(-)] 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.16.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=be55cdf9d796f63863731cebc1709e1c
+_md5_=599e865e844cc333417bdfdc2b8fffcf
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 33cc32812e64..9a55101dca48 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/actioncable-6.0.3.4 b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
new file mode 100644
index 000000000000..abcd91148378
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Integrated WebSockets for Rails
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) 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 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1420ad774e4d0b68fbfa5ded5b8cb145
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
new file mode 100644
index 000000000000..7fd902980876
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[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=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c1ea03fc3711e3dc41a30b34b6561de8
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
new file mode 100644
index 000000000000..66ebf2de4ed0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[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=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5d4bb66a7776d770e3b76b1cb3051274
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
new file mode 100644
index 000000000000..0a57e385e9ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby25(-)] dev-ruby/rack:2.1[ruby_targets_ruby25(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby25(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby26(-)] dev-ruby/rack:2.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby26(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby27(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Eases web-request routing, handling, and response
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby25(-)] dev-ruby/rack:2.1[ruby_targets_ruby25(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby25(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby26(-)] dev-ruby/rack:2.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby26(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby27(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) 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 ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bf9621504f7db1b3d181c9f0e5865a1
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4 b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
new file mode 100644
index 000000000000..a081cb8e20cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=Edit and display rich text in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[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=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cdabeafe75e9feb132061a63c009c6ed
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionview-6.0.3.4
new file mode 100644
index 000000000000..7c805ebc4d02
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Simple, battle-tested conventions and helpers for building web pages
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) 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 ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=00fb56c4525f0677f06506361f2071aa
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.3.4 b/metadata/md5-cache/dev-ruby/activejob-6.0.3.4
new file mode 100644
index 000000000000..e5517da65cc3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=Job framework with pluggable queues
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[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=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fa7d9df6f9699f07afc6e0fdfc18f068
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4 b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
new file mode 100644
index 000000000000..b7669e412bb0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) 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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby27(-)] ) 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 ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5336489af9b4aec6d849192c15f544cc
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4 b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
new file mode 100644
index 000000000000..3483f5f56953
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25(-)] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby27(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby27(-)] ) ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=test? ( >=dev-db/sqlite-3.12.1 ) 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=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25(-)] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby27(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby27(-)] ) ) ) 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 ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5c4e020947bbed1e716ac6fa6254572e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4 b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
new file mode 100644
index 000000000000..a09f31ca6212
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25(-)] =dev-ruby/marcel-0.3*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26(-)] =dev-ruby/marcel-0.3*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) 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=Attach cloud and local files in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25(-)] =dev-ruby/marcel-0.3*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26(-)] =dev-ruby/marcel-0.3*[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=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bbda2198867bbb3c9c88a49fc0a8761
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4 b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4
new file mode 100644
index 000000000000..997c6556c301
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) 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/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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=Utility Classes and Extension to the Standard Library
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby27(-)] ) 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 ) !test? ( test )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=72d86959c7f179421e8642087c413192
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.3.4 b/metadata/md5-cache/dev-ruby/rails-6.0.3.4
new file mode 100644
index 000000000000..8820f9ff7976
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[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? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[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=ruby on rails is a web-application and persistance framework
+EAPI=7
+HOMEPAGE=https://rubyonrails.org
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[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 )
+SLOT=6.0
+SRC_URI=https://rubygems.org/gems/rails-6.0.3.4.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=813694436dcd4199f77e82243a85fa72
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.3.4 b/metadata/md5-cache/dev-ruby/railties-6.0.3.4
new file mode 100644
index 000000000000..88ee834d925e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) 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? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[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 postinst postrm 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=Tools for creating, working with, and running Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) 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 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=889696cbe40031ad815465258d7df43f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 338921be584e..46365beb6d5e 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/cargo-c-0.6.2 b/metadata/md5-cache/dev-util/cargo-c-0.6.2
index cfa178c0b15a..1cac7ce331e4 100644
--- a/metadata/md5-cache/dev-util/cargo-c-0.6.2
+++ b/metadata/md5-cache/dev-util/cargo-c-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Helper program to build and install c-like libraries
 EAPI=7
 HOMEPAGE=https://github.com/lu-zero/cargo-c
 IUSE=libressl debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0 MIT
 RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-misc/curl[ssl]
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.27/download -> anyhow-1.0.27.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.0.0/download -> bitmaps-2.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/cargo/0.43.1/download -> cargo-0.43.1.crate https://crates.io/api/v1/crates/cargo-c/0.6.2/download -> cargo-c-0.6.2.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cbindgen/0.13.2/download -> cbindgen-0.13.2.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/crates-io/0.31.0/download -> crates-io-0.31.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.28/download -> curl-0.4.28.crate https://crates.io/api/v1/crates/curl-sys/0.4.30+curl-7.69.1/download -> curl-sys-0.4.30+curl-7.69.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.11.0/download -> git2-0.11.0.crate https://crates.io/api/v1/crates/git2-curl/0.12.0/download -> git2-curl-0.12.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/ignore/0.4.12/download -> ignore-0.4.12.crate https://crates.io/api/v1/crates/im-rc/14.3.0/download -> im-rc-14.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/libgit2-sys/0.10.0/download -> libgit2-sys-0.10.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.3/download -> libnghttp2-sys-0.1.3.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.16/download -> libssh2-sys-0.2.16.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.28/download -> openssl-0.10.28.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.54/download -> openssl-sys-0.9.54.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.11/download -> proc-macro-error-0.4.11.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.11/download -> proc-macro-error-attr-0.4.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustfix/0.5.0/download -> rustfix-0.5.0.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.18/download -> schannel-0.1.18.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_ignored/0.1.1/download -> serde_ignored-0.1.1.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.5.3/download -> sized-chunks-0.5.3.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a553081caa7697794805854382b93569
+_md5_=2b29a6cffd0229955c77c278c29e0092
diff --git a/metadata/md5-cache/dev-util/clion-2020.2 b/metadata/md5-cache/dev-util/clion-2020.2.3
similarity index 90%
rename from metadata/md5-cache/dev-util/clion-2020.2
rename to metadata/md5-cache/dev-util/clion-2020.2.3
index b3b6d5019d2f..404f8e3d38d0 100644
--- a/metadata/md5-cache/dev-util/clion-2020.2
+++ b/metadata/md5-cache/dev-util/clion-2020.2.3
@@ -8,6 +8,6 @@ LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) A
 RDEPEND=dev-libs/libdbusmenu dev-util/cmake sys-devel/gdb !custom-jdk? ( virtual/jdk )
 RESTRICT=bindist mirror splitdebug
 SLOT=0
-SRC_URI=https://download.jetbrains.com/cpp/CLion-2020.2.tar.gz -> clion-2020.2.tar.gz
+SRC_URI=https://download.jetbrains.com/cpp/CLion-2020.2.3.tar.gz -> clion-2020.2.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25546143f6a76daf8705cded54677e52
diff --git a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1 b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
index b3dfd0fab9aa..67b79017e179 100644
--- a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
+++ b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V gen
 EAPI=7
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=! glslang-8.13.3743.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ba108bec74ce72fae441c8f6e170659
+_md5_=bd5de649988284472a4f109716b8d06c
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26 b/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
new file mode 100644
index 000000000000..291241b611df
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+IUSE=+jbr8 -jbr11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 ) jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
+REQUIRED_USE=jbr8? ( !jbr11 )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.2.3-no-jbr.tar.gz -> ideaIC-2.3.202.7660.26.tar.gz jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-i586-b1483.37.tar.gz -> jbrx-8u202-linux-i586-b1483.37.tar.gz ) amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-x64-b1483.37.tar.gz -> jbrx-8u202-linux-x64-b1483.37.tar.gz ) ) jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-11_0_2-linux-x64-b164.tar.gz -> jbr-11_0_2-linux-x64-b164.tar.gz ) )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=05442bd3ae88bffa45105c0c809d4f93
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.249.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.249.2
new file mode 100644
index 000000000000..f37ab2ce5d92
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.249.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.249.2/jenkins.war -> jenkins-bin-2.249.2.war
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0935a84615a963df9606323f353012d9
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.260 b/metadata/md5-cache/dev-util/jenkins-bin-2.260
new file mode 100644
index 000000000000..e31986dd3ab8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.260
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.260/jenkins.war -> jenkins-bin-2.260.war
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f9b8099d1ee40aac4985e6c9006bd6f9
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0_rc6 b/metadata/md5-cache/dev-util/lldb-11.0.0_rc6
new file mode 100644
index 000000000000..010a59e8bb68
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0_rc6
@@ -0,0 +1,15 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_6? ( ~dev-python/lit-11.0.0_rc6[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-11.0.0_rc6[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-11.0.0_rc6[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-11.0.0_rc6[python_targets_python3_9(-)] ) sys-devel/lld ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-11.0.0_rc6[xml] ~sys-devel/llvm-11.0.0_rc6 !=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-11.0.0_rc6[xml] ~sys-devel/llvm-11.0.0_rc6 ! spirv-headers-1.5.3.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=743b455c86faf19a6a22379f931a9c91
+_md5_=22294ea88bc9d1d30824059059ebdd09
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2020.3 b/metadata/md5-cache/dev-util/spirv-tools-2020.3
index 191eea361de0..6003d1f7731b 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2020.3
+++ b/metadata/md5-cache/dev-util/spirv-tools-2020.3
@@ -5,10 +5,10 @@ DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.3.tar.gz -> spirv-tools-2020.3.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4932201fd16d6775bec3d59da3b89317
+_md5_=fffdb0d22c4ce790f72a936db8dd054e
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.143 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
index 8b09a50a8b55..66c6ebdf1200 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Vulkan Header files and API registry
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.143.tar.gz -> vulkan-headers-1.2.143.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cefe1a80db5009216795add08daee616
+_md5_=9c4e91e14125cac0a6d6239bd8b7e0ce
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 002f0bf773c5..e520ee58c817 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
deleted file mode 100644
index f341b074d26d..000000000000
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer >=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
-DESCRIPTION=puzzle game inspired by Atomix and written in SDL
-EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	games	be6b136152d095d3e15031e2c725eb3f	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64ee62039f2cdf38a00db38da312751b
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
new file mode 100644
index 000000000000..5cfbbe7c2a68
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
@@ -0,0 +1,13 @@
+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=install
+DEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
+DESCRIPTION=puzzle game inspired by Atomix and written in SDL
+EAPI=7
+HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=https://download.sourceforge.net/lgames/lmarbles-1.0.8.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e6faab015b0ddada2198ac5b9f3ebc9a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index a1b9708313f0..11b9416a3255 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.34.2 b/metadata/md5-cache/gnome-base/gnome-session-3.34.2
index 41f0cf4700bc..cf8ba5ae4155 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.34.2
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.34.2
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome session manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
-IUSE=consolekit doc elogind systemd
+IUSE=doc elogind systemd
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.34/gnome-session-3.34.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.34.2-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9bb2b9f1ca9ad760f990f6646e781b80
+_md5_=589cc3990973c2f23fba94eb7b8098ad
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.36.0 b/metadata/md5-cache/gnome-base/gnome-session-3.36.0
index 58780120b9ea..633691cb1dbe 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.36.0
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.36.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome session manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
-IUSE=consolekit doc elogind systemd
+IUSE=doc elogind systemd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.36/gnome-session-3.36.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.36.0-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d278cfbebf7531395ede10694c5e9448
+_md5_=7a8ed00c287a20cbf9ce0b835c009f17
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1
index a672aa203450..8891da52b1a8 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome session manager
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
-IUSE=consolekit doc elogind systemd
+IUSE=doc elogind systemd
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) consolekit? ( >=dev-libs/dbus-glib-0.76 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl,gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.36/gnome-session-3.36.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.36.0-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b6a4731a2a14803b1193dec8fccafd2
+_md5_=40096fec5b5cac0cc865253f24ea1a88
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index f8e8b32737a4..beb45c36ac2c 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/waybar-0.8.0 b/metadata/md5-cache/gui-apps/waybar-0.8.0
deleted file mode 100644
index 4349531317a5..000000000000
--- a/metadata/md5-cache/gui-apps/waybar-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
-EAPI=7
-HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=mpd network pulseaudio tray +udev
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-SLOT=0
-SRC_URI=https://github.com/Alexays/Waybar/archive/0.8.0.tar.gz -> waybar-0.8.0.tar.gz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa349df36534b99d8fbf45fddef90e28
diff --git a/metadata/md5-cache/gui-apps/waybar-0.9.4 b/metadata/md5-cache/gui-apps/waybar-0.9.4
new file mode 100644
index 000000000000..b97f6a123013
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/waybar-0.9.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
+DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors
+EAPI=7
+HOMEPAGE=https://github.com/Alexays/Waybar
+IUSE=mpd network popups pulseaudio tray +udev
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/date:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots x11-libs/gtk+:3[wayland] mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) popups? ( gui-libs/gtk-layer-shell ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] dev-libs/libappindicator ) udev? ( virtual/libudev:= )
+SLOT=0
+SRC_URI=https://github.com/Alexays/Waybar/archive/0.9.4.tar.gz -> waybar-0.9.4.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=838cbc6221d612472f698af5046b71b4
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 8df6a9068fed..4fee9da65cc0 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.74.0 b/metadata/md5-cache/kde-frameworks/attica-5.74.0
index 4d80090e660d..18847619684d 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing access to Open Collaboration Services
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/attica-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e28630fe660e9b01316b17354a436e95
+_md5_=222be283a39cf9adbf0ddee6038596bd
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.74.0 b/metadata/md5-cache/kde-frameworks/baloo-5.74.0
index fcb16aeb111b..e7f0514bbe2b 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for searching and managing metadata
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/kfilemetadata-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kidletime-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/solid-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/baloo-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66c8357a72d2575cabbadaec5a92ed4c
+_md5_=754dd6bdb74ffbb7a156d5e59c92e7b6
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
index 38cf9dbae4de..ada5e964590c 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/bluez-qt-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9376566d43274f091cf0bc8a706c4550
+_md5_=769e6ee2c907f63303d8a1b3a30def8d
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
index f6726e4d3bf9..fb91ad3fc5a4 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/breeze-icons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4598dc3ba77bba9c790897868d2d68d
+_md5_=4f6df19a0cbda439cccc27fb8ee60e28
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
index 81fbd36c18e2..f9282462af1e 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze SVG icon theme binary resource
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/breeze-icons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d1419c7755f4d3d646495ce88c53249
+_md5_=a443c487774e107e5497a740f7fe3fa4
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
index cc83fe83666f..65813f2983c3 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
@@ -4,11 +4,11 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
 IUSE=doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/extra-cmake-modules-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4b90b8357e29d06f0536bd29e5793c1
+_md5_=eec0a1f000a09b52b73f297fe3752d78
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
index 4a1f9dd2f070..8a7bf89df1db 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5= =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/knewstuff-5.74*:5 =kde-frameworks/knotifications-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/frameworkintegration-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=026cd9152fd785a0ad55e760c97b1fdf
+_md5_=5c97732addf79d63cafd9aa2f55e2725
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.74.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
index 4af9a41f180e..3bc5684a020f 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for working with KDE activities
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kactivities-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3db262beeba1eebb0137977ff5711f1
+_md5_=547b5931f5db00d00506aa75244f294b
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
index 1422f43fb085..9f844d2966a6 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for getting the usage statistics collected by the activiti
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/kconfig-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kactivities-stats-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08053cb527502250aba927c12a390226
+_md5_=e69a07b49ba0f94891df566ce15d49c4
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.74.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
index f74dd1288b67..e321c6e50530 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for building KDE API documentation in a standard format an
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) media-gfx/graphviz[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kapidox-5.74.0.tar.xz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	074252323c6185f751658b74c09b68ff	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7a21128ad99dad49a207018a8ba4ad7
+_md5_=ce3fa8d5abc5f00180fa058794f66290
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.74.0 b/metadata/md5-cache/kde-frameworks/karchive-5.74.0
index 895f571f1465..daaf9411980d 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for reading, creation, and manipulation of various archive
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/karchive-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=493b8eaa87e6c4b03f1a2d94756aa6aa
+_md5_=babbe428b37659ea411502b082e710b5
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.74.0 b/metadata/md5-cache/kde-frameworks/kauth-5.74.0
index 8128422d204e..bb6420c27022 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.74.0
@@ -5,7 +5,7 @@ DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls +policykit test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kauth-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f5453f8f267debe3455113a9dea5eda
+_md5_=a63987b411e9d7282d41cfebc4438a09
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
index 7eda98ca1781..7f8bbaae0db4 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing bookmarks stored in XBEL format
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kbookmarks-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2d3c1162d1b7402c226de17ae1748c0
+_md5_=695dcc056e4f49eedf5b85cf1ad0b9b7
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
index 7f7cf63f344a..9db7cc620685 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interfacing with calendars
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+ test? ( LGPL-3+ )
 RDEPEND=dev-libs/libical:= >=dev-qt/qtgui-5.14.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcalendarcore-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6f9aef40eeb984be8fb86e90e9a17eb
+_md5_=3055a5d6fc5c378d6cff9341dcac14e8
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
index 9f000ce26008..61e615303744 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to work with KDE System Settings modules
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcmutils-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=725729d71130190282a0d44414181ebf
+_md5_=41b5ebd79192b108b3079b8ecc146fad
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
index d4f9bede133c..4a7c5ba3762c 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for manipulating strings using various encodings
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcodecs-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f7e581927359353d09fd483e06b1e21
+_md5_=d55e6c89285c4ff322932250c3f75e0d
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
index d5c47458a59b..2f28032c9111 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for common completion tasks such as filename or URL comple
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcompletion-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6674fb8e38ba889857fd907968bc16e
+_md5_=c4708820fc13a24f13c688df1b922305
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.74.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
index 0db3e8dc5bda..097604673ea7 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for reading and writing configuration
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=dbus nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 dbus? ( >=dev-qt/qtdbus-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kconfig-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3dbd933c873e2f02ff444784911d9c70
+_md5_=70e3c8e96b67a5587989a91a6c7cf104
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
index 73c5469fc182..249ed56c2dd4 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing an assortment of configuration-related widgets
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kconfigwidgets-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a348ad6ba85710b2deee30e3a302230
+_md5_=659af7bda5f7ed1f073ecf814a8f4248
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
index 560d146a1d33..b0634aa9b4c6 100644
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Address book API based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcontacts-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c59aa2fa6248001ba162f31525e9ec
+_md5_=c625e8a4f47c68a79f4518efec643e86
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
index aff682226493..af54a11771ce 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for solving common problems such as caching, randomisation
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=fam nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.14.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcoreaddons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bf20844fa0e6f8a80914ceeee84e551
+_md5_=658e975fd6ee254ba949c7e19e48b63c
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.74.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
index 04efa01b0665..4da0e2690f08 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcrash-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e191298b6d38bbbe54f0e8e96158532
+_md5_=76e827235090ee0e55f8f36a5020507f
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.74.0 b/metadata/md5-cache/kde-frameworks/kdav-5.74.0
index 095a93233776..fb05c9148fa4 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=DAV protocol implemention with KJobs
 EAPI=7
 HOMEPAGE=https://api.kde.org/frameworks/kdav/html/index.html
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kcoreaddons-5.74:5 >=kde-frameworks/ki18n-5.74:5 >=kde-frameworks/kio-5.74:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdav-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4274edad9eaf494bf5d181bac9eb3af0
+_md5_=25482f72367fbcd4d159af19089b5fb8
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
index a31beffbd542..18a39eb03a7c 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for registering services and applications per freedesktop
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdbusaddons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61ddc72715606f794d614be31d092d50
+_md5_=07cb56c00fe39406a93fc1147660b784
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
index d532fd68df50..8005b4d7643f 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing integration of QML and KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5= >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdeclarative-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d46ffe124fe17b6f3d33f3de285bf441
+_md5_=058dfa4269fde184480f838e6cd741cc
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.74.0 b/metadata/md5-cache/kde-frameworks/kded-5.74.0
index 38cc7da0d699..12b6d844fa42 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Central daemon of KDE workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/kinit-5.74*:5 =kde-frameworks/kservice-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kded-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d503216a32c9a39b24b0feed4f8fbd8
+_md5_=6f2fd78acc179182b52ef2cb12268d69
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
index f5e37b83a2d0..9ed9ac1f1365 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=libressl X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qttest-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 >=kde-frameworks/kded-5.74:5 =kde-frameworks/kdesignerplugin-5.74*:5 =kde-frameworks/kdoctools-5.74*:5 =kde-frameworks/kemoticons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kunitconversion-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.74*:5 =kde-frameworks/kitemmodels-5.74*:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdelibs4support-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dac124bc438e1f00b54578ad3f8ddd62
+_md5_=dbc33de2fe12874eaca8ed4b2b479b37
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
index a52f3cc573a3..0027508fa8a7 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesig
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND==kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdesignerplugin-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a76b1c6ba889c7fbdca751c605f9ce84
+_md5_=7c3a9e8ffaacb4c27e6356af331c7d19
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.74.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
index 5d1e561017c5..4fdcd527b9f2 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to handle super user actions
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND==kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kpty-5.74*:5 =kde-frameworks/kservice-5.74*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdesu-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b6d51a43a2e632388f5a489e07c4ef4
+_md5_=ec6f830886a08510cd123306bc4e4d3f
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
index ae8614dee2ef..c64132fe7c92 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing KDE integration of QtWebKit
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=designer debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwallet-5.74*:5 designer? ( =kde-frameworks/kdesignerplugin-5.74*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdewebkit-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b9de31f1296a7cbf00ad01eabd3a045
+_md5_=4f7a473d15aad9481b504ee1737dd224
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
index cd47db70c1f3..4580781fc8bd 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for network service discovery using Zeroconf
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls zeroconf debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 zeroconf? ( >=dev-qt/qtdbus-5.14.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdnssd-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81927dbc9634458542828e4f891c5354
+_md5_=fc4a428eb947d7c6980544eef9ff1a36
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
index 05b321b128ce..51037e2dcbfc 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to generate documentation in various formats from DocBook file
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdoctools-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bc31c5894e0e08360f03fecfdd95477
+_md5_=e33bd84fa8d2bb1bc29c6faf16c6628d
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
index be7dfca4967a..1a19916fa750 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for converting text emoticons to graphical representations
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kservice-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kemoticons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a250a29997b71319b7bea2536ec99938
+_md5_=97ff4c5b7baa57c1af7e6d5bc7ffd73b
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
index 9e74d90fe5a7..7bfe2f03b9b4 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for extracting file metadata
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.74*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kfilemetadata-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76b4b98d329a33f6bd822a42a73d5c26
+_md5_=69fef8d5039c306f69f11f122bf088ab
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
index e6a62a5d168d..a8fa3c275ee9 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to handle global shortcuts
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kglobalaccel-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40a54d1b5d1728252eecc07e599272b8
+_md5_=c35339831f6813ce5f35fd13866fef19
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
index 3a923fdbe51e..f86ee5e1040e 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing assorted high-level user interface components
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kguiaddons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f713c4dd27d904c31e3a2334028ece4a
+_md5_=adaee2718c7a5e2dcbf8ea1c0abf8b2f
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.74.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
index 11f35247fbb9..5809cdcde43d 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kholidays-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d815710cf119833b13ec7c54b1cfbac
+_md5_=c101e0336f26931969c269f3d42ccf81
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.74.0 b/metadata/md5-cache/kde-frameworks/khtml-5.74.0
index 77491c033863..fea3a8ab01c9 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=KHTML web rendering engine
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=libressl X test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/kjs-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwallet-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/sonnet-5.74*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/khtml-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8be7582a77725e0875bfdca4072f23e
+_md5_=7c17f87f2a18a2a5fd44ab7f407bd357
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.74.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
index 93545e7eb137..75d10ed15824 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
@@ -5,7 +5,7 @@ DESCRIPTION=Framework based on Gettext for internationalizing user interface tex
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdeclarative-5.14.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ki18n-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6065a5c0c121129f07c156cc0f26e942
+_md5_=42f59850ff15a4fb740cce03426c463a
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
index c8a7b29a3a84..f7b381793df5 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for icon theming and configuration
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kiconthemes-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d263fc128173477ce7df6e4e6ac182a
+_md5_=52dafd6b208c51cc3a2e4d949301bf6b
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.74.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
index 9502abb6df5c..c0a475c37cb9 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for detection and notification of device idle time
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X xscreensaver debug doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.14.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kidletime-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f95597a61b9ca99462a133af90118ad9
+_md5_=82feed59e00b2a715b512c46881eff1d
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
index a8ed2d846f92..55ff3f98ab7d 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing additional format plugins for Qt's image I/O sys
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=eps openexr test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/karchive-5.74*:5 eps? ( >=dev-qt/qtprintsupport-5.14.2:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kimageformats-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=307e803c5804a308486a78cd04287226
+_md5_=70511b84d9336c762bcead5203443ad9
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.74.0 b/metadata/md5-cache/kde-frameworks/kinit-5.74.0
index 47e716d15771..365a3003916f 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kinit-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b5dcc7c32c24688ebef9ff46b2fb69d
+_md5_=d3542e222570c58372dfff1849c6fc73
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1 b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
index 652ef9aacfff..1e06834d3604 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Framework providing transparent file and data management
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.74:5
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5=[ssl] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kbookmarks-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.74*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.74*:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kio-5.74.1.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=029f70d7d8564c4e1ce33658c68150bc
+_md5_=e2bd6d2b6f3d77f98be0784aadef1efc
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
index 832a5d44d92a..b8dacccaa813 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Lightweight user interface framework for mobile and convergent appli
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=debug examples test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kirigami2-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ef3aea385b6b5df1f196933b0757408
+_md5_=e17ba1fff4da4a065ad81a1c7142f487
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
index 6656bd1b07a6..d5912a84ed77 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing data models to help with tasks such as sorting a
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=qml test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kitemmodels-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8658c03a4cae96e5271e6d9a201d4d59
+_md5_=2cfc88cacf5c62da7c5151350c9f0bdf
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
index 9c26fdaa23c1..4f16ac8c55b2 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing additional widgets for item models
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kitemviews-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19d49c3e485feb3a4bd191315dc5eca4
+_md5_=8a8e99ad624628c7fee76cd4780afece
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
index 077ec188eceb..0798d015d043 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing assorted widgets for showing the progress of job
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kjobwidgets-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3f933186dfc2aca12fde7508a967688
+_md5_=957b23f1136ec4cd463923dae3cf7c4e
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.74.0 b/metadata/md5-cache/kde-frameworks/kjs-5.74.0
index d0013a777cd7..2bd02422e82a 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=ECMAScipt compatible parser and engine
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kjs-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa6edf067889e1d662e70df47f62cff3
+_md5_=43bcdfc32ec23b4d032a96d55c3885df
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
index f60ff12fefd3..1e2e8362ae9f 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework binding JavaScript objects to QObjects
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kjs-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kjsembed-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ab16749d41d1ccae6b20f0009e90b4d
+_md5_=43c87afd469fd4c72c46d4a8307f6c71
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
index d82a8120ae3d..e20d69b5f6ea 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing a common interface for KParts that can play medi
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kmediaplayer-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c9b62d9558354f2f58f39f4862a0522
+_md5_=dfe312ca33a15217c94cb434580895b7
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
index 2adb4ffb4c0e..1e607bbcb812 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for downloading and sharing additional application data
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/attica-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kirigami-5.74:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knewstuff-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a67ac783ce0614ba2ab9e88b3a503f44
+_md5_=aad1cbceec51c544f59813744d14239a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.74.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
index 68fddaee681a..a3d454f5cd45 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for notifying the user of an event
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knotifications-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=023aabd0427fd3a0f7152b7dfd81a9e7
+_md5_=10892d40eea5f0091904d01942e5889d
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
index 4523a0ef3462..b720ac0ec802 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for configuring desktop notifications
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=phonon debug doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knotifyconfig-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac940c0c61d3484146f52ce7f802be39
+_md5_=342378627ada87ae84994d679e4bc37f
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.74.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
index addd28813478..bf424d4a740e 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to install and load packages of non binary content
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/karchive-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpackage-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0088bdea928259cfeaa6021097e11db0
+_md5_=bd06e9ae971ebf58a95f165025722e7e
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.74.0 b/metadata/md5-cache/kde-frameworks/kparts-5.74.0
index e6ef6bd42b52..9d95ec7bd400 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing elaborate user-interface components
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kparts-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0893ecd09cfce0720e66d282027bbb03
+_md5_=d069fe60bd3c8b8fdc49b9673524cd5f
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.74.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
index 4cfb4a3246e0..08b888e5e163 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=KDE contact person abstraction library
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kpeople
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpeople-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fd06ea9b3ae781a6ee463b6d5eb624e
+_md5_=fccc46e08f2afaa8fb3fc26f485254fa
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.74.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
index b588dab94350..1b9880e88939 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing easy data-plotting functions
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kplotting-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88a144d8125e418c8a78b3ce1c50519f
+_md5_=3763f80e83c674d4074b9a9600fa1145
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.74.0 b/metadata/md5-cache/kde-frameworks/kpty-5.74.0
index 1c4fcacaef49..22814811bc0c 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for pseudo terminal devices and running child processes
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpty-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=854b4fc8da5481a3b44085fc689c626f
+_md5_=083a13cd60dcac490a7ca9e34f399be8
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
index c090b94629a0..b23c70bcf1b6 100644
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=QtQuick plugin providing high-performance charts
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
 IUSE=test debug examples test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 examples? ( >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kirigami-5.74*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kquickcharts-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cee543ad428ec62fa02676b012c1c94b
+_md5_=64fb1ee15c260499591be473d543ef67
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.74.0 b/metadata/md5-cache/kde-frameworks/kross-5.74.0
index 9b6aed2ab0e3..43f1e415a239 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for embedding scripting into applications
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kross-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ee47b78455530666e24b0e72c3e217b
+_md5_=552cff9ec4f73aa1a37794153af342a0
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.74.0 b/metadata/md5-cache/kde-frameworks/krunner-5.74.0
index 9145fef421f7..910d4a26e4b5 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for providing different actions given a string query
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/plasma-5.74*:5 =kde-frameworks/solid-5.74*:5 =kde-frameworks/threadweaver-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/krunner-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2524edf872e42050db7246945f919f1c
+_md5_=8f4464a5804088325750af55a886719c
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.74.0 b/metadata/md5-cache/kde-frameworks/kservice-5.74.0
index a2a3f43a3c4e..46d2c4295eca 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced plugin and service introspection
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2 LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kservice-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38477cc5d85c8b231d2d62f3ba3f242a
+_md5_=254981fc7e2840bfcb828a436ef3c447
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
index 0b4f44c09ac3..c0615659ab7a 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing a full text editor component
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+editorconfig git test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/sonnet-5.74*:5 =kde-frameworks/syntax-highlighting-5.74*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ktexteditor-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df6940b3f446292edf922a3029a1d278
+_md5_=035d8d93015ebea6ec0ab07186ebcb3f
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
index 1a0e03831945..114327ed9f3f 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing an assortment of widgets for displaying and edit
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=speech test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/sonnet-5.74*:5 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ktextwidgets-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7325b81fc259e6fb7d310f48152bae68
+_md5_=f93209fcc1c1cd2ad9d4205ca44f7f3d
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
index 10b193815a29..e5bc02dfcd90 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for converting units
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 =kde-frameworks/ki18n-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kunitconversion-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b87d66aa7b90a6eac9efcd2b3ee8e72
+_md5_=8568dcea4ed30e67ec48ec02936a7cd1
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.74.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
index 702f368d024f..35f51fca79ef 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing desktop-wide storage for passwords
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=gpg +man debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwallet-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f69a6550050271ad8f7d3ce249cc699d
+_md5_=0074d955f5519b2442a14e157245ca6f
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.74.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
index 73e6cac1d907..9a29267a6a43 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kwayland
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwayland-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8ab264c2aa7e55b1bcdba9c5e180ad5
+_md5_=66e465e2cd56d72ecc478a4bf2db4c21
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
index 4c72782ca5c8..93845b5bdbff 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=An assortment of high-level widgets for common tasks
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwidgetsaddons-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=702de5ff705b38e354e60c0e8015c08d
+_md5_=2af788b580e75dc28c5670106e3d4e58
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
index 1d02582ebec7..62bb9bf421d0 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing access to properties and features of the window
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwindowsystem-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ff5ac126f909a8714e7e45febc039e2
+_md5_=14ac289cce3c86cec4f54cf612afc8b7
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
index e75c8ba66b01..8a3140e455e3 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kxmlgui-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27d61ebb78a1a77b9b1c19f09358a6a2
+_md5_=a41ac16b98703cec5528d0d358761e00
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
index 9d337310b274..c8033f4258d7 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kxmlrpcclient-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e89213f15a0ecb180df826557ecec08f
+_md5_=342b650a53a8bee3b52c8ad0b921e150
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
index c0624722c501..954a73d4678b 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/modemmanager-qt-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bc273b96ddf0c5c1f8fb384aba68cc9
+_md5_=e5d7ebc58531a9d53e8dd5046c0aa65b
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
index deb64798b6fc..090ba0bc31a3 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=teamd debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/networkmanager-qt-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a42a11fba40cd38a0310106848d95ffb
+_md5_=e8bf059db58e3ab439531c35d109d74b
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
index 10338c675ea3..52da3e822a53 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
@@ -5,10 +5,10 @@ DESCRIPTION=Oxygen SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/oxygen-icons5-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6678bbff97712fe521769a6a9258a456
+_md5_=991ac9598d0a2850da55f5e3313be597
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
index 283351fdfe6d..41eca048ba5a 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma framework
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=gles2-only wayland X test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.74*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/plasma-framework-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d18bf21dbf1768b965c9dcf746572854
+_md5_=a641d54273c1479a00f67ccf6efd84f8
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.74.0 b/metadata/md5-cache/kde-frameworks/prison-5.74.0
index c5320696088d..5be43ad93b10 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=QRCode and data matrix barcode library
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/prison
 IUSE=qml debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/prison-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6796797e915381a1895c14d3b1fae21
+_md5_=a4431806e16628f29bc670597a3aae82
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.74.0 b/metadata/md5-cache/kde-frameworks/purpose-5.74.0
index ecb1262f869b..8c9f67de2dd0 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for providing abstractions to get the developer's purposes f
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=bluetooth +dolphin +kaccounts debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 dolphin? ( =kde-frameworks/knotifications-5.74*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kdeclarative-5.74:5 bluetooth? ( =kde-frameworks/bluez-qt-5.74*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/purpose-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5c04c7c5df98249707a4a6dcfa97798
+_md5_=6e67801ea9842ba287212e92935da8f6
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
index 314e7d13cbee..b67ef57132e8 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kirigami-5.74*:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/qqc2-desktop-style-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69778c653f851856b3f7fc0c3c7fe417
+_md5_=4c00ce92b36b054241a78310dabc17df
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.74.0 b/metadata/md5-cache/kde-frameworks/solid-5.74.0
index e393c49e1147..edde2c4ef458 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/solid-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3207d30734b312b3fadd831debf855f7
+_md5_=06d25e40307b94dda8cf730a1b514123
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.74.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
index 767854c27fbc..061873781565 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for providing spell-checking through abstraction of popula
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/sonnet-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=259b2e7539d08a3f7f7f33b1108ee51a
+_md5_=69a235e26c15f1bf49521e4edfa172d4
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.74.0 b/metadata/md5-cache/kde-frameworks/syndication-5.74.0
index 9661016ce9ab..8224c260f056 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for parsing RSS and Atom feeds
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.74*:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/syndication-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=513fc02837a7f84c4ea9b2d2b67a0251
+_md5_=ac010ef999bf486c7e72eef87cf615eb
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
index 1de3476f85d3..26fc7eb85608 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for syntax highlighting
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/syntax-highlighting-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f28498d24717d7141db977dac347f1a5
+_md5_=25d1fedf5a097e63e5f133c19cb43df6
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
index 459a14bda9ad..e73f226a99bf 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing threads using job and queue-based interfaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/threadweaver-5.74.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e40097d6f8601bdeabf22a88bf869d5f
+_md5_=0385c9f2bd77727cafa1f358ff61f290
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index ce4726d8f54e..57e835ea724b 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.19.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
index cc25d627f232..9e098e87e38d 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Bluetooth stack for KDE Plasma
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/bluedevil
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/bluedevil-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7781559681c32c93be9d1df41429d114
+_md5_=f9e5c8b8c65874dc2861477e05a10478
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1 b/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
index 12b51cec115e..c274e3010d6d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/breeze
 IUSE=wayland X debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-frameworks/breeze-icons-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.5:5 wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=730ba3ff9b37bd28e20d30d8f803eb47
+_md5_=011377a888684736985bc12a131f7ceb
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
index e844c7dcdec0..9f362e85e312 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install nofetch prepare unpack
 DESCRIPTION=Breeze theme for GRUB
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-grub-5.19.5.tar.xz
 _eclasses_=kde.org	074252323c6185f751658b74c09b68ff
-_md5_=270b2cdcf373ee819b537ef206caaac8
+_md5_=ca51bc6534ba4c193e1dc63899d48d37
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
index c9c951c8fe04..44c6e501b1bb 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-gtk-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dd57ecc3389f47dd546b86ed0c93626
+_md5_=675d2fe959cc84fe00792bb5cf749d2d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
index 1cdd7cf849b1..40b775bc897e 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
@@ -4,10 +4,10 @@ DEPEND=sys-boot/plymouth
 DESCRIPTION=Breeze theme for Plymouth
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-plymouth-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44e4369f31dd7e3d965379f87e38a9f7
+_md5_=4a04d4b890b3d09c4e2f6ee792d1f41d
diff --git a/metadata/md5-cache/kde-plasma/discover-5.19.5 b/metadata/md5-cache/kde-plasma/discover-5.19.5
index 59231333b822..1770e9a48acc 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.19.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma resources management GUI
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/Discover
 IUSE=+firmware telemetry test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/discover-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a93fe8bcab1f7bb0fea822b85127443
+_md5_=18c2334f5f4dca3f39b437d937c7c512
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.19.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
index e19d15755652..6e8c0027a5f4 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=X debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/syntax-highlighting-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/drkonqi-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=872df03ff3a7db87f4285b4c189fda8b
+_md5_=d67a82c8d8d713e1697d1893e7afad83
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
index 82f7047ad44a..4365c7dfe8df 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=System service to manage user's activities, track the usage patterns
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kactivitymanagerd-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79105d7aad7cb650baafa78745844a92
+_md5_=8cebf47f26853d20b1bb114ca775a869
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
index d249c6c3c03a..55f46b14a6c0 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
@@ -5,7 +5,7 @@ DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
 IUSE=kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/libkworkspace-5.19.5:5 kdesu? ( >=kde-frameworks/kdesu-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=kdesu? ( X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kde-cli-tools-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78435015b9940e6d3d368ace90ccc7b4
+_md5_=b0201245a822dd30653db8c31a894ce1
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
index 238c96256541..544e9f56b7fe 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
 IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.19.5:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kde-gtk-config-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=373a96c9d4d36772831679fdfe67a5f4
+_md5_=0dd73c4d3ec2f21c90b6e3683b202a11
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.19.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
index b8cb52337bd7..ea1f6a78ba8f 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plugin based library to create window decorations
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/ki18n-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kdecoration-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5665477a6341067fb066119536f91b5
+_md5_=f0b026ccdc3e53d593580d78ec8bd117
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
index a5858e3e7463..3707448949a7 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Extra Plasma applets and engines
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=+comic share webengine test debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kholidays-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kunitconversion-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 comic? ( >=kde-frameworks/kross-5.71.0:5 ) share? ( >=kde-frameworks/purpose-5.71.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-plasma/plasma-workspace-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kdeplasma-addons-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7a6ea3ad8d261c3504ecb126574813e
+_md5_=65c1f1983c2cd2fa5b3d4e061fba0eab
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.19.5 b/metadata/md5-cache/kde-plasma/kgamma-5.19.5
index 691014a3b094..bdece878b425 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Screen gamma values kcontrol module
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kgamma5-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c6c9c06fd9773da7ef31d236634c5f
+_md5_=bae2d9cfcda590f0e93fc58b2804ea07
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.19.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
index f945c3df11f9..2cde3bedb6ea 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5[X] >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.5:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/khotkeys-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=566c74f4c095f134efdc737a8c55f2de
+_md5_=356330c3de02d91e293c1b2c0c5934b9
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
index 45b86d639220..4a82d30910ec 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/KInfoCenter
 IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kinfocenter-5.19.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c66cd7b5137a52da700f4efd03ce8f4
+_md5_=7d72c8e0841f21e2a7835baa02de9964
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
index 612085e4eb91..248045904765 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma menu editor
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kmenuedit-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d2a44385d44da5e0a3c0222079d1719
+_md5_=edac06cb0bd42d575b11343b3dea1da8
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.19.5 b/metadata/md5-cache/kde-plasma/kscreen-5.19.5
index fcf0e0879617..e1aada68c2fd 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma screen management
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/libkscreen-5.19.5:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kscreen-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb214cb6be955ef5e4a252c7fa203fe0
+_md5_=b9750c9e1f6a1e510e79785bf050e78d
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
index a8015a113b7e..65e96d894161 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
@@ -5,7 +5,7 @@ DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=+pam test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-frameworks/plasma-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kscreenlocker-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31e7924646ad7512799324466f7316bf
+_md5_=510548df9f912e9bd4e0f7d6f316c03f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
index 7c11790c43eb..fdf654ed6cbd 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/ksshaskpass
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/ksshaskpass-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2449b4c48449f325214e3bcfb70d0222
+_md5_=270d53e2a9c076c4a5f854f2a0b299f9
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.19.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
index e7478c0bd371..dfdd894d57f3 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=lm-sensors pcap debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libksysguard-5.19.5:5 lm-sensors? ( sys-apps/lm-sensors:= ) pcap? ( net-libs/libpcap sys-libs/libcap ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/ksysguard-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d515cbeb798ca07b38f425e3f05d704
+_md5_=99bd6a2ad31533f1cd7f2b48286120fa
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
index ce4bb8608ebc..026a36196b28 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=PAM module to not enter KWallet password again after login
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.71.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwallet-pam-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=029916e6f10086c81eec1d4514bc53d7
+_md5_=975a674f6220beb518461647889268a8
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
index 7b0e3058807e..3eddc1c41115 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwayland-integration-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c84e41c0bb1c1a248f2014220e1d5885
+_md5_=a98dd33d7df2b4728fdbe0c99694bea4
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5 b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
index 8fa796764540..b14c551c13c3 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Wayland Server Components built on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[egl] >=dev-qt/qtwayland-5.14.2:5 >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwayland-server-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b70ee64da761c5c8e2b588d662c9e14c
+_md5_=d44b69a7fabcf7e91de5337668f7b58f
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1 b/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
index 0ce67d45e9fa..47e6a9a8dfaa 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=caps gles2-only multimedia test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[gles2-only=] >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsensors-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5= >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5= >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5[X] >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 >=kde-plasma/kdecoration-5.19.5:5 >=kde-plasma/kscreenlocker-5.19.5:5 >=kde-plasma/kwayland-server-5.19.5:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtvirtualkeyboard-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.14.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwin-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f68bf8707037843d31c76cd46af1dc7
+_md5_=e1527586101da27f2606285726277726
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.19.5 b/metadata/md5-cache/kde-plasma/kwrited-5.19.5
index 3f56ec17ab08..a216849b83b0 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpty-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwrited-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=052f8f39ffc50ce57b95e978858caea4
+_md5_=5046c88994d2ca7c220b371a0a7119d8
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.19.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
index 00903a29e036..11c308489847 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.19.5/libkscreen-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebb0556870b25b748b6decbeff2d142d
+_md5_=7edcb36026d612d3ea1087a705198097
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.19.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
index fc2a89c5e89d..f39ccca403c3 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Task management and system monitoring library
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=webengine X test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
 SRC_URI=mirror://kde/stable/plasma/5.19.5/libksysguard-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5be2ea2d195f951ebb06ce2b170df6f
+_md5_=b42c65e6c4327c3e403b53b6543b9473
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
index d801a86b5e2c..43cf9c73e2f0 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.5:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f45fe65d66a532aa03a3cf95e617b6b
+_md5_=29184bb27473c49966b0c9d731ef5d36
diff --git a/metadata/md5-cache/kde-plasma/milou-5.19.5 b/metadata/md5-cache/kde-plasma/milou-5.19.5
index f6126b5fa33e..cdbec5671cbf 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.19.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/milou
 IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/milou-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a5ee037044798bdccf98cdcd409356e
+_md5_=07b819c0560ba658de9f7dd13d8db27c
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.19.5 b/metadata/md5-cache/kde-plasma/oxygen-5.19.5
index 3ed01f3b4ff9..77f344c48d7a 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/oxygen
 IUSE=wayland debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.5:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) !=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/oxygen-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25bc7b3548f97c5eea403063f27e86c1
+_md5_=da1699307357cbaa1eca33ff0a91d5d8
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
index 194706e83363..f058b421f670 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensio
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kfilemetadata-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/purpose-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-browser-integration-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dd7f4e5cbc9cfac9711329589689f31
+_md5_=1e0502a66acafc968d888db7dc1a8096
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
index 87e7db0621fa..7419a6330cfd 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=emoji +fontconfig ibus scim +semantic-desktop test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/qqc2-desktop-style-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 >=kde-plasma/kde-cli-tools-5.19.5:5 >=kde-plasma/oxygen-5.19.5:5 sys-apps/util-linux x11-apps/setxkbmap !=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-desktop-5.19.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddaecd2dd42aef38af3251ec8f354f00
+_md5_=6430aff5d7c8a6771d017653c034ee2b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
index 86349fa39e35..e4a5e1aedcf9 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-integration-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c23b3210508796cdfbb3f0f00db002f
+_md5_=69359503b4902e7985d1df392238213b
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
index 39799096d10f..0a1489bf6247 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all Plasma 5 packages
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.19.5:5 >=kde-plasma/drkonqi-5.19.5:5 >=kde-plasma/kactivitymanagerd-5.19.5:5 >=kde-plasma/kde-cli-tools-5.19.5:5 >=kde-plasma/kdecoration-5.19.5:5 >=kde-plasma/kdeplasma-addons-5.19.5:5 >=kde-plasma/kgamma-5.19.5:5 >=kde-plasma/khotkeys-5.19.5:5 >=kde-plasma/kinfocenter-5.19.5:5 >=kde-plasma/kmenuedit-5.19.5:5 >=kde-plasma/kscreen-5.19.5:5 >=kde-plasma/kscreenlocker-5.19.5:5 >=kde-plasma/ksshaskpass-5.19.5:5 >=kde-plasma/ksysguard-5.19.5:5 >=kde-plasma/kwayland-integration-5.19.5:5 >=kde-plasma/kwayland-server-5.19.5:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/kwrited-5.19.5:5 >=kde-plasma/libkscreen-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/milou-5.19.5:5 >=kde-plasma/oxygen-5.19.5:5 >=kde-plasma/plasma-desktop-5.19.5:5 >=kde-plasma/plasma-integration-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=kde-plasma/polkit-kde-agent-5.19.5:5 >=kde-plasma/powerdevil-5.19.5:5 >=kde-plasma/systemsettings-5.19.5:5 >=kde-plasma/user-manager-5.19.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.19.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.19.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.19.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.19.5:5 ) discover? ( >=kde-plasma/discover-5.19.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.19.5:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.19.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.19.5:5 >=kde-plasma/kde-gtk-config-5.19.5:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.19.5:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.19.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.19.5:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.19.5:5 >=kde-plasma/plymouth-kcm-5.19.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.19.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.19.5:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.19.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.19.5:5 )
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=5
-_md5_=aedfad29ce2f0a54851351a56e165d32
+_md5_=996854d530879e53c7eaeb6c28a5ec52
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
index c5f53856373f..3efccdf1c691 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5[teamd=] >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/modemmanager-qt-5.71.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.14.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-nm-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d3c4892c64275c20efc190ca6308cc8
+_md5_=2b0e2b639e9e503cd982762a0c8b0f43
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
index 9208791b537b..c10854d7d8b2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-pa-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3615ac617ed5274e4967c5d3c9299737
+_md5_=9097ac7917a255389e1682baa5d3e620
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
index 90e9f855218a..dfe1655e6db5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
@@ -5,11 +5,11 @@ DESCRIPTION=Useful applications for Plasma development
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-sdk-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac9ca756c98ab6efeabb6871cdce0574
+_md5_=757d1857078363babe1cd13cf8d8e30c
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
index e9a93a8c1b46..609e0667edb4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/libksysguard-5.19.5:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-vault-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32d47097c119e5204c3208e236706390
+_md5_=c27f08493cbd587a9da7ae3beccca573
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
index beb14d94afd7..f11ea01ebafb 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5[jpeg] >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kpeople-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktexteditor-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/kscreenlocker-5.19.5:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libkscreen-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/libkworkspace-5.19.5:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.71.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.71.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtpaths-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5[widgets] >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kquickcharts-5.71.0:5 >=kde-frameworks/kdesu-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/ksysguard-5.19.5:5 >=kde-plasma/milou-5.19.5:5 >=kde-plasma/plasma-integration-5.19.5:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f3dad31d01377430eac160180e51163
+_md5_=941707ced6aaf7a384ca2430fc2e4060
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
index a026e68c6017..7836817a4e30 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install nofetch prepare test unpack
 DESCRIPTION=Wallpapers for the Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-wallpapers-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2211570ebf48052d8a413d5c0827a1ca
+_md5_=27200312ce371c87ecae4d160c81aaa4
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
index d9493a0cdc6c..3ecd5c770b8d 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plymouth-kcm-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dced87cbed94c6f4029981803ab1e8b4
+_md5_=3c8b0e36a1ae91d3a7619aa7a03471d9
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
index 31e7a8173ebe..0d8e1b13a4b4 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=PolKit agent module for KDE Plasma
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/polkit-kde-agent-1-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61de2233da028272b2e7a7659840733f
+_md5_=6bcb40513a1a7314fbd63c892bbdb454
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.19.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
index 23ae43d1e2c2..d9710f660bec 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5[policykit] >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/libkscreen-5.19.5:5 >=kde-plasma/libkworkspace-5.19.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5 ) >=kde-plasma/kde-cli-tools-5.19.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/powerdevil-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54b047fdc84bd2eb5e452e419eb611b7
+_md5_=9e6389609b001293132e58f085b16366
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
index 7840d043f0d9..4e6ac9dee1f6 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/sddm-kcm-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb724270ca0df46851b8c4e0e51b079f
+_md5_=44df926095b1a558b9456acc1bb17eaa
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.19.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
index d1d953bded78..a7a09d34f3f6 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Control Center to configure KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.5:5 !kde-misc/systemd-kcm >=kde-frameworks/kirigami-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/systemsettings-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd6d55eb64a414535e3f57f1636e4866
+_md5_=ac96a7a5d242d50fdea195e8ae72025d
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.19.5 b/metadata/md5-cache/kde-plasma/user-manager-5.19.5
index 5082bd9fafb4..afac41caf2ec 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.19.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/user-manager-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2372e2d342f685f16eea61b00b44100a
+_md5_=e49a11139816baa333a5c039058c1ec2
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
index 1dd0a1b3781b..ed2a29f1c3be 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
@@ -5,10 +5,10 @@ DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE F
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=screencast debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) sys-apps/xdg-desktop-portal[screencast?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/xdg-desktop-portal-kde-5.19.5.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d25fc5cd41d979acfe6b3453519c9fcc
+_md5_=9b9609a5d66f07bc07dbc7ee6a6e23c0
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
index 73f43fb4537f..a1bbe69fc159 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image ! rspamd-2.6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b80221428840d1e39edb995bbb5b3cca
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 8de500e2a0a1..2295cdb4c4d4 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/hiredis:= dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 dev-lua/lpeg[luajit] ) !jit? ( dev-lang/lua:* dev-lua/lpeg[-luajit] dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa51a854f9828886223356ccd8c4d4e9
+_md5_=b80221428840d1e39edb995bbb5b3cca
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 8c881bc888a5..720e8e676f78 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925
deleted file mode 100644
index d339d21675ec..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl ) !libressl
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200925.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=901e7a43bc878872e847ad09afc8d20f
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20201003 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20201003
new file mode 100644
index 000000000000..7c2313dc7ea8
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.6_pre20201003
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl ) !libressl
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20201003.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=01efefcb23e1b28547b525be877b29c0
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index d62951277e81..ecdf9832ddcc 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.22 b/metadata/md5-cache/media-gfx/gimp-2.10.22
new file mode 100644
index 000000000000..d3c5bef4f9f8
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig >=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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=6
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.22.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f27273a1d1ee0ca2fab56392e5d55681
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.7.0 b/metadata/md5-cache/media-gfx/gscan2pdf-2.7.0
deleted file mode 100644
index 7934cecb8e72..000000000000
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[tiff] app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),tiff] app-text/unpaper media-gfx/imagemagick[djvu,png,tiff,perl] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) dev-lang/perl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
-EAPI=7
-HOMEPAGE=http://gscan2pdf.sourceforge.net/
-IUSE=test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.7.0.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=023a8c496cce80170aab6dda59613579
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
new file mode 100644
index 000000000000..e11f8c984ffb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-perl/Sub-Override media-libs/fontconfig app-text/djvu[tiff] app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),tiff] app-text/unpaper media-gfx/imagemagick[djvu,png,tiff,perl,postscript] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends ) dev-lang/perl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Scan documents, perform OCR, produce PDFs and DjVus
+EAPI=7
+HOMEPAGE=http://gscan2pdf.sourceforge.net/
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/Filesys-Df dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane dev-perl/List-MoreUtils dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl dev-perl/PDF-API2 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan dev-perl/Try-Tiny virtual/perl-Archive-Tar virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-threads virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends media-libs/tiff dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.9.1.tar.xz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=999e0522485bca2e9c5b41b8202bbe04
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.1.2 b/metadata/md5-cache/media-gfx/opentoonz-1.1.2
deleted file mode 100644
index d3c888995579..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2:= sci-libs/blas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl virtual/pkgconfig dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=6
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2:= sci-libs/blas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.1.2.tar.gz -> opentoonz-1.1.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa6ca93d5bc856109d35a3a9c6ee7659
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1 b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
deleted file mode 100644
index 94f84746654b..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl virtual/pkgconfig dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=6
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut:= media-libs/freetype:2= media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.3.0 media-libs/libpng:= media-libs/libsdl2:= sci-libs/cblas-reference:= >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.2.1.tar.gz -> opentoonz-1.2.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab523646869c0e3c6e70683ba2a20911
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.3.0 b/metadata/md5-cache/media-gfx/opentoonz-1.3.0
deleted file mode 100644
index 1896fd6d1844..000000000000
--- a/metadata/md5-cache/media-gfx/opentoonz-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= media-libs/libsdl2 sci-libs/cblas-reference >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An open-source full-featured 2D animation creation software
-EAPI=6
-HOMEPAGE=https://github.com/opentoonz/opentoonz
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD libtiff
-RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= media-libs/libsdl2 sci-libs/cblas-reference >=sci-libs/superlu-4.1:= sys-libs/zlib:= virtual/libusb:= virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.3.0.tar.gz -> opentoonz-1.3.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5abe62abb74a8360021a22ceae3ac8e4
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1b10f43b3559..c4c2c590f377 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.26 b/metadata/md5-cache/media-libs/gegl-0.4.26
new file mode 100644
index 000000000000..dbbe52a98092
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.26
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.9 >=dev-python/pygobject-3.2:3[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.26.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7bbe451bce5f0c68c87d37f61c40d232
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.3.2-r1 b/metadata/md5-cache/media-libs/libglvnd-1.3.2-r1
index f67ed4a9632d..ac32fb4fe032 100644
--- a/metadata/md5-cache/media-libs/libglvnd-1.3.2-r1
+++ b/metadata/md5-cache/media-libs/libglvnd-1.3.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=! libglvnd-1.3.2.tar.bz2
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f68b50293c0f702b25701003158b001c
+_md5_=1374ecef64f19cec739181414ffec2b3
diff --git a/metadata/md5-cache/media-libs/libpgf-7.19.3 b/metadata/md5-cache/media-libs/libpgf-7.19.3
new file mode 100644
index 000000000000..5fd17d9aed7c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libpgf-7.19.3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip doc? ( app-doc/doxygen ) >=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 prepare
+DESCRIPTION=Library to load, handle and manipulate images in the PGF format
+EAPI=7
+HOMEPAGE=https://www.libpgf.org/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/libpgf/libpgf/7.19.3-latest/libPGF-codec-and-console-src.zip -> libpgf-7.19.3.zip
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e055012ecc2ce98599b8dbf18a3139a
diff --git a/metadata/md5-cache/media-libs/mesa-20.2.0 b/metadata/md5-cache/media-libs/mesa-20.2.0
index dc9c77915fa4..511f2cadbe18 100644
--- a/metadata/md5-cache/media-libs/mesa-20.2.0
+++ b/metadata/md5-cache/media-libs/mesa-20.2.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install pretend setup test
 DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install pretend setup test unpack
 DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) =x11-drivers/nvidia-drivers-435.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.1.23.1/nv-codec-headers-9.1.23.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=115d7ab284eb3122f151f7996f35f515
+_md5_=6bc6e81f4ccfb04b8349ce52742fbc9e
diff --git a/metadata/md5-cache/media-libs/opencv-4.4.0 b/metadata/md5-cache/media-libs/opencv-4.4.0
new file mode 100644
index 000000000000..a50e4bfd7219
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-4.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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/numpy[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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=7
+HOMEPAGE=https://opencv.org
+IUSE=contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine cpu_flags_arm_neon cpu_flags_arm_vfpv3 cpu_flags_ppc_vsx cpu_flags_ppc_vsx3 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_popcnt cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 elibc_FreeBSD java elibc_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribhdf? ( sci-libs/hdf5:= ) contribfreetype? ( media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/harfbuzz:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) contribovis? ( dev-games/ogre:0/1.12 ) ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libdc1394:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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/numpy[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(-)] ) qt5? ( dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-qt/qttest:5= dev-qt/qtconcurrent:5= opengl? ( dev-qt/qtopengl:5= ) ) tesseract? ( app-text/tesseract[opencl=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnnsamples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contribcvv? ( contrib qt5 ) contribdnn? ( contrib ) contribfreetype? ( contrib ) contribhdf? ( contrib ) contribovis? ( contrib ) contribsfm? ( contrib eigen gflags glog ) contribxfeatures2d? ( contrib download ) java? ( python ) opengl? ( qt5 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) tesseract? ( contrib ) ?? ( gtk3 qt5 )
+SLOT=0/4.4.0
+SRC_URI=https://github.com/opencv/opencv/archive/4.4.0.tar.gz -> opencv-4.4.0.tar.gz dnnsamples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> opencv-4.4.0_extdep.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/4.4.0.tar.gz -> opencv-4.4.0_contrib.tar.gz contribdnn? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d66de84108535e5c7dd27fa870184ec6
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.2 b/metadata/md5-cache/media-libs/openexr-2.5.2-r1
similarity index 67%
rename from metadata/md5-cache/media-libs/openexr-2.5.2
rename to metadata/md5-cache/media-libs/openexr-2.5.2-r1
index 9a1bf1f34f67..0f01e4a720cc 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.2
+++ b/metadata/md5-cache/media-libs/openexr-2.5.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ilmbase:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=media-libs/ilmbase:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 -arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
-RDEPEND=media-libs/ilmbase:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=media-libs/ilmbase:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> openexr-2.5.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d0f48c979d6c21a37993504b6651bb
+_md5_=5527199d91f4f04bec24bab290e9818e
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.141 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
index f79017567f70..14ce14b18ad7 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
@@ -5,9 +5,9 @@ DESCRIPTION=Vulkan Validation Layers
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.141.tar.gz -> vulkan-layers-1.2.141.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=156614d86ea939ef1a52389f0ffe04ec
+_md5_=022752fb148eb171a92cb48709941eeb
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
index f85873aad56f..b73b41fdcfa7 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.2.141.tar.gz -> vulkan-loader-1.2.141.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1f7e7c6b0616170b41e77bd71d5458b
+_md5_=78de0b977af195271ce9984504095137
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index b8875565593d..0151af5c21f3 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2 b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
index c78a40da2432..b4f8871373f0 100644
--- a/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
+++ b/metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=>=media-gfx/gimp-2.8 media-libs/liblqr
 DESCRIPTION=Content-aware resizing for the GIMP
-EAPI=5
+EAPI=7
 HOMEPAGE=http://liquidrescale.wikidot.com/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-gfx/gimp-2.8 media-libs/liblqr
 SLOT=0
 SRC_URI=http://liquidrescale.wikidot.com/local--files/en:download-page-sources/gimp-lqr-plugin-0.7.2.tar.bz2
-_md5_=8da8973ed4149cea7376a518e164b0b6
+_md5_=09112e2c43365be1bb2641ddd45f754c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1
new file mode 100644
index 000000000000..6330eabb2b75
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+DESCRIPTION=Kodi's Stalker client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-stalker-6.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a35e639fdba029ce4751fca42bead41
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index 12d5593da68f..c018e796c175 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
+DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
 DESCRIPTION=Kodi's Stalker client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
+RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7ac2301adfd99f61865c806e642817f
+_md5_=248dbf0bec6d2127ba5db89ae84b4339
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8567394ed216..f8b9fe3037fe 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.3 b/metadata/md5-cache/media-sound/mumble-1.3.3
new file mode 100644
index 000000000000..926714778de2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mumble-1.3.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=7
+HOMEPAGE=https://wiki.mumble.info
+IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca797290848238c6b7ad2bcaae61144c
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.3 b/metadata/md5-cache/media-sound/murmur-1.3.3
new file mode 100644
index 000000000000..81e31f5524a7
--- /dev/null
+++ b/metadata/md5-cache/media-sound/murmur-1.3.3
@@ -0,0 +1,14 @@
+BDEPEND=acct-group/murmur acct-user/murmur virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=7
+HOMEPAGE=https://wiki.mumble.info
+IUSE=+dbus debug +ice pch zeroconf
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=13344d7d693f1ff4723f450156cbfb9b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 24cd841a5c5d..6d99850a66eb 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3 b/metadata/md5-cache/media-video/ffmpeg-4.3
deleted file mode 100644
index f9eafc4bd4d9..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/make-3.81 virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes libavcodec
-EAPI=7
-HOMEPAGE=https://ffmpeg.org/
-IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-SLOT=0/56.58.58
-SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88fa4fdf8728d85dd1e8e8af048494d0
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.1 b/metadata/md5-cache/media-video/ffmpeg-4.3.1
index 085e31faf7b3..d1459b61b14a 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2cb429b676d81304b23c2543167a3126
+_md5_=1812ff1c3593a1614b92697f861fec63
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.10 b/metadata/md5-cache/media-video/pipewire-0.3.10
index 02a3bb843cad..4573cb691114 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.10
+++ b/metadata/md5-cache/media-video/pipewire-0.3.10
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.10.tar.gz -> pipewire-0.3.10.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=07119141774dc3c15206db747cf39629
+_md5_=fb8e3d738d05e793ac4af616f00ff32c
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.3 b/metadata/md5-cache/media-video/rav1e-0.3.3
index 41507a28cd0b..d50949ed6c7a 100644
--- a/metadata/md5-cache/media-video/rav1e-0.3.3
+++ b/metadata/md5-cache/media-video/rav1e-0.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.3.3.tar.gz -> rav1e-0.3.3.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.1/download -> addr2line-0.12.1.crate https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.1.4/download -> aom-sys-0.1.4.crate https://crates.io/api/v1/crates/arbitrary/0.2.0/download -> arbitrary-0.2.0.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.48/download -> backtrace-0.3.48.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/0.8.5/download -> bitstream-io-0.8.5.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.54/download -> cc-1.0.54.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/console/0.11.3/download -> console-0.11.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/criterion/0.3.2/download -> criterion-0.3.2.crate https://crates.io/api/v1/crates/criterion-plot/0.4.2/download -> criterion-plot-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.2/download -> crossbeam-queue-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.14/download -> ctor-0.1.14.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/deflate/0.8.4/download -> deflate-0.8.4.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.4/download -> image-0.23.4.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/ivf/0.1.0/download -> ivf-0.1.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.40/download -> js-sys-0.3.40.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.4/download -> memoffset-0.5.4.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.crate https://crates.io/api/v1/crates/nasm-rs/0.1.7/download -> nasm-rs-0.1.7.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/noop_proc_macro/0.2.1/download -> noop_proc_macro-0.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-derive/0.3.0/download -> num-derive-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/object/0.19.0/download -> object-0.19.0.crate https://crates.io/api/v1/crates/oorandom/11.1.1/download -> oorandom-11.1.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.16/download -> paste-0.1.16.crate https://crates.io/api/v1/crates/paste-impl/0.1.16/download -> paste-impl-0.1.16.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.4/download -> png-0.16.4.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.16/download -> proc-macro-hack-0.5.16.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rav1e/0.3.3/download -> rav1e-0.3.3.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.111/download -> serde-1.0.111.crate https://crates.io/api/v1/crates/serde_derive/1.0.111/download -> serde_derive-1.0.111.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.15/download -> signal-hook-0.1.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.30/download -> syn-1.0.30.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.19/download -> thiserror-1.0.19.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.19/download -> thiserror-impl-1.0.19.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinytemplate/1.1.0/download -> tinytemplate-1.1.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/vergen/3.1.0/download -> vergen-3.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.63/download -> wasm-bindgen-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.63/download -> wasm-bindgen-backend-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.63/download -> wasm-bindgen-macro-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.63/download -> wasm-bindgen-macro-support-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.63/download -> wasm-bindgen-shared-0.2.63.crate https://crates.io/api/v1/crates/web-sys/0.3.40/download -> web-sys-0.3.40.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.5.3/download -> y4m-0.5.3.crate
 _eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1338e97e6a84424d94ab37653bb277ea
+_md5_=fc583b27f213ceea3176eb5792de1261
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 0ecdfe83be55..80e1b936c222 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/knot-3.0.0 b/metadata/md5-cache/net-dns/knot-3.0.0
new file mode 100644
index 000000000000..1f4da2307386
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-3.0.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=7
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-3.0.0.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f8a67f34a1e7dc0cb7218f538d8495a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d2f080c6d89c..0606ff3a645c 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/prosody-modules-0_pre20201004 b/metadata/md5-cache/net-im/prosody-modules-0_pre20201004
new file mode 100644
index 000000000000..66f895ce1862
--- /dev/null
+++ b/metadata/md5-cache/net-im/prosody-modules-0_pre20201004
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=A collection of community-maintained modules for Prosody
+EAPI=7
+HOMEPAGE=https://modules.prosody.im
+IUSE=savedconfig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=net-im/prosody
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~conikost/distfiles/prosody-modules-0_pre20201004.tar.xz
+_eclasses_=portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=f281356bddb6f4a125182229c4f9eb7e
diff --git a/metadata/md5-cache/net-im/prosody-modules-9999 b/metadata/md5-cache/net-im/prosody-modules-9999
new file mode 100644
index 000000000000..aafcd807bf75
--- /dev/null
+++ b/metadata/md5-cache/net-im/prosody-modules-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=dev-vcs/mercurial
+DESCRIPTION=A collection of community-maintained modules for Prosody
+EAPI=7
+HOMEPAGE=https://modules.prosody.im
+IUSE=savedconfig
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=net-im/prosody
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1f0d60d827e0830a5311d7bb3edf0170
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.1.13-r1 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.1.13-r1
deleted file mode 100644
index b0043fea72bb..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.1.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.1.13.tar.gz -> tdesktop-2.1.13.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.1.13.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.1.13.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	optfeature	6c9aa35fc16df43d7142ef2660e00e25	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8101a175c757895d0a307f888fe9c217
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0
deleted file mode 100644
index 666ba282fef3..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.3.0.tar.gz -> tdesktop-2.3.0.tar.gz https://updates.tdesktop.com/tlinux/tsetup.2.3.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	optfeature	6c9aa35fc16df43d7142ef2660e00e25	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d2a49d9e869c57921aa6381ba350343
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.2.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
similarity index 76%
rename from metadata/md5-cache/net-im/telegram-desktop-bin-2.2.0
rename to metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
index 7d3379f3e9a6..1c2514ec99be 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.2.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.4.0
@@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.2.0.tar.gz -> tdesktop-2.2.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.2.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.2.0.tar.xz )
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.4.0.tar.gz -> tdesktop-2.4.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.4.0.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.2.4.0.tar.xz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	optfeature	6c9aa35fc16df43d7142ef2660e00e25	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8101a175c757895d0a307f888fe9c217
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 591b87d78027..2a65a0bb318f 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.1.1 b/metadata/md5-cache/net-libs/libwebsockets-4.1.2
similarity index 94%
rename from metadata/md5-cache/net-libs/libwebsockets-4.1.1
rename to metadata/md5-cache/net-libs/libwebsockets-4.1.2
index 8f0dd1f26627..f5d7032c0b52 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.1.1
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.1.2
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !libressl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( >net-libs/mbedtls-2.0.0 ) ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) socks5? ( client http-proxy ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/17
-SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.1.tar.gz -> libwebsockets-4.1.1.tar.gz
+SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.2.tar.gz -> libwebsockets-4.1.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a04fb68984cb54f95a779f3d29580559
diff --git a/metadata/md5-cache/net-libs/nodejs-12.18.4-r1 b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
index 5e0adefa0a62..075f2c75b50d 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
+++ b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.7 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v12.18.4/node-v12.18.4.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64235bd6cb00cca05e580456e1f50097
+_md5_=b12b5069c0956d8578dcf2698c1c0d57
diff --git a/metadata/md5-cache/net-libs/nodejs-12.19.0 b/metadata/md5-cache/net-libs/nodejs-12.19.0
index 0457d32efbb1..8496943bf9d7 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.19.0
+++ b/metadata/md5-cache/net-libs/nodejs-12.19.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v12.19.0/node-v12.19.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92f7e954044a1b4fa0d21e8b28fbe2b5
+_md5_=11085428531fcdc1b77bd59795dd64e6
diff --git a/metadata/md5-cache/net-libs/nodejs-14.11.0 b/metadata/md5-cache/net-libs/nodejs-14.11.0
index 4832d684d40e..7662adf3c607 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.11.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.11.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.11.0/node-v14.11.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b23aa6a1c0aec49ae1715a9d65aa51d8
+_md5_=05770c7bcd41c23ee23230f65e7e47cf
diff --git a/metadata/md5-cache/net-libs/nodejs-14.12.0 b/metadata/md5-cache/net-libs/nodejs-14.12.0
index db665db60b6b..d5abf5d65b8a 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.12.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.12.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.12.0/node-v14.12.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57530e3e0123068db3a6d483da9e32e0
+_md5_=86c734ca462f19e100e1056f3c7af89d
diff --git a/metadata/md5-cache/net-libs/nodejs-14.13.0-r1 b/metadata/md5-cache/net-libs/nodejs-14.13.0-r1
index fadad9ecba40..eb96519f3306 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.13.0-r1
+++ b/metadata/md5-cache/net-libs/nodejs-14.13.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.13.0/node-v14.13.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f10f9b9e4861bfe008c6f2fee081cb43
+_md5_=fb2018def93b01cb26088d19491b485f
diff --git a/metadata/md5-cache/net-libs/nodejs-14.13.1 b/metadata/md5-cache/net-libs/nodejs-14.13.1
new file mode 100644
index 000000000000..f6e969a0e783
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-14.13.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v14.13.1/node-v14.13.1.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb2018def93b01cb26088d19491b485f
diff --git a/metadata/md5-cache/net-libs/nodejs-14.2.0 b/metadata/md5-cache/net-libs/nodejs-14.2.0
index 79bc81f0c4fc..feba369a3cae 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.2.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.2.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.2.0/node-v14.2.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6075feb04a29895f86a743124b3079fa
+_md5_=0fbb25a92ddb7df0f8ddcec089ad8a35
diff --git a/metadata/md5-cache/net-libs/nodejs-14.4.0 b/metadata/md5-cache/net-libs/nodejs-14.4.0
index b9bc2a7122f3..be4705358c7c 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.4.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.4.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.37.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-65:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.4.0/node-v14.4.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41e0f995e73dfda7f915fe0244f8ae9a
+_md5_=c24ab3f3f165931480670204891a9d2d
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 7c55b0c410a7..c9669a1dda2a 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) sys-apps/coreutils systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -12,4 +12,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49eb7f71442fe540c1f5a05b161b89f7
+_md5_=62f013dda7d95bb7f909aa8422f8a2bc
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1b3183a44086..fe7331e928a7 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/chrony-4.0 b/metadata/md5-cache/net-misc/chrony-4.0
new file mode 100644
index 000000000000..ee5b841f47db
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-4.0
@@ -0,0 +1,16 @@
+BDEPEND=nettle? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
+DESCRIPTION=NTP client and server programs
+EAPI=7
+HOMEPAGE=https://chrony.tuxfamily.org/
+IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( nettle )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8aaec88b877efb3af0f64312ed6e3e8f
diff --git a/metadata/md5-cache/net-misc/chrony-4.0_pre3 b/metadata/md5-cache/net-misc/chrony-4.0_pre3
deleted file mode 100644
index 9831cde26610..000000000000
--- a/metadata/md5-cache/net-misc/chrony-4.0_pre3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nettle? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
-DESCRIPTION=NTP client and server programs
-EAPI=7
-HOMEPAGE=https://chrony.tuxfamily.org/
-IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc samba +seccomp +sechash selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-REQUIRED_USE=?? ( libedit readline ) sechash? ( nettle )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.0-pre3.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ccedae9871bef498908d01d73a39cba
diff --git a/metadata/md5-cache/net-misc/chrony-4.0_pre4 b/metadata/md5-cache/net-misc/chrony-4.0_pre4
deleted file mode 100644
index 063d7bab5efa..000000000000
--- a/metadata/md5-cache/net-misc/chrony-4.0_pre4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nettle? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
-DESCRIPTION=NTP client and server programs
-EAPI=7
-HOMEPAGE=https://chrony.tuxfamily.org/
-IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc samba +seccomp +sechash selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-REQUIRED_USE=?? ( libedit readline ) sechash? ( nettle )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.0-pre4.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ccedae9871bef498908d01d73a39cba
diff --git a/metadata/md5-cache/net-misc/chrony-9999 b/metadata/md5-cache/net-misc/chrony-9999
index 1f7c0c61f6f3..cd909da0607b 100644
--- a/metadata/md5-cache/net-misc/chrony-9999
+++ b/metadata/md5-cache/net-misc/chrony-9999
@@ -1,15 +1,15 @@
 BDEPEND=nettle? ( virtual/pkgconfig ) virtual/w3m virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
 DESCRIPTION=NTP client and server programs
 EAPI=7
 HOMEPAGE=https://chrony.tuxfamily.org/
-IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc samba +seccomp +sechash selinux
+IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-REQUIRED_USE=?? ( libedit readline ) sechash? ( nettle )
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( nettle )
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ccedae9871bef498908d01d73a39cba
+_md5_=8aaec88b877efb3af0f64312ed6e3e8f
diff --git a/metadata/md5-cache/net-misc/dropbox-104.4.175 b/metadata/md5-cache/net-misc/dropbox-104.4.175
deleted file mode 100644
index ec47b1ea1d6c..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-104.4.175
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-IUSE=selinux X
-KEYWORDS=amd64 x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( dev-libs/glib:2 media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/libffi-compat:6 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib sys-libs/ncurses-compat:5
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-104.4.175.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-104.4.175.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a54bc615ceb1b9d710da67b7ef698bd
diff --git a/metadata/md5-cache/net-misc/dropbox-105.4.651 b/metadata/md5-cache/net-misc/dropbox-105.4.651
deleted file mode 100644
index 1aadc870d21c..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-105.4.651
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-105.4.651.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-105.4.651.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6988e1d99f9bf049b53feb57c7e6e90e
diff --git a/metadata/md5-cache/net-misc/dropbox-106.4.368 b/metadata/md5-cache/net-misc/dropbox-106.4.368
deleted file mode 100644
index 430918fc5e53..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-106.4.368
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-106.4.368.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-106.4.368.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6988e1d99f9bf049b53feb57c7e6e90e
diff --git a/metadata/md5-cache/net-misc/dropbox-105.4.649 b/metadata/md5-cache/net-misc/dropbox-107.4.443
similarity index 87%
rename from metadata/md5-cache/net-misc/dropbox-105.4.649
rename to metadata/md5-cache/net-misc/dropbox-107.4.443
index 8671cd7ea7a7..111dacdcdf9d 100644
--- a/metadata/md5-cache/net-misc/dropbox-105.4.649
+++ b/metadata/md5-cache/net-misc/dropbox-107.4.443
@@ -5,11 +5,11 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-105.4.649.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-105.4.649.tar.gz )
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-107.4.443.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-107.4.443.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6988e1d99f9bf049b53feb57c7e6e90e
+_md5_=bf7d611bab280bf05e4aa9a1eff8d32b
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.9 b/metadata/md5-cache/net-misc/ntpsec-1.1.9
index d9435970b41c..243b744aff15 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.9
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=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(-)] sys-libs/libcap dev-python/psutil[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(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=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(-)] sys-libs/libcap dev-python/psutil[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(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.9.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a24d4a3d8257ebee0748ea08a80b00f
+_md5_=fdf66909ef3a294f2e1b8fcfee9ec3cf
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.1 b/metadata/md5-cache/net-misc/oidc-agent-3.3.1
index fcc7ab7f29f0..7e248e4d5711 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-3.3.1
+++ b/metadata/md5-cache/net-misc/oidc-agent-3.3.1
@@ -1,7 +1,7 @@
 BDEPEND=test? ( dev-libs/check )
 DEFINED_PHASES=compile install postinst postrm
 DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-DESCRIPTION=oidc-agent for managing OpenID Connect tokens on the command line
+DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
 EAPI=7
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
 IUSE=test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.1.tar.gz -> oidc-agent-3.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36b19b964f8fb545450f3c9a259cc7e3
+_md5_=b6c9bee4775719707bfd139b324bca4c
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1 b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
index 31ab0049153d..14aedf9ef761 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
+++ b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
@@ -1,7 +1,7 @@
 BDEPEND=test? ( dev-libs/check )
 DEFINED_PHASES=compile install postinst postrm
 DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-DESCRIPTION=oidc-agent for managing OpenID Connect tokens on the command line
+DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
 EAPI=7
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
 IUSE=test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.5.tar.gz -> oidc-agent-3.3.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=134c6cb6b4c0d0af5ac33aa41b55eeec
+_md5_=8d853e6500d872d75c7918d43d2aebe3
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index a61f8f553818..17b7c186b4c4 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.10.0 b/metadata/md5-cache/net-p2p/syncthing-1.10.0
new file mode 100644
index 000000000000..8138ef1aef42
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=7
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense
+RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( acct-group/stdiscosrv acct-group/strelaysrv acct-user/stdiscosrv acct-user/strelaysrv ) selinux? ( sec-policy/selinux-syncthing )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.10.0.tar.gz -> syncthing-1.10.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20190627213056-c55ef6137fc6.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20190627213056-c55ef6137fc6.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.5.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.zip -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.zip mirror://goproxy//github.com/bkaradzic/go-lz4/@v/v0.0.0-20160924222819-7224d8d8f27e.mod -> github.com%2Fbkaradzic%2Fgo-lz4%2F@v%2Fv0.0.0-20160924222819-7224d8d8f27e.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.zip -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.zip mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.zip -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/calmh/xdr/@v/v1.1.0.mod -> github.com%2Fcalmh%2Fxdr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.0.0-20180726100737-be486d185f3d.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.0.0-20180726100737-be486d185f3d.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20190905060710-a5e0173ced67.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20190905060710-a5e0173ced67.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.0.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.zip -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.zip mirror://goproxy//github.com/chmduquesne/rollinghash/@v/v0.0.0-20180912150627-a60f8e7142b5.mod -> github.com%2Fchmduquesne%2Frollinghash%2F@v%2Fv0.0.0-20180912150627-a60f8e7142b5.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.zip -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/d4l3k/messagediff/@v/v1.2.1.mod -> github.com%2Fd4l3k%2Fmessagediff%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.zip -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/dchest/siphash/@v/v1.2.1.mod -> github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.3.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2-0.20200115201040-8f368f2f2ab3.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.zip -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.0.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.0.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.0.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.0.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191027212112-611e8accdfc9.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/greatroar/blobloom/@v/v0.3.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.3.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.6.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.zip -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/jackpal/go-nat-pmp/@v/v1.0.2.mod -> github.com%2Fjackpal%2Fgo-nat-pmp%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.18.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.0.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.zip -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.10.0.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.3.0.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.5.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.4.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.6.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.2.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20190826022208-cac0b30c2563.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.7+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.7+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.7+incompatible.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20190709140112-69c7a957d3e2.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20190709140112-69c7a957d3e2.mod mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.zip -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.zip mirror://goproxy//github.com/syndtr/goleveldb/@v/v1.0.1-0.20200815071216-d9e9293bd0f7.mod -> github.com%2Fsyndtr%2Fgoleveldb%2F@v%2Fv1.0.1-0.20200815071216-d9e9293bd0f7.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.zip -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/thejerf/suture/@v/v3.0.2+incompatible.mod -> github.com%2Fthejerf%2Fsuture%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.zip -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.zip mirror://goproxy//github.com/vitrun/qart/@v/v0.0.0-20160531060029-bf64b92db6b0.mod -> github.com%2Fvitrun%2Fqart%2F@v%2Fv0.0.0-20160531060029-bf64b92db6b0.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200813134508-3edf25e44fcc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200813134508-3edf25e44fcc.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180926160741-c2ed4eda69e7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180926160741-c2ed4eda69e7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191010194322-b09406accb47.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191224085550-c709ea063b76.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200814200057-3d37ad5750ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200814200057-3d37ad5750ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200819171115-d785dc25833f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200819171115-d785dc25833f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200819171115-d785dc25833f.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=88a6259303e7a84b520b5b128636e31e
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index d7c2feb9d835..4d18eb7ebb75 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/gr-m2k-9999 b/metadata/md5-cache/net-wireless/gr-m2k-9999
new file mode 100644
index 000000000000..df4356044694
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-m2k-9999
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:= net-libs/libiio net-wireless/libm2k dev-lang/swig
+DESCRIPTION=A C++ library for interfacing with the ADALM2000
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/gr-m2k
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:= net-libs/libiio net-wireless/libm2k
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f89aa116d684314a35ad913763ccf9f
diff --git a/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20201005 b/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20201005
new file mode 100644
index 000000000000..ec7601599a35
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20201005
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:=
+DESCRIPTION=Scopy IIO blocks for GNU Radio
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/gr-scopy
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:=
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/gr-scopy/archive/f48b45cabe2a81f491137dbc220032ea65f080c3.tar.gz -> gr-scopy-0.0_p20201005.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=622a853d6cd9068c815bda6726024f13
diff --git a/metadata/md5-cache/net-wireless/gr-scopy-9999 b/metadata/md5-cache/net-wireless/gr-scopy-9999
new file mode 100644
index 000000000000..6224c819bb6b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-scopy-9999
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:=
+DESCRIPTION=Scopy IIO blocks for GNU Radio
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/gr-scopy
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:=
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=622a853d6cd9068c815bda6726024f13
diff --git a/metadata/md5-cache/net-wireless/libm2k-0.0_p20201005 b/metadata/md5-cache/net-wireless/libm2k-0.0_p20201005
new file mode 100644
index 000000000000..58b8073a3683
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libm2k-0.0_p20201005
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) net-libs/libiio dev-lang/swig
+DESCRIPTION=A C++ library for interfacing with the ADALM2000
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/libm2k
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) net-libs/libiio
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/libm2k/archive/f98dfa42134d2dff458c7832842d1f51c3131aa4.tar.gz -> libm2k-0.0_p20201005.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5247358b5d60203f4edfff15c94507b
diff --git a/metadata/md5-cache/net-wireless/libm2k-9999 b/metadata/md5-cache/net-wireless/libm2k-9999
new file mode 100644
index 000000000000..aba4ae08c786
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libm2k-9999
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) net-libs/libiio dev-lang/swig
+DESCRIPTION=A C++ library for interfacing with the ADALM2000
+EAPI=7
+HOMEPAGE=https://github.com/analogdevicesinc/libm2k
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) net-libs/libiio
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5247358b5d60203f4edfff15c94507b
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.24 b/metadata/md5-cache/net-wireless/unifi-6.0.27
similarity index 81%
rename from metadata/md5-cache/net-wireless/unifi-6.0.24
rename to metadata/md5-cache/net-wireless/unifi-6.0.27
index ca7597053a7e..d13098e2840e 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.24
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.27
@@ -9,6 +9,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/6.0
-SRC_URI=https://dl.ui.com/unifi/6.0.24-b200bf6446/UniFi.unix.zip -> unifi-6.0.24.zip
+SRC_URI=https://dl.ui.com/unifi/6.0.27-e23884806a/UniFi.unix.zip -> unifi-6.0.27.zip
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84833ebe4151eda3c6645a959bc06e23
+_md5_=ea6926d934567aff8ced2704cba2baf5
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 32a5da69998e..516664bcc411 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1 b/metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
deleted file mode 100644
index edd7417d9ac0..000000000000
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig >=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
-DESCRIPTION=Smith charting program, mainly designed for educational use
-EAPI=5
-HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
-IUSE=doc examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
-SLOT=0
-SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.30.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=099781fa93e189d972672b88d69f6b0d
diff --git a/metadata/md5-cache/sci-electronics/linsmith-0.99.31 b/metadata/md5-cache/sci-electronics/linsmith-0.99.31
deleted file mode 100644
index 203f20113240..000000000000
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.31
+++ /dev/null
@@ -1,14 +0,0 @@
-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=install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui virtual/pkgconfig
-DESCRIPTION=Smith charting program, mainly designed for educational use
-EAPI=7
-HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
-IUSE=doc examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
-SLOT=0
-SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.31.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c97fe6ff53c15f7bc1a712ea7c020bc8
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index fc7160e71831..5db4b62050fa 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/xdg-dbus-proxy-0.1.2 b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
index b91623e807df..31bc1dfc133f 100644
--- a/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
+++ b/metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.40:2
 DESCRIPTION=Filtering proxy for D-Bus connections
 EAPI=7
 HOMEPAGE=https://github.com/flatpak/xdg-dbus-proxy
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
-_md5_=3533380173485c0594ed07db32a4d27b
+_md5_=1f116184c478103ff62d22a886949f19
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0
index 6c7ebf56e14b..552913cf74c3 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=Desktop integration portal
 EAPI=7
 HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
 IUSE=geolocation screencast
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.0/xdg-desktop-portal-1.8.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a5ea5b2e360f90f41e397f8a4d51a6b
+_md5_=3c50daba3f09e82fa27a5ca121dbcc30
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1 b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
deleted file mode 100644
index 8819b5d6dc51..000000000000
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-DESCRIPTION=Official authentication app for German ID cards and residence permits
-EAPI=7
-HOMEPAGE=https://www.ausweisapp.bund.de/
-KEYWORDS=amd64 x86
-LICENSE=EUPL-1.2
-RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-SLOT=0
-SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.20.1.tar.gz -> AusweisApp2-1.20.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8439ab0c9177708855dfb0a05cbe1766
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index af7f5d815bcd..b2975e1bea5f 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d8096d9aa8a6..c26bff380356 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/heat-14.1.0 b/metadata/md5-cache/sys-cluster/heat-14.1.0
new file mode 100644
index 000000000000..a682b3960093
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-14.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
+EAPI=7
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/croniter-0.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-ironicclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-octaviaclient-1.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-vitrageclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zunclient-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/yaql-1.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] acct-user/heat acct-group/heat python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-14.1.0 https://tarballs.openstack.org/heat/openstack-heat-14.1.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e86b55d7c22ec858bb0794fff2a75378
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.1.9999 b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
index aad68c7aa722..9c276cb73493 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
 DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/croniter-0.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-ironicclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-octaviaclient-1.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-vitrageclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zunclient-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/yaql-1.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] acct-user/heat acct-group/heat python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/croniter-0.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-ironicclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-octaviaclient-1.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-vitrageclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-zunclient-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/yaql-1.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] acct-user/heat acct-group/heat python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-2020.1.9999
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c197558a16f6a04510b566b9c57daf19
+_md5_=e86b55d7c22ec858bb0794fff2a75378
diff --git a/metadata/md5-cache/sys-cluster/kube-router-1.1.0 b/metadata/md5-cache/sys-cluster/kube-router-1.1.0
new file mode 100644
index 000000000000..e70c1af55c2c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-router-1.1.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A turnkey solution for Kubernetes networking
+EAPI=7
+HOMEPAGE=https://kube-router.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
+RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/cloudnativelabs/kube-router/archive/v1.1.0.tar.gz -> kube-router-1.1.0.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=ee9a9161273a32686bbba69d3ec651f6
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.2.0 b/metadata/md5-cache/sys-cluster/neutron-16.2.0
new file mode 100644
index 000000000000..666f3ce6b069
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-16.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
+DEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
+DESCRIPTION=A virtual network service for Openstack
+EAPI=7
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.2.0.tar.gz https://tarballs.openstack.org/neutron/neutron-16.2.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e1e3a0066e1550303ae49186398417a
diff --git a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
index 537f6703adb0..5d517eb88958 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
+DEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
 DESCRIPTION=A virtual network service for Openstack
 EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 kernel_linux
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-2020.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-2020.1.9999.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d7848b664075c8dbd613c08a0fef1cc6
+_md5_=6e1e3a0066e1550303ae49186398417a
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 775e3addb559..8464f7eea6e0 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0_rc6 b/metadata/md5-cache/sys-devel/clang-11.0.0_rc6
new file mode 100644
index 000000000000..8057289dcc5e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0_rc6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/sphinx xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.0_rc6:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.0.0_rc6 default-compiler-rt? ( =sys-libs/compiler-rt-11.0.0* ) default-libcxx? ( >=sys-libs/libcxx-11.0.0_rc6 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-11.0.0_rc6:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !=sys-libs/libcxx-11.0.0_rc6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-11.0.0_rc6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=11.0.0
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=227477f42947a65af543cd73da80bf66
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3 b/metadata/md5-cache/sys-devel/gcc-config-2.3
deleted file mode 100644
index 4e707f14c0fa..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-config-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Utility to manage compilers
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/gentoo-functions-0.10
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=205506e592c6aa7b1634e924fe4b1cbe
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0_rc6 b/metadata/md5-cache/sys-devel/lld-11.0.0_rc6
new file mode 100644
index 000000000000..9be96e4e7abe
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0_rc6
@@ -0,0 +1,14 @@
+BDEPEND=test? ( || ( ( dev-lang/python:3.9 ~dev-python/lit-11.0.0_rc6[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 ~dev-python/lit-11.0.0_rc6[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 ~dev-python/lit-11.0.0_rc6[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-11.0.0_rc6[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.0_rc6 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-11.0.0_rc6
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0_rc6 b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc6
new file mode 100644
index 000000000000..3d8fcdb8d20e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc6
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( =sys-devel/binutils-apple-5.1 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] doc? ( dev-python/recommonmark[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(+)] doc? ( dev-python/recommonmark[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(+)] doc? ( dev-python/recommonmark[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(+)] doc? ( dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] =dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-11 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] =dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=582102f687941bb6f2575493c0df12d9
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc6 b/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc6
new file mode 100644
index 000000000000..6ed2e8abe692
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1b33c9bfec8b..ef82cfeea89c 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/dracut-crypt-ssh-1.0.6-r1 b/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
deleted file mode 100644
index 823222d97591..000000000000
--- a/metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-kernel/dracut
-DESCRIPTION=Early unlocking of encrypted systems via ssh for dracut
-EAPI=6
-HOMEPAGE=https://github.com/dracut-crypt-ssh/dracut-crypt-ssh
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-kernel/dracut net-misc/dhcp net-misc/dropbear
-SLOT=0
-SRC_URI=https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v1.0.6.tar.gz -> dracut-crypt-ssh-1.0.6.tar.gz
-_md5_=ad57f2e11b78d5a94bb3f0c23a518258
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.150 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.150
new file mode 100644
index 000000000000..c8898757d1dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.150
@@ -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=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.150
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-149.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-149.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-149.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-149.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-149.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-149.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-149.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-149.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-149.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=153a788825c9587bcf3d7fe72d8d9ab2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.70 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.70
new file mode 100644
index 000000000000..cde8af255258
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.70
@@ -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=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.70
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-71.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-71.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-71.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-71.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-71.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-71.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-71.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-71.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-71.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9e91165eacca332e6fd4ec7bd1f2df99
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.14
new file mode 100644
index 000000000000..3af901bab129
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.14
@@ -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=Full sources including the Gentoo patchset for the 5.8 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.8.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-17.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-17.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-17.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-17.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-17.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-17.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-17.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-17.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3dc31952751e35985040d00f29611058
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.149 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.150
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.149
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.150
index 54e257958031..a553b6fd7072 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.149
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.150
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.149
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.149.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.150
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.150.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.69 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.70
similarity index 84%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.69
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.70
index 5dc669c2330d..43d8fdd9717b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.69
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.70
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.69
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.69.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.70
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.70.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.14
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.8.13
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.8.14
index 253f1388358b..de1815131574 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.14
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~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 virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.8.13
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.8.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
+SLOT=5.8.14
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.8.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index beab96fe870a..210e4834312f 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc6 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc6
new file mode 100644
index 000000000000..95e755009d3e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc6
@@ -0,0 +1,13 @@
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0*:11 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=11.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc6
new file mode 100644
index 000000000000..7b9b6d775bf8
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc6
@@ -0,0 +1,14 @@
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !=dev-python/lit-5[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0*:11 sys-libs/compiler-rt:11.0.0 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=11.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2e6fd014a8efd48dfffce61058ddc182
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc6 b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc6
new file mode 100644
index 000000000000..4fed8f7f8d0c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0_rc6[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0_rc6[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60bef60670e5a51ea9a5ee43824d67ff
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc6 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc6
new file mode 100644
index 000000000000..f870216f47c1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc6
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind +static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0_rc6 b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc6
new file mode 100644
index 000000000000..28f0c1ad55e0
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc6
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc6 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc6
new file mode 100644
index 000000000000..911f5d15de5b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc6
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bc455a315eb7e4e54cebd94c549cabc
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020b b/metadata/md5-cache/sys-libs/timezone-data-2020b
new file mode 100644
index 000000000000..5ee4485bdd6d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=7
+HOMEPAGE=https://www.iana.org/time-zones
+IUSE=nls leaps-timezone elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020b.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=70e84a6a125223e402ccd247eee0980a
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index dfcc27e8f718..b6222690bf98 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0 b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
new file mode 100644
index 000000000000..8bb52ee9edc6
--- /dev/null
+++ b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=OWASP ModSecurity Core Rule Set
+EAPI=7
+HOMEPAGE=https://coreruleset.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=www-apache/mod_security-2.9.1
+SLOT=0
+SRC_URI=https://github.com/coreruleset/coreruleset/archive/v3.3.0.tar.gz -> modsecurity-crs-3.3.0.tar.gz
+_md5_=964c7fadd40bf1398a8a35b3743917c0
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index b349c633b555..b426bb35318d 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-86.0.4240.22 b/metadata/md5-cache/www-apps/chromedriver-bin-86.0.4240.22
new file mode 100644
index 000000000000..b66e63c3562c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-86.0.4240.22
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=7
+HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
+KEYWORDS=~amd64
+LICENSE=google-chrome
+RDEPEND=!www-client/chromium www-client/google-chrome
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/86.0.4240.22/chromedriver_linux64.zip -> chromedriver-bin-86.0.4240.22.linux64.zip )
+_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/gitea-1.12.1 b/metadata/md5-cache/www-apps/gitea-1.12.4
similarity index 89%
rename from metadata/md5-cache/www-apps/gitea-1.12.1
rename to metadata/md5-cache/www-apps/gitea-1.12.4
index 20c3586e4910..c4cf353cfa8c 100644
--- a/metadata/md5-cache/www-apps/gitea-1.12.1
+++ b/metadata/md5-cache/www-apps/gitea-1.12.4
@@ -8,8 +8,8 @@ IUSE=+acct build-client pam sqlite +filecaps
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-RESTRICT=strip
+RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.12.1/gitea-src-1.12.1.tar.gz -> gitea-1.12.1.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.12.4/gitea-src-1.12.4.tar.gz -> gitea-1.12.4.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fe702724809fec6b7f37bb93aa31d75c
+_md5_=0f1fe972dfb095d49c62c9d57eff27f2
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.9 b/metadata/md5-cache/www-apps/nextcloud-17.0.9
deleted file mode 100644
index fcb2f792f4a9..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-17.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=17.0.9
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-17.0.9.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-apps/nextcloud-18.0.7 b/metadata/md5-cache/www-apps/nextcloud-18.0.7
deleted file mode 100644
index 89de9f8c3bcc..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-18.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=18.0.7
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-18.0.7.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-apps/nextcloud-18.0.9 b/metadata/md5-cache/www-apps/nextcloud-18.0.9
deleted file mode 100644
index 128010fd8aa9..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-18.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=18.0.9
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-18.0.9.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-apps/nextcloud-19.0.1 b/metadata/md5-cache/www-apps/nextcloud-19.0.1
deleted file mode 100644
index 8921dab4f88a..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-19.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=19.0.1
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-19.0.1.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-apps/nextcloud-19.0.2 b/metadata/md5-cache/www-apps/nextcloud-19.0.2
deleted file mode 100644
index bf1f095202cd..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-19.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=https://nextcloud.com/
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=19.0.2
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-19.0.2.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.8 b/metadata/md5-cache/www-apps/nextcloud-20.0.0
similarity index 96%
rename from metadata/md5-cache/www-apps/nextcloud-17.0.8
rename to metadata/md5-cache/www-apps/nextcloud-20.0.0
index f4a16802a138..7509bd4203f1 100644
--- a/metadata/md5-cache/www-apps/nextcloud-17.0.8
+++ b/metadata/md5-cache/www-apps/nextcloud-20.0.0
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=AGPL-3
 RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=17.0.8
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-17.0.8.tar.bz2
+SLOT=20.0.0
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-20.0.0.tar.bz2
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=4440baf5c6e1013a6f30620fba20abd3
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c804e3229e95..5003f8ff92e0 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/chromium-85.0.4183.121 b/metadata/md5-cache/www-client/chromium-85.0.4183.121
deleted file mode 100644
index 008878d6375a..000000000000
--- a/metadata/md5-cache/www-client/chromium-85.0.4183.121
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1726 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +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 arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid ) headless? ( ozone ) ozone-wayland? ( ozone )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.121.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-2/chromium-85-patchset-2.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50228ac9281ed1713a4a0bf8cdc2af08
diff --git a/metadata/md5-cache/www-client/chromium-86.0.4240.68 b/metadata/md5-cache/www-client/chromium-86.0.4240.75
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-86.0.4240.68
rename to metadata/md5-cache/www-client/chromium-86.0.4240.75
index 0761474885be..fed77f7a66cf 100644
--- a/metadata/md5-cache/www-client/chromium-86.0.4240.68
+++ b/metadata/md5-cache/www-client/chromium-86.0.4240.75
@@ -5,12 +5,12 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +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 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/gtk+:3[wayland,X] x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
 REQUIRED_USE=component-build? ( !suid ) headless? ( ozone ) ozone-wayland? ( ozone )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.68.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.75.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=897a9683f74991a87473c4e4fa0d937c
+_md5_=33ea1384a8dce5a62e2bcb0021f0bde2
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-87.0.4278.0 b/metadata/md5-cache/www-client/google-chrome-unstable-87.0.4280.11
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-87.0.4278.0
rename to metadata/md5-cache/www-client/google-chrome-unstable-87.0.4280.11
index bd0b0c891f6a..7d8c5cbb9d4f 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-87.0.4278.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-87.0.4280.11
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 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/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_87.0.4278.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_87.0.4280.11-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cdefb8add175ffb0104dff1410b2d85
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.7_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.7_p1
new file mode 100644
index 000000000000..4971e12b8e69
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.7_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+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/snapshot/vivaldi-snapshot_3.4.2066.7-1_amd64.deb -> vivaldi-snapshot-3.4.2066.7_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.7-1_arm64.deb -> vivaldi-snapshot-3.4.2066.7_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.7-1_armhf.deb -> vivaldi-snapshot-3.4.2066.7_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.7-1_i386.deb -> vivaldi-snapshot-3.4.2066.7_p1-i386.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b6850c0cd923015cdb28366a21fd330
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 86903f32355a..2f046b1b5201 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/buku-4.3 b/metadata/md5-cache/www-misc/buku-4.3-r1
similarity index 78%
rename from metadata/md5-cache/www-misc/buku-4.3
rename to metadata/md5-cache/www-misc/buku-4.3-r1
index 97800f203635..471a3b36c9cd 100644
--- a/metadata/md5-cache/www-misc/buku-4.3
+++ b/metadata/md5-cache/www-misc/buku-4.3-r1
@@ -1,4 +1,4 @@
-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(-)]
+BDEPEND=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] ) >=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-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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/attrs[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/click-7.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/flake8[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/hypothesis[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/py-1.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(-)] >=dev-python/pylint-1.7.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/pytest[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/pyyaml-4.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/vcrpy-4.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=Powerful command-line bookmark manager
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/jarun/buku
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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(-)]
+RDEPEND=>=dev-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-4.3.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=167d94285c42b47ab5db352c226e5982
+_md5_=70129f4b409f51dd85f3ec26adfec7a3
diff --git a/metadata/md5-cache/www-misc/buku-4.4 b/metadata/md5-cache/www-misc/buku-4.4-r1
similarity index 76%
rename from metadata/md5-cache/www-misc/buku-4.4
rename to metadata/md5-cache/www-misc/buku-4.4-r1
index 866c29964a56..6b9414be5b27 100644
--- a/metadata/md5-cache/www-misc/buku-4.4
+++ b/metadata/md5-cache/www-misc/buku-4.4-r1
@@ -1,4 +1,4 @@
-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(-)]
+BDEPEND=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] ) >=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-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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/attrs[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/click-7.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/hypothesis[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/py-1.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(-)] dev-python/pytest[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/pyyaml-4.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/vcrpy-4.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=Powerful command-line bookmark manager
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/jarun/buku
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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(-)]
+RDEPEND=>=dev-python/beautifulsoup-4.6.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/cryptography[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/html5lib-1.0.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/urllib3[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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=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 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-4.4.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8f1b2eeda495e2348070d710b51ff79e
+_md5_=cacc67da5772d14d51feb41f4405f0a9
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 7e2ef1d196f2..ead5e002c991 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4278.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.11_alpha
similarity index 90%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4278.0_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.11_alpha
index 1679a623b6f5..9b81a4f944e1 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4278.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.11_alpha
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_87.0.4278.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_87.0.4280.11-1_amd64.deb
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index d60a263b97e4..c7266659f84f 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.12 b/metadata/md5-cache/x11-apps/xdm-1.1.12
index f0992d8cc839..08acce06213f 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.12
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.12
@@ -11,4 +11,4 @@ RDEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdm-1.1.12.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=ca8ae3919966b08bfcb11d9b0865e0bd
+_md5_=1e50f59f840bf4c4171ece86b476695d
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index a9efa6eee107..7225a57ada25 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
index 746baa2b9d95..cd0029f4c151 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r4
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a6323a68aa3e4e223f1afe58bcd9d2d
+_md5_=1b2c89c4469cbba6b1b9cf361a70c4df
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
index b8229151b294..8f479fb415e8 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r4
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8202fd6ea9f21c4648d0a6abdb18ad5
+_md5_=cb04ec8eaf6228e209bbb6e6a05cfcfe
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
index 089a8afbf6ea..2a595eed1fd4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=108c9aae076d8ce76efd271cd6feb51b
+_md5_=f6ecacb9909e1b970c0c8148a4268017
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
index 599f4cbaa030..b36cd1272236 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r2
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=504b527cac808f0d29260c715c8062c7
+_md5_=6c95381b180cd1ca76bd0760247c9e87
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.66 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.66
index 0e4e3c19aaec..80943db4aec6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.66
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.66
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.66/NVIDIA-FreeBSD-x86_64-450.66.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.66/NVIDIA-Linux-x86_64-450.66.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.66.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ad7896d752cb1910aee92f1e5c74421
+_md5_=ec61e0b9c4f64770f4ce3082a8196576
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
index e17a27f116de..af2de51cf835 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.80.02/NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.80.02/NVIDIA-Linux-x86_64-450.80.02.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.80.02.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28f27d254d4d3af565e767eb01284a1e
+_md5_=9b8d19988bfcf2404ba448f7ff067d03
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.23.04-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.23.04-r1
index 25af3fcf75fa..09b114fa8c1d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.23.04-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.23.04-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.23.04/NVIDIA-FreeBSD-x86_64-455.23.04.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.23.04/NVIDIA-Linux-x86_64-455.23.04.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.23.04.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c0e98d426db4ce9cb44f137ff489e62e
+_md5_=6b2a2d8a4c720d44750d1911559d3136
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28
new file mode 100644
index 000000000000..f274445e2727
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/pax-utils !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( !app-eselect/eselect-opengl media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( sys-apps/kmod[tools] )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror test
+SLOT=0/455
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.28/NVIDIA-FreeBSD-x86_64-455.28.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.28/NVIDIA-Linux-x86_64-455.28.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.28.tar.bz2 )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6b2a2d8a4c720d44750d1911559d3136
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 2d2f42260e37..103a5c40e9db 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.5 b/metadata/md5-cache/x11-libs/qwt-6.1.5
new file mode 100644
index 000000000000..5bdb390675ad
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qwt-6.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
+DESCRIPTION=2D plotting library for Qt5
+EAPI=7
+HOMEPAGE=https://qwt.sourceforge.net/
+IUSE=designer doc examples mathml opengl svg
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
+SLOT=6/1.5
+SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.5/qwt-6.1.5.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=00162e31a984cbb8924d11a0a6a50a9c
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4cb57b9c7f7b..5898301f8915 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
index 3c089bde99d1..132eed596c66 100644
--- a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
+++ b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3 dev
 DESCRIPTION=Application menu module for GTK
 EAPI=7
 HOMEPAGE=https://gitlab.com/vala-panel-project/vala-panel-appmenu
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
 SLOT=0
 SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=171c7efd5bbbdf2fff085980085e1479
+_md5_=0c0f1322fb01e114091a714ebd494cc2
diff --git a/metadata/md5-cache/x11-misc/vym-2.7.1 b/metadata/md5-cache/x11-misc/vym-2.7.1
index 95049260d545..d917ad30f75c 100644
--- a/metadata/md5-cache/x11-misc/vym-2.7.1
+++ b/metadata/md5-cache/x11-misc/vym-2.7.1
@@ -1,13 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 dev-qt/linguist-tools:5
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 DESCRIPTION=View Your Mind, a mindmap tool
 EAPI=7
 HOMEPAGE=https://www.insilmaril.de/vym/
 IUSE=dbus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vym/vym-2.7.1.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b27873c6cd8bc27389c5397b976c1c7d
+_md5_=6c6c437a67b3b0748bb287235295cd09
diff --git a/metadata/md5-cache/x11-misc/vym-9999 b/metadata/md5-cache/x11-misc/vym-9999
index 5347bf80d656..8d41b22ca674 100644
--- a/metadata/md5-cache/x11-misc/vym-9999
+++ b/metadata/md5-cache/x11-misc/vym-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/qtcore:5 dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 DESCRIPTION=View Your Mind, a mindmap tool
 EAPI=7
-HOMEPAGE=http://www.insilmaril.de/vym/
+HOMEPAGE=https://www.insilmaril.de/vym/
 IUSE=dbus
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e728a2ae871ce8a2d09d0a5887990267
+_md5_=7e2d581fbd038e41e1e999bf8984c4c6
diff --git a/metadata/md5-cache/x11-misc/xsettingsd-1.0.0 b/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
index 6e3ecd5a56c9..b6ad155e6401 100644
--- a/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
+++ b/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11
 DESCRIPTION=Provides settings to X11 applications via the XSETTINGS specification
 EAPI=7
 HOMEPAGE=https://github.com/derat/xsettingsd
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/derat/xsettingsd/archive/v1.0.0.tar.gz -> xsettingsd-1.0.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47baf9e15ec184e1e9d5befe697ccf77
+_md5_=fc33575d7d21e6a5ddaf1db2f3dd1b57
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5f2833afa520..197a7573e11a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Oct 2020 12:38:36 +0000
+Thu, 08 Oct 2020 13:38:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2ce8503fdedb..35e66b4814fb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 07 Oct 2020 12:38:35 PM UTC
+Thu 08 Oct 2020 01:38:36 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8e7ad800aec0..fb98b6bc196d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Oct 2020 13:00:01 +0000
+Thu, 08 Oct 2020 14:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b2579827e186..649a9649a591 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c0951faee5483e3415d9913062abe6d6bb0c34a4 1602068735 2020-10-07T11:05:35+00:00
+b4c03874df5d69f1080a6c449b3d4b717fbaef82 1602163086 2020-10-08T13:18:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1eeffc4023a7..ca0938979b19 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1602074101 Wed 07 Oct 2020 12:35:01 PM UTC
+1602164101 Thu 08 Oct 2020 01:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 24361248e9b6..197a7573e11a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Oct 2020 12:38:35 +0000
+Thu, 08 Oct 2020 13:38:36 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e3af8c56a505..d14630f31066 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 66e3a6e728f1..4b392b98b329 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,2 +1,3 @@
 DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
 DIST knot-2.9.6.tar.xz 1188412 BLAKE2B 95b165bf37079fbda91cc8e81b8a4a5e662d53bf5efdf9a96cfd59646fe246f0c59e2438d42f9566dcf6dbe675400d450e131f66bfa88769b1c3fcf55b09d849 SHA512 95164a8ec913b3e3f01355d7f41f08caf6048c39317e63b2968e2bf8cf2ed08791ea0136b1e721add07f183b81a241ab2c2b8779c44368079d8eac082f49e368
+DIST knot-3.0.0.tar.xz 1329064 BLAKE2B 6a70ed9a4026b7c094688c12489e00527024204d3c8fa83e5de0f97fad042a8d1048881713c77e05b4876fe47150ac26383cf3f42a27bd97ad758fd274837dcf SHA512 286861e4127f8c70eeba1e76f2de82e8f89d4c15d2dc3733902f8d19103f6a44b9da97a91bc99168fd4f6024d60b8bc53a78580ed04a6e9cbf8c6ad921780c81
diff --git a/net-dns/knot/knot-3.0.0.ebuild b/net-dns/knot/knot-3.0.0.ebuild
new file mode 100644
index 000000000000..2cc9e9753dfc
--- /dev/null
+++ b/net-dns/knot/knot-3.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8277ab66bbf7..5cb080942ae2 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
new file mode 100644
index 000000000000..18c71611ce9c
--- /dev/null
+++ b/net-im/prosody-modules/Manifest
@@ -0,0 +1 @@
+DIST prosody-modules-0_pre20201004.tar.xz 1152400 BLAKE2B 66170cbeea156d8843aad2ace62294a40b6168170cd3da3b59cf660aa9d6aab743a7bfe1a5d313e83a69336ef7165a4a45ac27da9afa239a7f97413f275883fe SHA512 b4201c108b6ba5ed2404d65efa3fbb50ca1493e204b6cfe55893c19fe22a01bcb23244fa35f2c03cf52ecabdac1354aa388740fc62b5516cb2a85fdd753e9efc
diff --git a/net-im/prosody-modules/metadata.xml b/net-im/prosody-modules/metadata.xml
new file mode 100644
index 000000000000..fdabf81a3e5f
--- /dev/null
+++ b/net-im/prosody-modules/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+		conikost@gentoo.org
+		Conrad Kostecki
+	
+	
+		Prosody can be customized extensively using modules (plugins) to change
+		its default behaviour and to add new features and functionality.
+
+		Please note that each module is in a different state of development.
+		Some are proof-of-concept, others are quite stable and ready for production use.
+		Be sure to read the documentation page of any module before installing it on your server.
+	
+
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
new file mode 100644
index 000000000000..949393ac4e63
--- /dev/null
+++ b/net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig
+
+DESCRIPTION="A collection of community-maintained modules for Prosody"
+HOMEPAGE="https://modules.prosody.im"
+SRC_URI="https://dev.gentoo.org/~conikost/distfiles/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="net-im/prosody"
+
+src_prepare() {
+	default
+
+	# Exclude 'misc' folder from install, since it does not provide any modules.
+	echo "# Remove all modules from this list, which you don't want to install." > prosody-modules.conf || die
+	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
+
+	use savedconfig && restore_config prosody-modules.conf
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/prosody/community-modules"
+	while read prosody_module; do
+		if ! [[ "${prosody_module}" = \#* ]]; then
+			if [[ -f "${prosody_module}/README.markdown" ]]; then
+				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
+				rm "${prosody_module}/README.markdown" || die
+			fi
+
+			doins -r "${prosody_module}"
+		fi
+	done  prosody-modules.conf || die
+	find * -maxdepth 0 -type d ! -name misc >> prosody-modules.conf || die
+
+	use savedconfig && restore_config prosody-modules.conf
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)/prosody/community-modules"
+	while read prosody_module; do
+		if ! [[ "${prosody_module}" = \#* ]]; then
+			if [[ -f "${prosody_module}/README.markdown" ]]; then
+				newdoc "${prosody_module}/README.markdown" "README.${prosody_module}"
+				rm "${prosody_module}/README.markdown" || die
+			fi
+
+			doins -r "${prosody_module}"
+		fi
+	done  "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-12.19.0.ebuild b/net-libs/nodejs/nodejs-12.19.0.ebuild
index 7147f99f5e5f..b7aa130c8fd8 100644
--- a/net-libs/nodejs/nodejs-12.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.19.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -34,6 +34,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 "
@@ -168,7 +169,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild
index 214d56f3f4ad..fc0e59f7a51b 100644
--- a/net-libs/nodejs/nodejs-14.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.11.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -162,7 +163,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.12.0.ebuild b/net-libs/nodejs/nodejs-14.12.0.ebuild
index 43b934166628..83578308be86 100644
--- a/net-libs/nodejs/nodejs-14.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -162,7 +163,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
index 1b229989974f..f6e7a717189e 100644
--- a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -33,6 +33,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -167,7 +168,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.13.1.ebuild b/net-libs/nodejs/nodejs-14.13.1.ebuild
new file mode 100644
index 000000000000..f6e7a717189e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.13.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/coreutils
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-14.2.0.ebuild b/net-libs/nodejs/nodejs-14.2.0.ebuild
index a46c7ef71090..d0b1b55301a6 100644
--- a/net-libs/nodejs/nodejs-14.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -162,7 +163,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-14.4.0.ebuild b/net-libs/nodejs/nodejs-14.4.0.ebuild
index a96306904aee..b2433059bd73 100644
--- a/net-libs/nodejs/nodejs-14.4.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -162,7 +163,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 87f5c52bddd6..f5b9e1eee3d6 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
 HOMEPAGE="https://nodejs.org/"
@@ -32,6 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	sys-apps/coreutils
 	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )
 	pax_kernel? ( sys-apps/elfix )
@@ -164,7 +165,7 @@ src_install() {
 		# npm otherwise tries to write outside of the sandbox
 		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
 		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
 		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 343de2f34491..b1d4306c57c7 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e5aa925ad248..f52b2b3f5f63 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,3 +1,2 @@
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
-DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
-DIST chrony-4.0-pre4.tar.gz 544660 BLAKE2B d7f25a980a8cfd9c56fdf4f8ab3dc63594a428e0a18a5bb3b93488ea4db16201e67589ac8a0d966dea4a06c7ff9c4dfa5a1adc3a77849f69d594305e5961a1c8 SHA512 81471682b091851f79dfe08315a016c01199b850a1cc6289a3f3d6f56df2ab415266e156900f2e9d60804197097ff8bb89bf7c8072a90a05d6f257b5368e5939
+DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0.ebuild
similarity index 86%
rename from net-misc/chrony/chrony-4.0_pre3.ebuild
rename to net-misc/chrony/chrony-4.0.ebuild
index b5c97cbbd863..a13a14df678e 100644
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild
+++ b/net-misc/chrony/chrony-4.0.ebuild
@@ -19,11 +19,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock
 	+rtc samba +seccomp +sechash selinux
 "
 REQUIRED_USE="
-	?? ( libedit readline )
 	sechash? ( nettle )
 "
 RESTRICT=test
@@ -31,7 +30,6 @@ CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
 	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
 "
 DEPEND="
@@ -86,18 +84,6 @@ src_configure() {
 
 	tc-export CC PKG_CONFIG
 
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
 	# Note: ncurses and nss switches are mentioned in the configure script but
 	# do nothing
 	# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
+		$(usex libedit '' --without-editline)
 		$(usex nettle '' --without-nettle)
 		$(usex ntp '' --disable-ntp)
 		$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
 		$(usex rtc '' --disable-rtc)
 		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/chrony/chrony-4.0_pre4.ebuild b/net-misc/chrony/chrony-4.0_pre4.ebuild
deleted file mode 100644
index b5c97cbbd863..000000000000
--- a/net-misc/chrony/chrony-4.0_pre4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
-	+rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
-	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
-	html? ( dev-ruby/asciidoctor )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-BDEPEND="
-	nettle? ( virtual/pkgconfig )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	sed -i \
-		-e 's|RELOADDNS||g' \
-		-e 's|pkg-config|${PKG_CONFIG}|g' \
-		configure || die
-
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/ -F 0//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
-	# Note: ncurses and nss switches are mentioned in the configure script but
-	# do nothing
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex caps '' --disable-linuxcaps)
-		$(usex cmdmon '' --disable-cmdmon)
-		$(usex ipv6 '' --disable-ipv6)
-		$(usex nettle '' --without-nettle)
-		$(usex ntp '' --disable-ntp)
-		$(usex phc '' --disable-phc)
-		$(usex pps '' --disable-pps)
-		$(usex refclock '' --disable-refclock)
-		$(usex rtc '' --disable-rtc)
-		$(usex samba --enable-ntp-signd '')
-		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
-		${EXTRA_ECONF}
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]]; then
-		# uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=false
-
-	if has_version 'net-misc/chrony[caps]'; then
-		HAD_CAPS=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
-		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-		ewarn "This is necessary for chrony to drop privileges"
-	fi
-}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index b5c97cbbd863..a13a14df678e 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -19,11 +19,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock
 	+rtc samba +seccomp +sechash selinux
 "
 REQUIRED_USE="
-	?? ( libedit readline )
 	sechash? ( nettle )
 "
 RESTRICT=test
@@ -31,7 +30,6 @@ CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
 	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
 "
 DEPEND="
@@ -86,18 +84,6 @@ src_configure() {
 
 	tc-export CC PKG_CONFIG
 
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
 	# Note: ncurses and nss switches are mentioned in the configure script but
 	# do nothing
 	# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
+		$(usex libedit '' --without-editline)
 		$(usex nettle '' --without-nettle)
 		$(usex ntp '' --disable-ntp)
 		$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
 		$(usex rtc '' --disable-rtc)
 		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 471115ead648..e256be73db74 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,8 +1,2 @@
-DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c
-DIST dropbox-lnx.x86-105.4.649.tar.gz 96974503 BLAKE2B b14cd6891afcd7858ae7564e4f49753a60a70caef6f0c7ff56ecfef54bf1cfee629fd99f069679d210a3e16f48ab0387ca78bf49f92b2fce40ba4cdb0ec147df SHA512 5dfebc03d76465bc6a6cfd9fdb551385e0fa0b50908c8f2fab90a200815a8c5d90b2294cd8d8ff00284668b4d3e09aba031d124680b6780f5269224ee2e25376
-DIST dropbox-lnx.x86-105.4.651.tar.gz 96975853 BLAKE2B 63c37c22475127d06e5cabd9234818d5a54ca6ebb76b8e53616bc6642b6d9045ad1c0b4cbb364b181b2ccbfc4f6905fe39ce2092cb97978288c6c7e5ee9db771 SHA512 e6c4d02c268753b06613206086f9b4a1ff10202a7bca914a071921407fbd276f6a21352d9b43861966fdafd7dc08181bb0654575fcd0c5b344bd2e8f16ab9a47
-DIST dropbox-lnx.x86-106.4.368.tar.gz 97028969 BLAKE2B 915bd80dd3c09cef04fe1d2099975f8d5852fa058925803081ce38741965e4abeb94b9baa941904294970e224830b48934619b3ad7c01966d97b92154b7e12eb SHA512 c1755b919893ff337defd67e453c2550900d9f0d0585ee96871ce03c8dd07d6682da17f2be4a80978c282778a79cd8b1d8e49abce51f0ae7ede522edbf8a3fd8
-DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d
-DIST dropbox-lnx.x86_64-105.4.649.tar.gz 101001350 BLAKE2B e6aeef5bf38649fca5fba35a88080e905a2d16276927bf9ae5952fbc79e32fe7aac5552b7a53fe3cc59170d0af711f2c9c412da8a4539f7bedea6cea47986b03 SHA512 b6f3e766ee9e2b138624bab5ffed9365163b8d33017cce27c9e0beab2b2f500288e6283c59da8a96421daca36b1c6e46925658b6ffab1fdde43efc92ccf1ce18
-DIST dropbox-lnx.x86_64-105.4.651.tar.gz 101001773 BLAKE2B 9cb07111fceec62b34faa7f9b258e9c60f63c7d3828986f9fe06e27c9df24da00d77ec61eed0318c33453a7a4254e89946504deb8e9c1078204a508c2e9ac7df SHA512 8ffdb4682950a643d3230ae07c73a2b6e862051d700af021cb14152b681c7d01164e821b2fd59978612aaf12843084912aae9d0a6fa127d2fcc01e49908a1c5b
-DIST dropbox-lnx.x86_64-106.4.368.tar.gz 101043233 BLAKE2B 781beb485914fd73d63ad5c909e43dc4ee24c13674c069ea51251ec0d63f731b13e4199c0cb1e536e485170375ec77664adf1ab11999f04fb1a9d864b7e5447c SHA512 08ce3b7e13d8ecd26212fc533d23e900b635a834fe4550dcdc50fc6a7852f0f372e6dd797b1f9553fb73545a78567ed60b8c503d50db00574a9729db3a8565be
+DIST dropbox-lnx.x86-107.4.443.tar.gz 97367039 BLAKE2B 03fe85febc6e1da364166f3be9a80dafa0ba1d50b885ab354f788bef2237280cb57f04a5e12d21b211f342e8a12a5a3b7ca92a958899dfcfacc33503f2aaf5a8 SHA512 49332eba4ba7f6babf018aa6a3d6fb48e82b404c69a19aeb51f9497bca9800062302146862c900d2f545e032edb80d2c82b240f58a748c09d78834dbc717ccd1
+DIST dropbox-lnx.x86_64-107.4.443.tar.gz 101412428 BLAKE2B 06761d0a08945a149c97229b820f545cf269c647958495b5a1b6949ad57107b10e7ae38dd2180773060d386dee8311e4d076abb423a685c96832960aedbcdcc8 SHA512 753504d38d5a26c26ff132299e4e87b1106beea4490cc1a482e3a95f3ba8c5cc23269d3719ed317ab046b2f5943a998e99f18f3d0b0a1730b3e5d8568214cc1a
diff --git a/net-misc/dropbox/dropbox-104.4.175.ebuild b/net-misc/dropbox/dropbox-104.4.175.ebuild
deleted file mode 100644
index 2408606d15fa..000000000000
--- a/net-misc/dropbox/dropbox-104.4.175.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/libffi-compat:6
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-105.4.649.ebuild b/net-misc/dropbox/dropbox-105.4.649.ebuild
deleted file mode 100644
index 7286be94a2dc..000000000000
--- a/net-misc/dropbox/dropbox-105.4.649.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-106.4.368.ebuild b/net-misc/dropbox/dropbox-106.4.368.ebuild
deleted file mode 100644
index 7286be94a2dc..000000000000
--- a/net-misc/dropbox/dropbox-106.4.368.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-105.4.651.ebuild b/net-misc/dropbox/dropbox-107.4.443.ebuild
similarity index 98%
rename from net-misc/dropbox/dropbox-105.4.651.ebuild
rename to net-misc/dropbox/dropbox-107.4.443.ebuild
index 7286be94a2dc..c4fb56f770ad 100644
--- a/net-misc/dropbox/dropbox-105.4.651.ebuild
+++ b/net-misc/dropbox/dropbox-107.4.443.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
new file mode 100644
index 000000000000..1f483ce33fbd
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
@@ -0,0 +1,14 @@
+--- a/wafhelpers/asciidoc.py	2020-10-06 20:14:47.040245129 -0700
++++ b/wafhelpers/asciidoc.py	2020-10-06 20:17:48.100394117 -0700
+@@ -37,9 +37,9 @@
+     # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions
+     # < 8.6.4 have no HTML5 backend.
+     # asciidoc3 versions < 3.0.2 throw errors.
+-    adoc_list = [['asciidoctor', (1, 5, 8)],
+-                 ['asciidoc', (8, 6, 8)],
++    adoc_list = [['asciidoc', (8, 6, 8)],
+                  ['asciidoc3', (3, 0, 2)],
++                 ['asciidoctor-bad', (1, 5, 8)],
+                  ]
+     for progname, asciidocminver in adoc_list:
+         if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []:
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
index 1af747e2e914..51381f4b16be 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 	acct-user/ntp
 "
 DEPEND="${CDEPEND}
-	app-text/asciidoc
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
@@ -56,6 +56,11 @@ DEPEND="${CDEPEND}
 	rclock_pps? ( net-misc/pps-tools )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
+	"${FILESDIR}/${P}-remove-asciidoctor-from-config.patch"
+)
+
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
@@ -87,7 +92,7 @@ src_configure() {
 		--nopyo
 		--refclock="${CLOCKSTRING}"
 		--build-epoch="$(date +%s)"
-		$(use doc	&& echo "--enable-doc")
+		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index ca748e52e6d0..2ca56ed3f68e 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
 SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
index 5d92fd75b2cc..1a5486a56b56 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
 SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 8aa5636882a6..7829d6e9dbba 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 1e425715cf03..cb49aed470fe 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -225,10 +225,16 @@ DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod 207 BLAKE2B 5b3
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip 589816 BLAKE2B 690313edcd713bf57bbb66b18922d6d6d5a94a68bd4321c910e80b69b7a2e1f8c24ebf7ca1200e96027d603578aefd02e4036c9c02229457da2998269e4cd8d2 SHA512 ae2f6c302772afdf93cdf44f51c9c7c230da984fd2ff2d48715f522f6bb5a37f7ad8129eaf654c1e2ec1f4e018ee9296fe8d3b1f73a0c35313b49d0137a20b6d
 DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.mod 189 BLAKE2B 3c34af8e95170301452977d89f023bada8c3e270f12b50fe3e45e7cf1865c2c70dd36ffdaaeae108c3f37b6b9eb4f3808271c15e5142d3776f8b267c776451ec SHA512 cb02aff2c4be380bcdc26e15f10ac2a0f525939d5d10ca55de4d617a09bb9db77a9bd4e302debfeaed8229bec66d8e5d32a0890088c7b75d826a27af4113a8c0
 DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.3.0.zip 70016 BLAKE2B 3069b8fad8b3e2798f92481566cddc02353b13adf04e992a1d5fb0ffb27befc4e472425d5a86eaf16c560a2c19d950dcfa696f7b03709a45c5f318c0f632167c SHA512 b5c781e3cac14f21774af07457dc53f6dd9524c731baffea0edd0f341f16a917129c59cf25362ccefef51921c9fb800aeaf4db392edd5fec2573c15a19de195f
+DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.mod 276 BLAKE2B c087908fe1063fb3566158a7d09f4752eec386c1c2e7f3d6bc4767875ae799cf9f46f86c594dcc37ffcf9ed09b5126cac0a3d23dc0a7d5755681df61da412558 SHA512 bf0f0e8f2cc573cab7f5a968a43c2be31f68fe9195b872504a3a00c9866faf566da5c1ebd9af9effb5c901923af6b6431cbc92ab88b486749d7b0184638c7666
+DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.5.1.zip 124955 BLAKE2B 9c287a6d433254dd673c7de9209b3f77f595bab43200f36b5cfb5936adacd255fcea24dd1cbef19e2f669071bc3719a43451e1e0bbba2b3beca99f8dd405d46a SHA512 ea148481be3ffe95ebfb7aad03f1dd273f776b1e339c4efbcf423b3b38cb2fc3a4fa7877f51a5f009dce35777b91a1fcc85af14708847f6723989f92ab583cd5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip 12177 BLAKE2B f0c99c40e021ae1262064909bdbaf9493836fc860e36decf3400d1ffb385d23ed4fbfd476d5c329d74a336b26781cea0b62180420895d3a9811a1d5fa27dac76 SHA512 fb7597c396082e29ccef11a9f78963d850bfe154a400def531e607cad7b3585b1f546de026eebff6ea8bc6d00962dc4610f2d20d4e75c25d7c36915e6831aabc
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.zip 7426 BLAKE2B c42a596413d6fe296963691c017fa61b17bf4cf2ed74f9d0b58624026c36096c4ebb55bcae397e12403d5742519597f780cacfa5c1408008d0271baebca60880 SHA512 ef6ce0a1aee69e9d88c7e0191f768e4833225094727e5c11c7ed2831cac83e80dd3003f975db9ad09d6ee47f6da7af18a4626f39739eb23bb1158d519fc5d8ce
@@ -464,6 +470,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191224085550-c709ea063b76.zip 1913722 BLAKE2B b02e67c26248f281f5bd327420c2a84aeaa126b6a7e61f1f8e1a94c7e4600ef903a444a2b4da9f9e721fbed70c16ba92c25ea96bba7acd7dfae5a93d4a1a8930 SHA512 dd977c1211355bae90efc5470b0960990b3e840e8648265bef7be35b589b7e7f419408babb8d8ee69f7f9074fffb105eb07ab331b7be5021ed4f914d34ae0517
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -561,5 +568,6 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b20
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
+DIST syncthing-1.10.0.tar.gz 4909540 BLAKE2B 380d0e10085ac5960566fb5d72261f6a239bb1f738f3e4e712b4e611f4b736efdad0f92619c28b2387f3d280163f6fb5f3efb7d8e6b66129d1aeb6862f0bf210 SHA512 c47d48684c66ed3257ba8e6cb36e01375a9f132faaa27ef99a761a1420cadeeecf6e9b62d953ca2e71be174d17d715b7d65558eb7a4e5af05e5b6f2c1a31efc5
 DIST syncthing-1.7.1.tar.gz 4856327 BLAKE2B 52c62d364dbef2d8472c774867e39302fd92195abe343b060fa3389e13b575d91b3df86cf9f5a728bb75912f6fd57198407daad0a667e1340663dbc127ad6318 SHA512 7607111f00bb2d6adc8e0262da4500a3f7234793775fe865c370ba196a7d69cb01eafabb7c227ccc6ce514be03db402675ae53d80d69272c56d0cf7cb4faffa1
 DIST syncthing-1.9.0.tar.gz 4859621 BLAKE2B cb849cce6baf481d2f9d5c7885c3afa56ed192134be2a012c87942ce362cfb7b42aaf5251213493017816db0bd81df88fc2def3c7f3ef6256781b5384448fae6 SHA512 5637b663500096a093bfb7e38845eac440ff38c91d34575c36213b7d89788122674e95e33b6ea14465a27bd663ab83f8a61c7de9214e929b0aa3caaf4982bf42
diff --git a/net-p2p/syncthing/syncthing-1.10.0.ebuild b/net-p2p/syncthing/syncthing-1.10.0.ebuild
new file mode 100644
index 000000000000..4a502ea07543
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.10.0.ebuild
@@ -0,0 +1,633 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop go-module systemd xdg-utils
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20190627213056-c55ef6137fc6/go.mod"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d"
+	"github.com/ccding/go-stun v0.0.0-20180726100737-be486d185f3d/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67"
+	"github.com/certifi/gocertifi v0.0.0-20190905060710-a5e0173ced67/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.0"
+	"github.com/cespare/xxhash/v2 v2.1.0/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/d4l3k/messagediff v1.2.1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.1/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.0.3"
+	"github.com/dgraph-io/badger/v2 v2.0.3/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.5.0"
+	"github.com/go-asn1-ber/asn1-ber v1.5.0/go.mod"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.2.0"
+	"github.com/go-ldap/ldap/v3 v3.2.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.4.0"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.0"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/greatroar/blobloom v0.3.0"
+	"github.com/greatroar/blobloom v0.3.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackpal/gateway v1.0.6"
+	"github.com/jackpal/gateway v1.0.6/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lucas-clemente/quic-go v0.18.0"
+	"github.com/lucas-clemente/quic-go v0.18.0/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.2.0/go.mod"
+	"github.com/marten-seemann/qtls v0.10.0"
+	"github.com/marten-seemann/qtls v0.10.0/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.0"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/maruel/panicparse v1.3.0/go.mod"
+	"github.com/maruel/panicparse v1.5.1"
+	"github.com/maruel/panicparse v1.5.1/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-isatty v0.0.7"
+	"github.com/mattn/go-isatty v0.0.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/minio/sha256-simd v0.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/nxadm/tail v1.4.4"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.1/go.mod"
+	"github.com/onsi/ginkgo v1.14.0"
+	"github.com/onsi/ginkgo v1.14.0/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.10.1"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/geoip2-golang v1.4.0/go.mod"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_golang v1.2.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v2.20.7+incompatible"
+	"github.com/shirou/gopsutil v2.20.7+incompatible/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2"
+	"github.com/syncthing/notify v0.0.0-20190709140112-69c7a957d3e2/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thejerf/suture v3.0.2+incompatible"
+	"github.com/thejerf/suture v3.0.2+incompatible/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc"
+	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47"
+	"golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod"
+	"golang.org/x/sys v0.0.0-20200819171115-d785dc25833f"
+	"golang.org/x/sys v0.0.0-20200819171115-d785dc25833f/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# We do not need this and it sometimes causes build failures
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	domenu etc/linux-desktop/*.desktop
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f2e68e6ac050..ef024633576d 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gr-m2k/Manifest b/net-wireless/gr-m2k/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/net-wireless/gr-m2k/gr-m2k-9999.ebuild b/net-wireless/gr-m2k/gr-m2k-9999.ebuild
new file mode 100644
index 000000000000..5ba99f4abc99
--- /dev/null
+++ b/net-wireless/gr-m2k/gr-m2k-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-m2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-m2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/gr-m2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	=net-wireless/gnuradio-3.8*:=
+	net-libs/libiio
+	net-wireless/libm2k
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/gr-m2k/metadata.xml b/net-wireless/gr-m2k/metadata.xml
new file mode 100644
index 000000000000..683b3dae68f4
--- /dev/null
+++ b/net-wireless/gr-m2k/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+		zerochaos@gentoo.org
+		Rick Farina
+	
+	
+		radio@gentoo.org
+		Radio
+	
+	
+		analogdevicesinc/gr-m2k
+	
+
diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest
new file mode 100644
index 000000000000..bac2b331b822
--- /dev/null
+++ b/net-wireless/gr-scopy/Manifest
@@ -0,0 +1 @@
+DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350
diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
new file mode 100644
index 000000000000..f695c1501bb3
--- /dev/null
+++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Scopy IIO blocks for GNU Radio"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	inherit git-r3
+else
+	COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3"
+	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	sci-libs/volk:=
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
new file mode 100644
index 000000000000..f695c1501bb3
--- /dev/null
+++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Scopy IIO blocks for GNU Radio"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	inherit git-r3
+else
+	COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3"
+	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	sci-libs/volk:=
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-scopy/metadata.xml b/net-wireless/gr-scopy/metadata.xml
new file mode 100644
index 000000000000..5424315fd975
--- /dev/null
+++ b/net-wireless/gr-scopy/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+		zerochaos@gentoo.org
+		Rick Farina
+	
+	
+		radio@gentoo.org
+		Radio
+	
+	
+		analogdevicesinc/gr-scopy
+	
+
diff --git a/net-wireless/libm2k/Manifest b/net-wireless/libm2k/Manifest
new file mode 100644
index 000000000000..ba466716103f
--- /dev/null
+++ b/net-wireless/libm2k/Manifest
@@ -0,0 +1 @@
+DIST libm2k-0.0_p20201005.tar.gz 590923 BLAKE2B 47b018ca8524a30d2d22c387c45361a3765ef356a481ff144783e459f673f3c00ba122cfc086b4f7d3cef2f6847b9adee3bc1eec4f6ee52eb355a9625b29b7c6 SHA512 60ca79048408e3ee6b09978f417cc8a0b67982fe9ac62563331c96fb503af22b050803f9d10598e9edd02eb3af396c1ad0d16772ae3cd3d16c251bd588a682c8
diff --git a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
new file mode 100644
index 000000000000..25cde65f485c
--- /dev/null
+++ b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 udev
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libiio
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/libm2k/libm2k-9999.ebuild b/net-wireless/libm2k/libm2k-9999.ebuild
new file mode 100644
index 000000000000..25cde65f485c
--- /dev/null
+++ b/net-wireless/libm2k/libm2k-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 udev
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libiio
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/libm2k/metadata.xml b/net-wireless/libm2k/metadata.xml
new file mode 100644
index 000000000000..5e6b1e4eb830
--- /dev/null
+++ b/net-wireless/libm2k/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+		zerochaos@gentoo.org
+		Rick Farina
+	
+	
+		radio@gentoo.org
+		Radio
+	
+	
+		analogdevicesinc/libm2k
+	
+
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2c5f655232ad..350f6579314e 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,5 @@
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
-DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0
 DIST unifi-6.0.26.zip 226932393 BLAKE2B f5c42eccbcfea45af30cf10da69dccbb9b8ddccef53c7c35db059e53ddf5800fecdde84be88dd80320c265c655dc71d18cf25851090e29209204d39552200466 SHA512 3f221035dd27c38cd59b3a1202ce526143eb9bc6253e1e157a82e0cbb765445c8264c09177593830493598a8ef65cce2406bf25b84c242674b35c66db341743e
+DIST unifi-6.0.27.zip 214476444 BLAKE2B e13f5255d46c07fa9973cde14ad62bffa955a8a3ad84b3652d3cc4979d2280965166009fac6f8dacb68e94886d1e5680bd6e3bd3cf5caf611738d90e738a023f SHA512 b511011f424281dc9fd50ddca708daeb22f76743cb02df3cbb32be238bc477828f9720b798ac79067c1e315c17db9d73f7fe47930053637d39d61d3583e90901
 DIST unifi-6.1.16.zip 220033149 BLAKE2B 4e965c1577ef35d3dd28357aa884f8234f3cc9c45783dd261153ecc87bda24fc4b58ea4f49096304331bd11896251c29eaaa8e8b44046e50ee7e9d54d997223a SHA512 d1b241d5a47ee34c66a08b847405f615f83782fc67a38fe5fc4c281bac6335bc2ab8b021774cafb98753759b9924e773a2c4883a1ed2b30cb2e58ab56b3c07f3
diff --git a/net-wireless/unifi/unifi-6.0.24.ebuild b/net-wireless/unifi/unifi-6.0.27.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-6.0.24.ebuild
rename to net-wireless/unifi/unifi-6.0.27.ebuild
index b9e8e79d0068..b7445898ec50 100644
--- a/net-wireless/unifi/unifi-6.0.24.ebuild
+++ b/net-wireless/unifi/unifi-6.0.27.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-b200bf6446"
+RC_SUFFIX="-e23884806a"
 
 inherit systemd
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d3008d6a3256..1b645f5550b9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 5590712ff6eb..6b98a1f0ede7 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann  (2020-10-07)
+#  (2020-10-05)
 # Guile only supports JIT on some arches
 # (See 9.3.8 in the Guile manual)
diff --git a/profiles/arch/arm/armv6j/package.use.mask b/profiles/arch/arm/armv6j/package.use.mask
index acb4ca99cbd4..fe8a73d403cf 100644
--- a/profiles/arch/arm/armv6j/package.use.mask
+++ b/profiles/arch/arm/armv6j/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola  (2020-10-08)
+# libavif is keyworded for this profile.
+dev-libs/efl -avif
+
 # Mart Raudsepp  (2020-08-02)
 # virtual/rust is available here
 >=media-gfx/eog-3.33.1 -svg
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
index 961a9bcf203d..9f750cc47acb 100644
--- a/profiles/arch/arm/armv7a/package.use.mask
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola  (2020-10-08)
+# Dependency keyworded on this arm profile.
+dev-libs/efl -avif
+
 # Sam James  (2020-10-05)
 # Guile only supports JIT on some arches
 # (armv7 only for arm)
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 8b8fdf3c290d..d94ce1f6df0f 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola  (2020-10-02)
+# Dependency only keyworded on specific arm profiles.
+dev-libs/efl avif
+
 # Adam Feldman  (2020-09-05)
 # dev-util/dogtail is not keyworded for arm
 app-text/atril test
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index df624451a53b..7321f9dd4bfe 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -4,6 +4,11 @@
 # Unmask the flag which corresponds to ARCH.
 -arm64
 
+# Sam James  (2020-10-08)
+# PyPy3 works on arm64
+-python_targets_pypy3
+-python_single_target_pypy3
+
 # David Seifert  (2020-10-08)
+# Not enough packages stable w/ PyPy3 support
+python_targets_pypy3
+python_single_target_pypy3
+
 # Sam James  (2020-10-07)
 # app-misc/lirc not stable yet
 # dev-db/tokyocabinet not stable yet
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 66af11f807ec..c64bfedf58c6 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Joonas Niilola  (2020-10-08)
+# Dependency not keyworded on this arch.
+dev-libs/efl avif
+
 # Matt Turner  (2020-08-11)
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 5f974491eb8d..63f3a9aec687 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola  (2020-10-08)
+# Dependency not keyworded on this arch.
+dev-libs/efl avif
+
 # Georgy Yakovlev  (2020-10-05)
 # criu is masked on big-endian ppc*
 app-emulation/crun criu
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index f8b1061fcff0..178bf43d284e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann  (2020-10-07)
+#  (2020-10-05)
 # Guile only supports JIT on some arches
 # (See 9.3.8 in the Guile manual)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 07610ecd9d90..94de6f1fa71b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -23,11 +23,6 @@ sci-geosciences/viking mapnik
 # Python 2 only. Bug #735496.
 sys-cluster/ganglia python
 
-# Joonas Niilola  (2020-09-23)
-# Not yet packaged in ::gentoo but besides that the functionality is 
-# still experimental and possibly broken. Use with caution.
-dev-libs/efl avif
-
 # Joonas Niilola  (2020-09-23)
 # Highly experimental, may cause breakages when updating. Use with 
 # caution!
@@ -643,3 +638,8 @@ net-proxy/squid ipf-transparent pf-transparent
 # Alexis Ballier  (2011-02-16)
 # Win32 specific useflag for vlc. Can be used for cross-compiling.
 media-video/vlc directx
+
+# Ross Charles Campbell  (2020-09-21)
+# Since >=dev-games/ogre-1.11.2 is masked, mask contribovis USE to
+# make repoman happy
+media-libs/opencv contribovis
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 9c9cb38905d5..3a3b7af9c7e8 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Joonas Niilola  (2020-10-08)
+# Experimental feature not yet stabilized. Use with caution.
+dev-libs/efl avif
+
 # Michał Górny  (2020-09-20)
 # Always build python-exec with all the targets.
 dev-lang/python-exec -python_targets_python3_9
diff --git a/profiles/package.mask b/profiles/package.mask
index e50d128dda27..f055c888571b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -458,13 +458,6 @@ net-vpn/peervpn
 dev-db/mariadb:5.5
 dev-db/mariadb:10.1
 
-# Thomas Beierlein  (2020-09-09)
-# Depends on obsolete gnome-base/libgnomeui.
-# Upstream promised to have a better version
-# for nearly a year now, but no release in sight.
-# Masked for removal in 30 days.
-sci-electronics/linsmith
-
 # Louis Sautier  (2020-09-10)
 # Masked for removal in 30 days, no revdeps.
 # All former consumers now use os.sendfile available in Python >= 3.3.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 52efcb6f6aab..f76c8566f976 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3351,7 +3351,6 @@ gnome-base/gnome-extra-apps:shotwell - Install the media-gfx/shotwell photo mana
 gnome-base/gnome-extra-apps:tracker - Install the app-misc/tracker indexer and the GNOME packages that require it
 gnome-base/gnome-keyring:ssh-agent - Use GNOME Keyring to unlock SSH keys. Recommended unless you are using ECDSA or Ed25519 keys.
 gnome-base/gnome-light:gnome-shell - Install gnome-base/gnome-shell and x11-wm/mutter for the standard GNOME 3 desktop mode
-gnome-base/gnome-session:consolekit - Support sys-auth/consolekit for session tracking
 gnome-base/gnome-session:elogind - Support sys-auth/elogind for session tracking
 gnome-base/gnome-settings-daemon:elogind - Rely on sys-auth/elogind as runtime logind provider
 gnome-base/gnome-settings-daemon:modemmanager - Enable WWAN support via net-misc/modemmanager
@@ -4320,7 +4319,9 @@ media-libs/netpbm:rle - Build converters for the RLE format (utah raster toolkit
 media-libs/opencv:contrib - Install user contributed scripts from opencv_contrib (Experimental!)
 media-libs/opencv:contribcvv - CVV module requires Qt5
 media-libs/opencv:contribdnn - DNN module contrib requires tiny dnn
+media-libs/opencv:contribfreetype - Enable Drawing UTF-8 strings with freetype/harfbuzz
 media-libs/opencv:contribhdf - HDF module requires sci-libs/hdf5
+media-libs/opencv:contribovis - Enable Ogre vision module support
 media-libs/opencv:contribsfm - SFM module requires eigen, gflags, and glog
 media-libs/opencv:contribxfeatures2d - Enables xfeatures2d and autodownload of samples in contrib
 media-libs/opencv:cuda - Enable NVIDIA Cuda computations support (Experimental!)
@@ -4332,6 +4333,7 @@ media-libs/opencv:gdal - Enable support for sci-libs/gdal library
 media-libs/opencv:gflags - Use Google's C++ argument parsing library
 media-libs/opencv:glog - Use Google's C++ loggin library
 media-libs/opencv:gtk3 - Enable x11-libs/gtk+:3 support
+media-libs/opencv:lto - Build using Link Time Optimizations (LTO)
 media-libs/opencv:opencl - Add support for OpenCL
 media-libs/opencv:opencvapps - Enable compilation with opencvapps
 media-libs/opencv:tesseract - Use Google's OCR Engine
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 7a0cdf95e04e..3a298a5f48e3 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/linsmith/Manifest b/sci-electronics/linsmith/Manifest
deleted file mode 100644
index 96f5ae647409..000000000000
--- a/sci-electronics/linsmith/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST linsmith-0.99.30.tar.gz 1132438 BLAKE2B fda024052d0aa1af7254aa37975a62bcb1bd2dbeb020202853bc32c85e6859bda6153fb5e6af8f18a4bf29a11c5eb7bd5eaacc68ebbf20b7d2622cc0d04d77d1 SHA512 d1f6cd3895b7c217de49c214f8b86b1bb9ce97d540546f0004b7f320b7cf142652cf0ec51ce48cf32b89564bf408546bf10d5f4937544cf9e8a4d87d1db5bed5
-DIST linsmith-0.99.31.tar.gz 1138998 BLAKE2B c8b32bf2530b87a0bb9f2b7914e5ccdb6c8ad28b57b919b93c4ed0fb272a2e61f588adb3794b81565580a68413f3cb4e43ac861c4a70cce105d3e821d21eccf3 SHA512 0218992243ff5db6efa39e01d7eddf6d44d921fe4caf131d020416d320a542f19bd577a3bbd9fc8df5f1ccb62ba152d02f825bab8fae55dadd262c5dce47c076
diff --git a/sci-electronics/linsmith/files/linsmith-datafiles.patch b/sci-electronics/linsmith/files/linsmith-datafiles.patch
deleted file mode 100644
index cae7a2a7c28e..000000000000
--- a/sci-electronics/linsmith/files/linsmith-datafiles.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.am.old	2005-11-03 00:56:51.000000000 -0300
-+++ Makefile.am	2005-11-03 00:57:09.000000000 -0300
-@@ -20,15 +20,6 @@
- 	    fi \
- 	  done \
- 	fi
--	@$(NORMAL_INSTALL)
--	if test -d $(srcdir)/datafiles; then \
--	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE); \
--	  for datafile in $(srcdir)/datafiles/*; do \
--	    if test -f $$datafile; then \
--	      $(INSTALL_DATA) $$datafile $(DESTDIR)$(datadir)/$(PACKAGE); \
--	    fi \
--	  done \
--	fi
- 
- dist-hook:
- 	if test -d pixmaps; then \
-@@ -39,11 +30,3 @@
- 	    fi \
- 	  done \
- 	fi
--	if test -d datafiles; then \
--	  mkdir $(distdir)/datafiles; \
--	  for datafile in datafiles/*; do \
--	    if test -f $$datafile; then \
--	      cp -p $$datafile $(distdir)/datafiles; \
--	    fi \
--	  done \
--	fi
diff --git a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
deleted file mode 100644
index 6ee6d95fdf63..000000000000
--- a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Smith charting program, mainly designed for educational use"
-HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	dev-libs/atk
-	gnome-base/libgnome
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# This patch is to prevent make install copying
-	# the examples in /usr/share/linsmith
-	# Now they are cp to the correct location.
-	epatch \
-		"${FILESDIR}"/${PN}-datafiles.patch
-
-	# fix QA warnings about wrong categories and location of icon file
-	# in .desktop file
-	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
-		-e "s/Encoding=/#Encoding=/" \
-	    -e "s#pixmaps/linsmith/l#pixmaps/l#" \
-		${PN}.desktop || die
-
-	# fix QA warnings about 'maintainer mode'
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/usr/share/${PN}"
-	doins datafiles/conv0809
-
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-	doman doc/${PN}.1
-
-	domenu ${PN}.desktop
-	doicon ${PN}_icon.xpm
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}"
-		doins doc/manual.pdf
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load
-	fi
-}
diff --git a/sci-electronics/linsmith/linsmith-0.99.31.ebuild b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
deleted file mode 100644
index 911fd0398417..000000000000
--- a/sci-electronics/linsmith/linsmith-0.99.31.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="Smith charting program, mainly designed for educational use"
-HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	dev-libs/atk
-	gnome-base/libgnome
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS TODO )
-
-src_prepare() {
-	eapply_user
-
-	# This patch is to prevent make install copying
-	# the examples in /usr/share/linsmith
-	# Now they are cp to the correct location.
-	eapply -p0 "${FILESDIR}"/${PN}-datafiles.patch
-
-	# fix QA warnings about wrong categories and location of icon file
-	# in .desktop file
-	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
-		-e "s/Encoding=/#Encoding=/" \
-	    -e "s#pixmaps/linsmith/l#pixmaps/l#" \
-		${PN}.desktop || die
-
-	# fix QA warnings about 'maintainer mode'
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/usr/share/${PN}"
-	doins datafiles/conv0809
-
-	einstalldocs
-	doman doc/${PN}.1
-
-	domenu ${PN}.desktop
-	doicon ${PN}_icon.xpm
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}"
-		doins doc/manual.pdf
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load
-	fi
-}
diff --git a/sci-electronics/linsmith/metadata.xml b/sci-electronics/linsmith/metadata.xml
deleted file mode 100644
index 0ca98970f31a..000000000000
--- a/sci-electronics/linsmith/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-  
-    tomjbe@gentoo.org
-    Thomas Beierlein
-  
-  
-    sci-electronics@gentoo.org
-    Gentoo Electronics Project
-  
-  
-    linsmith
-  
-
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 223534d2bb79..5f0082bfae14 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index 6b57ded1cb6a..a4cfc357adc8 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild
index 043e274493ac..f272c6ac76b5 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="geolocation screencast"
 
 BDEPEND="
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild
deleted file mode 100644
index 10c6acdf2f5f..000000000000
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Official authentication app for German ID cards and residence permits"
-HOMEPAGE="https://www.ausweisapp.bund.de/"
-SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EUPL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5[qml]
-	dev-qt/qtwidgets:5
-	net-libs/http-parser:0=
-	sys-apps/pcsc-lite
-	virtual/udev"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index 8b5c7d67a291..62ea43e7f1f5 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,2 +1 @@
-DIST AusweisApp2-1.20.1.tar.gz 10103225 BLAKE2B 79afb6e793827bec16c0ba4830d87e4ab5da35a76cb1ce1a9e59ee70a7e8c7606ae1f2244ac73fbe6ac758d559451dbaefe7cc4ad9f49adb33228af3d2647051 SHA512 08e51207bca38871b6cfc3146fa5252bd18bc018d91b7c4cb847519b0282aa5d0e6ff40ffa0bf389c421fed0d40855044e7eb9e0630ca8dc639c263d3055c1bf
 DIST AusweisApp2-1.20.2.tar.gz 10110603 BLAKE2B cb3063decb3a5aacbc1d7690c58566914776032cd305d29f6352df659a27dcf81e07550613809849822ee20d7aaa467303f33602c40aaa39a99501daa7d1e887 SHA512 4a968d3d9043f9eba5927f049155e203448a27034f0c051c10fbaa262bb7b4257c5a6de4763c1fa470a1c46d51bf67636f14c136c7e7c8038eab7e929dcb38c2
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 3686a5c2d767..f385f2805610 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ab789eec2980..66ab3d080f3b 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 7414cabed28d..f3f11cd41b96 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,3 +1,5 @@
 DIST heat.conf.sample-14.0.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
+DIST heat.conf.sample-14.1.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-2020.1.9999 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST openstack-heat-14.0.0.tar.gz 2393821 BLAKE2B 93d4728166496213447571afe9745d217431c1871ee415d413ff96e940c7fe0e9e7d97512cec8dc864564796ac15dd8c5f16e62ecabd6603939074ebba81612a SHA512 973818f33d24d057ce84c8826f50516566ae47386e9559ea2124d5c68f7cfbdf53390bcc7786e1cd29482c3f63ecfee2a10c01bb542fa59141f36cf52b0a5ec3
+DIST openstack-heat-14.1.0.tar.gz 2356647 BLAKE2B 0b4d009fcb631929bdc1e9a429e3370a546fb1763ab66439cd3791b1437417ef18da46f4bae8397bc5a661e09acbceb09d2f32dc06a190852f67989b900035ac SHA512 b74795ae10d29348b47c91d8de2166999ab51caef42521d9347565414ba1f2bbd2870c54af9d3877fe11e1388c900e64ed780a0e22a1270adea6cb1cc4971e0b
diff --git a/sys-cluster/heat/heat-14.1.0.ebuild b/sys-cluster/heat/heat-14.1.0.ebuild
new file mode 100644
index 000000000000..8ad0dab1631c
--- /dev/null
+++ b/sys-cluster/heat/heat-14.1.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
+HOMEPAGE="https://launchpad.net/heat"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/openstack-${P}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-ironicclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
+	!~dev-python/python-mistralclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.14.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-octaviaclient-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-vitrageclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zunclient-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]
+	acct-user/heat
+	acct-group/heat"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+	rm -r "${ED}"/usr/etc
+}
diff --git a/sys-cluster/heat/heat-2020.1.9999.ebuild b/sys-cluster/heat/heat-2020.1.9999.ebuild
index 16a42a5729f3..8ad0dab1631c 100644
--- a/sys-cluster/heat/heat-2020.1.9999.ebuild
+++ b/sys-cluster/heat/heat-2020.1.9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 eutils linux-info
 
@@ -28,8 +29,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
+DEPEND="${CDEPEND}
 	app-admin/sudo"
 
 RDEPEND="
diff --git a/sys-cluster/kube-router/Manifest b/sys-cluster/kube-router/Manifest
index dfced39f99af..dfe5c7683c54 100644
--- a/sys-cluster/kube-router/Manifest
+++ b/sys-cluster/kube-router/Manifest
@@ -1,2 +1,3 @@
 DIST kube-router-0.4.0.tar.gz 8403982 BLAKE2B e5e9e92064f00d696ca1cde310813541910d3e37b9c31336b1f2729e63a963fb454a2a9d07b2394134b9ea96e64d6caa26b6230bfd214883f5951bcfdd30c674 SHA512 00617e434b770c1b5eeb3f2c85ae9b6f49157224a5df223f5d1ec514ba087164bb03f0e28a38c75d3149c0c028ed54ceccf898a77c474bbf64921f45db7c3e3c
 DIST kube-router-1.0.1.tar.gz 8413249 BLAKE2B dd158fda5a25925d1f630764f7ad77a821c145def887093692333fcdb4e9a3d9736fe3243f7834abf60d71835fe37a81e4d0a9f20cb45e05d9bb817a50d81196 SHA512 a84176785367fb87562a9a410d87376d938fb32c8aec0cd71259ca3af2204b76ba083201b5f2ad38b395a83a321f0feec4b304a4f3add595b5eadf0837a6918b
+DIST kube-router-1.1.0.tar.gz 8095149 BLAKE2B 9487d329ef1dc09b0e0d58233a4440da53a239f78dfd4d1f4676c23c347f550431c2a898656e0670afc002bd5435ae172662408fa3526335af95303a1ac9d6d9 SHA512 14ff214257fb0dd1a2e98c5d2a5abb65d2b104402d8403066225274f85dfa861fef6c2b389c2c008a07b42367bb5be52785e375c13e2feffd915863f1da5c86a
diff --git a/sys-cluster/kube-router/kube-router-1.1.0.ebuild b/sys-cluster/kube-router/kube-router-1.1.0.ebuild
new file mode 100644
index 000000000000..001c06d8fbc8
--- /dev/null
+++ b/sys-cluster/kube-router/kube-router-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="A turnkey solution for Kubernetes networking"
+HOMEPAGE="https://kube-router.io"
+SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	net-firewall/iptables[conntrack]
+	net-firewall/ipset
+	sys-cluster/ipvsadm
+"
+
+src_compile() {
+	emake BUILD_IN_DOCKER=false GIT_COMMIT=v${PV} kube-router
+}
+
+src_test() {
+	go test -mod=vendor -v -timeout=30s ./cmd/kube-router ./pkg/... || 
+		die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+	newinitd "${FILESDIR}"/kube-router.initd kube-router
+	newconfd "${FILESDIR}"/kube-router.confd kube-router
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kube-router.logrotated kube-router
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index f1146210c510..0105cb1af1b5 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,5 +1,8 @@
 DIST neutron-16.1.0.tar.gz 12757452 BLAKE2B 0561d2ed30c525dd5c9bc8502636714cd67680cb3f8d1d8bd04caa03ad50e0bf3f7578563789fc7172f6a53847c039a5e1e1fc12a0b5268b29077c83853c146f SHA512 13f5a58aeff8df85771737615706db67885baa1c115be01854a6e917bdf13415e201f971bd03fd3558f975c579c165c3b8079d6c7ee50588948b511d02d13b9f
+DIST neutron-16.2.0.tar.gz 12771467 BLAKE2B d3dbfbffcf7321a195d3cadf0bd4864763f6a1c6c3022ec32d20ffeb1770d522446c78e2bad9c7dc281fdb67b445b3ecbf8908741dd7a42ebc1efde56af642bb SHA512 d5c39296c925af8b69e23a3faf75e99e6d4d2e5b1daf0da7883a75bcce1e41990392aa90499510c7dee552178cb908c1cd80add48ac894015255842d15711641
 DIST neutron-configs-16.1.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
+DIST neutron-configs-16.2.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-ml2-plugins-16.1.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
+DIST neutron-ml2-plugins-16.2.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
diff --git a/sys-cluster/neutron/neutron-16.2.0.ebuild b/sys-cluster/neutron/neutron-16.2.0.ebuild
new file mode 100644
index 000000000000..a48cc0a000dc
--- /dev/null
+++ b/sys-cluster/neutron/neutron-16.2.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
+	acct-group/neutron
+	acct-user/neutron"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
+	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-2020.1.9999.ebuild b/sys-cluster/neutron/neutron-2020.1.9999.ebuild
index b8a3ed95df97..a48cc0a000dc 100644
--- a/sys-cluster/neutron/neutron-2020.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2020.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 linux-info
 
@@ -30,9 +30,7 @@ REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						|| ( openvswitch linuxbridge ) )"
 
 CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
+DEPEND="${CDEPEND}
 	app-admin/sudo"
 
 RDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 97b17c3c14f0..3e8ed5406315 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/clang-common/clang-common-11.0.0_rc6.ebuild b/sys-devel/clang-common/clang-common-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..18e41e0917da
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-11.0.0_rc6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc6.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..2713d1f397ff
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.0_rc6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index b1df16bae5aa..9439ef4cda7b 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -4,4 +4,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/clang/clang-11.0.0_rc6.ebuild b/sys-devel/clang/clang-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..8f5be4425a42
--- /dev/null
+++ b/sys-devel/clang/clang-11.0.0_rc6.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/sphinx
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+
+			# manpages
+			docs-clang-man
+			docs-clang-tools-man
+		)
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=ON
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 409820ed79bd..915ebef261de 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,3 +1,2 @@
 DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.2.tar.xz 17444 BLAKE2B c66fd121770dddcb27033be228de691f766f1acd9ada9580ae96dc12f6fbd0cd823e6656dc9b0515d498305b10d72f9cd87cf69388791971e9eac1a20e3f97c9 SHA512 31327d9abd26fdadaaf25a63568fd860ae25030b4a99dcbf0424f2d8fb14e61f041e681eea90c781a3f4e5401e3a7ba3299b1260ceb6e51bda5bef24f65dcacc
-DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
diff --git a/sys-devel/gcc-config/gcc-config-2.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild
deleted file mode 100644
index dc82652e013b..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+native-symlinks"
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)" \
-		USE_NATIVE_LINKS="$(usex native-symlinks)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)" \
-		install
-}
-
-pkg_postinst() {
-	# Scrub eselect-compiler remains.
-	# To be removed in 2021.
-	rm -f "${ROOT}"/etc/env.d/05compiler
-
-	# We not longer use the /usr/include/g++-v3 hacks, as
-	# it is not needed ...
-	# To be removed in 2021.
-	rm -f "${ROOT}"/usr/include/g++{,-v3}
-
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	# USE flag change can add or delete files in /usr/bin worth recaching
-	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/lld/lld-11.0.0_rc6.ebuild b/sys-devel/lld/lld-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..7b627c88cf1b
--- /dev/null
+++ b/sys-devel/lld/lld-11.0.0_rc6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0_rc6.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..df9cf92b47a1
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-11.0.0_rc6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index b1df16bae5aa..9439ef4cda7b 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -4,4 +4,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-devel/llvm/llvm-11.0.0_rc6.ebuild b/sys-devel/llvm/llvm-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..6ee898821d6b
--- /dev/null
+++ b/sys-devel/llvm/llvm-11.0.0_rc6.ebuild
@@ -0,0 +1,503 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		=sys-devel/binutils-apple-5.1
+	)
+	libffi? ( virtual/pkgconfig )
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
+	')"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+python_check_deps() {
+	if use doc; then
+		has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include 
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+
+			# manpages
+			docs-dsymutil-man
+			docs-llvm-dwarfdump-man
+			docs-llvm-man
+		)
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=ON
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 26e6b066108c..b5e5e852600b 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest
index 08bf945e6708..67565c737568 100644
--- a/sys-kernel/dracut-crypt-ssh/Manifest
+++ b/sys-kernel/dracut-crypt-ssh/Manifest
@@ -1,2 +1 @@
-DIST dracut-crypt-ssh-1.0.6.tar.gz 19549 BLAKE2B fe73e5abefd00b07bcba9d8f55994a937328767730acc5b1ee7583487dea25c8df2628c4c46703148458cac3b0ae32673318fa960e0628570ddfcbadfb61dbd3 SHA512 a6fd9159ad74dd09f549a030fcb0189a525190d244d247a743e1c2ae044708aa1bfc3b9c7fe9d245945fa1b90668fedf913b87030fc7aab56e5ab36785a2f83d
 DIST dracut-crypt-ssh-1.0.7.tar.gz 19561 BLAKE2B b778d03d792c5ebe0466de7474a6cc821445fe0cd3b216f395d3ea28a17cb4ed3aa6da4b7d6dee86e4481e2ac98d677e3410cd6581c4d8c01ab0ec9564504bf3 SHA512 2958a59c3ff615e89b7631224e248e7e931dd91c566e792b10dffe09b8bd2dfcf2c55eef4e974988f19320e0d732d3dfb14b61713445e1ff3a4a9868dfc4e966
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild
deleted file mode 100644
index 74d7f899d279..000000000000
--- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Early unlocking of encrypted systems via ssh for dracut"
-HOMEPAGE="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh"
-SRC_URI="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-kernel/dracut"
-RDEPEND="${DEPEND}
-	net-misc/dhcp
-	net-misc/dropbear"
-
-DOCS=("README.md")
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8fc358f766ff..9503bbc281d4 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,6 +19,9 @@ DIST genpatches-4.19-147.extras.tar.xz 3316 BLAKE2B 168a00fdecab7530c7e94876a15a
 DIST genpatches-4.19-148.base.tar.xz 3980648 BLAKE2B f0c9a65a1132e26a7b4ace1f982d97ed841f4c2ef13050bd20366417391c8b1800e7c00b2db5c8ae75ce8d6e95fcfe401facf2bc76d58df31e29608721e4d1dc SHA512 b75a42bb6eea9418d75e333b3304cd0a6a43a54a4758a8de3e3d69dca3f22c18c75da3347f46b0d188d52642306691237e19db53305f1a83888aa4f85bd92f40
 DIST genpatches-4.19-148.experimental.tar.xz 6972 BLAKE2B 5104106075756bcbc6aa6ea79910b96f7c9ba37457f07a61ddc2c0f81728e910a853707a9e21d6918d57ed2a16d777c2851c1e3888a18eaf9c813d4587def797 SHA512 95d8638a98baf7a2b2569d32c7aeedbe5c85153f1f22b8f3bee72ac9f47169b31c85e47e887068d95a4f9469baf76ac00c5957fea3582573a2de268b161ca120
 DIST genpatches-4.19-148.extras.tar.xz 3316 BLAKE2B 57546aae74073e440e043c4754b2f51bc48a0b24a4ff0a130797d2bd96a0128bd786310a79bcf13b03f20e14eaa8fd8ce10c597d9a7281173cd2debc6b042bb2 SHA512 2971335b2a9e3fb4a7477e8ff40e3170fe40a272a3ff33a99e18bfb58398fe5e6a798ec88e1d35b7bc895dbf68a30297e1956357b05c988b321f06111297f354
+DIST genpatches-4.19-149.base.tar.xz 3989668 BLAKE2B cb632748208855bb928d675aa7e8c9ef7edadae3d09dbdb43712480798bf84926efa6454ddf60513e50ab0ca0ab375eb91cc0d723306d1c1362e019214261b4d SHA512 fd43c183a0645f3db99fb2dbd3374beae6c6c4b35100386e2b59ebe4b56f3193e7873cc6b5c790ba32b7fac39e5262b157883329a69c40f215eae057dd9a1601
+DIST genpatches-4.19-149.experimental.tar.xz 6972 BLAKE2B 5f5b3a8e75652fea28489b401fb5913fe751cbcf022b6d898b83faa3583487b79dc673aa2ed67aee95c52d591459700be8add513459b5590f64d49571e36bb07 SHA512 54bd299989a3e2b28da1e328dbf024bd332b2fccfac5f323bc9a7451bada79c5389e61bff9af3b09ae2d6e4c55d2203abf0740fd68f16e894730166bdc475519
+DIST genpatches-4.19-149.extras.tar.xz 3316 BLAKE2B cd042213619de10049e4c3810c71c30166c26a241cbac8dac8b729998df4215ed923638da3b8af3412096b2d6f60272ab8f5c532eb91426f09cfbe31c8b4b5ed SHA512 62c76ed239fd2e6f64538317903352b1cec178baa8002c27a1389007133d3d5ee95e22ee7b1450ed0c1b8355429a1e01bffc676e279f7c944e0cc667cb730f23
 DIST genpatches-4.4-237.base.tar.xz 3832188 BLAKE2B 014d7612d383737adde6a30e454675ec1fd74c909756cefac5bc97af7dafa6850a85ad4a7f5b63328dfa135d01451f0f72e746b60f5520095859063879f81aa2 SHA512 98c2d176518858b1d63d86f937a68d05293005459c5728c4c992767f190234d6b5413ef97cecbcfb923ec236f93f4582bd34f2dedc31e811ae34efe45dd99590
 DIST genpatches-4.4-237.experimental.tar.xz 83284 BLAKE2B 4fd3fe9b097cd7b2b71d32efb623f495f235f5359068a40142b19c5f98d83620caf9feb58b9ed33f55c31954d246e716ba0c0ceee3acf24066b95509efe3c96c SHA512 0f2737e304dc4ba9a596e96b8b0af063c32db0879b3fe481b5c9cc5e8755e5b1684ec139373fe2ecd716944054a9b451e667bb0d8092405b5a41640a8c9963c8
 DIST genpatches-4.4-237.extras.tar.xz 16504 BLAKE2B d4a7f563f97dc81e56cccc49087b1bc702ba2ca46b622e73da726eb0cdff2bc444a831f233830981f36f1eda1be82627f70348aa209ee3f8f89ab7e60f5550ce SHA512 61b94b84efd62360d21f90474d6b176379bf58aa3541cf6d0d4ff47991966239822d9d6eec45a8f832b0bfd7fef79f03c3428795a3e3fd31d006ac0be49699c0
@@ -49,6 +52,9 @@ DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c359
 DIST genpatches-5.4-70.base.tar.xz 2483716 BLAKE2B ec87f655614a22728baa721a291616f3c5f0516ec25dfcfba74ce72a8236e132dc2c66bc8b551cdac6cdd170d29a54545b05fec5d853afba33e70b23b7dd50da SHA512 246f449d7720de05a8527ce19ea47ebf79dfe970d87087674630416b438d31fe499b8fd053b7ea19ad81248435345b56544774eeb6298475145ae59b9ef718ae
 DIST genpatches-5.4-70.experimental.tar.xz 6696 BLAKE2B de4e2c647c1f2e71d3a302b284d55584d61f72ab75a22749f65255c3b1d389f904b152e9faaabf704da3542712252d4edda3e9acaa7c683ec82b2d16e032850e SHA512 b29a8e7c05db6f15c5bd6fc51bb16bf92a2301c60392bd377e71db65f997484c57cfde4acdf07d93bf007052c26af91e9e374ba40bc16903e4048457c7a17126
 DIST genpatches-5.4-70.extras.tar.xz 1772 BLAKE2B b7dcaf96dabb3dcb2ffac6532b59b9eff8e9e55e309b02b4d774a3c665e4499f0353bfb91ed81f1cbc73b852f0de50adc6a03dc36e8e7beb88f0cf62a5fd9a42 SHA512 3fedd41a60c6941f9ee18485c92b67c3dc69d0b36a134adb89c246106d043e10afcc9114f5448ea4164b956934e2dc9efb1f3af95c2bd1a67eaeef5253b07630
+DIST genpatches-5.4-71.base.tar.xz 2499052 BLAKE2B f19927e24c884ed8849b9572b5d199d8e9d1ad57137af70658016cee341e4a45d0e974996138c61880c39adb83616d6399e798e5fdd020c6275becd57a9d56b3 SHA512 dad3be3fa63d809458b08b7da7f45c2a0c126ca1df75ed156b2f54a93204b4504d42e678a74df79618e137b7b565fbc97e108e2807c97cd1b4a8d0bec69151a4
+DIST genpatches-5.4-71.experimental.tar.xz 6700 BLAKE2B 76965e6cafbcdcb297a34f0b7014f50c02f7f2705e563dabce4de65d08eb93cd828a5223fc0e6f75574d6cb63927c82e35dc363ed32c6ada348f842847bd71e7 SHA512 74c5669ef090d80e34a555649ccceca1bd8db9ef342a3ad3b39b1916ae84fa81c3520b24263d67732b0ac3182f7fbe70ef0f195549461ce93f107a13f8d07d25
+DIST genpatches-5.4-71.extras.tar.xz 1772 BLAKE2B e462c7bf461058db545a11d05d6f6de16d0868a4f162874682425424f07e6b78019ce65ba9bd51aa413433894cea8561cba33837b66dd600351f36c563a0edb0 SHA512 ba9930a24342f7ccb5514688913e2517c726137317563ce301dbf383d484a6243c04e4d7e6ba427c0269009f979aea8c623e677e9d7f763275c1e299519d2ee4
 DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e741a2bf9cfe569aadce43767b671706d256082a07e5c3b11bd9cc849bde645b664c641958590d1ec0b73dd826dab2996f56 SHA512 5dab9eb4f0077d5822b736e282696b95993e17d1078691cd14c2201043e9be9c496c56d5f89cfd38fbb5d0c1da433f62d35ff8b9542423524ef701205bc04577
 DIST genpatches-5.8-11.experimental.tar.xz 14248 BLAKE2B 41c0b5453d89c794504fe7bdd02d595553bd70abe0b4018f290328b7ffef0a2f9c3f7be61ae73cbb42827e64844d5ac2ff2bf798760e1bbb4bc0f4812753006c SHA512 3ce760f2b257e8fb9a443583daacee267f35469596bfa3867032e524235cfd5c1f98de5e4f92ecfa5651f9a3ab852c077eca940ce00f344c69386117ee824e57
 DIST genpatches-5.8-11.extras.tar.xz 1764 BLAKE2B 3798c0b54dd3056dfd389db8bbcea775462b218d9670c3322240d90d8f894c89bde55a04a80220e76b0d6fd135c32af1d9f5564795f30e9368f3f58d0d45501f SHA512 958d68e317c0140b2540f757dfabc767e28f1878a2b65012599248edd9ab8ac20e7f1736a0f802f01a9f0f22cc743f1a1f9f4665ac287ba6a477521dee323ab1
@@ -67,6 +73,9 @@ DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc4
 DIST genpatches-5.8-16.base.tar.xz 525416 BLAKE2B 53b0e2548b25b93999650cdf8eb920447367305049349a468b954f84368f803d2e1fd591fe4c01722515568257f1457a7480650a2debb1e9196bc41cebc07b5c SHA512 b708d0ad5303cabd7ba73b28391c138bf443c0af1dfc8296eb528e1a16cf00763a5a36aec1cb7bd0b0e9c9b0d844d4a135e2f1f5cf4ddbfa9742d7e05e0a4c0d
 DIST genpatches-5.8-16.experimental.tar.xz 6068 BLAKE2B 55365934343137e50ab3105e4ade4ce4d4293e58dc6c4965940999efe4e7fa02eef7e672c117054ba5bb21a153c4b88cf247dde0ae46982ea317dad105d17487 SHA512 7dbb46425215aa083fdd0fbef131d65a58437524d1605fcfa891f51ae6610914f9f3d1b0b8c8b416b06efe9f918e619893af5b3015dc3e5249dcccb01c6e5346
 DIST genpatches-5.8-16.extras.tar.xz 1772 BLAKE2B 60238a48924010a7ebe1214de7835522ad1ad5b156dd3bba13d315ad753f69ce7b82a5265bd4f8d8631699304526fd44279ba27413f10cc4f19e1a60880cf30b SHA512 f9760259d90cae491252c409c6521ca5285bc0f7655795055db8bbf7c5e2ca65948ffc5541d2c4499f6255e4462884a90cc3b2db485f37e6133ba03c1a519751
+DIST genpatches-5.8-17.base.tar.xz 547680 BLAKE2B ea21c869fba01bfa213444c19deb4e8c3bf312746ec0b17e6f407dac00e8c19c6d60e4e243ff5e16605b413c3aa763db9a8d91907fbd57c7443ef48b7f93a344 SHA512 7d66e6cad6a4aea50fb996608c45896c52cfb1797da24a486c9cfd0afd3121886fdba4ba91a044af2774c92805232ce988bd0b82cea0618c29c17f2cc3407905
+DIST genpatches-5.8-17.experimental.tar.xz 6064 BLAKE2B 6782abb25e0fa5c7da06680e1c6a9c76033ddc0e940c3524e8e264dc9acccbc04f132de4fe6c99220a191b4f7a53c42f828f4fdcf9b94ff745e96a0ae90eddde SHA512 48bc8f582d005f3bd9e7837a3f20d9785568d5a473c5fa4a106098decfb4cc24e22f573096d5b0bc12fa8d9140b8b079e0ceaa433e7a74b56ea15e5ae5e8d28f
+DIST genpatches-5.8-17.extras.tar.xz 1768 BLAKE2B 937be9f6fb92f23e8604b609de34c6f51e8e873203c9f7e6dea545f213d4be90e3d0c173b703bb6956c6d79097ea0f25528bb249a22d7edcfaec1be8f2ca636e SHA512 3409282b77cad9c06d13f814d1904819ea967b2c499c64a03bc188ca31aee991b7100946324c719d35cd4e5e30072f33e9e7ebb70986e1d4d386c47ab0ce8577
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.150.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.150.ebuild
new file mode 100644
index 000000000000..0a6113a1f81f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.150.ebuild
@@ -0,0 +1,28 @@
+# 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 experimental"
+K_GENPATCHES_VER="149"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.70.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.70.ebuild
new file mode 100644
index 000000000000..0b95f0b3042f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.70.ebuild
@@ -0,0 +1,28 @@
+# 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 experimental"
+K_GENPATCHES_VER="71"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.8.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.14.ebuild
new file mode 100644
index 000000000000..f89062030d0f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.8.14.ebuild
@@ -0,0 +1,28 @@
+# 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 experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 6c73a27f897c..d177e741dfab 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,8 +5,8 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST patch-4.14.200.xz 3924520 BLAKE2B a9a03c1d050876122208e988ebd8ac8a02e36478d331fea1b987f49296840d5f68688d14ff52cc3ef62b08217dcd932f87f131ae5c1a4ceb186160bbd4293d0e SHA512 1f80b48bd691a06789a08730227081f42ae2a104ee3b28f2ce023834fc8e500eee9fa2b2773c95aac386d06044406e77022cf692b8022bac0417b57cd0c5906f
-DIST patch-4.19.149.xz 3486848 BLAKE2B 45922aa5a9e22f2851d214417fde10de37a538c26379e758433e92de5e3a7b1079e0098f912eaebf7eec1398e010680e4996f6c9d2735e45507dfa1a7658c1af SHA512 5ec151d66d4c40c6a196e18890d50543f12cee48c1d38785d4e3114ec1acbeb6d2d3a97993b2a92b87090a9bcf72f316142be27272e31d410aca93124ce6e719
+DIST patch-4.19.150.xz 3494416 BLAKE2B fb22f2ff141773a91fa48a29faf323adc3753708d486d78c592ba30e158dabcde48395e3104c2056584918d26a40d5e5c5ab2534dec0550d3234bb3d6fbb8f1d SHA512 168f7760a682855cc5ed3c38ead28d51c3470b608bff2993fa3655226025d5f715954732efcb0b78a1bc5f07a22c2283fc02ee02ab7f306f8bc1c274d6c36287
 DIST patch-4.4.238.xz 3333168 BLAKE2B 7e5c487c1b3d1e1acff703391438e3ddac0bc904956a6075dcd014432c6b47d46b8d1a5d3aa70ee968e9e1411b83d4196bdd1f74cd448140cc0e9a9a9e7130d1 SHA512 00faa3f0f0db0b54894343b5c671483a86cd7566650e9d33378510319101c7334ba12f9773c9f7e6794e3d818fdca386edf63134a0ae27e8f5ce1ff3aeffa0f6
 DIST patch-4.9.238.xz 3697300 BLAKE2B 7acb0538c9ed95a6058fb74ce2dae90eba483ea1bd516b85d9ecfc38f75b8c742ea6404f16b773ae90ece1615ff769426fd9f49661291ac28e325bb63a8f7076 SHA512 a8cf63afad2b0e773403ea308278b9421dee744412c6af73e3edaa30d080ae6ba8051bd0726b468ad9e06e9c564da027b016cb4bec6c4388a1785edc67e2dca5
-DIST patch-5.4.69.xz 2117080 BLAKE2B 619d336ea9a6bf36b895db92649ba966c4f4b2ac81ef37320d41c52e8a58f64a1ee740a7e1059eeb687903a7ca4eecdf676871ac1772e306823722b3153d1791 SHA512 a929fbf3d2c72717c786ad5911dd59a8a80d0ab52a91ae1087db00ee7c26061a3214c22ae863230a88dda378c313b67660c12f65aeae661dc40d59e1a0ee9cab
-DIST patch-5.8.13.xz 507376 BLAKE2B 1c23aea239e7a9329546aedd161a415bf59b8c2aa9dba1e11c2775cd93013e70541205894acc6f79707ab432840bcc2363ca170fdfb827a2f87684f6bac7aa00 SHA512 4686b149cde34dae709a806b283724a970a2a8ce3b5bc858c160618c756ce3d6dd5628d9e91117a682dc011a68ef23cc3e9c16fbce4ff3537d919201a432ade8
+DIST patch-5.4.70.xz 2131576 BLAKE2B 6d9dab0ec5dc84f1487d179355cf497ad9e16b7a22b69a931dab206e8617cfe52fd09a88ec8fe9070f9735c9f5cbb825c61aa6501d3851c8d2925f849146629a SHA512 a87fffe500b7f0355fe49077b4d80359b31e0721d824ba95135ba851d1b1b747ea9dfd0bc15e6133bc93132df60c4ca9ee99830acb0309866f02f9c88b7784f9
+DIST patch-5.8.14.xz 527788 BLAKE2B c64932af10c4b3a0d400e596046237f98728a586a51e82d8bffd998b7a74dc8a3cf1a739dec461553948c642e597b22b2216e9892b2ce25157106232fde2dc54 SHA512 41a75b2b2f02f3412be9327a54688830396e66bd2bf6ca5535ba7a20bef8b8619b5939b7fbea70ed54e895480be99b6cf1484403a4da44f3500349349a8e14fc
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.149.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.150.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.149.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.150.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.69.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.70.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.69.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.70.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.8.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.8.14.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.8.13.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.8.14.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 012192a8c217..96a60cce4458 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..cecd595ac6c1
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc6.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT} )
+	${PYTHON_DEPS}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0_rc6.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..c83c56ecf249
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/libcxx/libcxx-11.0.0_rc6.ebuild b/sys-libs/libcxx/libcxx-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..22c6462abd9d
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-11.0.0_rc6.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+DOCS=( CREDITS.TXT )
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+src_prepare() {
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	llvm.org_src_prepare
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0_rc6.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..4b304417a9c3
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/libomp/libomp-11.0.0_rc6.ebuild b/sys-libs/libomp/libomp-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..5bffd6685f64
--- /dev/null
+++ b/sys-libs/libomp/libomp-11.0.0_rc6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f07ccef25789..c9465e59a278 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,4 +2,5 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0-rc6.tar.gz 122769521 BLAKE2B 0d03f385447902846dcb8150bda85ac0ab42153f63bb653befc18ed1cba357493065777750447b0ac71c077f61ea8c8f7a4c313ea5f3079926ffd012ace0debd SHA512 249b8e685cfc45a651f4dbd777b10298251c77476b57f9657860644ded612f810224d16879225d17b7a6ac9d584d63d53a33ac114c38e1cf86dd9e8d0faed9a9
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc6.ebuild
new file mode 100644
index 000000000000..fff362b926dc
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index c58f31d96ec2..eac71b5fa583 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,2 +1,4 @@
 DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
+DIST tzcode2020b.tar.gz 259438 BLAKE2B a2140c557e1a26c49244624031fd798faceeb632c047605f1a93e30135299b0eff93511c71e6221fb63d19e53504e656fe35412aa6c3a34af8b173dc516db3f7 SHA512 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
+DIST tzdata2020b.tar.gz 400017 BLAKE2B a143ef18e083f801f8fa32c076af81867e02042602d2891095bfac0b0dc236d54f86c3b894b1e5936b20b60309c3b5f72ff36b95eb4be3c1971fe2f02b06a830 SHA512 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9
diff --git a/sys-libs/timezone-data/timezone-data-2020b.ebuild b/sys-libs/timezone-data/timezone-data-2020b.ebuild
new file mode 100644
index 000000000000..d6de39e14978
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2020b.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls leaps-timezone elibc_FreeBSD"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+
+	# check_web contacts validator.w3.org
+	sed -i -e 's/check_tables check_web/check_tables/g' \
+		Makefile || die "Failed to disable check_web"
+
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps-timezone posix_right posix_only) \
+		TZDATA_TEXT= \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}/etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L "${etc_lt}" ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
+		return 0
+	fi
+	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e "${etc_lt}" ]] ; then
+			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+			elog "Setting ${etc_lt} to Factory."
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
+	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 84ce601f9582..2947548d9dad 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 869ccd079b48..06878bd7d392 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,2 +1,3 @@
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
 DIST modsecurity-crs-3.1.0.tar.gz 250617 BLAKE2B 6081d09e90f3c18435e046264ff8c0b700fd0c8c2b6377f44517fce3ad74dcf1d6a8cf7eaf055b85040b21196b603bcb762f5a7ed237d14b6a05f1febd623cda SHA512 d613d2af8248424ac5d4d006a9f221b07c714fb47f84e6ec237b1389379b50dce984f51121cc22b69d148910169b5257b11558656640bc8349d0b09d9e70bb11
+DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4
diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml
index 3947bbf17bea..64361f081f7d 100644
--- a/www-apache/modsecurity-crs/metadata.xml
+++ b/www-apache/modsecurity-crs/metadata.xml
@@ -3,6 +3,6 @@
 
   
   
-    SpiderLabs/owasp-modsecurity-crs
+    coreruleset/coreruleset
   
 
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
new file mode 100644
index 000000000000..985caa850729
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="OWASP ModSecurity Core Rule Set"
+HOMEPAGE="https://coreruleset.org/"
+SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=www-apache/mod_security-2.9.1"
+
+S="${WORKDIR}/coreruleset-${PV}"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r rules
+
+	dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
+
+	# I don't think it's worth pulling in apache-module.eclass just for
+	# this path...
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}/80_mod_security-crs.conf"
+}
+
+pkg_postinst() {
+	einfo "The CRS configuration file has been installed to:"
+	einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 78f901976798..7a96dbe51bd7 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index b1c230f708cb..4a6a8a0260ae 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,4 @@
 DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
 DIST chromedriver-bin-84.0.4147.30.linux64.zip 5306126 BLAKE2B 2ee0a05eaa42e4724634251fd44d81a2d96f7486db40dc570c01f96cf16124fe2d666e110a4b9c6cd06adf38181c0b2aa3a38beb4ec59fbd65a98cba466fca71 SHA512 ec010c80958439427567c12c714afd5e15f80a9ccb7120e9539986d1af931eb063ad50b709cfa6495bb5a214027ed8531007d4497a01b26a94259aa4a2525f2d
 DIST chromedriver-bin-85.0.4183.83.linux64.zip 5359562 BLAKE2B 020370d0cd42f2af0c81e9ef02802a895e2d566454a27d5a80b8607ca3a83c7ca1ec8ece0ed997b5de70a725134d9c2f0a52765c3f1786b3050f9abbcac3d5d8 SHA512 ba26945906ac6a2b9c724917d8f2e82e9bc26fd601a91a390b637a8dfcecaa57a3acfcf376d316b75ba559b61858a6732cb04332c6c1c661927322ef623a62b8
+DIST chromedriver-bin-86.0.4240.22.linux64.zip 5456932 BLAKE2B 9a54a5b45e04069c326aafd0d5dd60663556b793dd756e28e82b7cbbe9c232d56c3722017fc2c792e79e2ba7705e4590dc6435ca090e756f87d3dd8e28ca3b5e SHA512 f61bc8a3f48eb3c6dbb51d8fdef93000150307cc0824dc5ffaa155aaa598ba7bd1aab723e41c1aa0eb317603c93f2c661e8fc14403179fe5bd18b317935f5a1e
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-86.0.4240.22.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index aa1130e4cf5e..ddafc399ab2f 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1 +1 @@
-DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec
+DIST gitea-1.12.4.tar.gz 135170598 BLAKE2B 5db5bda4b2a9ea94b97e2ea59416cb6a2f95d53cdd9804d4d38686413134b00935b859ab5d14883f0e9238472108b96d66e6c6f77cafb5eb9c505fd945abc97b SHA512 6d28cd1fca4332c12b2b9485775289cd86b450bb9072c6c200b1d7cc4e5ac439f5d5a39cb788228f8712a0e73990ff9f4b326ca1d8fa90bc0691c50925e1a8f1
diff --git a/www-apps/gitea/gitea-1.12.1.ebuild b/www-apps/gitea/gitea-1.12.4.ebuild
similarity index 96%
rename from www-apps/gitea/gitea-1.12.1.ebuild
rename to www-apps/gitea/gitea-1.12.4.ebuild
index 18b851d0c981..f4f0af94aa84 100644
--- a/www-apps/gitea/gitea-1.12.1.ebuild
+++ b/www-apps/gitea/gitea-1.12.4.ebuild
@@ -42,6 +42,9 @@ PATCHES=(
 	"${FILESDIR}/1.12-fix-vendoring.patch"
 )
 
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
 src_prepare() {
 	default
 
@@ -124,3 +127,9 @@ src_install() {
 		keepdir /var/log/gitea
 	fi
 }
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+	tmpfiles_process gitea.conf
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 6bfea719b170..b355c3f47c48 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,8 +1,3 @@
-DIST nextcloud-17.0.8.tar.bz2 66991137 BLAKE2B 8c7d685a7392164c673719733ce14adef90833f862e0fb379defd6d7642d5163fea74380d3359fb382649c7072ad375901edf4337d24e9434120c2786515df77 SHA512 c9a711fb1ad6871233fea581d6cbfe7083e925683235a86023842d3c9d65db6779218bce06c5960743fb277bb779c6cad4eb40eca65ade9e50f8459cbee531c3
-DIST nextcloud-17.0.9.tar.bz2 67112809 BLAKE2B 9aed75f3483580b0992d767efd6aa2f9b52b9a3794f6033449da16769a1fa1a69965583adc09c671287d3049e6c071e446d2d306491a93c1a4122d2233607324 SHA512 ba1759baf9a886f7cebc738d863bd1930048f395960a888b3bbfe21b51cc6880c3b72a5400d104549b8563738dff747f34b806dcd5bbf85a6ef3874c4d576d15
-DIST nextcloud-18.0.7.tar.bz2 87752820 BLAKE2B 0c54842ea2f90ba7981129feccdcac390ad6ef55bb04ebeefc6e04e1fff8b693c8727c89c314e8fafa0296a85231fe08f0cfc184be830faea926b119065ff221 SHA512 62dc2100e42e7bc1b112efda756a6a8d1dc5d818e3287041d56fbc05ab90f04b2545320715ea39e9018abbe9f9297a02d2432e55720da3fd0b59badf263e8575
 DIST nextcloud-18.0.8.tar.bz2 96919725 BLAKE2B d518f52f155e3ae9d2fbd94f225196c7a2fbc1af51e0a0bbeb07cd358065a17d37695402f5e8095f4a21b68753e756ad3011d9e4100ceff7d24613b32eaf0fa8 SHA512 0492815848d139135b4993984e5fa84c6827ddb064289fa6599c707d26bd3ab5d53cb5791b4d5e2be7808f5f127e48f83ad359063877391960dcbe057e3bb7ef
-DIST nextcloud-18.0.9.tar.bz2 96906179 BLAKE2B e51f6bffeae47db0693df9f650df2b255de1ae786e662b4d9c445cb636ddadbb9177b24edc2278522756fcf30fcc48c19614e523f0f6321cb12d56149700ab6c SHA512 8f5dd0941114819a5ebd6e3da2e7cbaaa7a7ae9adbb44d62cdfb2202d266c576e05ef5ec8b6c25b21a88c5a48df26bfb15d60dfd63a2b5443bac3f9b063504a6
-DIST nextcloud-19.0.1.tar.bz2 90595211 BLAKE2B 72feeca3105d31ada79b16cbc345ec191e37a7e2364cffd6c37ac60c990dbe0345f4c9f1b815ccf3632d1c31b5d561b6fc4d9870ee25dee48c51ae518bbd4a72 SHA512 aa4db108bff2b452123e5513bde03fe4c2f1da58c1987d74a246a69714fedf121ca9ed6151609d87c91dd6109419b764ba02c5c3c1669c5ddd5a49118e68f0c0
-DIST nextcloud-19.0.2.tar.bz2 99715473 BLAKE2B 9288da04aae8da92de39bc4712f2e458d0acf0277e3cfa6dd6f762819e0e8c790c9ce4a6eafbbd07babfdece70634ebab33fd59525bb9e5afddc3ceb2b8caa27 SHA512 0f4b2aa01acf75d95057b9197d4a66c8ef1f9174d45df4d4d0cc8ce4619ddeba07328fb00251f02ed462dbe698b415472a1fe3ff347539769ad124de1f4bd443
 DIST nextcloud-19.0.3.tar.bz2 100074272 BLAKE2B 295d22dfb9f82decd90e2d052e7b80069de871fb7850233016cc7b0238444cbbc646aa53e8de45b7e4297c3ebc623996aa501ee3475767cc54782e0b0ab3e98e SHA512 be4f489903ca7f777bda541a706d4c4f16a2a3ce56abc65525f72b0464592571ccdd9f8915457450ce37f90d51c944cab5c75b100433e3db3dcc154362c4d76f
+DIST nextcloud-20.0.0.tar.bz2 121470470 BLAKE2B f22cf588e6e72dc07ab28d4e888436d637130093f4b322b32e6328677ab62babdf0c4d82ae27a020d0096c34c8477e73115eb7a915e1618f80e4030b78d3f26e SHA512 45f50a9922831f2170c5cbd94bc9e7c144d4a7a6635b044a306ddc685d5dec733c52a63737c6b15b63918ee67149de9ea9a53337eeaf2e0a9007d8f248759405
diff --git a/www-apps/nextcloud/nextcloud-17.0.9.ebuild b/www-apps/nextcloud/nextcloud-17.0.9.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-18.0.7.ebuild b/www-apps/nextcloud/nextcloud-18.0.7.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-18.0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-18.0.9.ebuild b/www-apps/nextcloud/nextcloud-18.0.9.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-18.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-19.0.1.ebuild b/www-apps/nextcloud/nextcloud-19.0.1.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-19.0.2.ebuild b/www-apps/nextcloud/nextcloud-19.0.2.ebuild
deleted file mode 100644
index de1b7898efdf..000000000000
--- a/www-apps/nextcloud/nextcloud-19.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.8.ebuild b/www-apps/nextcloud/nextcloud-20.0.0.ebuild
similarity index 100%
rename from www-apps/nextcloud/nextcloud-17.0.8.ebuild
rename to www-apps/nextcloud/nextcloud-20.0.0.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 917e6d327510..d2e01184da5f 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b8d5944ebf68..e051529d7e37 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,5 @@
-DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
-DIST chromium-85.0.4183.121.tar.xz 833194480 BLAKE2B d91302792fc34730795815a39ba91878f1d6d33c7bb810a10efcea2e117c069a6493b3acb1e3d8a04b19d599335b60d70523f47c65c42080cbe0d3981255c264 SHA512 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945
 DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
-DIST chromium-86.0.4240.68.tar.xz 825424240 BLAKE2B 69638d0c0fb434593efd63c8d1700992d52e4ed20f5d36f2152d9c5e9aa6a0fc35a83c80c3428e3bc35ffb70e351185380ea2d4b98bcae6ca2dc7186d73ec45b SHA512 85d55d2ed5fa5fc9c835015871df258a7f465d07ba8b959345d309c52c718b70c2bbce476544eb1b432e88ef5f26ed3d1f1aeba50929b3795391f27371748f53
+DIST chromium-86.0.4240.75.tar.xz 825512672 BLAKE2B d7b596c6f3b0ac15eafdca53c10d520206f562331e6b858da585070f0f6f6be97e49524ffba2fd1c31429eb21ad0f0d5047aa5f78de7d338b84c9a989cfcb675 SHA512 d553d2ea1fd1d7e3fc64f0d0c5a4fd53235bdabd07c9f85b58c26d371ff587f2917cf0d50993d878c72a4a9f7d8031bf7e542be3bc3e9aeeb8625e4c1570efd8
 DIST chromium-87-patchset-5.tar.xz 7932 BLAKE2B d97f2f901e51288504cc6313d517251daf23d4f4b0f7802453076774c019ef4eeebef5e38c64c12efb156cc770f0fa3e0b00d6b832f8e0614988a0961b1ebb05 SHA512 b4d70cca16ec944771238140765c63487b7306a800298d896b6b5b46761af57b6c58f080d308bfd7d9e131e05d8b79503651c94b200a3ff3e18d11dafab3db0c
 DIST chromium-87.0.4278.0.tar.xz 832042784 BLAKE2B 5f02a03ddd076aa543a2c9620295d99f87a337f22afb7ebdee6533a57cfe947aa887522d53e83431b83ee213e56d4415624112d9bf094f39381d9cdf30a590ad SHA512 32ce81904659e07b63ced9ff0bbf9a1a61f6a201701e8154674d7107d0e62173c544fa4724bd1326e47209db44f65a7b29ae5c3832e59863126a7714f2947e0f
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-85.0.4183.121.ebuild b/www-client/chromium/chromium-85.0.4183.121.ebuild
deleted file mode 100644
index 3423601bdd4f..000000000000
--- a/www-client/chromium/chromium-85.0.4183.121.ebuild
+++ /dev/null
@@ -1,867 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="
-	component-build? ( !suid )
-	headless? ( ozone )
-	ozone-wayland? ( ozone )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libxcb:=
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	ozone? (
-		!headless? (
-			${COMMON_X_DEPEND}
-			x11-libs/gtk+:3[X]
-			ozone-wayland? (
-				dev-libs/wayland:=
-				dev-libs/libffi:=
-				x11-libs/gtk+:3[wayland,X]
-				x11-libs/libdrm:=
-				x11-libs/libxkbcommon:=
-			)
-		)
-	)
-	!ozone? (
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		${COMMON_X_DEPEND}
-	)
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( ! gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-
-		# we need to generate ppc64 stuff because upstream does not ship it yet
-		# it has to be done before unbundling.
-		if use ppc64; then
-			pushd third_party/libvpx >/dev/null || die
-			mkdir -p source/config/linux/ppc64 || die
-			./generate_gni.sh || die
-			popd >/dev/null || die
-		fi
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if use ozone && use ozone-wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone support
-	if use ozone; then
-		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-		myconf_gn+=" ozone_platform_headless=true"
-		if ! use headless; then
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" ozone_platform_wayland=$(usex ozone-wayland true false)"
-			myconf_gn+=" ozone_platform_x11=true"
-			myconf_gn+=" ozone_platform_headless=true"
-			if use ozone-wayland; then
-				myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
-				myconf_gn+=" ozone_platform=\"wayland\""
-			else
-				myconf_gn+=" ozone_platform=\"x11\""
-			fi
-		else
-			myconf_gn+=" ozone_platform=\"headless\""
-		fi
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# https://bugs.gentoo.org/717456
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	ozone_auto_session () {
-		use ozone && use ozone-wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r5.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so)
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-86.0.4240.68.ebuild b/www-client/chromium/chromium-86.0.4240.75.ebuild
similarity index 99%
rename from www-client/chromium/chromium-86.0.4240.68.ebuild
rename to www-client/chromium/chromium-86.0.4240.75.ebuild
index fcb525d806f7..c3160d8561be 100644
--- a/www-client/chromium/chromium-86.0.4240.68.ebuild
+++ b/www-client/chromium/chromium-86.0.4240.75.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="
diff --git a/www-client/chromium/files/chromium-84-mediaalloc.patch b/www-client/chromium/files/chromium-84-mediaalloc.patch
deleted file mode 100644
index 69f0229088a9..000000000000
--- a/www-client/chromium/files/chromium-84-mediaalloc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.chromium.org/p/chromium/issues/detail?id=1095962
-
---- /media/base/media.cc
-+++ /media/base/media.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include 
-+
- #include "media/base/media.h"
- 
- #include "base/allocator/buildflags.h"
-@@ -41,7 +43,7 @@
- 
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-     // Remove allocation limit from ffmpeg, so calls go down to shim layer.
--    av_max_alloc(0);
-+    av_max_alloc(std::numeric_limits::max());
- #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
- 
- #endif  // BUILDFLAG(ENABLE_FFMPEG)
---- /third_party/ffmpeg/chromium/dllmain.cc
-+++ /third_party/ffmpeg/chromium/dllmain.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -28,7 +29,7 @@
-   if (reason == DLL_PROCESS_ATTACH) {
-     DisableThreadLibraryCalls(instance);
-     // Remove allocation limit from ffmpeg, so calls go down to shim layer.
--    av_max_alloc(0);
-+    av_max_alloc(std::numeric_limits::max());
-     // Enable OOM crashes in the shim for all malloc calls that fail.
-     _set_new_mode(1);
-     _set_new_handler(&OnNoMemory);
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 229b724bd193..77fa4e5a8020 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_87.0.4278.0-1_amd64.deb 72610476 BLAKE2B b35e8494ed939ad609341a0ded272d6d51fa31202fcdc407f5379a015f703b1b5adf8cbe0708e552a9a6e001e6580a649bdd03059fb54979cb1fea32064d39c2 SHA512 2aee86b55637968601c69f9e7576cffa80262f77e7951f96737f5612eeef71cee188a2b68c846db8abc0c683ef91dac95cc0e66f75c3b4d9cc31a4d0ec6f59bf
+DIST google-chrome-unstable_87.0.4280.11-1_amd64.deb 76191448 BLAKE2B a4d0abd8045822518c936fbef1d55eeee93376eb053a7d30ec335a7f8cd3aeffc90cc00781434c285e4a82a9da73c559bd21a90573a87775571409f6f381fdf8 SHA512 5f1fe1afe598eb1d3436a666902eda4d389c30362a112251782303e8caa323d30f3ccaae4de6aadf0fa6c6e860295d80ff3c29245d999a0dcf8aa4e8b048baab
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4278.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4280.11.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-87.0.4278.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-87.0.4280.11.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 76610d690e20..c2ef58e65c09 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -26,3 +26,7 @@ DIST vivaldi-snapshot-3.4.2064.6_p1-amd64.deb 73503100 BLAKE2B 770ec75afc7f69d4d
 DIST vivaldi-snapshot-3.4.2064.6_p1-arm64.deb 65889028 BLAKE2B e53e7826a14efdcfbebca48f71a98c1bf9d08cc9d4748b7cc3094c7a5f3d41cf4e7206272ba6d3978d5f1257165493cbe8b2cc01021e62f129a217c16f8589cc SHA512 5ba83030cdff8fc402d8dd02a77f6e03ef2113d1844ee6b71271d08c0b910d9e61bcc79688619908a5931159e78fb5e56aceb4e05f7f2c5e849f895c49bc703b
 DIST vivaldi-snapshot-3.4.2064.6_p1-armhf.deb 64878048 BLAKE2B 6546116ef81c8f1b8d3b91f0da6b94e5fa96226d3b2528711cfed32fab836faa286138090772ddc86fbc17bd3e9372fa95a88ee04566500abf56c84b510aaa81 SHA512 3ca42a8825a6f57ea7b585e86cfc4426108713525f4ccf6b065cd658a3f9c918aa927d7d826f8f36c98b43cdfcded52b304b47df9ff0e12114b13e80398e4fa8
 DIST vivaldi-snapshot-3.4.2064.6_p1-i386.deb 70652860 BLAKE2B 9a648b7510c06cb24cff8e490327503d63c14fafcf777600fa0d5dbeb2f72f0f68d505658642789fb9257c6ed5a5d2f72a507644264fe2c6eb9946bc9e64954d SHA512 ed2b0407a2f746c0b446f3b231e81942085e82c03bc2e274c83332c5c46f175e6d736f3a367ad8be405ce4becfd6978508ebe42cb256f56b6c8dc002f67e192c
+DIST vivaldi-snapshot-3.4.2066.7_p1-amd64.deb 73464860 BLAKE2B d1739427773ddc899de3db290e4790f6766048eddbaa50b39e529cfcb4cfd34ff458da0fb0f610f923d29cbcf5d08f50c6c682370482ad174a2b13dd73baab75 SHA512 2829da513d85d29965813281fd36ddca2793b6cbb6a107fe1e0058ba5ad7ef29141c3e327edc6b776c5ac30077236adeda0d1bc5e5b8a2edbfdc33ddeb6ba6a1
+DIST vivaldi-snapshot-3.4.2066.7_p1-arm64.deb 65925004 BLAKE2B 93da59c7829042f48893279c26278bc96fb4c55d66949f74439ad19f3eae9084c25373cc501087b180fdac9d958ed0840deb839d5c92374c221509dc232fbc74 SHA512 9736f058106e2c7db772eba109644044d6e2838880bc13da61892dfb4b2827efbb701cd4490d3ffe750684a9b19d3286fa791014eaa2b990ac83fcc5a946d79c
+DIST vivaldi-snapshot-3.4.2066.7_p1-armhf.deb 64924616 BLAKE2B 4efc6da89b75c97d9fd6f7f35808c2a39a208a94d3da573ed1bb0c5c81577349e4fde126d2e924d6a3df9c08515d2770e0cb80cb8f309851c21b28cb15dcc002 SHA512 ea8175e6e49049a4770d8c90da0b86695653b4d392adc6dd9cbaf2331ceb418d9faa65c9ce20d6605b5eb130e9d8bd89b39051d0360b4591a1c15c172dd25fd7
+DIST vivaldi-snapshot-3.4.2066.7_p1-i386.deb 70657836 BLAKE2B 1a9603b9515cfacfc818ecddbc13f01fa473b6c6e2fdd09bcc55ef6c57136f51d8010d99c4937ad3bf00b539f35942d71fbc854aef7d7cf18f9c7c52ebf0d518 SHA512 e5a11cc714df584cd011e4c88dcd73de5c6a53f9bc1c559b31dc651d65fc32e72e1a241b8e61ae0c0a336265fa77389478cf0a74ce4612f980d5c97a46950440
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.7_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.7_p1.ebuild
new file mode 100644
index 000000000000..0178e0245253
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.7_p1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
+	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
+	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
+	tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+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 )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+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]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	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/${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/${PN} \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	rm -r usr/share/appdata || die
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9ce7e7b96092..ccc7e9487408 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/buku/buku-4.3.ebuild b/www-misc/buku/buku-4.3-r1.ebuild
similarity index 98%
rename from www-misc/buku/buku-4.3.ebuild
rename to www-misc/buku/buku-4.3-r1.ebuild
index 6dcf64f9dd50..96a36a815879 100644
--- a/www-misc/buku/buku-4.3.ebuild
+++ b/www-misc/buku/buku-4.3-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-misc/buku/buku-4.4.ebuild b/www-misc/buku/buku-4.4-r1.ebuild
similarity index 99%
rename from www-misc/buku/buku-4.4.ebuild
rename to www-misc/buku/buku-4.4-r1.ebuild
index a626d1b80273..6ea730152354 100644
--- a/www-misc/buku/buku-4.4.ebuild
+++ b/www-misc/buku/buku-4.4-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 4cb5a3c8c3eb..c4a8c6b1d608 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 213770e1d0b4..5150cf62c07f 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_86.0.4240.75-1_amd64.deb 71150268 BLAKE2B 0c23a141809f1915805c4a6dabd7edbf7bb46eb49df91586842cf6cd9cf28ce930847da21aed42bf198908c39124cc7b312d501814b3ca591072aea6708d34e4 SHA512 2e5378f29153f0225ac0344093644fda5d78876016debe985109de387b7b70670c2f49896dee2ff2f6c295e0967784e4b18da1001baa74af5fbb2619235db7ec
 DIST google-chrome-stable_86.0.4240.75-1_amd64.deb 71150488 BLAKE2B e94c5dd726b578f753348f692d32e3a731b50f02d12dfb151435477fa2c1785a0abcff8c2cdfe340d04eb89e4b87c28903d632047e783aa018cb2ec9898d0bfe SHA512 a6fddd9a7c5ff66cc9143a1435dc4bc4b4ff2150ceeb0aef3d31d1152f3e1d381e48869f39ffcd6ca76b91d3c9710923f02dd5963cb3fcd8fb1a5b930e8dd239
-DIST google-chrome-unstable_87.0.4278.0-1_amd64.deb 72610476 BLAKE2B b35e8494ed939ad609341a0ded272d6d51fa31202fcdc407f5379a015f703b1b5adf8cbe0708e552a9a6e001e6580a649bdd03059fb54979cb1fea32064d39c2 SHA512 2aee86b55637968601c69f9e7576cffa80262f77e7951f96737f5612eeef71cee188a2b68c846db8abc0c683ef91dac95cc0e66f75c3b4d9cc31a4d0ec6f59bf
+DIST google-chrome-unstable_87.0.4280.11-1_amd64.deb 76191448 BLAKE2B a4d0abd8045822518c936fbef1d55eeee93376eb053a7d30ec335a7f8cd3aeffc90cc00781434c285e4a82a9da73c559bd21a90573a87775571409f6f381fdf8 SHA512 5f1fe1afe598eb1d3436a666902eda4d389c30362a112251782303e8caa323d30f3ccaae4de6aadf0fa6c6e860295d80ff3c29245d999a0dcf8aa4e8b048baab
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4278.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.11_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4278.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.11_alpha.ebuild
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index baa12b251463..e375c87ad77f 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index 7fa675f5075e..e84d025f2a9f 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -52,7 +52,6 @@ pkg_setup() {
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-default-vt=${DEFAULTVT}
 		--with-xdmconfigdir=/etc/X11/xdm
-		--without-consolekit
 	)
 }
 
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 579b8f1619b2..12298e227c96 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ec5dd66b0b90..6ad8a33abea0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,6 +7,7 @@ DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 9d8eddcf3a58787a03fab
 DIST NVIDIA-FreeBSD-x86_64-450.66.tar.gz 82963662 BLAKE2B 8b0e0993600b4b9b5fa1648444f677c5a9f27523cdd8e3edbd67d7cecf67a7bcc2b975dface68dfa16e7d31f2219b0283f9313f4bd37023344bb8c4515a85c0f SHA512 744e912d7433a8db2af27f91854361054cc0085067951c03278a0ca1c6daacc7f9e34ed6db5bd87d78932c0836b28e77a79f306d6b5d3b43c2d21288774fb9fe
 DIST NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz 83040706 BLAKE2B d97bae80f6fdcec12fd12af0296f9ba44487cc83c86c14bc9f17d52e0e81107e1eaddd411d06d1bfd27c73bcf71300f7f49218d2a031540c0b42cd62998ef9aa SHA512 6dca92f20102a0432c6b92b7897a2ff5ec3da234af72907539026e18b1da55fc3ae01dc875be07ce9cae808ae4f9c08d2a2af1171db038c37bbba6ca9d03cf3a
 DIST NVIDIA-FreeBSD-x86_64-455.23.04.tar.gz 94602240 BLAKE2B ea9ea6904b0dd59c3f35d2c94a9bd80f06376119c601cb03abc2312b5a94f3c92269c9d5b55e8fe9cd1cb08c6a1929078ba7f88a1ae40e562078f26c5226fd00 SHA512 876b1b969bcd35801edf7d4dda7e6d8e65a61720d48884a6a4381b9f4b8838622582b9bd38e396d0a03dfd2ae9dfdc23e581722e95bdf7ac53c29ff95af4735a
+DIST NVIDIA-FreeBSD-x86_64-455.28.tar.gz 94617354 BLAKE2B 8f98bd4a750ba4af84453e3d9722c133e27914a84574973b378b078c47395e29fa7194172d230888f6693626d1cc84ba2403a8bdd5d1de6601ce057437b13bfd SHA512 94ff49da3ee106884a1ed91b36e4d028c4f0c1042ae2b329db81e039aafba7fefafcacfac6cab4c07ed2ee244146c9496435fb59e53ae608b92034e196da185c
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d SHA512 2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
 DIST NVIDIA-Linux-x86-390.132.run 48152101 BLAKE2B f1e76c2796d12476a35701607226483a34ee3b50a0c7dc03e3626e8cab4250b07c0f5aa238a0d5d5b65b79dc504963f2723089108281668b2f4fae03f4bf25c5 SHA512 12b0f80b4bbaebc984c7dbacd365795646c7697606242b05095ac61d69d89ab89fded47d583b4b99793ebcea9e38ec1e7b63dda1c2fdce53ab697cafcdbb3a85
@@ -18,6 +19,7 @@ DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B a62e6324f5ac6033c1c4b5948
 DIST NVIDIA-Linux-x86_64-450.66.run 141068918 BLAKE2B de8f76eade30bcd040d4a022edb96ab00be00190ed2a86b96584a4b147a2da935f8e83411f01d03f747c875a652f8e6f843bf273f905f1e8fa334e263bd941f3 SHA512 d4408cf2274602b7ee28f1056b8875468e8b9dae9f9e2dd8fe2dc505cbcdbb76eff2e2182252b8d5182008046ed5ca33c2fdc15d46e4c854b7ca46325724bc67
 DIST NVIDIA-Linux-x86_64-450.80.02.run 141055124 BLAKE2B bc4440bb65e4980863f4eb8aa2875a883cbe67f142c8afabe6023956ca2cb765666a5c8a308175c32162194ed821618d2595ad6e45188caf8813d8c8582dc6ea SHA512 ec5c57ed9ac897c671e4b29e0ef4f6a0c233fd4a04d1947a21c3646ddfce38322864cbc607e94e6a74506d99e7b9088cb497b562874a5837d94c000348c97823
 DIST NVIDIA-Linux-x86_64-455.23.04.run 167691811 BLAKE2B 6a3baf79f6cbada9bf7a21604a60657d88f3df477d308222f8a75e1e9e9bc51ccad4d7de8f32e6cab4c4c910abb65aff1e932a8118a732ce5ef98d9d272dc637 SHA512 96e8267ea76bf42f0c8be67d27b4d2a6f180cbea9348feb19c313805dc7957a945992d11ea4a1233d7cf96c75254b717d48153db0fe6aed8146bffd041f50a6e
+DIST NVIDIA-Linux-x86_64-455.28.run 168953614 BLAKE2B 7f6ef29932c73eaefdbe6c006a35f5f8baea05eb6b7beea129b9b5d77e9342e6a920af63a303f08fcabc136f8635bd6d122820712d77231df67505f46a40011f SHA512 1456ccf29461816ee4a7cdfabe8b5a3e021d4959e8ea8ee88e83f9058683baee4a2e7d31e02bbb22f1c0c6d25163bd2314385ebde1b8896159b6964878381720
 DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea SHA512 12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
 DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc8b4e6fb92e340aae6d65f0a0583db159478fb11f8d5c4cf0fa5ef87098ec1582ccb896fec9f2bf81e4c748b8ff5ee5d73af6b SHA512 6c54ff039840098c23f2091b4c33ab2b712ff90c16829c568bc39c9375cb2f4fb677bb5ab90efcf2034b15a1d93d13f1fbb40dde1d90092073af7d9f3c16de97
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
@@ -25,3 +27,4 @@ DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269
 DIST nvidia-settings-450.66.tar.bz2 1057263 BLAKE2B 8ec77f96bafec823b1e668cb695dfbe84ec31aa86310b0584bb416299dcf378324c97c4924112a89015bbbdeefb3c8556fc6fb5d76f973c29ce80766241af4db SHA512 82d20b479e5d11862b304dfa0b15e724b1f63692765237cb3d0fc4e5cd6f6d954a36f2c6872d0ccb2d29cfcd31b0c207f1172112a623b79a0e49b276223c7785
 DIST nvidia-settings-450.80.02.tar.bz2 1057306 BLAKE2B 8bd5e3b75c2941c49a6ae3d4e6c1eacd22fe63cf56aae2cc83d58e5be6d72ef58b5abbee757265e799c075d907e37f7d1bba389b8b912c53994c60eed2e71623 SHA512 1724bd5171eaa54d82c12e35890a4289e301b1a6c11c1a6c05ec0a6f0275cbf532011235d8121d7b5882a640cf42c32b3be3eb22ae036dd5a2b8a372c7b5b7f7
 DIST nvidia-settings-455.23.04.tar.bz2 1056064 BLAKE2B b9ee7bd874d693f45eafa1dfa55fec9839147195b9d10db740392694304b54fd5e7482eb6d5084e72a74056101047a58f1251086e80421b9299b73f780dad3b5 SHA512 55b71944da62a529e7ba7776b7e584213cd97469e76183dde5e98723b276a33ba8ac0ee6052849001875902a101a0363408d5546e8327707ef4135775c98d6e3
+DIST nvidia-settings-455.28.tar.bz2 1056911 BLAKE2B b2a19fce197901b395bcf3e4c81e6d2589441e7da4297f1d5fb20ffd5ec8946428577d08f4500d9a1bcc92190ae9e7beaef5622921e74553b911f8c63b3f1231 SHA512 418a9cc7c98a6248b27aac5d39faeb89de537bfa04ae858e31ad362499042c02212ad6740b8b482aaae92ae7e4c038a305bab309a2caa2cc3f944c50160d033d
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
index a52d05345629..123424138e83 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r4.ebuild
@@ -57,7 +57,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
index 7945a6a20592..a851136b1f81 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
@@ -57,7 +57,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
index 4c34eee7c731..18d9f7ed2272 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
@@ -52,7 +52,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
index a25f1dee5338..812530139112 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
@@ -52,7 +52,7 @@ COMMON="
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.66.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.66.ebuild
index a6cfef61e6cd..d67d190f2134 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.66.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.66.ebuild
@@ -50,12 +50,13 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		app-misc/pax-utils
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
 		=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
 	kernel_linux? ( net-libs/libtirpc )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
index ff32bf7fafa9..af9724937594 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
@@ -50,12 +50,13 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		app-misc/pax-utils
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
 		=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
 	kernel_linux? ( net-libs/libtirpc )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild
index cc07abf0b33e..80fd5f19687b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.23.04-r1.ebuild
@@ -50,12 +50,13 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		app-misc/pax-utils
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			media-libs/libglvnd[${MULTILIB_USEDEP}]
 			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
-		app-misc/pax-utils
 	)
 "
 DEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
 		=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
 	kernel_linux? ( net-libs/libtirpc )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild
new file mode 100644
index 000000000000..80fd5f19687b
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild
@@ -0,0 +1,595 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+	nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* ~amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	driver? ( kernel_linux? ( acct-group/video ) )
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		app-misc/pax-utils
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			!app-eselect/eselect-opengl
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		)
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+	kernel_linux? ( net-libs/libtirpc )
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+PATCHES=(
+	"${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.9"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
+	~SYSVIPC
+"
+
+pkg_pretend() {
+	nvidia-driver_check
+}
+
+pkg_setup() {
+	nvidia-driver_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+
+		if kernel_is lt 2 6 9; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD OBJCOPY
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch \
+			|| die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	insinto /etc/vulkan/icd.d
+	doins nvidia_icd.json
+
+	insinto /etc/vulkan/implicit_layer.d
+	doins nvidia_layers.json
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	systemd_dounit *.service
+	dobin nvidia-sleep.sh
+	exeinto /lib/systemd/system-sleep
+	doexe nvidia
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(multilib_get_enabled_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	dodoc supported-gpus.json
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+		if ! use libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.5"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-ngx.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(getent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+
+	elog "To enable nvidia sleep services under systemd, run these commands:"
+	elog "	systemctl enable nvidia-suspend.service"
+	elog "	systemctl enable nvidia-hibernate.service"
+	elog "	systemctl enable nvidia-resume.service"
+	elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+	elog "suitable path in case the default of /tmp does not work for you"
+	elog "For more information see:"
+	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 74cf7fb34a0a..ac0a5362bd98 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 493631909bf1..67c5258709bd 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1 +1,2 @@
 DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
+DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
new file mode 100644
index 000000000000..4ea5805f7f0b
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6/1.5"
+IUSE="designer doc examples mathml opengl svg"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	opengl? (
+		dev-qt/qtopengl:5
+		virtual/opengl
+	)
+	svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES-6.1 README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+)
+
+src_prepare() {
+	default
+
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+	EOF
+
+	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+	cat >> qwtconfig.pri <<-EOF
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+	EOF
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+		-e "/^TARGET/s:qwt):qwt6-qt5):g" \
+		-i src/src.pro || die
+
+	sed \
+		-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+		-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	cd examples || die
+	eqmake5 examples.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	if use mathml; then
+		sed \
+			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
+			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+	fi
+
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	einstalldocs
+
+	mkdir -p "${ED}"/usr/share/man/ || die
+	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+		rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}6
+		doins -r examples
+	fi
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 85d88eddbd39..be5bcf23dc94 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
index 3d6fb689e682..78cead766566 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 7dec5336b1ef..1635a0a689ac 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dbus"
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
@@ -25,6 +26,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/linguist-tools:5
 "
 DOCS=( README.md doc/vym.pdf )
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index 539db055b531..a5984727412e 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
+PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW"
 inherit desktop git-r3 l10n qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
+HOMEPAGE="https://www.insilmaril.de/vym/"
 EGIT_REPO_URI="https://git.code.sf.net/p/vym/code"
 
 LICENSE="GPL-2"
@@ -15,6 +15,7 @@ KEYWORDS=""
 IUSE="dbus"
 
 RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
@@ -24,6 +25,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/linguist-tools:5
 "
 DOCS=( README.md )
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
index 50dc3af73944..494313069e74 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"