diff --git a/Manifest.files.gz b/Manifest.files.gz
index d890737a769d..ce695f56f54b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 07f288d27647..e2bb3dd7163d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild
index 92b83232fe06..8cb21b3ed999 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 8fbbdb0c1182..6eba3590e705 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,11 @@
 DIST postgresql-10.16.tar.bz2 19140221 BLAKE2B 37fccd3f5c72ac489cbc26225dcc6992fa7fd5884a0141ec093122f556d7959a053181e01c6892d2e322af54028bf40b2293d090afa6366739cdefd3f62abd73 SHA512 690649b4e2f4e0650e5b927048e06894e60c5cf1663bb63ab89143f49e5f753e590d3f011b44df3c402379953a9c23f4832f0cf97c984f03c37d14cb85c860aa
+DIST postgresql-10.17.tar.bz2 19153278 BLAKE2B 0f043a9e95a76b5b96572548b82ae35c0b9fb517214ea392e6ba278f78071811ea8942fd50c14508dc3380c797a2196b5c5cfadff299d6a379ee581db18e3489 SHA512 4989abe56cf631b367252c62f15c9f4a22a864a75d607fa29c2116c95e29f95bc3855df6b2fc88dbedcfc7b238d6732d13629fc967f09bbd3ea4d5c328cb925f
 DIST postgresql-11.11.tar.bz2 20054359 BLAKE2B d15a75319c53fb38a63e4e331567e32014e30fd8696ce19e4c50a458e866827f934d1bc7d28a0c28fddbf1ff7e9f61e5b3016cef27ed988ca43aabb3278bb64d SHA512 8d38e6b7826e73191159f1ee69efde28adc061e0041eb136f55681503a189355b869b2ff312860325d454c1f95367d921fb61dd2de31f584261f165f229bcdb9
+DIST postgresql-11.12.tar.bz2 20075485 BLAKE2B 0986a31662a307f76c230d7945495b42c70417835c8d7c7b6781d0ff4317607c736d9278a4b8bb95582799b771011efca256d9507d5bb9db423f3ad43eb220fb SHA512 668914424e1dbe09a66d5272e5b0a17fa24c90d3d099f8161f1420eaa76675ea1c622e4d149bdfcb31f07af19602a500913cb97c49d717df23e374de09dc0274
 DIST postgresql-12.6.tar.bz2 20771172 BLAKE2B 7df8eb901255f56b4574cdd94a5e9d5a907d800edded805d4e8a9d1b85e5aac1c9b1963c9f8980ff5c95607e046e8e92f35a808f009cfdd36d54e1aca2e35db0 SHA512 5742c9d861c53bbdd032972e63b706d24ccb39492474c446cf4edac235d57357f036e48727027819004177003c4328123148e3d767d2b3d7866a52f333f8d68d
+DIST postgresql-12.7.tar.bz2 20819005 BLAKE2B 4939cb314253bb9ca2b14639f730967ce7ad5c5eb135d529b112290e6b351f7b507d6428cc48b4e24f34f664b5f4938029ceb9cc6161c9aff5f60ba0b3f848c7 SHA512 47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44
 DIST postgresql-13.2.tar.bz2 21057276 BLAKE2B 982feffdd98d3f519ff1e790d35ac828710d3ca6cbf935a78bf04011dbc12b4523b451bc7f2421a788a709d1746b2cca9135842bfc1d5048ef5951ed48b20b6a SHA512 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce
+DIST postgresql-13.3.tar.bz2 21119109 BLAKE2B 395a3dc5cde8f579a3c35ea70346bdc630a8e8f2f86f310a5e4f4a1f6177dab7e78ba6e41c384ba650eb86813fcd428fea8aa22481f9a494cd80aa94bd7b52dd SHA512 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60
 DIST postgresql-9.5.25.tar.bz2 17923796 BLAKE2B 432e035e78dacddddfd46fd4d04775b61e2e4db9e61945fa5f7e1c3c5ea3516a5e327489b4e57313b0d6ba4f2e20f52a164f96db01aa22b755ff625039f262eb SHA512 621b36d767d2c7eb2e942cb7b26ca7491450fcfd9606114849f7336b4d8a0bc0196badb44da4918e748145d21b6f72ccf1255a1309dff2427da8b39b63fca427
 DIST postgresql-9.6.21.tar.bz2 18990266 BLAKE2B 42a2feaf15b8fd4cfcc028a744a696314f0ce7b22ec6c18c43152d7e4b8149a9d5acd6cf22c1d13643709dd2b3f1de571e2925c7fc501dc361248c99c88e3f42 SHA512 6fba42171cbe4ec24ed250c32cc8f35be70ddfbc6d1ef0df733bbd094b29174ef198db351f6679a26170effe1fed44269dbe9dbdd619bb18be87f5b539f74475
