diff --git a/Manifest.files.gz b/Manifest.files.gz
index 56f542ba9017..774a6e78d5d7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index db297e07d8aa..4e1dfb62d93f 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fish/fish-3.1.2.ebuild b/app-shells/fish/fish-3.1.2.ebuild
index 8e420aa0e48b..a50c8dfeff34 100644
--- a/app-shells/fish/fish-3.1.2.ebuild
+++ b/app-shells/fish/fish-3.1.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
else
SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f08b2ac895c5..a796b44e40bd 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 89bf12dd2bbd..1b8ec6960d0a 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
# Sablotron can optionally be built under GPL, using MPL for now
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 5af66d2ff1bf..c38e788958cb 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
index 8390195bb165..c7686d3e76f2 100644
--- a/dev-db/phppgadmin/metadata.xml
+++ b/dev-db/phppgadmin/metadata.xml
@@ -6,6 +6,6 @@
Tupone Alfredo
- phppgadmin
+ phppgadmin/phppgadmin
diff --git a/dev-db/unixODBC/unixODBC-2.3.9.ebuild b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
index 881e87660d38..cefa55fb11f0 100644
--- a/dev-db/unixODBC/unixODBC-2.3.9.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f81728db1b5b..83bf2a80242f 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index 3f5263fc2371..56efba866a33 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -82,10 +82,6 @@ src_prepare() {
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
- # Fix build for Windows platform
- # https://bugzilla.gnome.org/show_bug.cgi?id=760456
- # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
# Fix python detection, bug #567066
# https://bugzilla.gnome.org/show_bug.cgi?id=760458
eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
@@ -182,15 +178,6 @@ multilib_src_install() {
}
multilib_src_install_all() {
- # on windows, xmllint is installed by interix libxml2 in parent prefix.
- # this is the version to use. the native winnt version does not support
- # symlinks, which makes repoman fail if the portage tree is linked in
- # from another location (which is my default). -- mduft
- if [[ ${CHOST} == *-winnt* ]]; then
- rm -rf "${ED}"/usr/bin/xmllint
- rm -rf "${ED}"/usr/bin/xmlcatalog
- fi
-
rm -rf "${ED}"/usr/share/doc/${P}
einstalldocs
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index 1143f60faddb..d1e71d4e5020 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index c0c11a81d414..bd5a23dfc3ed 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
index 73db2978201f..5ce35bafda96 100644
--- a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
index 6b79666dab62..32e5559d8548 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
index 24bc536d4d03..b178b2cb055d 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index 53576524a259..9074b9e27c38 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="examples"
S="${WORKDIR}/manifest-${PV}"
diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index 1ddbd002159e..b16de9376adf 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
S="${WORKDIR}/version-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
index 3dad3fd76a4c..0b396d498f72 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/prophecy-${PV}"
diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild
index 27257dd7656d..5d87e3517972 100644
--- a/dev-php/phpunit/phpunit-8.5.11.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
BDEPEND="dev-php/theseer-Autoload"
@@ -36,7 +36,9 @@ RDEPEND="dev-php/fedora-autoloader
dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
- )"
+ )
+ !dev-php/phpunit-mock-objects
+"
src_prepare() {
default
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
index 6a72c10c4c37..1967df759685 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
index 50d48dc717ed..5fa9f76c31c8 100644
--- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
index 05fd48dc1ca7..7de2b3bc07d0 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
index f2aaba7905c9..707301722613 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
index c0b63b0beb3e..90dcda08ea79 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
index 56dd2650e473..aa39559702b3 100644
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
index 830d78275012..fc0a0fd747d0 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
index 678588caefb6..e79868e3a85c 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
index f3e2397ed3a3..927ccabd7bf5 100644
--- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+++ b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index 62e97098c22f..54bd9135e64f 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 74be56b348aa..4c359d3a8ae6 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index 2a0026b402b3..8717574cc0bf 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index 9d3434897bd1..df9262e51479 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-arch/brotli:=
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
index 3db61f22ba83..81319ba899c0 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
index 86510b350757..b09c37cd68ae 100644
--- a/dev-python/multidict/multidict-5.1.0.ebuild
+++ b/dev-python/multidict/multidict-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
index f50d28c17e11..5fa84d6565c5 100644
--- a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1cfab3235aa3..0426a50c39a0 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 96b1f416a4a4..724f64f412cc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 20:08:34 +0000
+Thu, 07 Jan 2021 20:38:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 96b1f416a4a4..4a60b11d9391 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 20:08:34 +0000
+Thu, 07 Jan 2021 20:38:39 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 88775057768f..a39f3e1eaace 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 4dbad96b199a..acb4eee077ea 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/fish-3.1.2 b/metadata/md5-cache/app-shells/fish-3.1.2
index 0e12270ea20d..196318bc5661 100644
--- a/metadata/md5-cache/app-shells/fish-3.1.2
+++ b/metadata/md5-cache/app-shells/fish-3.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Friendly Interactive SHell
EAPI=7
HOMEPAGE=http://fishshell.com/
IUSE=doc nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz
_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=27e9d8dcb300855af5ab4a4acc492297
+_md5_=49a2e22ac2bce1807175137f10039e60
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5bda6caf951c..0e360b0a0089 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/sablotron-1.0.3-r2 b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
index f7612ff74079..93afa07b252f 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r2
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=An XSLT Parser in C++
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/sablotron/
IUSE=perl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=MPL-1.1
RDEPEND=>=dev-libs/expat-1.95.6-r1
SLOT=0
SRC_URI=mirror://sourceforge/sablotron/Sablot-1.0.3.tar.gz
_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=d306ce8ae2ebb2d71a712cee8753d030
+_md5_=4bc3d07394b7bf9de65118bb544eeabb
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index dfe0d4ee0f96..b6209c42a64e 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/unixODBC-2.3.9 b/metadata/md5-cache/dev-db/unixODBC-2.3.9
index eedf93ad1b8e..343467524455 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.9
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.9
@@ -5,10 +5,10 @@ DESCRIPTION=A complete ODBC driver manager
EAPI=7
HOMEPAGE=http://www.unixodbc.org/
IUSE=+minimal odbcmanual static-libs unicode 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=|| ( dev-libs/libltdl: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/libtool-2.4.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(-)?] ) >=sys-libs/readline-6.2_p5-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(-)?] >=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(-)?] >=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(-)?]
SLOT=0
SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz
_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=49f6030f1a06bdae708369a076bafcdd
+_md5_=0ca7e5bee8957431dd9533b3dc992531
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a4a3017a7d91..a508421286d6 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/libxml2-2.9.10-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
index 99eea420ab1e..9834cf22005d 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=2
SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 prefix de7d8e2b10085ed5ff09ad70e4753e5c python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c89245cfcbacfd4f1f76b76bb4a26831
+_md5_=c37c15d45994d39e26e5cf338011a23f
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.14.0 b/metadata/md5-cache/dev-libs/protobuf-3.14.0
index 77f61e91a42e..d3e74a005169 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.14.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
EAPI=7
HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
IUSE=emacs examples static-libs test 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
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD
RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( 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/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb edos2unix 33e347e171066657f91f8b0c72ec8773 elisp-common 34cc2b6f6d8914019a353fe39cff43ce eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=19f243956728975467f216abc4416b9c
+_md5_=c7292c2d8332f297a6ef65a3d468bb9f
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 61fbf57dc264..d84c6799ceec 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PHP_Timer-2.1.2-r1 b/metadata/md5-cache/dev-php/PHP_Timer-2.1.2-r1
index 5f0e2be88bcb..96fe9f622d2c 100644
--- a/metadata/md5-cache/dev-php/PHP_Timer-2.1.2-r1
+++ b/metadata/md5-cache/dev-php/PHP_Timer-2.1.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=Utility class for timing
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann/php-timer/archive/2.1.2.tar.gz -> PHP_Timer-2.1.2.tar.gz
-_md5_=6ec84719e8cb9a05b70c767cfb308ba7
+_md5_=a5a062a24fbe218c5e4f4ee690bdc106
diff --git a/metadata/md5-cache/dev-php/doctrine-instantiator-1.3.1 b/metadata/md5-cache/dev-php/doctrine-instantiator-1.3.1
index f49541d4a6ee..62c3f809cbf6 100644
--- a/metadata/md5-cache/dev-php/doctrine-instantiator-1.3.1
+++ b/metadata/md5-cache/dev-php/doctrine-instantiator-1.3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
EAPI=7
HOMEPAGE=https://github.com/doctrine/instantiator
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=MIT
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/doctrine//instantiator/archive/1.3.1.tar.gz -> doctrine-instantiator-1.3.1.tar.gz
-_md5_=9b3e2345c177e5b90de98c958616f1c0
+_md5_=a95d9cdf5ef0a5570e3000fca688aefe
diff --git a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.10.2 b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.10.2
index d33c22e99033..3d120d93d247 100644
--- a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.10.2
+++ b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.10.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Create deep copies (clones) of your objects
EAPI=7
HOMEPAGE=https://github.com/myclabs/DeepCopy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=MIT
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.10.2.tar.gz -> myclabs-deepcopy-1.10.2.tar.gz
-_md5_=256f797db61b6ca1d8d7ec804ef247a2
+_md5_=6fedb8723099df8d70c6576830a3349a
diff --git a/metadata/md5-cache/dev-php/phar-io-manifest-1.0.3 b/metadata/md5-cache/dev-php/phar-io-manifest-1.0.3
index 9da378c949e8..973ce778ebcf 100644
--- a/metadata/md5-cache/dev-php/phar-io-manifest-1.0.3
+++ b/metadata/md5-cache/dev-php/phar-io-manifest-1.0.3
@@ -3,9 +3,9 @@ DESCRIPTION=Reading phar.io manifest information from a PHP Archive (PHAR)
EAPI=7
HOMEPAGE=https://github.com/phar-io/manifest
IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-php/phar-io-version-2 dev-lang/php:*[phar]
SLOT=0
SRC_URI=https://github.com/phar-io/manifest/archive/1.0.3.tar.gz -> phar-io-manifest-1.0.3.tar.gz
-_md5_=6994e1d57559f060763fdf497aab714f
+_md5_=daa1044b7c3623c342b4831f1df9c2ff
diff --git a/metadata/md5-cache/dev-php/phar-io-version-2.0.1 b/metadata/md5-cache/dev-php/phar-io-version-2.0.1
index b6f483f2dff4..32ad04a87eb1 100644
--- a/metadata/md5-cache/dev-php/phar-io-version-2.0.1
+++ b/metadata/md5-cache/dev-php/phar-io-version-2.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Library for handling version information and constraints
EAPI=7
HOMEPAGE=https://github.com/phar-io/version
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader dev-lang/php:*
SLOT=0
SRC_URI=https://github.com/phar-io/version/archive/2.0.1.tar.gz -> phar-io-version-2.0.1.tar.gz
-_md5_=75f608906a0f4d8818cf9a5eff8ea865
+_md5_=0dc155ca3c01950930b59130476d4692
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
index f03048860978..8e28c470ec9b 100644
--- a/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
+++ b/metadata/md5-cache/dev-php/phpspec-prophecy-1.10.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Highly opinionated mocking framework
EAPI=7
HOMEPAGE=https://github.com/phpspec/prophecy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=MIT
RDEPEND=dev-php/fedora-autoloader =dev-lang/php-5.6:*
SLOT=0
SRC_URI=https://github.com/phpspec/prophecy/archive/v1.10.3.tar.gz -> phpspec-prophecy-1.10.3.tar.gz
-_md5_=988f2020bdc588e94e5104abb2a213a6
+_md5_=c7bcfec5b0e328e8263e7b2bd29a15e9
diff --git a/metadata/md5-cache/dev-php/phpunit-8.5.11 b/metadata/md5-cache/dev-php/phpunit-8.5.11
index d32ad2cfd06f..55b0029b979e 100644
--- a/metadata/md5-cache/dev-php/phpunit-8.5.11
+++ b/metadata/md5-cache/dev-php/phpunit-8.5.11
@@ -3,9 +3,9 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=A PHP Unit Testing framework
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_CodeCoverage-7.0.12 >=dev-php/PHP_Timer-2.1.2 >=dev-php/doctrine-instantiator-1.3.1 >=dev-php/myclabs-deepcopy-1.10.0 >=dev-php/phar-io-manifest-1.0.3 >=dev-php/phar-io-version-2.0.1 >=dev-php/phpspec-prophecy-1.10.3 >=dev-php/sebastian-comparator-3.0.2 >=dev-php/sebastian-diff-3.0.2 >=dev-php/sebastian-environment-4.2.3 >=dev-php/sebastian-exporter-3.1.2 >=dev-php/sebastian-global-state-3.0.0 >=dev-php/sebastian-object-enumerator-3.0.3 >=dev-php/sebastian-resource-operations-2.0.1 >=dev-php/sebastian-type-1.1.3 >=dev-php/sebastian-version-2.0.1 || ( dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] )
+RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-2.0.2 >=dev-php/Text_Template-1.2.1 >=dev-php/PHP_CodeCoverage-7.0.12 >=dev-php/PHP_Timer-2.1.2 >=dev-php/doctrine-instantiator-1.3.1 >=dev-php/myclabs-deepcopy-1.10.0 >=dev-php/phar-io-manifest-1.0.3 >=dev-php/phar-io-version-2.0.1 >=dev-php/phpspec-prophecy-1.10.3 >=dev-php/sebastian-comparator-3.0.2 >=dev-php/sebastian-diff-3.0.2 >=dev-php/sebastian-environment-4.2.3 >=dev-php/sebastian-exporter-3.1.2 >=dev-php/sebastian-global-state-3.0.0 >=dev-php/sebastian-object-enumerator-3.0.3 >=dev-php/sebastian-resource-operations-2.0.1 >=dev-php/sebastian-type-1.1.3 >=dev-php/sebastian-version-2.0.1 || ( dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] ) !dev-php/phpunit-mock-objects
SLOT=0
SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/8.5.11.tar.gz -> phpunit-8.5.11.tar.gz
-_md5_=5fab6b74477b94e4536313f0a8a504c0
+_md5_=28666633f0561f298a609ce04e3f8497
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2 b/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
index 30bae7f00472..38f5cc495d6a 100644
--- a/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
+++ b/metadata/md5-cache/dev-php/sebastian-comparator-3.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Compare PHP values for equality
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-php/sebastian-diff-3.0 =dev-php/sebastian-exporter-3.1 =dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann//comparator/archive/3.0.2.tar.gz -> sebastian-comparator-3.0.2.tar.gz
-_md5_=f9a0af769b406a333ce4a387627955fb
+_md5_=23595624c7d0d44f44798b54c0d0b707
diff --git a/metadata/md5-cache/dev-php/sebastian-diff-3.0.2 b/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
index 6778154e80aa..7620525bb121 100644
--- a/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
+++ b/metadata/md5-cache/dev-php/sebastian-diff-3.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=PHP Diff implementation
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann/diff/archive/3.0.2.tar.gz -> sebastian-diff-3.0.2.tar.gz
-_md5_=596302c552860893aff299afcc957192
+_md5_=e47d31154d479eef50915469636d56aa
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2 b/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
index 0b0f4f5fae70..8d407f09170e 100644
--- a/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
+++ b/metadata/md5-cache/dev-php/sebastian-exporter-3.1.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Export PHP variables for visualization
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-3* =dev-lang/php-7*:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann//exporter/archive/3.1.2.tar.gz -> sebastian-exporter-3.1.2.tar.gz
-_md5_=1171e8239484ccd831899e4502d15d52
+_md5_=9c7f12fef1106bc2c050e119eedd9ac8
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0 b/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
index a3faa78a962a..5afb2c50413a 100644
--- a/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-global-state-3.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Snapshotting of global state
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:* >=dev-php/sebastian-object-reflector-1.1.1 sebastian-global-state-3.0.0.tar.gz
-_md5_=ef6baca7bdd1dfd30506ec5ae7df77c3
+_md5_=cf7c825dccb88ea7f28560e09f6da1bf
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
index 224808e87d72..93ab06dc3aba 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
+++ b/metadata/md5-cache/dev-php/sebastian-object-enumerator-3.0.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-3.0 sebastian-object-enumerator-3.0.3.tar.gz
-_md5_=e9a2fad84c8e7fc11b04f425b481cf26
+_md5_=a55b76d27dee6a6a7ddca71ecf93e615
diff --git a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1 b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
index 3170907af558..d0560f86e715 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
+++ b/metadata/md5-cache/dev-php/sebastian-object-reflector-1.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Allows reflection of object attributes, including inherited and non-public ones
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann/object-reflector/archive/1.1.1.tar.gz -> sebastian-object-reflector-1.1.1.tar.gz
-_md5_=41d398e881604975a01a5e56ff2fda63
+_md5_=e8a35c63c9cc22798ce12b8b9e4f2e21
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
index 686063f5ee98..1bab04237aca 100644
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-recursion-context-3.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Recursively process PHP variables
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader =dev-lang/php-7*:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/3.0.0.tar.gz -> sebastian-recursion-context-3.0.0.tar.gz
-_md5_=085d79193c0e29f1792140427ec931f6
+_md5_=7d4beb8739bbf676efa5388f3e11f078
diff --git a/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1 b/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
index 6a766a51eba3..b865cbb4530d 100644
--- a/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-resource-operations-2.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Provides a list of PHP built-in functions that operate on resources
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann//resource-operations/archive/2.0.1.tar.gz -> sebastian-resource-operations-2.0.1.tar.gz
-_md5_=3eec1fb3b4e3d7af757bf0e9c404dfb1
+_md5_=1c9af260b92cc79fd18da1d68f5e390f
diff --git a/metadata/md5-cache/dev-php/sebastian-type-1.1.3 b/metadata/md5-cache/dev-php/sebastian-type-1.1.3
index 4efe69f4035e..f0ec0cd595ed 100644
--- a/metadata/md5-cache/dev-php/sebastian-type-1.1.3
+++ b/metadata/md5-cache/dev-php/sebastian-type-1.1.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Collection of value objects that represent the types of the PHP type system
EAPI=7
HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=BSD
RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.2:*
SLOT=0
SRC_URI=https://github.com/sebastianbergmann/type/archive/1.1.3.tar.gz -> sebastian-type-1.1.3.tar.gz
-_md5_=3566f79fc7b60f7a394f658509afe208
+_md5_=e5a5e98631fa021d7027ac0cdb2532c1
diff --git a/metadata/md5-cache/dev-python/Babel-2.9.0 b/metadata/md5-cache/dev-python/Babel-2.9.0
index 3c1a95fa1eda..8896a1b59525 100644
--- a/metadata/md5-cache/dev-python/Babel-2.9.0
+++ b/metadata/md5-cache/dev-python/Babel-2.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of tools for internationalizing Python applications
EAPI=7
HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/
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 ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos
LICENSE=BSD
RDEPEND=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(-)] python_targets_pypy3? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) 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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/B/Babel/Babel-2.9.0.tar.gz
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=2201e872ed7f567903965213e072f17a
+_md5_=4196a4e68528248fb319b9d4e1b7b044
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7a08cbbfe7cd..7b85b2fb6c80 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/backports-zoneinfo-0.2.1-r1 b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
index ff2a252144f9..c319143eee46 100644
--- a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of the standard library zoneinfo module
EAPI=7
HOMEPAGE=https://github.com/pganssle/zoneinfo/
IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos
LICENSE=Apache-2.0
RDEPEND=python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/pganssle/zoneinfo/archive/0.2.1.tar.gz -> zoneinfo-0.2.1.tar.gz
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=8436c2c9de5300ff40d0400c9d220c7a
+_md5_=afa006ceb4d8da5761b35ec59124e128
diff --git a/metadata/md5-cache/dev-python/brotlicffi-0.8.0 b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
index 62bd5312be27..4cb9ee3fb362 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-0.8.0
+++ b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
EAPI=7
HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
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 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=app-arch/brotli:= virtual/python-cffi[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v0.8.0.tar.gz -> brotlicffi-0.8.0.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=42b248a138514196cb5fda61705d2280
+_md5_=dc3d85ceb2eb9a677594eaebfcd9bab0
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
index ede871d3245a..0d4b8c2f4a8d 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP Request and Response Service
EAPI=7
HOMEPAGE=https://github.com/postmanlabs/httpbin https://pypi.org/project/httpbin/
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 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=MIT
RDEPEND=dev-python/brotlicffi[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/decorator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[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/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/werkzeug-0.14.1[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/h/httpbin/httpbin-0.7.0.tar.gz
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=30e49b7c1067edc0413cffeef3b5e435
+_md5_=8708cafbedc6435dcebe94721b69f5cf
diff --git a/metadata/md5-cache/dev-python/multidict-5.1.0 b/metadata/md5-cache/dev-python/multidict-5.1.0
index a7c667ab6626..8171b40ebe59 100644
--- a/metadata/md5-cache/dev-python/multidict-5.1.0
+++ b/metadata/md5-cache/dev-python/multidict-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
EAPI=7
HOMEPAGE=https://github.com/aio-libs/multidict/
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 ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
LICENSE=Apache-2.0
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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/aio-libs/multidict/archive/v5.1.0.tar.gz -> multidict-5.1.0.tar.gz
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=97fb4cf7c8e5bcb97e99ccddb27acd7b
+_md5_=285ef0eaa70ff7e8fc154eb3ed14cce4
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.14.0 b/metadata/md5-cache/dev-python/protobuf-python-3.14.0
index 8f7261a7e88b..ca6a31734e0d 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.14.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.14.0
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
EAPI=7
HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
IUSE=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 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD
RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) 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-libs/protobuf-3.14.0 dev-python/namespace-google[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[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(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0/25
SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 1a94dc06d324bd0dab754e11abe6d27e
-_md5_=623849d63c28b0a471882686ac0f8a19
+_md5_=508e35792ffdae430c1a0bb4c567ef52
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 96b1f416a4a4..4a60b11d9391 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 20:08:34 +0000
+Thu, 07 Jan 2021 20:38:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0f04be13449f..0b1418ad1750 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 7 08:08:34 PM UTC 2021
+Thu Jan 7 08:38:38 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1dd9bf21a4bd..36c19e207314 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 20:30:01 +0000
+Thu, 07 Jan 2021 21:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6a98e888711d..685e6c5f1ac6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eba35ffd1d6e367e89d334e54432bd66f1b1ea41 1610049564 2021-01-07T19:59:24+00:00
+3b13f4c12d8eaccc0f6c04accc420f5231326722 1610050999 2021-01-07T20:23:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 89b8c89d4126..f770f86b7fc1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1610049902 Thu 07 Jan 2021 08:05:02 PM UTC
+1610051701 Thu 07 Jan 2021 08:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 96b1f416a4a4..724f64f412cc 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 07 Jan 2021 20:08:34 +0000
+Thu, 07 Jan 2021 20:38:38 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 94a3848e4424..4faa86d4d03b 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/prefix/linux/x86/profile.bashrc b/profiles/prefix/linux/x86/profile.bashrc
deleted file mode 100644
index 5e3242d8ff41..000000000000
--- a/profiles/prefix/linux/x86/profile.bashrc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-
-# When x86-linux runs on an amd64 host having /lib32,
-# we need to have binutils to search there too (#360197).
-# The patches to do so are applied upon SYMLINK_LIB=yes,
-# needed when /lib32 is (a symlink to) an existing directory.
-if [[ ${CATEGORY}/${PN} = sys-devel/binutils ]] \
-&& [[ ${EBUILD_PHASE} == setup ]] \
-&& [[ -d ${ROOT}lib32/. ]] \
-; then
- export SYMLINK_LIB=yes
-fi