+DIST postgresql-9.6.22.tar.bz2 19003741 BLAKE2B adff6e81ec4b289bd5c51fa44adb38d7cc3936e2e5545ff23fccb0f3f1fe1c881ed70f9a0a5d366319f876eb01a9f675b66c9374b8b41615220f45a70450ad6d SHA512 371f85f2d02a8a3b888396440149e9b432f91e106a7feb8a163b275a0586843683124281a0965abf3c1215cb68e2002976913f88c75e35e52ac5f78d4145fd7b
diff --git a/dev-db/postgresql/postgresql-10.17.ebuild b/dev-db/postgresql/postgresql-10.17.ebuild
new file mode 100644
index 000000000000..48326b1ee7d7
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.17.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap nls pam perl
+	  python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	# https://bugs.gentoo.org/766225
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch \
+		   "${FILESDIR}"/postgresql-10.0-icu68-2.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-11.12.ebuild b/dev-db/postgresql/postgresql-11.12.ebuild
new file mode 100644
index 000000000000..1a4ce65f78cb
--- /dev/null
+++ b/dev-db/postgresql/postgresql-11.12.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-12.7.ebuild b/dev-db/postgresql/postgresql-12.7.ebuild
new file mode 100644
index 000000000000..d1aafcadf2a0
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12.7.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-13.3.ebuild b/dev-db/postgresql/postgresql-13.3.ebuild
new file mode 100644
index 000000000000..3a172f350095
--- /dev/null
+++ b/dev-db/postgresql/postgresql-13.3.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-9.6.22.ebuild b/dev-db/postgresql/postgresql-9.6.22.ebuild
new file mode 100644
index 000000000000..5c7e9f2653e2
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6.22.ebuild
@@ -0,0 +1,478 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1-2)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc kerberos kernel_linux ldap nls pam perl
+	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  static-libs tcl threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-${SLOT}.3-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable !pg-legacytimestamp integer-datetimes) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT/.}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		# Temporarily tack on tmp to workaround a file collision
+		# issue. This is only necessary for 9.7 and earlier. 10 never
+		# had this issue.
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}tmp"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Find all of the slot-specific symlinks, if any, in /usr/bin (e.g.,
+	# /usr/bin/psql96). They may have been created by the
+	# postgresql.eselect module, but they're handled within this ebuild
+	# now. It's alright if we momentarily delete /usr/bin/psql as it
+	# will be recreated by the eselect module in pkg_ppostinst(). This
+	# is only necessary for 9.7 and earlier. 10 and later were never
+	# handled in this manner.
+	local canonicalise
+	if type -p realpath > /dev/null; then
+		canonicalise=realpath
+	elif type -p readlink > /dev/null; then
+		canonicalise='readlink -f'
+	else
+		# can't die, subshell
+		die "No readlink nor realpath found, cannot canonicalise"
+	fi
+
+	local l
+	# First remove any symlinks in /usr/bin that may have been created
+	# by the old eselect
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
+			rm "${l}" || ewarn "Couldn't remove ${l}"
+		fi
+	done
+
+	# Then move the symlinks created by the ebuild to their proper place.
+	for l in "${ED}"/usr/bin/*tmp ; do
+		mv "${l}" "${l%tmp}" \
+			|| ewarn "Couldn't rename $(basename ${l}) to $(basename ${l%tmp})"
+	done
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 69fcd2a28224..fec08073c406 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
index a3ff872376f8..596d01232017 100644
--- a/dev-java/commons-lang/commons-lang-3.12.0.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
 SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 642e27cbcfec..041b1f2e5647 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/abcl/abcl-1.8.0.ebuild b/dev-lisp/abcl/abcl-1.8.0.ebuild
index fdf7e5a4c742..ed631f697127 100644
--- a/dev-lisp/abcl/abcl-1.8.0.ebuild
+++ b/dev-lisp/abcl/abcl-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 60dfbcd89ecc..6de4698c2ea9 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild
index facb4470ae85..5f7e9c4b7df3 100644
--- a/dev-php/swoole/swoole-4.2.13.ebuild
+++ b/dev-php/swoole/swoole-4.2.13.ebuild
@@ -44,7 +44,7 @@ IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
 	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		--disable-coroutine-postgresql
@@ -52,7 +52,7 @@ src_configure() {
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.12.ebuild
+++ b/dev-php/swoole/swoole-4.4.12.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.4.14.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.14.ebuild
+++ b/dev-php/swoole/swoole-4.4.14.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.15.ebuild
+++ b/dev-php/swoole/swoole-4.4.15.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.16.ebuild
+++ b/dev-php/swoole/swoole-4.4.16.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.19.ebuild
+++ b/dev-php/swoole/swoole-4.4.19.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild
index 48523b05538a..5d5171051808 100644
--- a/dev-php/swoole/swoole-4.5.9.ebuild
+++ b/dev-php/swoole/swoole-4.5.9.ebuild
@@ -43,14 +43,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c81592e5d2db..4714d80846c2 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 5bde09e919c1..6162503089a0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,4 @@
 DIST fonttools-4.22.0.tar.gz 2544600 BLAKE2B 685da467c40fc7cffe2b33b08da53e5bd148c5190efdc8d08e2c66ef06e67b5e26ec5fa090334b9ef427b1a005c6386b0f78b978d376c7daee7f4d540faa21c7 SHA512 06db054ce488d0291f876b05b5dd09a772a702f1d45b97c1ba46d02e01fe59f7c63e268fff958baa4076c1ce72f450384e473263250c1617791d78c0e311710d
 DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dcab81d974c7f5c9d9e644aa3850dbb08502ba14111397b42615fc5287f9af8aa4d7b83e7fe9f23ae4d080f2864189d SHA512 2f38eda41ce913bdd6e62f495a215c38ed9c1fa7df87f1ecc0964b3065498e39c55e030899a5561321b16f995a705449c958244ecca2aaef492c49066db0ef93
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
+DIST fonttools-4.24.0.tar.gz 2551274 BLAKE2B d893d07729ee680c77ff3f2d369e1c77333e5a706ee5696e0843b19cfd419084d3278e35bf9f4cc3accc62bdc168d2e25cb0bacaf6b8adea17301e47cc185c34 SHA512 be80610e9c61a6f49b66b81d2e0ee50ed07e8ff8f932e3ccaf59869cce347088aa739883c6bc599dc47e196aecb69a648033dd485da3d18c84901c02f0aea92c
diff --git a/dev-python/fonttools/fonttools-4.24.0.ebuild b/dev-python/fonttools/fonttools-4.24.0.ebuild
new file mode 100644
index 000000000000..95ced12ecf0d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.24.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4edb2e52fcd4..9a25faf24769 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,7 @@
 DIST hypothesis-python-6.10.0.tar.gz 9126095 BLAKE2B 7dbcbb1d1099490c5329fb9a134b87449a8224565c4ccc88692c6cdedc847b0c3143b438f1d7bed98932ddfdf53fb5d09980ec0cc7d5e23fe60e651aef10ddbe SHA512 a9ced1baccaa411c264aa02de3ebc2d76985b3f61a378f9ec413b510b7b16c40cc3072d0d042a03046593b303ee367f3dd34f8b09987a1b0fb97de77f6fe3e8d
 DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
 DIST hypothesis-python-6.12.0.tar.gz 9127949 BLAKE2B fae9be5f82362f46554e9912f34e7da06b2e8f8612428af7a8a77bda06e926b8c541e79c40a8aaab4a1d4d299cd947f2ffc92f44c8d569c185891e5b6aaac61e SHA512 7eafa80a546d17cb5239caf3aa18df1a23caea3021fe9a8d1e180c85443920df44ab93a31c13192ea9856db6a1ee8d5af82f44dcbaefb6dba6c37ab63081e050
+DIST hypothesis-python-6.12.1.tar.gz 9128039 BLAKE2B fd0d7108f8a32ac95ff07f03060fa0ad30c28bcc77bd7ac70e1d16505aeb8052b673178870b9196cb19d17f9d8c7bf2b206335ed553eeea7fc8787f042884c36 SHA512 668bdc1da0c1bc239edfa52d34406dd7e3fa2230041c1de7791209bbec8de96b6d6714ed82a2e80807f5c51c32c7098717dd053b45b7276acf1ffcdf2fd425ee
 DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
 DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b856124a312b63f087a6fd200282e9b0a0cd6fcad1a42a6008406bc347f21bf9cd6c5ff2db79d013987281f59365bd9d91550d SHA512 2f25e994438479b5faa15b2038146ab385445bf2722b0951ff55f324b074248d7322c4c6f3e9c659c18d0aa94150eea4c6567a7ac24debf2de4b32bab37a4dcc
 DIST hypothesis-python-6.8.9.tar.gz 9122168 BLAKE2B 2568dcfcbc7182071247d0b7d978abf2184be4583937a42568c3e199eac6ce538adb7b3687747979fc6ab9da1e61088db7d1a01294982e75cb04992cdc10537a SHA512 4dc3884e2487f27a3b6b362e04cecd281f9072fdd2e8e91738899baf589d6d48df9eeacb9a158251c20b210d1190b78eadd191aa95f151023bd81091131dff66
diff --git a/dev-python/hypothesis/hypothesis-6.12.1.ebuild b/dev-python/hypothesis/hypothesis-6.12.1.ebuild
new file mode 100644
index 000000000000..e8455f78614c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
index a8827f8bc182..98ce41c1e073 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
index c7a1cf5de753..ee6431b44f73 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
index 39c08af934b8..e7af70accd2c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 05de332e9d10..b1aa7f228fd7 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
+DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
diff --git a/dev-python/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
new file mode 100644
index 000000000000..9de1aeb1b611
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/pybind11/pybind11-2.6.2.ebuild b/dev-python/pybind11/pybind11-2.6.2.ebuild
index 93aafcc7a3f4..553c637d08d4 100644
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
index 2c8ad069433b..a08b0c4fd9b4 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples opengl"
 
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
 RDEPEND="${COMMON}
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
 	dev-python/pybind11[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild b/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
index a9a305e869f5..863ef6a22457 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="examples opengl"
 
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
 RDEPEND="${COMMON}
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
 	dev-python/pybind11[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 0f433f5033f4..c2f3ef4c5dd9 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1 +1,2 @@
 DIST pyproject2setuppy-14.tar.gz 10669 BLAKE2B ee4fac31546455ac3144f4989dd4260d876a7b8bd749bb34b210e5fc0194fb6347f9b5e7ebc9aa1374b4e4e5e4f22d260923097a58b47b5b940c69ec77f3b5b1 SHA512 46bbe31460195ca7df2c7e707772a430ccdbabf264a26f54d98101d08031d302343a6299a8e20d7be3d7984c48ad095dae942bf4da085285f61e2900a501245a
+DIST pyproject2setuppy-15.tar.gz 11796 BLAKE2B 7fd7176fa611e293d35db0cb91a029c0896921947252ffba51ba25599fab5ebe7d4a5c2f65593ec83bfcc180983de6e2022053bcaa3583c3f6cce9640e57c5f6 SHA512 dee048eed352ebf178981fdf9fd69143a72658d9161e2d65257001b3ee6773bb7040d12145e79496cf141cdf86aa5e5eeaf4de7023c4e721a3d978f9eb267374
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
new file mode 100644
index 000000000000..2134ae093aac
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
index 02dca8baddc8..2bdd7b51332e 100644
--- a/dev-python/pyyaml/pyyaml-5.4.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index c2cb49785269..6382fff90072 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1 +1,2 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
+DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
new file mode 100644
index 000000000000..44cf89905b50
--- /dev/null
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/pyproject2setuppy-15
+	test? (
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2ce7de4d20f7..444271f20626 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/facter/facter-3.14.17.ebuild b/dev-ruby/facter/facter-3.14.17.ebuild
index 249ddd7569a6..b69eea0e499e 100644
--- a/dev-ruby/facter/facter-3.14.17.ebuild
+++ b/dev-ruby/facter/facter-3.14.17.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bac9096e7ea5..853a6c768a01 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index d8a4ee1e7808..d46cd48c6c1f 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -1,11 +1,13 @@
 DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aes-0.5.0.crate 87133 BLAKE2B eae0f752199900c274afb47bd700167d9185201a5341e6bdcc014fb70b51bf304ba7cff3a69c9d35484220c2e91ff879edc579da2532dfa81fe6874bec61b037 SHA512 e0ac02f3e0b3b5279f741e0ad391c2a4440d3570ccf732d69db1257ee4a841914db6fce0c889b1d8a8bcd067715549ecc01efe3156fcc1141fde9413a7be4f38
 DIST aes-soft-0.5.0.crate 94026 BLAKE2B d6f2ac7233be9931b4e262d0a341e443e8ab720647643add0de8936aa6ba6f836ff86c8ce8512a0d55fdf8d804204fba1ece39a163a60541507bd18e00a8a652 SHA512 14303f08394119f25a9d3460e5e6cce8277d4e6871bd83b2abf17fa26c62e6abba8b47ede1633aaacaee3616d793725b6b3cb18a606e8490e4c8ab28d91d5248
 DIST aesni-0.8.0.crate 101630 BLAKE2B b20c3df90d881b87e18edb295a5ed210faa60c45f07d9f9cc156084f501f3ea89e2dc919f404e70b85d1f828d3a83b79b7e0ebccbdc32727f7b66e0e0387519d SHA512 205f572b5afccb5460d0a268305d7dada10935e297b9e9dda4651cc809f6b94f2817ac6d866fa17e0db93b32c7f3c4bf7a5b34d48d5b45c028116123ccf32d84
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.38.crate 30417 BLAKE2B 168c6692fa669e90bba848bbb830fcd18ef2e2359a6f0f6b0ac8a20666b9c8416ac79e20d1b31e7230e261284502ede8091adc6b8cfdb462e8c4ad57a2cad651 SHA512 3f6229fd9d284053f348f8180f9b1f1c1f1b711b733ff9a331b2f16ad6dd0c46a38ec17c8c8257981209230ba769b7cce349b64bb7f6f8ea6150ab9d6e483b8c
+DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST async-compression-0.3.7.crate 58367 BLAKE2B 3256e0cefb302acbf9905fc9b61686b8f1f5d5910081a15712dd33473bd832daa62cf783552cd6713c99c4e49ef18fe207ceb57ec5e0156c9a77cec4c2ab85d6 SHA512 234d9769e69be6406eb1d755b5a17d525dacc1e36ead6edb2a92a944c2936c4f0cb38e8219d605b84d933233a2cd2d825955fa87777f56ce537461614e50fa7a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
@@ -23,6 +25,7 @@ DIST blowfish-0.6.0.crate 16125 BLAKE2B 580f1af618652ca2bb5d7dfda74f129b5950882f
 DIST buf_redux-0.8.4.crate 26608 BLAKE2B 32698d29b357c625ab663730cbf7717b91200a9f980d3c9107ceb5f8f83ca7f2514b9b5c7fd2b229e8490832dc78291db460fb7fba130cd61cdec8b42c33a483 SHA512 709095a4acadf032143225740343840d247b4dc130968e36447260343294b134af780604eb8214b9e6dce924e13701dcf7a9c7291340c3393a9334c8aaf5454c
 DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
 DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
 DIST cast5-0.8.0.crate 38519 BLAKE2B 0e43d05d157945751c1990f2f9d914776b2297510d4f23633d2d8371efe763a02934b7df081da18546a717760b31c1030d1bd550708714ccafb008522c4c30ea SHA512 08e98f176b883c8c5636c418ce9514e5496ab56bd9d4fc84f01342628760ce744bb8aff41f8b69f787290d8f8ed3b755ad23a8ee37eefa225115db589225beca
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
@@ -42,9 +45,13 @@ DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
 DIST crossbeam-epoch-0.9.1.crate 39561 BLAKE2B dedbd19d8aba2c19b844a10323ab488f0dffd5a8ad041cd715a9b1d6d14da343c0c680f6756736501ae420846a5d19bf5aa7bc7142daa39fee901e97f28bb557 SHA512 63d03e71013f7ffbc7b7a8ec5fe478323e7cf679bd126f03980c5e0790b57f5c48ce0ddb5e9c7ece31bd7380a944c1a1d462a9a1bf0126f9851e549739d8afc4
+DIST crossbeam-epoch-0.9.3.crate 42766 BLAKE2B a9f458d912dc247bbc8d2172792e06992ae4b51f588a7cb5a4851c6d7021b428c8225ccf07f0e4597e3e9585cf7b860781c1829d6269826893da3cddc2a753a3 SHA512 f68e1957018f7b88440492403b6812403312b7252e0e873715a2a970a4c9d2647174a19853d1533451ff1f568ac7df2deaa614f342d695c613053b1a3d5d1ef1
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
+DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871cc9e0435edd4e1ba078a18e64e830f835c436285163512801408f33c64cc497c059d08d1edac1527aae923 SHA512 50250a3d5bf5b3fa899089a5452e9cd1dbb6553647ee52c0df4fb5837878131c4bfe84cf912e6cf5ede945e94906952051f4a2c4ea140cfeb41a91efb36f61a2
+DIST curl-0.4.35.crate 85012 BLAKE2B 11ab2e14e425caf91c4c42650f68e1ea5fe5edf6759b10e66718ee2c603056facd8dd00da4acb3124669fff3c8af366bad4f163b5477c28be0e9329ca188e7a8 SHA512 255f4f8d7ed2c0a4f4f9b32b3cbd6e9f20f299bf5379e084d884107836b108f4df31b3f8ef5ad3731e7209ee5eca63568b6d3b68a0e7cdf24d83d36b80bc23b4
 DIST curl-sys-0.4.40+curl-7.75.0.crate 2907247 BLAKE2B e1d53ee25e3b2f8cae645029b07707203b28c498aaebf1d0399e0b5da0fa293a9c6977668680067d16aaa659567407fdcee0f2518d7ce9308d0f6664b78749ad SHA512 193cc153836039dcc5748f70eb2ff004c672d2435334aa7f1fb2e45839ec2b679085ccad1efe85cb3babe54ef34719c251376c3fea364d0f02f513cbdc90239f
+DIST curl-sys-0.4.41+curl-7.75.0.crate 2907738 BLAKE2B f165531da074c856e8cb6725f55b1d00f6dcabf2756dab59c35fefe193b25aeb11dadcfb7f7a5bfc986d8983ffb360637ca76cc937b8559f5da6c15a019d7244 SHA512 34bd579b80135d72c50edcedeab88b00dfd7a5aed62f4eee59ce3fbbeac43553bdeb87d5cdb513bb8c6c064a64552443fad7c02501a44b840ad35bcf22cd4179
 DIST curve25519-dalek-3.0.2.crate 503545 BLAKE2B 9153d1bf551ac30f43c3e20ece8c50c98445d570378a0ec80aedfbbaf09df201f1d31f5c37e2d2cb3cc08f5a70411b92bdca4372dc7c413c6d1b004fb5ffa532 SHA512 e259f73460bbfd7cc418151963f58406636c197f9d9de0e22de5b77e9348ba09ebfa184a882157497e3b24cdc21c2be9d90d02d79277e575083ef2ca7203afd2
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
@@ -58,6 +65,8 @@ DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592
 DIST effective-limits-0.5.2.crate 20795 BLAKE2B f1fa0d55557ffcf61b03b1d64616d4bec8f127d06926840471b446e3b3857604a99c12c2585d7153f29d9f17d7f91b97a6985b6eeee00f00628b4e10a9441459 SHA512 f782307b4f4be1a4b2480aaca45a2d9025798edb1101054e6df0936a79babb873fc51fd605e98cac736ffe2d41cac692c153d86829e1e2f142dab3d160dc7321
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
+DIST enum-map-1.1.0.crate 10082 BLAKE2B b25916b68d8e395892c35cb5362a71834fc1e1e1ad304e0edb5a6b9760f0ced3a32621f1c6327edd8bb7d33c6508e333384a89848cf1b60d42cb72d95f21a4f7 SHA512 4ecc34d14d2f39eb3db6440052f019c4a0874d3890d8c25f38e11384c69350b70d05a50045f7791d4a9afba96faa4fa4e0c2ecbd91cebf18097e3ab87f824ba2
+DIST enum-map-derive-0.5.0.crate 2042 BLAKE2B e70c6a0c8e48a6982eef383bf5eb4920707a7b5c0e3c8b3e760b62bf51ec5516f0cf5d05da2fda044f1e6bc112c321abe6b5338aeb5895cbc9c0e2850233b081 SHA512 a94c45095cb96b45e79c3bae6492158b08c29386f8c03bd7d9093bc65d836c635667cdc081d1f501a5d35ec81d122baad4702301985e44f5bc1ac08db120e1aa
 DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
@@ -67,12 +76,19 @@ DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a864685020250
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST futures-channel-0.3.12.crate 29527 BLAKE2B 1b8b74a399aa97689b44e09b35fd190f4856a9a0e0c4afe8bebeb16d5ae8eb4c80d157b7aac62952fd2014d6e6e0836ba9625cf6b7e2c018abbe8ea309c50ab6 SHA512 338d252042a040e1f8c4678457a95b2488922008d5baa94d0dbdcd7902e5d678c7d7a9c32b81c40d701a7793395bfed2a66bee820efad49a9062c73e390c005f
+DIST futures-channel-0.3.13.crate 31089 BLAKE2B 051e50bffb13b5bf13b7d972aded2530db0dfe0769b1d59719d3d02ff2e0fecd4cf4d76db5ddf67eb0f71c43c64e9abb4a82e0556e9b88d463e8f5c157fbdede SHA512 e2ba7d3ad3963d2d6aa86f1a74e2fd6f12e339dd42c56df187b2c8dadaf85c2282056925b5fbfbd08429979f3bd017efd9f71d6962a3577bf8d8633b089cf855
 DIST futures-core-0.3.12.crate 13813 BLAKE2B 466fcaa45b874b4346868bb353296082ee0ec6f18b3c5b241b7783f7eeba2e68d7b0527eedcfc0cdf4480820c0ec2d751b241a2478fa95339170bdce83665def SHA512 392d99ca0b8d45399b2b4fbc61c0591f9ae0c0a37f7aefc7d567cdb38c91d8336a6ca9592421ee8aebacea819a7442c2cf5391157b32bc5c0faa347a39f6d7a2
+DIST futures-core-0.3.13.crate 13835 BLAKE2B aabbbd83d26ebe974d31d4cf0a8db3faee7a902b05cbad2cf85907528d70d5d9a0c57ba006b243357dd45a0c7b053ca7608224550da3dc5cb9b86cca1efac13c SHA512 f5a424fbf6984633740a05fe6f9ea0741d7433e9a34f2e360377391d1921f8a4ade756b543bcf165f8cc45e286b59c0d2e8242f86809926898fe4390895ed37f
 DIST futures-io-0.3.12.crate 9070 BLAKE2B 7e3e1aede1d1118217ab0fa2fc71fde2e238017d404a875bdf24e74c5ecd3751d446a8bea74b191b17b80fb5fd3e379f509ce247d3c91b1c9df1fd69e11f78b3 SHA512 dcf3dcb30a97fc7e6fa708c2606d90d45ba01f3426629d3b77aac20d31611cd8903bf82ebdaa4e336cae40f047df2f581c59c2ddfd92d4c41c1a59a003c856b1
+DIST futures-io-0.3.13.crate 9059 BLAKE2B f2e6586b50827b12e27a181d6e8acd501dfa587facc37e31dabd015fb70fbdac0a959ef2802e15a5a223179daaec050b45c6c87408c93b5e2f6aa956d27f4c06 SHA512 56353b9f5a6ee5d3f6a5edc0f031248b41280d60ca9108d196e106aade750c8acaf864cce6b4490faada917f2fc6eea919a49ad68a6bef039a88ef88a381a4b8
 DIST futures-macro-0.3.12.crate 9680 BLAKE2B 708d58040a5f4f3bc5212947299904cd46fcd1f2fc7f943fb005ee08aae2b6d0582ffb210678f39e5e492ef9b4c8f4953ae3838b5061e2f6a9f9a850c61e2f3c SHA512 1bc8d26f4d71f6faa8175ec5a11f27588d882a2b719607690e35d37b8509fa0d65619513b5be1cb0560c8d0e1c45e72ccf8e2967fc03f0ce313d7ffa7ebfc5d8
+DIST futures-macro-0.3.13.crate 9683 BLAKE2B e96b0c047dce0a7123c19d85fbb6e5a073ef8c547ecce48aea5ece04b96d597ea84bf5109c173f3d28802187e3124441b2ec2264c5103706f51a6d634cfc8906 SHA512 11b39bc563bac0cb993a35909270b1c3d62daba1ee5876d2cf8259d1dbc7f26147c399a0dabaad50c7f0a6d0e4ca50d456684ade64cedd009c093c9cf9fe2b38
 DIST futures-sink-0.3.12.crate 7659 BLAKE2B 3af9cdead9871be471c2e30ad68c98be19f959dc0964d98d7f8d66f0f12116d484b0660bf39e629b30d7e4ea14a26ce4ee22a58b555addead043436c8d40c04d SHA512 495dab9914fc5f27e97c63d365df229aded672fd9fbd7d65625148c861fe380d902faaf56380129be3828d65b0e825b4b98d30bf3713515dcbea93562363353e
+DIST futures-sink-0.3.13.crate 7660 BLAKE2B 59877d01be11bcc51b2df4560643287edafa8b319468d42fa1968e8ad42e65017a4884443058e3d6a8ada7e4e7f205f0a522d27ccc0fc36779d17dacf499bc89 SHA512 befc8b6979dc36419fb1c41bde0d8e7cdc66100b14cce54b1ca3d2a676a595d2c2b856448110f1b3e64b2a043b17a5c2304cedc650b41d1d807b9cbaa2380cea
 DIST futures-task-0.3.12.crate 11063 BLAKE2B 4d4d832ac27d453ab39b353aaf95ffbcf6d8a5994219e3574a25aaf996e7f90ef79dc961c1e71bd9f6cd6ad27b42b3c421fb094a7791906c1cd0f8c13decdd2a SHA512 0d92c5d32b1e939f324ce44f1e3b8a8407d681e9200ac0f41f44d4621768f6e00185a51d087af6923898c0bdbb2f9a553f4737f5a7f57ec1478572b0ecb82049
+DIST futures-task-0.3.13.crate 11118 BLAKE2B 84986a8a9c4ffae6b65821d35e63c1574e87410710e8255766c46a6f8f58b5c3d7853d6eb6103f5932b9108c6d4e00c1429a0e469b26371c7e524ff7d14d3814 SHA512 2989781a67a5fad9b7e9320155d01829fe5f2b04f2a2958ba20eb2ba51734b5d1ead3d3abd7ed5051478aefd3938c682e30d87a16a108546a812950ae50363bb
 DIST futures-util-0.3.12.crate 137448 BLAKE2B f6cd5cd4ec781f598c18830b6de2448762c43027b1d2607a0cea0b2614909a0c525ba815f4b3d2e4b7c2da517e279a88b9468d43a3bca8c18dca1a1fccb3eb67 SHA512 07f987cd6992f50cc96f2e639853bca2d208ffe25807a987862c5e8b62c2657c8c3169ea34f9337a02c59e6208b0fb4dbce44f7c231cad8f56ca173da05b9598
+DIST futures-util-0.3.13.crate 138948 BLAKE2B bc19faa2167da4cc2612cece11a99352111d8b74eba9c3701b5e5c6a2c2c9e6f61a3707a58132836d7f55cc7e98ae8ecca84220c2d7421d3254772fe6438e98e SHA512 75db6170eef5ed4f29a0512053ac01baa6aa30dd9f5b6152cd27150cf47eb83f7fa3e4a737b91864460e3d90b1b2ab36895dcb1802b2806252483f4f58a8cfca
 DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
@@ -81,28 +97,35 @@ DIST git-testament-0.1.9.crate 9610 BLAKE2B 55baf44278ef3d8a5cbc2b422939153c8d5c
 DIST git-testament-derive-0.1.10.crate 6854 BLAKE2B 446b54c7d64bbcd5799bed6bd2a337f2f3612ec0c50490eb9a47b0dfcf33886a6f2aab8702be0b517befcff5728ffc723eeec09b3d6cdb82611340f94e8c7bdc SHA512 01ae8909a66eabe7e6012f8c32274e19291d76c36b17cf37f98bf590d9208897a2cfc11c4332d956beb198fc6c8c16da038b0e5ae7e57268e8e4fa661836f49d
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST h2-0.3.0.crate 155662 BLAKE2B c38ea7d174e8b1f1ac901de643f39b2d706336e2a644fd5f0ff5a8c9ea6d5e7fd536625370d28da0200138b8dfb6123ff0c3e8baae710e632fc519c4cea4a2b4 SHA512 d34aa8271df83d847cbb73869abe13ae7242769c1f604c3a15094baa9fc2dc5179c28c010098f86638057f413dc2ce2189e35292c0d6370c392298a1d4defd56
+DIST h2-0.3.2.crate 158590 BLAKE2B aa10bcb70279be4034b6eb6e9084578c0da3851025f6e45f13ae5785c6618d00db021f021784448228624ab43023d38a49c3b51ab6a3917231446a078eee069e SHA512 0b85b011ddac37dd7f3c7b7b36a453418fe63632e77f163ac32816d58b9537b28d49e31fc2e117bca53970ac613e67d0093374bcf57c0492b8200d3b8b27d39a
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
 DIST http-0.2.3.crate 105044 BLAKE2B 09fe8f34e326833490d33dfce68faac450b7d29b374a38de1b8c19c652d9fe85078ff890908e775d5a2c91e322cc96e1685d7fbb1f778fd5cc662734723dd383 SHA512 55a5a19489b263b5703c7acde376d67fce8be3c563c3ca5c6a2d0c6f0d7987e3bc869fbf6bdcec18633a256fd02e8b87aef2a6675aaa2cb55a4dcb60b13e3483
 DIST http-body-0.4.0.crate 5325 BLAKE2B 4596f077c862140d350d1d47e496dab1830a8b86a91ef51ffc1be8b1f17bad80deee6908611bea515ab6c32a3b094d3fc0eca1a3ed9c893b2134e2e2f0afad9a SHA512 35c3a0df114b2f06fc9e2153cfa4e75ebe8e2fb8b2b682736519f290d738991c9e413e19ce058bdbf7692143d7a38f2e571985239a4e15414eceb1a73de86a41
+DIST http-body-0.4.1.crate 6792 BLAKE2B 462329c293946394b5bcf5deec9ab13a9afc34beaeff85bd7bc9cf23e09f0903d4d1921d648a732ffbb9a5d2893f1c1dfa3478ffd375d840cbaee2c803a971cd SHA512 1c26d924feb0a7f713e5726d51158461849a4b273881ae4e53904e284488f31b01e941a3a4e9ed6e07b5f248a8e476fd6bc4038706aaad31d8489fa14d5e50b3
 DIST httparse-1.3.5.crate 24018 BLAKE2B cda285741546f46ff297c8b866f3b107f683abf474de559966ec2bf6be9b0292463831583273fd97d8ef90693c2ceba4756a82d0020ff366e47e8b95e621f82d SHA512 80b73562c99cb82341f400bb2e66a70eed0c02826749fc545f56c97e33aa6634a26d358f0d381596428bf57eb1fd7d5ea0c4f2bc233e915105e03771c11128b8
 DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
 DIST hyper-0.14.4.crate 158482 BLAKE2B 99eff9b280412077ddbee0b9e672739cb13db6ccb2267721ca44cd4c9028a8198e28ccf42dbe843ed37e618431ffdb9793dc7abfbd1d3a8bb6d631868d47a498 SHA512 8126f88ae81e9e85c7035b94c8abbcac5664e6178f6ca470985b41824dd255a307ea90cb9e55a85329c1fb6597ab9fd1a44b12bcfc4b65e1bf4eadf8cb568b00
+DIST hyper-0.14.5.crate 159835 BLAKE2B fe391cbf2fae775f9488073ef0caa713276b24674b462935ef26fea34a5b650c97a5a3633851d17875ee65e20e76887a28e82664b23a6f7a4e2e911093cb169b SHA512 dc71ce2521dcc751cb814d44ca4e7d637a0af0244b156acd3497a6eb9415dccd4b4a9cef1a5c7873bc4794b96626b281f8adbb64ab28c703cd2e9935150c7222
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
 DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
+DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST js-sys-0.3.47.crate 67063 BLAKE2B c4c6f0bbc18e6ca8fb01ec052e1f897c69a4fa1276afdfc84d9b0f030ebc267022d5e397ea5e95cbab3e4e62c4b12b51756bc7fd93439ed0c9be506f5090e077 SHA512 28d4d16059421862db91789d9401486708a1e1c32f45717bf18507bc38ae8b52c40f9f7a26fafeb11c335ccf49b552d95225462f6246982a02eb3f2123c8a6b8
+DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
+DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
@@ -111,10 +134,14 @@ DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04
 DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
+DIST memoffset-0.6.3.crate 7697 BLAKE2B aae9b5dedf06680bc597825653c08bcfaef6429a8367c8dbb58df7f09e91b166d04a231f28856af592590eda0e255a947294e0b8064d7651f490e44e4d1e748a SHA512 5afd2f9a282e9bbc60da1abbf911a3b4480ab975c04c565149dca8a36e9975b3262023b73c67d9dcf80b2eba3e8540aa2b91466d37a2504facb3f1eae98f52bd
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
 DIST mio-0.7.8.crate 85713 BLAKE2B c14fc89d2b4953ed1f8803bb02867aaba93bbd3f50b362057d79b92d45707f9806b2a36b7b323c70dd0548ceb02f3afcbf04aa6401ae9b42139512c78006de25 SHA512 3d70002ac05f123ab8628f882cce2cccdddd7dfef849f416e448b0302b575eeb5be460d5bd03b15f55140fea4770b6060e465f23a8dd5e1e86ea7a1033819cdf
 DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
+DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST native-tls-0.2.7.crate 24958 BLAKE2B c06b2abdf77d9ecc7ef6dbb7ea2fb6fbb4e1eb782dfe8b9e44bb2fa799fc9f3800f3d865d2141d04533ec6679d84aa703aaf2a497db6b0f60544da1437e47476 SHA512 f646b45767b0aac208b840989a1fc09198e70cb5277c077ef8247d3f591631bed09c1d36cdf372e68ff3aa7da7c885c2307f8b0dfe2185839e15dd4e7dd8f143
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
@@ -127,25 +154,33 @@ DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
 DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
 DIST openssl-0.10.32.crate 199469 BLAKE2B d8dd269501a1991fb9ea27367a17674ec74265ea4281121aa114b18aebd821425d8cec43177f395542a1ee3227b1023d1bd4ca8c261ed194841e633d05735250 SHA512 dc37b5bdab49f6fab6c1b7610c89b5d9aca7a432f341bb10fb7c2a1132f42db63eda0c0bc4d82130e1bf3b521436fda1e0c1f9f1091c060621602384ea649962
+DIST openssl-0.10.33.crate 202638 BLAKE2B 717e9724117c8b16391b02d30f24a242f67087a53c61b3fdf623c88b3b6f22576cd726f24fcc04f4105bd985c16bdbd0b6a6f7ae1dc1d7dac5f7a44c68160039 SHA512 69f0aa67cf9beb2e66116e7d6a652fc64b0470fea6eae3ac6bbcddc8fcba8ce13d8a170dd990dae0524bd4a583e05588266806396f75a909851f9e124bc8f536
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-src-111.14.0+1.1.1j.crate 5085438 BLAKE2B a5944ce7d05d8bd93d95f290a0ae8d6bf0f94b6f047d502367f44afae5fa32c2663b30aa92ab2638c9939b476cc62f9c8b53fec635915640c19c10cc10fdb924 SHA512 954586457f4a22328c0d5acb9b841561dd65e8ffbcf7e16209be3482534413943328497fbf2ee22fdb80ff19c24754dcddcc54f251c5ec8005803f797670c14f
+DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
 DIST openssl-sys-0.9.60.crate 51509 BLAKE2B ae3a9396115f1bcf9896ea49b0144b431b92491c4731ab6ca83ee7c99c5a38a727b008dfa837b09d80689c1a638fb57628066a4d8a85b3bb539f5e2ecd6b918e SHA512 6d9ae277c73a4efc567fd34f23e424cf6107b10f71b7e6902361dc33f514cbc8702718060fcda31c60ff65571fa29d7ea468f94cd9b8e3b37e85611f1d5adab2
+DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
 DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pgp-0.7.1.crate 657889 BLAKE2B e22025e42ccb51ddd5eb32d77823fefe660dfd27dfff34f3bae2245887571f218d1d2e2e1ea324d187f9bed76d1b0e782b9e0d75fdd86f5bdacf3f566099f02f SHA512 413d5dddb435d7a6f2a64da59e32e6eeff49ed6b9718d99f7825b957cc26063191c87ac3dafa81a5a10026d06c8b115a9c18f872d767451a6d80a8f63d3e3c99
 DIST pin-project-1.0.5.crate 53782 BLAKE2B 8676c77bfb11cf184c5c57bee67912df613610d2599dcb582aa2da10ac8c899cb53283296b1dbc87088cf8d374acd6aa3b461400e74350401af74300ae0e1989 SHA512 ca9d1b26cbb8c54a1fe70b9d7bb42201a6ed6f6c3af27c8b3ae964b01be9df29156a79cd54e62e02a3ebe57af4d83b6d9a0bcf12ec924fbfe6d1719904cbb26c
+DIST pin-project-1.0.6.crate 53802 BLAKE2B 035ebb53abe0106994b7044973a2473c62a0d80693c47ba0d9d2f34d698ddfc838e52408093691d17070ad049a20c64c0828c53d7125b411514f1c48820b1b9d SHA512 3fc5d85e1c48d4b4df305e5f93266881a8f16835dab135e298ae9d0203fd2de0fb4cdce1c9df29243ed9e03fdc62eae8e553aacabb324a19237039093f9939a8
 DIST pin-project-internal-1.0.5.crate 27351 BLAKE2B c69ac995c79ad7589c86ffc5c41ba0fdda506f1b614e05005f6713e71c9c18e2f5ba3ecf4e3a99f5a7a7581b66ca587d40512b2302179692a36ee43557cc4424 SHA512 7cfaa8a4d38b191058e3942577a1a1260941344580bcc858ca7b0bc41fa02fa400dc348b8f9119fe89df3d92b96d6ac8557659d3a81cc1f7a3d7afce5f1dbf25
+DIST pin-project-internal-1.0.6.crate 27304 BLAKE2B e89393f4c23f91e070ac984ae7e19d44451f39cd34a6d2550cc7c5bd42b04db6189eed9b6b10fd1f21311aa922e5a1b312b44922368753ee656b8ea8c6edc7d5 SHA512 754216e5151742c6f957bc8171128af70ac6fca5f2a5fff2b0c3e2f7171113c19fe12740f9f711b83e012687df575e9924dc68e2979cef844597fd7cdb71807d
 DIST pin-project-lite-0.2.4.crate 22840 BLAKE2B 61c8e1a09cf892132499d76a9df2977445526aa27c4f3e5366e67f36551700cb9fc403fb765c4485de688285856151e06f9b26540422e1904659ab00a33866c8 SHA512 1bc1632806a0a463681ffc5d44cb4501a079801e01886fb8755f590f5b9de39897c5da82e137eb07403f32f1faf64e5dd91f5b4fc872c6bd406aae3bb6b6e26c
+DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -160,11 +195,15 @@ DIST rayon-1.5.0.crate 158037 BLAKE2B 6cb7f696e9c04d3aa6c3bf9c95690c2e259267024a
 DIST rayon-core-1.9.0.crate 63787 BLAKE2B bc5f930b1ce8e9fde03c01df7a53eeb3318ae24ac1c6b22e401a0b2359f4b9d6e419fcd41c7db33881c4ec29fbb844a44e2cff747d7dde2133668e733f8b6966 SHA512 d05b4c1e7bcb1c4e9238ab08bde39f08f069a08593084f041720694bae8bd524d1761766beb93e97784d7d541bde3e290446344fe129b0e10491405c1577366f
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
+DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
+DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST remove_dir_all-0.6.1.crate 7854 BLAKE2B 42d221f06c4d33a06b8cbf8705fbcea8113d3194f920f1c34f0ef00826a6ecf10bbab18903540f5005e3d448b256a9cdf59e009eab9a2c0c93d022b7b258e580 SHA512 ff22c03887d28e503725394d8b34eb6e118e3aa83d14429d8478b8440daf93874b3c5407d7918d0660b1dbec633601189e840a5fa57889028982187f5851ff66
 DIST reqwest-0.11.1.crate 128020 BLAKE2B 09e509b9cce48ae63f35f10a9502cafe6ad892cfb20847e06db525bb9826e44f0a519e9660933e60da0c7ec3ae1b42ecb5ce99d1ddf46badbaf483f47c93b066 SHA512 063b92ffb57dcc4d79a776a97b1cd2ed29c3ab686e49e3c1395589e4e2425154ab2eb7ad10785d1f904fdce4e50d8efe815f2bcc81a18d0d7e0a21af4898bae4
+DIST reqwest-0.11.2.crate 129168 BLAKE2B 2e219d951874c90200150c678919fcb1e0dcdba2f90b34bd95587ca01376265c5c89e8937ae1db5dde41be579d781eda0b8e662f803412fc2d74d4fdabeefedc SHA512 cb5d2dc85d7a0eccbcfcfc11db3fda7647b5ce706ec33e63e7105613e47facb20ca82cd02f8b9fb44e98be501e4e59fba6d7434bc056ef58225c8845417018b1
 DIST retry-1.2.0.crate 8000 BLAKE2B fe5a6a0b6c642a09b0419814fabcc4df096adc9bc127039280070bcefe62601ccfc22f9c164c955b67f24cf5a11dddf4975df823b7fd17d694ae0a1f96ce6abe SHA512 7c8e81fe730182056d86b94e88130c3acc2962d2c7649049e7fdbb30f996904bbdcb94ba7fe8a91b4c68ec971d37acfc12804edff4b24e2cc6d5a020fedf4357
+DIST retry-1.2.1.crate 6406 BLAKE2B 5400edb6bda16e3174742b39c98132d8562bc5e59d5f71643a9ea146864b975f8857db8a745f212499640910c44b6de17bca8f2b5534344cf696c2db374d8bfa SHA512 db91d618ea5537da6049cff70eef6eb1299f34045455a2e0e0ca9e40c91d3886c566fe391e9050dd4d8043149b8469db4d9638a10535829a6bef81e3cdd25b37
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST ripemd160-0.9.1.crate 12087 BLAKE2B f2e0677b053cec4b93b1ba750e1a7ad603e2f4ff2f6750a659a7768627b1b30c429c91e586b61fe31531a5447d5f8d51cef1a874a8376df97b430a9629c11c7b SHA512 cd36d5b3224fd393f04b97a1f624ff190c3302ace497e37d040b5eb3a76c32cb413429de2692ae8706e62998ee82d82d13591c320b76825bf1b93ebbb3ab9ddb
 DIST rs_tracing-1.0.1.crate 4859 BLAKE2B b79dc0c0dacb963be9b96d534d1e051b7c9f63aecd85412ff530d3c6fe997241a3a2430431f7ba224f6dd56fad18d02959c466943af499887f2356a919937b81 SHA512 eeae1266a9fae1918ed38678a0e3d83dbb42779d0e5a82b3dd9b2329ba2fc18535783fd1c7c7f053f569d368f8444eb6a7d9127cfd7972d535ab3314535488e6
@@ -173,6 +212,7 @@ DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d
 DIST rustls-0.19.0.crate 208339 BLAKE2B 55f627e2cd497d8fec205c3e5419804db23eea1b216aac606a136d4a53dd81fbcba8eb00a28c52f785cadcc3fe61dff839eb306828d0a924e3580c10d536515e SHA512 4c06462a67c5f6e5593fb1e747bdb2e35222e3b5512996051ee933e0cbfd3c376e30cc4bc692330b8678e286042240d096f9ec60fc484194c8fbeb9b48a8d886
 DIST rustls-native-certs-0.5.0.crate 18482 BLAKE2B 3bb991c7608afd7f06cc1ca2fb3a2f76b0f29224ef85557050f465eebd0cac90e286cea068208f8ea69692f8e803e89e9cda7b51bd23cb3da2287cdad215f3b7 SHA512 55ec5d034a4ca3fbff5255fdffd79c0abbcc9f767dffa18d48fd667c262f60dd67cd48c8aa8f1738e580a07e9a6bcb3375479b072d1e18ce6aaf8da32071ee41
 DIST rustup-1.24.1.tar.gz 689189 BLAKE2B 12b7c4c086bdfb422c609c471f14c2e309d019232eed16f2ec213d80235c3dfef1ad33787dd199e1968ef37757013b8c96b6da61f00f8737a984f350dd339cad SHA512 4d687cc686cc5166ac361ac22f861a4422681febc65afd60f2431e2bc2a2d199eb911390a0f57e8023033796d83747de1f83717e5532732d60c994d3422e3c67
+DIST rustup-1.24.2.tar.gz 691952 BLAKE2B 31d19fae2553b8d9b8248b461e8e27bc56c8f04b112f78c1c70facab2b120f17548909cf8b149b053f61583e5c41a6cabf3cbaacf877195fc58227210ed3b781 SHA512 1731e28e0a869caf781be980e91482f324e6bcd405bd0c40bc0457acb8825ffc3ffbb13439cce644330569057dcae3fe071e00cf86a3689ac6d8a439ce7e3a0f
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -180,21 +220,28 @@ DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sct-0.6.0.crate 28777 BLAKE2B b1e86bb40d30f8201e1fe94fbd4d5820754ffd6867815e4085bfbd710ea79712125207fd8c8d9a2bb73c5092a457890381e6f73867b1b9d1a3d37115657f0b38 SHA512 fed46a52834b90495a8bc37993ad0754f20fedef6db442368559594d7184a12b43e31a7d42a595b032e54f8aa535cae0030d9eccc828c9df2fb457267e782b15
 DIST security-framework-2.0.0.crate 54526 BLAKE2B 132382ee0dc0336ddc4b07417ef0613f44201d50b6f1ae6d6ae3cb1d53052521892bc8b4d4ad107071ea2c49a1d198b4f09b02d5982ca93eacef5d0e9139e9e8 SHA512 fa843a8638c7b4bc40041bff90cce422aec331a3b6c7ce8de32d2a817d2dbdf8689339a00236fc08d1669219ebbaf628be31693598b9574726ed06c22d3247e9
+DIST security-framework-2.2.0.crate 57599 BLAKE2B 2b35e52e8cccc6178222e7f85536ebee73f801b4a19661e8ae0ba303440b370dec664aca0eb2cdce3c7ef1da2c4b063554e565b0d5faaf2f9ff0929c4425f98f SHA512 33bbab6d82fe0669c9cb63778fe9888de045342640eb3d52806c4ad075f79720976e3f49c0f6af88b46518869c19786d16a602e109edfc7743c5beb5d6372040
 DIST security-framework-sys-2.0.0.crate 10518 BLAKE2B 6e616e6099883bd0a55f972a81c8eae90d39cba9b36efe5c5bc612866984cdcd088bbb89ea81cc9f5f6b2ef1acb81f12ea106d9afce38662304cc04039db8a57 SHA512 43222d67cb51630575e1861470c55950b7c96db9708d70e97328198d25c858a05dbb0a19e6513cf9341c26f1dbfe534c6ddbf9cf71c4c3f8dd47290f06ec3931
+DIST security-framework-sys-2.2.0.crate 11744 BLAKE2B 333f91d1f37ae4d6e85a073afe143339b2a6f7a46e3fbc0cb2182b3b3460ac3ec4da7db5726a2db15a407b15bc830d3093d89536641db66490117248a96d370d SHA512 639c267cc2f7529eb6c253f6908ac0681baca640a64efc97ef2b259c9d9db0d045569af2853d32ee2ad338f5d17334d3adeceb8587b77501ef462f7a890fda11
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
+DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
+DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_json-1.0.62.crate 114960 BLAKE2B 834ab58df2c57ea408d8407a57f6cbaa432ed9ba71decdd91241ed9531af7c00a8e95ef5f94ea5ea2fab1401fac3e2bd8b38d5c39aa2319f8b7a03845ab2a724 SHA512 eda305317c219fcb39a4e8ea0ddf3b24e5b86a26ab2f854ffba288a1d08439173dfe1a9fa649a159691e3d4b95e38589b0045ab7ad3033c294014a60063a4684
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha-1-0.9.4.crate 13724 BLAKE2B 5b573e563832269c2962a7188df7e6b52916535bee2ac51ea60ca7b54966a43b32740cd4611dce94cae177e464cecc0acca5652ec68cf0f0ee27d148ffeff751 SHA512 f815f6a8f046cd51b33c0d91c7fe36997490e9ebf6e0c1fdf58efec18560d3aec665b4edaa9d2b702b2aab4667ac17891c620d17d24f8e26657d825ddef24ff4
 DIST sha2-0.9.3.crate 19649 BLAKE2B b4a778aa9b5f2e66d5f72679f25c8d270d101229b1d815af4923ea6598e395edcea9ee3c14746eda83e5edd1e790bdde672cee7e1fe57537856948b87a4063a4 SHA512 95c6c30b73bd3ee712b29be6ebb66f6fdf5256f37a6345e9412db74bc294260d6edf2ff0c21ac768e7cf0fb100f45f23489138e8ec1d4ca6f695028ac42806a5
 DIST sha3-0.9.1.crate 523403 BLAKE2B 414ea8c45bb1d2d343dca750f61cd718f73792291ca82b9f0f55f9940e72974c5677697ce1fadd008122b1d5a08bb983f2692a07ab425fb32f20e49780429457 SHA512 ddf6d67233fcda103ce4e734bb92ff1cc7f2e66ddb630646234c81d3c2facfd19549b0601c77d6f6a5843803de353ec51e77e4b5a1f836cb74203d053816fc47
+DIST sharded-slab-0.1.1.crate 49002 BLAKE2B f5ed6ba3d454677ee404e30bfd960c7748c02272a5c4bbe8ab6d01e0a54a8160f091ea693451cce41a3db52d2c99e4ab98b58e7071c15f8cf60cb64ba3216dbd SHA512 aa4e2e210436d4799fee76fdf5f83350b06c6bac88ad668c30090eb2c594b656238b26f8ab6ea173fa894732fe7e1b3e80a43a003e592469a402de47cd5d9c8b
 DIST signature-1.3.0.crate 10353 BLAKE2B 501e48c7387b2d4964403b08396dbcb3839433ccde6560a1c275ec69022439971234d843fc258495d21e58d4ffb0fbc8a42a19df33c98f138d4e02499672d79d SHA512 efd2bd4fabf0cf07b2642676ec083209aaba298f54abeba2d5a6e5fb5c6899aabbb309420c91047e27afa2f7a09381c16a531767fb8d10dd81135b8d73d8569c
 DIST simple_asn1-0.4.1.crate 15752 BLAKE2B 99694bf4598b2039b69058a4fed0d790e4e22ec0ca82920d202bdd1405eca0d6cef6ab660ee0d48c68466f4583c3926ba20171b8c34012df52a041df2a1630af SHA512 37211608915e6ab2408ea91fa937f93962b621bb89c1eada6a06485fbe83cfc930a116464729878f42610ad4d9d21bb1494916f71290257ddc88441317bd0ffe
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7323c0031558aac89b1045f7433a81a8bba83f21523a3ed0ec793189d6333ed19ad06cfc1b70c28d730aa9a6 SHA512 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST stream-cipher-0.7.1.crate 10895 BLAKE2B 4d43e688d3f5907816a8901b61a1de6ded72dd876e7f6048095d35b1a1ebefdf0c0b5ee825772aad72d4a13f37f28b1e94a9d4e56a445bfc79622751090e45d3 SHA512 4e1393f41443d8d958300df51b82c863f65ade33b598a2c22949fda854c65826ab74688af96f69917911bbea8d3fb917ed9e05440df0df3bb9eb1ce8c9a786d9
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -202,6 +249,7 @@ DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST subtle-2.4.0.crate 12411 BLAKE2B 32968997d71c6eab4bf2736090469afdb1adab3d2064afd1ab34a2711294bed1f00a715c2c748b25412ef9732c96bd132e20384019ca6bcc0a01ab602ec24117 SHA512 ffa173d6678879c382d9165ed8ac4480bfda2f03a451ff120767d90b2fa17ecaf234af15c2d153be0d96c8363de82f0be1fffb7770f3bd417e2567d146b61c86
 DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
+DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
 DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
 DIST sys-info-0.6.1.crate 14216 BLAKE2B 3ec8023c8ab62540f85df37bf2b689231dfc187079e643425375d2e2e89c187770f77b451ced1c427354357685fd3bfbc9c1fe64da262de735f1207dc92f17df SHA512 225ae4b703bdf252abc92119acb6d555bdb5985e53e973a044f8d14e38881a9e6f1ff42019d3eaa74ad92d4ba0a8f8a5bb7ef25fb07e823df005317db8453af5
 DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
@@ -214,21 +262,26 @@ DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
+DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tokio-1.2.0.crate 428628 BLAKE2B 0def4a42bfe1c1eef5374da93156e0fba9766ad197755ae38ba42d289f9a94f375fc4b16cf47e4ae6746810b23cc1183d2141e191f091a6990de3375fa0cf817 SHA512 8fdb1fd7ec1d406ab3616e6794633d95c7ac1432f1536cbafcaf91aaaba3b26f50466636e3121f065909f90a85fb64f91df831a405eaf2a17b1b30730f937365
+DIST tokio-1.4.0.crate 439130 BLAKE2B 78b9c6e3551c378c1603d8fc8eb2725d73c47ca37f118b77cb38de555a0b18c41e7ad0c627f9199c214c412ec3f20ac40a88e10b1874efae28a022f03ac11439 SHA512 5a5016482ac681c7bea248372eb013b2cd863530aba28065df0b9c3f604aa6b5f71230c39484feb2cf15207dd8a99d41ef81fd31f1286fa0b973aee9226fa923
 DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
 DIST tokio-socks-0.5.1.crate 16137 BLAKE2B 195c302b357369aabc9759709eed3369bce26d423d4349ee8c85e06dce8f985062e19e52f338d65fba76844bb56b1b36c4d501ef4079fc001aabd0be38dd783d SHA512 dc0ea053d11935646df436d19a653d18c7a495af1dd8dd0c02696dceabfa5b6e91f370072dae426848915f91c95f7c37a1f3835256e3e23b144b9380210fca2d
 DIST tokio-util-0.6.3.crate 65782 BLAKE2B 79d377f2b93570e82f3cc6df47b03a3ae26a6b7f7684b204b38fc20b1a0c21df780bd74f6db5ef4976b28e07b2a56d5368a402e754b6f79fe9b25cf7da8579d5 SHA512 1f0861cea7d3a42ffa0c7d8dbcb51bd4bcc2b2a1bf732678fed03785d0b7f54b45713907a7a46316e3ab91a6ef3356ad856dcb04f8cc9b47f403912c4253e23f
+DIST tokio-util-0.6.5.crate 71019 BLAKE2B c34c4d53754dd590e3b98000a12eaec1929e9c8cab05dc0f25dc449284f0f27ea661b39f94e25b6fa9918c27d4a528a70d4a952ae319fbae8ef64d4a1602bb7f SHA512 e31e295b2c92fec616ea3a2b61de9d85026cf4ead75cd193aff4ca037425238b4e11cf8cb3955353f63e9f03130ad3690c951fdd7bc1769b6e2efde75516c8d7
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
 DIST tracing-0.1.24.crate 66112 BLAKE2B fcb283e90e0a4d7b046eb1ae7f1c33ac3f56d67c1c81f2671387ec4bcd96030ced940bba509cfc824b15a16d2cd3479d1d60a16a3d33514ddd4df038bf4e013d SHA512 6eac3d081e79347af3491d340fe92e4b3bb78aa28d0c0cac0493bbafe82fb9b3e981b636c11fd4cf10ef262edb0d52b1f155c68884128496b08cb0f186fb1d17
+DIST tracing-0.1.25.crate 68011 BLAKE2B cde3a7835328b8bd04c377108f032a3718d9ec1ca3ee95d43df855af32ebc356d988705c01b64fd5725e8274a6da7bec822f9ff532159d9711c3c4a327bc6d2b SHA512 a9c48aa6abda26d7a7f26a1db3d4ea8b2b72bc69a8d6fcaaae21342bc802b4804a38691969959b1bb5bb7adf7d67380b09dde0196f65b6e49735be79e78385f3
 DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
 DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
 DIST twofish-0.4.0.crate 11490 BLAKE2B 5af970a08b8e7bee4f5fa0776a16c43c20614c9d2f327775ae6ab98dabe62891a7cad56924c57b980287e41e55394ffea3885a6e12b90b4981e619a520aee729 SHA512 da7db8c86fc36f66caaf05df2152d7d2f5556d47ee6d18e25420b3876dc293a561e5f85fdec5c13938df2aa55c1c6d3d2fc45b00ae0d15aa6ce057dcc003b8c4
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
@@ -241,18 +294,27 @@ DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02e
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.70.crate 159291 BLAKE2B 8420da36597a61cb293268f7cce742e1ab3f9ea990382af1c40e37f5b088d558ffa28814c8cdd9cad518246451cb9805d708c9fbe91ae8b6ee4fd2c666588944 SHA512 2cc77c540738fe454aebac4d23ad9b97ddcf867afc2fab8d92e1a995ec3db7126b9dc9153a3e47d048477cf15363d5242caee3064ba850780ad5d121368a7c8c
+DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
 DIST wasm-bindgen-backend-0.2.70.crate 25517 BLAKE2B 121690827f7500c19d4964b91fd69cc189e018f534e79a8462b69ef8a7c189ab0475e49a9689cbc4ce2ae082ac591567335a5a416675f0afed02aa14d68425be SHA512 22304a91c6d636bd721209c622ffdce4ed2646bb2c0b2433eaac61cb582ba59bee5ec0d08b4ed88695a8956b38292e646b8481cdfdb86de254e1b321a25308cf
+DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
 DIST wasm-bindgen-futures-0.4.20.crate 14813 BLAKE2B 1e6d86bc6878701824cfb3ce1e605594a83120fd50ceab0a3cd31e5c2d4a3d247903cef330387321d061a5d575ef824cc324f12fbb80279218790928025e2339 SHA512 97fd5ad69a3b44a41201d93981c1c501a24dab4302c90643cebbdb7023e9e868c8b64b569d0f6907700cf1ac699d81694a3876d4e5689e8bbe77bed348e9890c
+DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
 DIST wasm-bindgen-macro-0.2.70.crate 11596 BLAKE2B ce91e20491ef421dbb4a87d1d775e55ca1cd6367825a7cbebe848bfe6af972bb4f514b62de949b8945da335dc57352b8f5c5fd0c6114498b195627f6455ff223 SHA512 b0deff7972a95472d4edec101c080bdd40e0c2ddbaee07f62093847f7e39142388b6f223cef75d71c2c7c90f1022e9ad3e797439c7d61200719b883707d9d171
+DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
 DIST wasm-bindgen-macro-support-0.2.70.crate 17904 BLAKE2B 614121a2625eaaaa8303576cc3c3b05961aaa7c4ea0a65244f055582d8c22960d019e4afcaf7332f7ed7fc742a07ad654eb9848587f36270a6c7a64b9e83f4ea SHA512 a88b4650a05d28f1bf42a236b7f506450f3f84a215e363bb1fd434804bd73211ee7117a4fc07a6f4153aeaf8ad03737617aa29bc4072dd4c9f9a0f2c7fbeedab
+DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
 DIST wasm-bindgen-shared-0.2.70.crate 6729 BLAKE2B ae9f755efcb7efdc8aae9bbaa4809526ef3b9b03d0caee6bf673e739d268d7de3c40d395e8c78d4b021c18dd457bcfe038e4bb3d15e846d4446f5414819afa17 SHA512 f9ef2275fb3ef0c61d7ed84e72e820f5b607981e57e0ec042cddc631789533da87a36f717ab6ff7a5f1dbf00f809cb32ab593514aa5fcd586ca0e4fdf53c62c3
+DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
 DIST web-sys-0.3.47.crate 648902 BLAKE2B a670816a41130dc1c5a202cfb7e60f281850be7916c825096a41e306ec2a221a443eafcc1a2e8d037697ee3fe564968974947fd29b026f6a565d0e542114aec1 SHA512 d8edc7e942fa3c97102dca51a2d398c616d96b7a9aba872f055e9e2dc00878f59fb7bf3c4975f527300bc7fc418f5da8a2f6ba8242a5e9f2edc445d391a47813
+DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
@@ -266,5 +328,8 @@ DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe2
 DIST zeroize-1.2.0.crate 15450 BLAKE2B 1f3c2688cf84d8bc22f777cc06673c29c9306b2c246bec67404729dac01570dd550c4ebe1f9cbd04c3d6a2711bf7106c45a34d01bb0ab7b73d3a15a65bf66eb7 SHA512 9bc0242824908909669e473029990a582efb884ce8f37d153d3a92083f64afe7b3bb26821dff8f39af74ea7935024d9414d458cf61c2e6291ca3611e896ae390
 DIST zeroize_derive-1.0.1.crate 8047 BLAKE2B c43d99d7f80d104ec43708742d2c13080a3b96d0b8ffac099f86c82bce33d263313a42ebec42ed5dbeaeac397d1717e6cf089980dd7934b1efc7228b737a5f21 SHA512 cbb7fe8d9ecb38c0f6fd11e491afa289cc9d8719f2460f4569816d7d55ec17fc88aa9a167aafb83809e2122481e016039b055e3bc4edfdeaf009fc0d65212dc7
 DIST zstd-0.6.0+zstd.1.4.8.crate 26159 BLAKE2B cd4323d0a9c30f73a35e6fc5d168973a3340203ab58a5c0f4224b392a455d6d8727dd694836f266fa25a6f5d5e244ef6706b3a9e2f5155d9e426aeb4b2492ae5 SHA512 0362e7aa4d1205dad9f9037b36b5678e9bd49a202822f53a7a4b34135cefa018e6590954b08fd3ffcbd0c607c85f00228aae8b82c03defca46229501ec376a12
+DIST zstd-0.6.1+zstd.1.4.9.crate 27005 BLAKE2B 337f69b51efa2289b31c041c7822916176512ffdf2ad785a9fd54b0a8693ddc13c2cb53be9152abaada7c3a3c38357159c1da207b85f92f950c7a08fef424ba0 SHA512 145373dd3c571e455579474c1bff847de44532b34e5f97e7c2461ac7094060fabdd1c88d8161a868f05bd75f07efeb70b020c60198479c5f6b16d5473abe8c7d
 DIST zstd-safe-3.0.0+zstd.1.4.8.crate 10200 BLAKE2B 26a6689ac2bfc101f826e6668a1c9dd588c610fd3fac088e69262cb4adae66108c85515380c0cf079628dea46369dbbc07800bedaf67255b8e12f41f75c0f2e7 SHA512 294e9527890fa0f74b6659e20436e67e81740ddc201a879a0ca9ec77964b543c50227db3be809b197ec9dbe7c31befef79867d698fa4e9966e6a0d1ad1b56bf9
+DIST zstd-safe-3.0.1+zstd.1.4.9.crate 10230 BLAKE2B b0b24a9e1df9f6ff3a810b774d178b6116c4949155f9e1c2ed04d2b8c7dd638c70b44b95f8305d9fd2a567ae3442904d720713e53dd96a0f202009cc487915e3 SHA512 9ca714ae45adb4421a29ccf8dbc0752d3c2b69e72b15cf6533064a5b1f016250b745fa469b9e7c5d0b24c50a0c46f1d6dd2683917b33cd80ebe80223eead0227
 DIST zstd-sys-1.4.19+zstd.1.4.8.crate 1881914 BLAKE2B 1c3ca362f0d63ac0ef234fa1722b0e786d67c528c4edabb0bfabc48b651d9b10d60f8a0999df1adf627c147eb2d0b25c7ab78de10e35ef79c2c7e5b17cfbd812 SHA512 6e096e5d2bb47e57c4553aa2b587698c88cf67f6cae4724fd85ca53450ec4bb414e3495c9354af1f363f8d22f9c9c7e0ebee62bd7f37dd321b7667c6d7721c30
+DIST zstd-sys-1.4.20+zstd.1.4.9.crate 1900796 BLAKE2B 1e7de5cd89b4d6f1fa65b28de41c63f5855cd349113bdd01b21b7c4c7d5bec3624f23f53508a9174d6415919f617f4db9e8a18af67c1344575ca9e9a5b3cd598 SHA512 71853b2aaeff3c0b2e6cd3bdabb21d10db3a299376338f5b491fca12432f322e96d30ff2c9e0df46ff084dcd2143315a30ff4aa702cebdb900a0cd9afcb49894
diff --git a/dev-util/rustup/rustup-1.24.2.ebuild b/dev-util/rustup/rustup-1.24.2.ebuild
new file mode 100644
index 000000000000..467162e82212
--- /dev/null
+++ b/dev-util/rustup/rustup-1.24.2.ebuild
@@ -0,0 +1,366 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler-1.0.2
+aes-0.5.0
+aesni-0.8.0
+aes-soft-0.5.0
+aho-corasick-0.7.15
+ansi_term-0.11.0
+anyhow-1.0.40
+async-compression-0.3.7
+atty-0.2.14
+autocfg-0.1.7
+autocfg-1.0.1
+base64-0.12.3
+base64-0.13.0
+bitfield-0.13.2
+bitflags-1.2.1
+block-buffer-0.9.0
+block-cipher-0.8.0
+block-modes-0.6.1
+block-padding-0.2.1
+blowfish-0.6.0
+buf_redux-0.8.4
+bumpalo-3.6.1
+byteorder-1.4.3
+bytes-1.0.1
+cast5-0.8.0
+cc-1.0.67
+cfb-mode-0.5.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+circular-0.3.0
+clap-2.33.3
+clear_on_drop-0.2.4
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+cpuid-bool-0.1.2
+crc24-0.1.6
+crc32fast-1.2.1
+crossbeam-channel-0.5.0
+crossbeam-deque-0.8.0
+crossbeam-epoch-0.9.3
+crossbeam-utils-0.8.3
+curl-0.4.35
+curl-sys-0.4.41+curl-7.75.0
+curve25519-dalek-3.0.2
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derive_builder-0.9.0
+derive_builder_core-0.9.0
+des-0.5.0
+digest-0.9.0
+ed25519-1.0.3
+ed25519-dalek-1.0.1
+effective-limits-0.5.2
+either-1.6.1
+encoding_rs-0.8.28
+enum-map-1.1.0
+enum-map-derive-0.5.0
+env_proxy-0.4.1
+filetime-0.2.14
+flate2-1.0.20
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+form_urlencoded-1.0.1
+futures-channel-0.3.13
+futures-core-0.3.13
+futures-io-0.3.13
+futures-macro-0.3.13
+futures-sink-0.3.13
+futures-task-0.3.13
+futures-util-0.3.13
+generic-array-0.14.4
+getrandom-0.1.16
+getrandom-0.2.2
+git-testament-0.1.9
+git-testament-derive-0.1.10
+h2-0.3.2
+hashbrown-0.9.1
+hermit-abi-0.1.18
+hex-0.4.3
+http-0.2.3
+httparse-1.3.5
+http-body-0.4.1
+httpdate-0.3.2
+hyper-0.14.5
+hyper-rustls-0.22.1
+hyper-tls-0.5.0
+ident_case-1.0.1
+idna-0.2.2
+indexmap-1.6.2
+ipnet-2.3.0
+itoa-0.4.7
+jobserver-0.1.21
+js-sys-0.3.50
+keccak-0.1.0
+lazy_static-1.4.0
+libc-0.2.93
+libm-0.2.1
+libz-sys-1.1.2
+log-0.4.14
+lzma-sys-0.1.17
+matches-0.1.8
+md-5-0.9.1
+memchr-2.3.4
+memoffset-0.6.3
+mime-0.3.16
+miniz_oxide-0.4.4
+mio-0.7.11
+miow-0.3.7
+native-tls-0.2.7
+nom-4.2.3
+ntapi-0.3.6
+num-bigint-0.2.6
+num-bigint-dig-0.6.1
+num_cpus-1.13.0
+num-derive-0.3.3
+num-integer-0.1.44
+num-iter-0.1.42
+num-traits-0.2.14
+once_cell-1.7.2
+opaque-debug-0.3.0
+opener-0.4.1
+openssl-0.10.33
+openssl-probe-0.1.2
+openssl-src-111.15.0+1.1.1k
+openssl-sys-0.9.61
+pem-0.8.3
+percent-encoding-2.1.0
+pest-2.1.3
+pgp-0.7.1
+pin-project-1.0.6
+pin-project-internal-1.0.6
+pin-project-lite-0.2.6
+pin-utils-0.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro2-1.0.26
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+pulldown-cmark-0.8.0
+quote-1.0.9
+rand-0.7.3
+rand-0.8.3
+rand_chacha-0.2.2
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.2.0
+rand_hc-0.3.0
+rayon-1.5.0
+rayon-core-1.9.0
+redox_syscall-0.2.5
+regex-1.4.5
+regex-syntax-0.6.23
+remove_dir_all-0.5.3
+remove_dir_all-0.6.1
+reqwest-0.11.2
+retry-1.2.1
+ring-0.16.20
+ripemd160-0.9.1
+rsa-0.3.0
+rs_tracing-1.0.1
+rustls-0.19.0
+rustls-native-certs-0.5.0
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+schannel-0.1.19
+scopeguard-1.1.0
+sct-0.6.0
+security-framework-2.2.0
+security-framework-sys-2.2.0
+semver-0.11.0
+semver-parser-0.10.2
+serde-1.0.125
+serde_derive-1.0.125
+serde_json-1.0.64
+serde_urlencoded-0.7.0
+sha-1-0.9.4
+sha2-0.9.3
+sha3-0.9.1
+sharded-slab-0.1.1
+signature-1.3.0
+simple_asn1-0.4.1
+slab-0.4.2
+smallvec-1.6.1
+socket2-0.3.19
+socket2-0.4.0
+spin-0.5.2
+stream-cipher-0.7.1
+strsim-0.10.0
+strsim-0.8.0
+strsim-0.9.3
+subtle-2.4.0
+syn-1.0.68
+synstructure-0.12.4
+sys-info-0.6.1
+tar-0.4.33
+tempfile-3.2.0
+term-0.5.1
+textwrap-0.11.0
+thiserror-1.0.24
+thiserror-impl-1.0.24
+threadpool-1.8.1
+time-0.1.43
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+tokio-1.4.0
+tokio-native-tls-0.3.0
+tokio-rustls-0.22.0
+tokio-socks-0.5.1
+tokio-util-0.6.5
+toml-0.5.8
+tower-service-0.3.1
+tracing-0.1.25
+tracing-core-0.1.17
+try_from-0.3.2
+try-lock-0.2.3
+twofish-0.4.0
+typenum-1.13.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.17
+unicode-width-0.1.8
+unicode-xid-0.2.1
+untrusted-0.7.1
+url-2.2.1
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.1.5
+version_check-0.9.3
+wait-timeout-0.2.0
+walkdir-2.3.2
+want-0.3.0
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.73
+wasm-bindgen-backend-0.2.73
+wasm-bindgen-futures-0.4.23
+wasm-bindgen-macro-0.2.73
+wasm-bindgen-macro-support-0.2.73
+wasm-bindgen-shared-0.2.73
+webpki-0.21.4
+web-sys-0.3.50
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.7.0
+winreg-0.8.0
+x25519-dalek-1.1.0
+xattr-0.2.2
+xz2-0.1.6
+zeroize-1.2.0
+zeroize_derive-1.0.1
+zstd-0.6.1+zstd.1.4.9
+zstd-safe-3.0.1+zstd.1.4.9
+zstd-sys-1.4.20+zstd.1.4.9
+"
+
+inherit bash-completion-r1 cargo prefix
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	HOME_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/rbtcollins/home/archive/${HOME_COMMIT}.tar.gz -> home-${HOME_COMMIT}.tar.gz
+		$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-arch/xz-utils
+	net-misc/curl:=[http2,ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+# uses network
+RESTRICT="test"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	# patch git dep to use pre-fetched tarball
+	local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
+	sed -i "s@^home =.*@${home_path}@" "${S}/Cargo.toml" || die
+
+	default
+}
+
+src_configure() {
+	# modeled after ci/run.bash upstream
+	# reqwest-rustls-tls requires ring crate, which is not very portable.
+	local myfeatures=(
+		no-self-update
+		curl-backend
+		reqwest-backend
+		reqwest-default-tls
+	)
+	case ${ARCH} in
+		ppc*|mips*|riscv*|s390*)
+			;;
+		*) myfeatures+=( reqwest-rustls-tls )
+			;;
+	esac
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
+
+	ln -s "${ED}/usr/bin/rustup-init" rustup || die
+	./rustup completions bash rustup > "${T}/rustup" || die
+	./rustup completions zsh rustup > "${T}/_rustup" || die
+
+	dobashcomp "${T}/rustup"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}/_rustup"
+}
+
+pkg_postinst() {
+		einfo "No rustup toolchains installed by default"
+		einfo "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
+		einfo "and rustup updates will be managed by portage"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 68d6e3c1b8e0..b802a6544de8 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 cb354a359c64..ed830e66d6e1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 17 May 2021 13:39:15 +0000
+Mon, 17 May 2021 20:39:09 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d3ebf1e6eee2..ed830e66d6e1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 17 May 2021 13:39:16 +0000
+Mon, 17 May 2021 20:39:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a3f94144bbf5..f590994a8cfb 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index cf0d538f42f3..7b5d334ddbe3 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/phpmyadmin-5.0.3 b/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
index 7178dad6568d..f1a8acabf5c6 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
+++ b/metadata/md5-cache/dev-db/phpmyadmin-5.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=7
 HOMEPAGE=https://www.phpmyadmin.net/
 IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-7.1[ctype,filter,json(+),session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 SLOT=5.0.3
 SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/5.0.3/phpMyAdmin-5.0.3-all-languages.tar.xz
 _eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=61bc01d4d9b7bf66e9904a0e667b1d30
+_md5_=acfd191367d404ec814e627323267f84
diff --git a/metadata/md5-cache/dev-db/postgresql-10.17 b/metadata/md5-cache/dev-db/postgresql-10.17
new file mode 100644
index 000000000000..c1c809f2ee4a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.17
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=10
+SRC_URI=https://ftp.postgresql.org/pub/source/v10.17/postgresql-10.17.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d08716e5ebfed0196fea025122072c7b
diff --git a/metadata/md5-cache/dev-db/postgresql-11.12 b/metadata/md5-cache/dev-db/postgresql-11.12
new file mode 100644
index 000000000000..a59d4d9a2f18
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-11.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=11
+SRC_URI=https://ftp.postgresql.org/pub/source/v11.12/postgresql-11.12.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=28fed512c35ec7646d04280137ff749a
diff --git a/metadata/md5-cache/dev-db/postgresql-12.7 b/metadata/md5-cache/dev-db/postgresql-12.7
new file mode 100644
index 000000000000..135448c93eb8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-12.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=12
+SRC_URI=https://ftp.postgresql.org/pub/source/v12.7/postgresql-12.7.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2cfff0914f699b2ec9da395a6e42adc4
diff --git a/metadata/md5-cache/dev-db/postgresql-13.3 b/metadata/md5-cache/dev-db/postgresql-13.3
new file mode 100644
index 000000000000..7f91d5875a80
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-13.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=13
+SRC_URI=https://ftp.postgresql.org/pub/source/v13.3/postgresql-13.3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2b5408458b186acf9dc5ab5d6a11974e
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.22 b/metadata/md5-cache/dev-db/postgresql-9.6.22
new file mode 100644
index 000000000000..5df5a8fcda71
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.22
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc kerberos kernel_linux ldap nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=9.6
+SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.22/postgresql-9.6.22.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9673f16319b92e11a6b7ee77718824c2
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index d662b41b2005..f39fc0bf44f6 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.12.0 b/metadata/md5-cache/dev-java/commons-lang-3.12.0
index ed136782ccef..8c3b5b9a41c0 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.12.0
+++ b/metadata/md5-cache/dev-java/commons-lang-3.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Commons components to manipulate core java classes
 EAPI=7
 HOMEPAGE=https://commons.apache.org/proper/commons-lang/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.12.0-src.tar.gz -> commons-lang-3.12.0-sources.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=8f66e3740c0fc4ffd994a45285daddd9
+_md5_=446b8342536f4299e7d6971f1ea58f85
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 23222116253f..21c3eb889caa 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/abcl-1.8.0 b/metadata/md5-cache/dev-lisp/abcl-1.8.0
index fbb193625bf3..24ea0124a9f7 100644
--- a/metadata/md5-cache/dev-lisp/abcl-1.8.0
+++ b/metadata/md5-cache/dev-lisp/abcl-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Armed Bear Common Lisp is a Common Lisp implementation for the JVM.
 EAPI=7
 HOMEPAGE=http://common-lisp.net/project/armedbear/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://abcl.org/releases/1.8.0/abcl-src-1.8.0.tar.gz
 _eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aba8f2272108e997390bb85df5117d6f
+_md5_=4ef98c1e6c870aa2a70fa61f722af6f5
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 7dd980e18b32..b4a0990a9b06 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/swoole-4.2.13 b/metadata/md5-cache/dev-php/swoole-4.2.13
index 4267a35686ac..bf10e52a8155 100644
--- a/metadata/md5-cache/dev-php/swoole-4.2.13
+++ b/metadata/md5-cache/dev-php/swoole-4.2.13
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.2.13.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dd8c22860504f22c01f7b8ec6bbf6430
+_md5_=caf86a5863d7ef8f71647d1586448e41
diff --git a/metadata/md5-cache/dev-php/swoole-4.4.12 b/metadata/md5-cache/dev-php/swoole-4.4.12
index 2b4abd7c1739..706208e80f25 100644
--- a/metadata/md5-cache/dev-php/swoole-4.4.12
+++ b/metadata/md5-cache/dev-php/swoole-4.4.12
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.4.12.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da2c70ae5ff2a21b4654f579f9340f46
+_md5_=6dc6efa648d4eba758368306f603b117
diff --git a/metadata/md5-cache/dev-php/swoole-4.4.14 b/metadata/md5-cache/dev-php/swoole-4.4.14
index 62afd937b50b..e6209ea0cf4f 100644
--- a/metadata/md5-cache/dev-php/swoole-4.4.14
+++ b/metadata/md5-cache/dev-php/swoole-4.4.14
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.4.14.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da2c70ae5ff2a21b4654f579f9340f46
+_md5_=6dc6efa648d4eba758368306f603b117
diff --git a/metadata/md5-cache/dev-php/swoole-4.4.15 b/metadata/md5-cache/dev-php/swoole-4.4.15
index 6dc8670a94f5..2f6b78ca4fb8 100644
--- a/metadata/md5-cache/dev-php/swoole-4.4.15
+++ b/metadata/md5-cache/dev-php/swoole-4.4.15
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.4.15.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da2c70ae5ff2a21b4654f579f9340f46
+_md5_=6dc6efa648d4eba758368306f603b117
diff --git a/metadata/md5-cache/dev-php/swoole-4.4.16 b/metadata/md5-cache/dev-php/swoole-4.4.16
index 6d0eb78dd4ec..31b436b6b55c 100644
--- a/metadata/md5-cache/dev-php/swoole-4.4.16
+++ b/metadata/md5-cache/dev-php/swoole-4.4.16
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.4.16.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da2c70ae5ff2a21b4654f579f9340f46
+_md5_=6dc6efa648d4eba758368306f603b117
diff --git a/metadata/md5-cache/dev-php/swoole-4.4.19 b/metadata/md5-cache/dev-php/swoole-4.4.19
index 9c5966334d90..2dd16c1cadc1 100644
--- a/metadata/md5-cache/dev-php/swoole-4.4.19
+++ b/metadata/md5-cache/dev-php/swoole-4.4.19
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.4.19.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=da2c70ae5ff2a21b4654f579f9340f46
+_md5_=6dc6efa648d4eba758368306f603b117
diff --git a/metadata/md5-cache/dev-php/swoole-4.5.9 b/metadata/md5-cache/dev-php/swoole-4.5.9
index 098df469196f..9f4b1ecb9fe1 100644
--- a/metadata/md5-cache/dev-php/swoole-4.5.9
+++ b/metadata/md5-cache/dev-php/swoole-4.5.9
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/swoole-4.5.9.tgz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	597ff70c7422e3b3cebf00f526a32626	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=78a5f040fc94ea643136666b2a69f7b3
+_md5_=ced482d3de549134ff45d1aabca24763
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9ae84a35b742..9badf7c6b673 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/fonttools-4.24.0 b/metadata/md5-cache/dev-python/fonttools-4.24.0
new file mode 100644
index 000000000000..f7083dfb407d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fonttools-4.24.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/fs-2.4.9[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-arch/brotli[python,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-arch/zopfli ) test? ( >=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[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=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? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
+EAPI=7
+HOMEPAGE=https://github.com/fonttools/fonttools/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=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(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.0.tar.gz -> fonttools-4.24.0.tar.gz
+_eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=206f746006b413ac614989cf1b59f006
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.12.1 b/metadata/md5-cache/dev-python/hypothesis-6.12.1
new file mode 100644
index 000000000000..c14305bc4a29
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.12.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_7? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.12.1.tar.gz
+_eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=99fe7a5b96a95f7ebac4795541da6884
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-3.10.1 b/metadata/md5-cache/dev-python/importlib_metadata-3.10.1
index c755c8a95f21..4176cf69afc5 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-3.10.1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-3.10.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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(-)]
+BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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
 DESCRIPTION=Read metadata from Python packages
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/python/importlib_metadata
 IUSE=doc test python_targets_pypy3 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
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.10.1.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c4d79a7de58209ba60008bd360c8b80
+_md5_=15af4fa5dc91fe31b3205a737ef70851
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.0.0 b/metadata/md5-cache/dev-python/importlib_metadata-4.0.0
index 3cbf5f99ce57..0efd4749e252 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.0.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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(-)]
+BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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
 DESCRIPTION=Read metadata from Python packages
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/python/importlib_metadata
 IUSE=doc test python_targets_pypy3 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
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.0.0.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=219c6b4f30f44691e4c9979a2a0d6216
+_md5_=afd2784bfd380e10ac64d0f40acad0cf
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.0.1 b/metadata/md5-cache/dev-python/importlib_metadata-4.0.1
index 3d79864916b2..66c76eb810af 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.0.1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.0.1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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(-)]
+BDEPEND=dev-python/setuptools_scm[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(-)] test? ( dev-python/packaging[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/pyfakefs[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/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[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/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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/unittest-or-fail[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
 DESCRIPTION=Read metadata from Python packages
 EAPI=7
 HOMEPAGE=https://github.com/python/importlib_metadata
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/zipp[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.0.1.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=38af111ab5938ce36885a48f7ea2a7d8
+_md5_=3f66c6ec0dcedb6cfa4b6d9ddf1ac658
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.0 b/metadata/md5-cache/dev-python/notebook-6.4.0
new file mode 100644
index 000000000000..2f43b4ec3485
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-6.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests[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/requests-unixsocket[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? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[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/jinja[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/terminado-0.8.3[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(-)] >=www-servers/tornado-6.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(-)] dev-python/ipython_genutils[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/traitlets-4.2.1[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/jupyter_core-4.6.1[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/pyzmq-17[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/jupyter_client-5.3.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(-)] dev-python/nbformat[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/nbconvert-4.2.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(-)] dev-python/ipykernel[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/send2trash[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/prometheus_client[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[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_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 postinst postrm preinst prepare test
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[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/jinja[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/terminado-0.8.3[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(-)] >=www-servers/tornado-6.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(-)] dev-python/ipython_genutils[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/traitlets-4.2.1[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/jupyter_core-4.6.1[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/pyzmq-17[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/jupyter_client-5.3.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(-)] dev-python/nbformat[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/nbconvert-4.2.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(-)] dev-python/ipykernel[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/send2trash[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/prometheus_client[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[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_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=mirror://pypi/n/notebook/notebook-6.4.0.tar.gz
+_eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2869487c2c9bae83fa763e0a916cdbb0
diff --git a/metadata/md5-cache/dev-python/pybind11-2.6.2 b/metadata/md5-cache/dev-python/pybind11-2.6.2
index d1a086d9781c..1f98744226fb 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.6.2
+++ b/metadata/md5-cache/dev-python/pybind11-2.6.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-cpp/eigen:3 >=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(-)] ) dev-util/ninja dev-util/cmake 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(-)]
+BDEPEND=test? ( dev-cpp/eigen:3 >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) dev-util/ninja dev-util/cmake 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=AST-based Python refactoring library
 EAPI=7
 HOMEPAGE=https://pybind11.readthedocs.io/en/stable/
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 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 )
+RDEPEND=dev-cpp/eigen:3 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.6.2.tar.gz -> pybind11-2.6.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	f0ca511df3fddd316b783632b804e8fb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a4346a153109d5f21dac62bdee02e74
+_md5_=03b19fcb605279a1523423ae233d4897
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.1.3 b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
index 5f8edda94bce..bb61492814d9 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2021.1.3
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
@@ -1,16 +1,16 @@
 BDEPEND=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
-DEPEND=dev-python/numpy[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/pybind11[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(-)]
+DEPEND=dev-python/numpy[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(-)] >=virtual/opencl-2 dev-python/pybind11[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=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
 IUSE=examples opengl python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=dev-python/numpy[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/appdirs-1.4.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(-)] >=dev-python/decorator-3.2.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(-)] dev-python/mako[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/pytools-2017.6[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/six-1.9.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(-)] >=virtual/opencl-2 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(-)]
+RDEPEND=dev-python/numpy[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(-)] >=virtual/opencl-2 >=dev-python/appdirs-1.4.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(-)] >=dev-python/decorator-3.2.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(-)] dev-python/mako[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/pytools-2017.6[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/six-1.9.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(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.1.3.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a515e4754e3ead0a208e558c802b4bc
+_md5_=57017d4f130ad0d49041c433bc9b7c14
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.1.6 b/metadata/md5-cache/dev-python/pyopencl-2021.1.6
index 6b751aa5cdc2..b6a09a66cad3 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2021.1.6
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.1.6
@@ -1,16 +1,16 @@
-BDEPEND=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(-)]
+BDEPEND=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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[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/pybind11[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(-)]
+DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
-IUSE=examples opengl python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples opengl python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-python/numpy[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/appdirs-1.4.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(-)] >=dev-python/decorator-3.2.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(-)] dev-python/mako[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/pytools-2017.6[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/six-1.9.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(-)] >=virtual/opencl-2 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=virtual/opencl-2 >=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/decorator-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/mako[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytools-2017.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.1.6.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=859fb2663cdb297e8783db381e3dcbbe
+_md5_=37f1de68c13150e79308b801f55b6195
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-15 b/metadata/md5-cache/dev-python/pyproject2setuppy-15
new file mode 100644
index 000000000000..5b640c909820
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-15
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v15.tar.gz -> pyproject2setuppy-15.tar.gz
+_eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b3c53a7a03ae171fc89b518d5a59c19e
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.4.1 b/metadata/md5-cache/dev-python/pyyaml-5.4.1
index 9e3876cfc984..929d336f64e9 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.4.1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.4.1
@@ -1,16 +1,16 @@
-BDEPEND=libyaml? ( python_targets_python3_7? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) test? ( libyaml? ( dev-libs/libyaml:= ) ) 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(-)]
+BDEPEND=libyaml? ( python_targets_python3_7? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) ) test? ( libyaml? ( dev-libs/libyaml:= ) ) 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=libyaml? ( dev-libs/libyaml:= )
 DESCRIPTION=YAML parser and emitter for Python
 EAPI=7
 HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/ https://github.com/yaml/pyyaml
-IUSE=examples +libyaml test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples +libyaml test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=libyaml? ( dev-libs/libyaml:= ) 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(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=libyaml? ( dev-libs/libyaml:= ) 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 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/pyyaml/archive/5.4.1.tar.gz -> pyyaml-5.4.1.gh.tar.gz
 _eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=890587fe763e61d1fc75894a559d2d10
+_md5_=804ff83ad2fce5fdccacca1b919619cb
diff --git a/metadata/md5-cache/dev-python/testpath-0.5.0 b/metadata/md5-cache/dev-python/testpath-0.5.0
new file mode 100644
index 000000000000..1735c79237bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testpath-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-15 test? ( dev-python/pathlib2[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[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(-)] ) test? ( >=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(-)] ) 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-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_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/pyproject2setuppy[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
+DESCRIPTION=Test utilities for code working with files and commands
+EAPI=7
+HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=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(-)]
+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/jupyter/testpath/archive/0.5.0.tar.gz -> testpath-0.5.0.tar.gz
+_eclasses_=distutils-r1	f0ca511df3fddd316b783632b804e8fb	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=dbea0266c2e9bf648c61ae11e1addc0b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 804ded9fba2d..26e2bf5dcee6 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/facter-3.14.17 b/metadata/md5-cache/dev-ruby/facter-3.14.17
index b48fc1a863ad..b4466a002e4b 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.17
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.17
@@ -5,7 +5,7 @@ DESCRIPTION=A cross-platform ruby library for retrieving facts from operating sy
 EAPI=7
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.17.tar.gz -> facter-3.14.17.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f892652831b3a7281c0984b82759ac62
+_md5_=dea72c42ef0ec27061e8566cd6e6545a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 17bd054a6529..54f846562365 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/rustup-1.24.2 b/metadata/md5-cache/dev-util/rustup-1.24.2
new file mode 100644
index 000000000000..c305d5627b76
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rustup-1.24.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/rust >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
+DESCRIPTION=Rust toolchain installer
+EAPI=7
+HOMEPAGE=https://rust-lang.github.io/rustup/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB
+RDEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rust-lang/rustup/archive/1.24.2.tar.gz -> rustup-1.24.2.tar.gz https://github.com/rbtcollins/home/archive/a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz -> home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.5.0/download -> aes-0.5.0.crate https://crates.io/api/v1/crates/aesni/0.8.0/download -> aesni-0.8.0.crate https://crates.io/api/v1/crates/aes-soft/0.5.0/download -> aes-soft-0.5.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.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.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/async-compression/0.3.7/download -> async-compression-0.3.7.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitfield/0.13.2/download -> bitfield-0.13.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-cipher/0.8.0/download -> block-cipher-0.8.0.crate https://crates.io/api/v1/crates/block-modes/0.6.1/download -> block-modes-0.6.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/blowfish/0.6.0/download -> blowfish-0.6.0.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cast5/0.8.0/download -> cast5-0.8.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfb-mode/0.5.0/download -> cfb-mode-0.5.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/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/circular/0.3.0/download -> circular-0.3.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clear_on_drop/0.2.4/download -> clear_on_drop-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/cpuid-bool/0.1.2/download -> cpuid-bool-0.1.2.crate https://crates.io/api/v1/crates/crc24/0.1.6/download -> crc24-0.1.6.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download -> crossbeam-epoch-0.9.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/curl/0.4.35/download -> curl-0.4.35.crate https://crates.io/api/v1/crates/curl-sys/0.4.41+curl-7.75.0/download -> curl-sys-0.4.41+curl-7.75.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.0.2/download -> curve25519-dalek-3.0.2.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/des/0.5.0/download -> des-0.5.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/ed25519/1.0.3/download -> ed25519-1.0.3.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/effective-limits/0.5.2/download -> effective-limits-0.5.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/enum-map/1.1.0/download -> enum-map-1.1.0.crate https://crates.io/api/v1/crates/enum-map-derive/0.5.0/download -> enum-map-derive-0.5.0.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.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/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/futures-channel/0.3.13/download -> futures-channel-0.3.13.crate https://crates.io/api/v1/crates/futures-core/0.3.13/download -> futures-core-0.3.13.crate https://crates.io/api/v1/crates/futures-io/0.3.13/download -> futures-io-0.3.13.crate https://crates.io/api/v1/crates/futures-macro/0.3.13/download -> futures-macro-0.3.13.crate https://crates.io/api/v1/crates/futures-sink/0.3.13/download -> futures-sink-0.3.13.crate https://crates.io/api/v1/crates/futures-task/0.3.13/download -> futures-task-0.3.13.crate https://crates.io/api/v1/crates/futures-util/0.3.13/download -> futures-util-0.3.13.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/git-testament/0.1.9/download -> git-testament-0.1.9.crate https://crates.io/api/v1/crates/git-testament-derive/0.1.10/download -> git-testament-derive-0.1.10.crate https://crates.io/api/v1/crates/h2/0.3.2/download -> h2-0.3.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/http/0.2.3/download -> http-0.2.3.crate https://crates.io/api/v1/crates/httparse/1.3.5/download -> httparse-1.3.5.crate https://crates.io/api/v1/crates/http-body/0.4.1/download -> http-body-0.4.1.crate https://crates.io/api/v1/crates/httpdate/0.3.2/download -> httpdate-0.3.2.crate https://crates.io/api/v1/crates/hyper/0.14.5/download -> hyper-0.14.5.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/ipnet/2.3.0/download -> ipnet-2.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.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.50/download -> js-sys-0.3.50.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.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.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/lzma-sys/0.1.17/download -> lzma-sys-0.1.17.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.11/download -> mio-0.7.11.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint-dig/0.6.1/download -> num-bigint-dig-0.6.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.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.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.33/download -> openssl-0.10.33.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-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.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/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pgp/0.7.1/download -> pgp-0.7.1.crate https://crates.io/api/v1/crates/pin-project/1.0.6/download -> pin-project-1.0.6.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.6/download -> pin-project-internal-1.0.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download -> pin-project-lite-0.2.6.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/pulldown-cmark/0.8.0/download -> pulldown-cmark-0.8.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.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_chacha/0.3.0/download -> rand_chacha-0.3.0.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_core/0.6.2/download -> rand_core-0.6.2.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_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.6.1/download -> remove_dir_all-0.6.1.crate https://crates.io/api/v1/crates/reqwest/0.11.2/download -> reqwest-0.11.2.crate https://crates.io/api/v1/crates/retry/1.2.1/download -> retry-1.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/ripemd160/0.9.1/download -> ripemd160-0.9.1.crate https://crates.io/api/v1/crates/rsa/0.3.0/download -> rsa-0.3.0.crate https://crates.io/api/v1/crates/rs_tracing/1.0.1/download -> rs_tracing-1.0.1.crate https://crates.io/api/v1/crates/rustls/0.19.0/download -> rustls-0.19.0.crate https://crates.io/api/v1/crates/rustls-native-certs/0.5.0/download -> rustls-native-certs-0.5.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.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.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.6.0/download -> sct-0.6.0.crate https://crates.io/api/v1/crates/security-framework/2.2.0/download -> security-framework-2.2.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.2.0/download -> security-framework-sys-2.2.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.9.4/download -> sha-1-0.9.4.crate https://crates.io/api/v1/crates/sha2/0.9.3/download -> sha2-0.9.3.crate https://crates.io/api/v1/crates/sha3/0.9.1/download -> sha3-0.9.1.crate https://crates.io/api/v1/crates/sharded-slab/0.1.1/download -> sharded-slab-0.1.1.crate https://crates.io/api/v1/crates/signature/1.3.0/download -> signature-1.3.0.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/socket2/0.4.0/download -> socket2-0.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stream-cipher/0.7.1/download -> stream-cipher-0.7.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/sys-info/0.6.1/download -> sys-info-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.33/download -> tar-0.4.33.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.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.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.4.0/download -> tokio-1.4.0.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.6.5/download -> tokio-util-0.6.5.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.25/download -> tracing-0.1.25.crate https://crates.io/api/v1/crates/tracing-core/0.1.17/download -> tracing-core-0.1.17.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twofish/0.4.0/download -> twofish-0.4.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.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.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.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/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.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.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.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.73/download -> wasm-bindgen-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.73/download -> wasm-bindgen-backend-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.23/download -> wasm-bindgen-futures-0.4.23.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.73/download -> wasm-bindgen-macro-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.73/download -> wasm-bindgen-macro-support-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.73/download -> wasm-bindgen-shared-0.2.73.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/web-sys/0.3.50/download -> web-sys-0.3.50.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.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/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.crate https://crates.io/api/v1/crates/x25519-dalek/1.1.0/download -> x25519-dalek-1.1.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.2.0/download -> zeroize-1.2.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.0.1/download -> zeroize_derive-1.0.1.crate https://crates.io/api/v1/crates/zstd/0.6.1+zstd.1.4.9/download -> zstd-0.6.1+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-safe/3.0.1+zstd.1.4.9/download -> zstd-safe-3.0.1+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-sys/1.4.20+zstd.1.4.9/download -> zstd-sys-1.4.20+zstd.1.4.9.crate
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cargo	7a8c7ca59987a0dfb53f3c68656d2c3c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2785b5db55a39c25ccea330378d277a2
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 65463eb5aee9..c499184ff0ed 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.6 b/metadata/md5-cache/net-analyzer/suricata-5.0.6
index 52942f31b687..b9fc26d8be07 100644
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.6
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.6
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=config configure install postinst prepare pretend setup
-DEPEND=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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=7
 HOMEPAGE=https://suricata-ids.org/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.6.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aec89e271ffa1e36d19a227b2ea9e744
+_md5_=108d36787d08ed8a19b1d2cb6364acb7
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.2 b/metadata/md5-cache/net-analyzer/suricata-6.0.2
index 05c293877639..1305eac2e7cb 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.2
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=config configure install postinst prepare pretend setup
-DEPEND=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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DEPEND=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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
 DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
 EAPI=7
 HOMEPAGE=https://suricata-ids.org/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test kernel_linux lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-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] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+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] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) >=net-libs/libhtp-0.5.37 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.1.0 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) bpf? ( af-packet ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cfd08ce4f570c39cb7159e8ae4f8695a
+_md5_=6b8504e2eabfe8da7148aa01bf8afc8c
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 75812283021d..d7df72bab49f 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/dnsdist-1.6.0 b/metadata/md5-cache/net-dns/dnsdist-1.6.0
new file mode 100644
index 000000000000..8224d78bf572
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsdist-1.6.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/dnsdist acct-user/dnsdist >=dev-libs/boost-1.35:= dev-libs/libedit:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
+EAPI=7
+HOMEPAGE=https://dnsdist.org
+IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/dnsdist acct-user/dnsdist >=dev-libs/boost-1.35:= dev-libs/libedit:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) remote-logging? ( >=dev-libs/protobuf-3:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.6.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1855f56668430061187c5f1472e4086f
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f95ccf12e891..1d0ac641107b 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
deleted file mode 100644
index f20f52ade2b1..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( <dev-db/postgresql-9999:=[server] ) spamassassin? ( mail-filter/spamassassin )
-DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
-EAPI=7
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( <dev-db/postgresql-9999:=[server] ) spamassassin? ( mail-filter/spamassassin )
-REQUIRED_USE=mysql? ( !postgres )
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmail	b35b6b912311fb36e8fff96eaeb6bcf7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a209eac77d6a3cdd3fe40ad2ee26b1f2
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index f9bca88abd15..e1fc2721af7e 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/geos-3.9.1 b/metadata/md5-cache/sci-libs/geos-3.9.1
index 2db10dfc190d..66082320b7e7 100644
--- a/metadata/md5-cache/sci-libs/geos-3.9.1
+++ b/metadata/md5-cache/sci-libs/geos-3.9.1
@@ -4,9 +4,9 @@ DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://trac.osgeo.org/geos/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/geos/geos-3.9.1.tar.bz2 -> geos-3.9.1-r1.tar.bz2
-_md5_=157b8e8cbf66d4a8580f6486cd3e6f3d
+_md5_=c155f6c25883c57ffd35b7f8f9c0c556
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b0b3b44035d9..c047a45de8a1 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/fwupd-1.5.9 b/metadata/md5-cache/sys-apps/fwupd-1.5.9
index 2fa24638ee0d..0b4ec090126d 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.9
+++ b/metadata/md5-cache/sys-apps/fwupd-1.5.9
@@ -5,7 +5,7 @@ DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
 IUSE=agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi kernel_linux 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.1+
 RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 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] ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar x11-libs/cairo ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) uefi? ( gnutls )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.9.tar.gz -> fwupd-1.5.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	00d6fba6e500964c50ba74d1d1fc2e6c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	12de027593aabf8f7d7df8d6c702db16	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1503fce1a699602dbd6ed9a99549eca
+_md5_=7b61ecd0ab5c3fe10511c144f625de5f
diff --git a/metadata/md5-cache/sys-apps/less-581.2 b/metadata/md5-cache/sys-apps/less-581.2
index 32bb2f7a29fc..956f4546637f 100644
--- a/metadata/md5-cache/sys-apps/less-581.2
+++ b/metadata/md5-cache/sys-apps/less-581.2
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=7
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-581.2.tar.gz
-_md5_=fec5b565415ab5061221ebf06d30da43
+_md5_=15601695fd6e5430c73dc0464b7e60a6
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.23 b/metadata/md5-cache/sys-apps/sandbox-2.23
index b613031524d7..48c2af5f96a3 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.23
+++ b/metadata/md5-cache/sys-apps/sandbox-2.23
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Sandbox
 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=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/sandbox-2.23.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ccd5e533d0ee348c69ccd8f11247a248
+_md5_=6b227eced7907acb43f7183403b997ab
diff --git a/metadata/md5-cache/sys-apps/systemd-248.2 b/metadata/md5-cache/sys-apps/systemd-248.3
similarity index 98%
rename from metadata/md5-cache/sys-apps/systemd-248.2
rename to metadata/md5-cache/sys-apps/systemd-248.3
index 5f9b95462a2b..7f159d763663 100644
--- a/metadata/md5-cache/sys-apps/systemd-248.2
+++ b/metadata/md5-cache/sys-apps/systemd-248.3
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.2/systemd-stable-248.2.tar.gz
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.3/systemd-stable-248.3.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	00d6fba6e500964c50ba74d1d1fc2e6c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4072fe2dfc3ddb9a10ff2ddc6e2b13ef
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 078445eb16a0..b1c12bb18e47 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0
new file mode 100644
index 000000000000..d1ae16a615bf
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.380.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Archive-Tar
+EAPI=7
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/Archive-Tar-2.380.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.380.0 !>perl-core/Archive-Tar-2.380.0-r999
+SLOT=0
+_md5_=fdd13f031637934bca0407a32b465d97
diff --git a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r3 b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r4
similarity index 52%
rename from metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r3
rename to metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r4
index b35c6b215ef2..2a561de7c53b 100644
--- a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r3
+++ b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r4
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Attribute-Handlers
 EAPI=6
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Attribute-Handlers-1.10.0 ) dev-lang/perl:= !<perl-core/Attribute-Handlers-1.10.0 !>perl-core/Attribute-Handlers-1.10.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.34* =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Attribute-Handlers-1.10.0 ) dev-lang/perl:= !<perl-core/Attribute-Handlers-1.10.0 !>perl-core/Attribute-Handlers-1.10.0-r999
 SLOT=0
-_md5_=cb89441146246fd1102caab98fd63dae
+_md5_=2e62cd70a7cbd102ca3fd806952cc907
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.340.0 b/metadata/md5-cache/virtual/perl-autodie-2.340.0
new file mode 100644
index 000000000000..144dc19af1bc
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-autodie-2.340.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for autodie
+EAPI=7
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-lang/perl-5.34* ~perl-core/autodie-2.340.0 ) dev-lang/perl:= !<perl-core/autodie-2.340.0 !>perl-core/autodie-2.340.0-r999
+SLOT=0
+_md5_=fdd13f031637934bca0407a32b465d97
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 38d95c3471e8..cf239aa7aa29 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/libapreq2-2.16 b/metadata/md5-cache/www-apache/libapreq2-2.16
index f0d7f3000447..0672eb02b94d 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.16
+++ b/metadata/md5-cache/www-apache/libapreq2-2.16
@@ -4,11 +4,11 @@ DESCRIPTION=A library for manipulating client request data via the Apache API
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/apreq/
 IUSE=perl test
-KEYWORDS=~amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[nss] ) perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.16.tar.gz
 _eclasses_=apache-module	6d6745b832afba32cbcfba34e3ee328f	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=c4f01fc891b583e638c9ca6c4d9fc801
+_md5_=1e7b8d75bf6057b3c5cc3d60a060d9a3
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index f22814ea94da..711c68149ba0 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-developer-77.0.4032.0 b/metadata/md5-cache/www-client/opera-developer-78.0.4058.0
similarity index 69%
rename from metadata/md5-cache/www-client/opera-developer-77.0.4032.0
rename to metadata/md5-cache/www-client/opera-developer-78.0.4058.0
index 428caeaae673..874a04ab73c7 100644
--- a/metadata/md5-cache/www-client/opera-developer-77.0.4032.0
+++ b/metadata/md5-cache/www-client/opera-developer-78.0.4058.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.opera.com/
 IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/77.0.4032.0/linux/opera-developer_77.0.4032.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/77.0.4032.0/linux/opera-developer_77.0.4032.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/77.0.4032.0/linux/opera-developer_77.0.4032.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/77.0.4032.0/linux/opera-developer_77.0.4032.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4449.6.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/78.0.4058.0/linux/opera-developer_78.0.4058.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/78.0.4058.0/linux/opera-developer_78.0.4058.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/78.0.4058.0/linux/opera-developer_78.0.4058.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/78.0.4058.0/linux/opera-developer_78.0.4058.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4484.7.tar.xz )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcaea4d3a550e572647a573cc4061f83
+_md5_=c8a7f8d825ff7892b939c39ba7796168
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f64df47e0aa3..20a5c73e7318 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/fracplanet-0.5.1 b/metadata/md5-cache/x11-misc/fracplanet-0.5.1
index f3367d86ae89..2ef1a91a9876 100644
--- a/metadata/md5-cache/x11-misc/fracplanet-0.5.1
+++ b/metadata/md5-cache/x11-misc/fracplanet-0.5.1
@@ -1,13 +1,13 @@
 BDEPEND=dev-libs/libxslt
 DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl
+DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5 virtual/glu virtual/opengl
 DESCRIPTION=Fractal planet and terrain generator
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/fracplanet/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl
+RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5 virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/fracplanet/fracplanet-0.5.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e11e4b9d5462656d654cef61a32ef3f
+_md5_=443a5ad3960805d75115a0b110a7319d
diff --git a/metadata/news/2021-05-18-syncthing-tls-incompatibility/2021-05-18-syncthing-tls-incompatibility.en.txt b/metadata/news/2021-05-18-syncthing-tls-incompatibility/2021-05-18-syncthing-tls-incompatibility.en.txt
new file mode 100644
index 000000000000..2e5505c01152
--- /dev/null
+++ b/metadata/news/2021-05-18-syncthing-tls-incompatibility/2021-05-18-syncthing-tls-incompatibility.en.txt
@@ -0,0 +1,16 @@
+Title: >=net-p2p/syncthing-1.17.0 incompatibility warning
+Author: Marek Szuba <marecki@gentoo.org>
+Posted: 2021-05-18
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: net-p2p/syncthing
+
+Starting with version 1.17.0, net-p2p/syncthing by default only allows
+TLS 1.3 for sync connections - making it impossible to sync with devices
+not supporting it, i.e. running Syncthing versions older than 1.3.0.
+
+If you do require your Syncthing cluster to support TLS 1.2, you will have to
+explicitly allow it by enabling the option "insecureAllowOldTLSVersions".
+For details see:
+
+https://docs.syncthing.net/advanced/option-insecure-allow-old-tls-versions.html
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 7ca8f9b0a0aa..e5dfcd03c7ed 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d3ebf1e6eee2..ed830e66d6e1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 17 May 2021 13:39:16 +0000
+Mon, 17 May 2021 20:39:09 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index a6b010795e9a..3566cb00e033 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-eecc7672075400fe7f0ca40fdf9843b8da23774c 1621029447 2021-05-14T21:57:27+00:00
+5b9f31eb4ae87122032e416b6ef3daef7f634e87 1621262978 2021-05-17T14:49:38+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 8d71e45dff05..681921b41473 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon May 17 01:39:15 PM UTC 2021
+Mon May 17 08:39:09 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e469feccf9db..2b75eca777c3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 17 May 2021 14:00:01 +0000
+Mon, 17 May 2021 21:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9023e1c80908..c2bb928a5485 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-cd39544d0a52fff69c1a1c9bd95d5c21aec4a785 1621257909 2021-05-17T13:25:09+00:00
+de3495c689731b7fefadb64626fd5d9ccb31b4d9 1621280552 2021-05-17T19:42:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8ec6d248a7bb..3f1b941bbe16 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1621258801 Mon 17 May 2021 01:40:01 PM UTC
+1621283701 Mon 17 May 2021 08:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d3ebf1e6eee2..ed830e66d6e1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 17 May 2021 13:39:16 +0000
+Mon, 17 May 2021 20:39:09 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c6e8930028e5..6473f40dc802 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/suricata/suricata-5.0.6.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild
index defd0c6f7f87..ac0387dc3152 100644
--- a/net-analyzer/suricata/suricata-5.0.6.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild
index 061242b9a529..ac72587b971d 100644
--- a/net-analyzer/suricata/suricata-6.0.2.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
 
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b23c89e67ad8..06d543f3eed9 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index a5947ea150cd..a19099ebb1fc 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1 +1,2 @@
 DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
+DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f
diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
new file mode 100644
index 000000000000..3340f22db784
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	regex? ( dev-libs/re2:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		--with-lua="${ELUA}" \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use_with regex re2) \
+		$(use_with remote-logging protobuf) \
+		$(use_with snmp net-snmp) \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d8c741da0896..acef7c95f5b3 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
deleted file mode 100644
index 73511f611bc7..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( <dev-db/postgresql-9999:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
-	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am || die
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local -a authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=( "--enable-auth-module=mysql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-			"--disable-mysql-replication"
-			"--enable-mysql-limits"
-		)
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=( "--enable-auth-module=pgsql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-		)
-	else
-		authopts+=( "--enable-auth-module=cdb" )
-	fi
-
-	econf ${authopts[@]} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6f69f8c4b3d9..2315d81e5204 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/exabgp/files/exabgp.initd b/net-misc/exabgp/files/exabgp.initd
index c3e3d93a494e..c3bbcf1247e1 100644
--- a/net-misc/exabgp/files/exabgp.initd
+++ b/net-misc/exabgp/files/exabgp.initd
@@ -8,7 +8,7 @@
 command="capsh"
 command_args="
 	--groups=${EXABGP_GROUP:=exabgp}
-	--user=${EXABGP_USER:-exabgp}
+	--user=${EXABGP_USER:=exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 command_background="yes"
diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
index 070a9bf07251..1d942d850253 100644
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ b/net-misc/exabgp/files/exabgp.initd-r1
@@ -8,7 +8,7 @@
 command="capsh"
 command_args="
 	--groups=${EXABGP_GROUP:=exabgp}
-	--user=${EXABGP_USER:-exabgp}
+	--user=${EXABGP_USER:=exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index def8d41e6424..8f1d9b156103 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 17a0fca84d1f..9d0868557f40 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -106,6 +106,8 @@ dev-perl/gtk2-spell
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-09)
 # Work in progress, do not use yet
 =dev-lang/perl-5.34*
+~virtual/perl-Archive-Tar-2.380.0
+~virtual/perl-autodie-2.340.0
 
 # David Seifert <soap@gentoo.org> (2021-05-09)
 # All revdeps masked, last release in 1999, needs to do now.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 02f2b3e774a3..cdd6438edc39 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
index 158228f7dfbc..0288365f38c1 100644
--- a/sci-libs/geos/geos-3.9.1.ebuild
+++ b/sci-libs/geos/geos-3.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index aa60cf9ecc49..fff10c46dd44 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd/fwupd-1.5.9.ebuild b/sys-apps/fwupd/fwupd-1.5.9.ebuild
index 0f781efec9ef..e70909e361c4 100644
--- a/sys-apps/fwupd/fwupd-1.5.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/less/less-581.2.ebuild b/sys-apps/less/less-581.2.ebuild
index a8c2f621cc46..10671e00e64e 100644
--- a/sys-apps/less/less-581.2.ebuild
+++ b/sys-apps/less/less-581.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/sandbox/sandbox-2.23.ebuild b/sys-apps/sandbox/sandbox-2.23.ebuild
index 411e33fa45e0..3fcb495f4274 100644
--- a/sys-apps/sandbox/sandbox-2.23.ebuild
+++ b/sys-apps/sandbox/sandbox-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 73a0e79018d4..dde16d6bd272 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,4 +2,4 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-DIST systemd-stable-248.2.tar.gz 10320003 BLAKE2B 0eb62cc6efc9fba06f3458c49242fd9c91fb26d296a1ad627867fe61e43c191fd2240e7448ab30f7ca0d16ebc16b1915f1cef51a172c283c1e8586d9fe3077e0 SHA512 b72d31f93a5ec21a013a67b293fccb028af9c8d69d0577ed2448c4855673e48268041520a44a656cc200bb15baa3c4d34d01d03e900abd37515f771a66893a9c
+DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
diff --git a/sys-apps/systemd/systemd-248.2.ebuild b/sys-apps/systemd/systemd-248.3.ebuild
similarity index 100%
rename from sys-apps/systemd/systemd-248.2.ebuild
rename to sys-apps/systemd/systemd-248.3.ebuild
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 369e3f61d288..c644caf1b277 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild
new file mode 100644
index 000000000000..9f4f948183fb
--- /dev/null
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.380.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r4.ebuild
similarity index 82%
rename from virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
rename to virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r4.ebuild
index ffa75f024ab8..cd01690f6805 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r4.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.34* =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-autodie/perl-autodie-2.340.0.ebuild b/virtual/perl-autodie/perl-autodie-2.340.0.ebuild
new file mode 100644
index 000000000000..9f4f948183fb
--- /dev/null
+++ b/virtual/perl-autodie/perl-autodie-2.340.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 5522455e7dd6..a46674a967e1 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/libapreq2/libapreq2-2.16.ebuild b/www-apache/libapreq2/libapreq2-2.16.ebuild
index 06d39f3633a6..cd02c5f60184 100644
--- a/www-apache/libapreq2/libapreq2-2.16.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://httpd.apache.org/apreq/"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ffe64f848c81..7dc355a7ad0e 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 141e43c0fd24..b8abc254ed53 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_77.0.4032.0_amd64.deb 75682812 BLAKE2B 777d935e76df59efb1be6997f222ab5ad64b64ec6cc8cbfc797f763f190feb0b539569a0a7025df8eca0ed4c4d4f05b226a461e4efb7c16ece3cd5e0c9952c70 SHA512 bddad890f4c2190922d0bb4734cab21696f402fcdf9da60dc4bd20f1fd15e4b0a34888fb33d6e1918502ad38ec305fd5a08301242c8806e24bbc0ae6db4aea20
 DIST opera-developer_77.0.4046.0_amd64.deb 74348004 BLAKE2B 62640a0086622995505acf5e5c9d27127b1553424faf58668d1a672bd5389f89215ae9a1881529bd73f0f42968ef95bf1c3e01fcab452f1be59c1b1fb676887c SHA512 a3703961b85eb30cf6d0bbcc02783b7e33d02607bfc4429c93f8f6837a3c1706d117c6e7aa0c793539c73da2410ff81dfcf10f781f74034d629f855f14b88175
 DIST opera-developer_77.0.4051.0_amd64.deb 74289808 BLAKE2B 28aa53020aa1f359cccc89c5ac37f4f76a6627a7af049fd549c5d495b984b8420c202da36c113709513caff3d1b5d7354ad67579a21513ea2661d2201b18ae57 SHA512 d524dc0ae12779b09e892232a2d592a9308cd765e1e5e346d651d47961d2e65dd1f54dad8f6761664ac28e5a0767760c91b4fdaf8cfb7a716dce57d0d5235bbd
-DIST opera-ffmpeg-codecs-91.0.4449.6.tar.xz 1383580 BLAKE2B 95cea2f648aded8193f0806f2fe82dca7cf23ea69051fb961224a6430f312230cb138e1e2ec0e3ad82d7540523ca943a7195ed1d5669382174619b1bf90ec459 SHA512 01bc10777387d9223b9f8781052fef10377af5fe79b260698458aa7c7400b191f112ac6f6e3dada4cb0a3c052e1c456e6831e5857500c8567dd7a0d8b8d322a2
+DIST opera-developer_78.0.4058.0_amd64.deb 75204120 BLAKE2B 6ad70e31dfa379f524e8844404b5d8863715346ccdc7a193812be6d6a549281742c6a90250bf3998c0da717551bfe328d3b5b71a7cda990a89d83f600e5345bf SHA512 25f8f08a114803494be9b2a00721ad8d1dcfec47fab72325606c27a35f9b0c11bb33dc24a431a43e2b383737ec49c15899e4792ced68783b36a686e5e078aa4d
 DIST opera-ffmpeg-codecs-91.0.4472.19.tar.xz 1383552 BLAKE2B f278bcef8ec013e24bb5293f50cb82be8b9381d181d6e837e8ed0f5b5f7fbdbde4d6e16e30787def46c333f2d6fb7573c7fbdf09697400d9429b3bc154a8da92 SHA512 58c419e469f257e5d3a7ec2fb18885a61aa8f4d6a56f8f6922fb4d4cecbfd9267d7cd72a451d1b23ee88bad0bebd83affa0850a1bbf7b2b26dac398752c7e905
+DIST opera-ffmpeg-codecs-92.0.4484.7.tar.xz 1384356 BLAKE2B 6032d1f1641e5c5e83ea2315e3774b97a1aa2c5740095d5716b3d6b31ac31d4315a32195273ac5a944578b8c28128802d21e226393f60bdcf6c3a6e73e9b91de SHA512 b152d0a19151b51a1eb9c28946ca7cbb9e6b389fd440554853de0e7c8cf149e805214b051aca9c579988ec1000368208a42afe88cdd47b6290c5da3d5122d1f0
diff --git a/www-client/opera-developer/opera-developer-77.0.4032.0.ebuild b/www-client/opera-developer/opera-developer-78.0.4058.0.ebuild
similarity index 98%
rename from www-client/opera-developer/opera-developer-77.0.4032.0.ebuild
rename to www-client/opera-developer/opera-developer-78.0.4058.0.ebuild
index bf54e3c22929..9d5d1cbbfdab 100644
--- a/www-client/opera-developer/opera-developer-77.0.4032.0.ebuild
+++ b/www-client/opera-developer/opera-developer-78.0.4058.0.ebuild
@@ -30,7 +30,7 @@ fi
 
 KEYWORDS="-* ~amd64"
 
-FFMPEG_VERSION="91.0.4449.6"
+FFMPEG_VERSION="92.0.4484.7"
 
 SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	proprietary-codecs? (
@@ -60,6 +60,7 @@ RDEPEND="
 	x11-libs/libdrm
 	x11-libs/libxcb
 	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c155c275f2c7..206cba5d39a3 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 86a237d31893..5f89bd2b1b43 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.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
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
+	dev-qt/qtopengl:5[-gles2-only]
 	dev-qt/qtwidgets:5
 	virtual/glu
 	virtual/opengl