diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4e26ff6d85a7..30e6e1e86ddb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f769a3957397..95eb55845a3d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 11f34af475a0..a6191eae9021 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -10,4 +10,5 @@ DIST awscli-1.20.30.tar.gz 2066899 BLAKE2B 47a111849b14e9cdc24a8fb117711195bee5a
 DIST awscli-1.20.31.tar.gz 2067614 BLAKE2B 28c268f89f733dcf3db18f83abaa312ab25b082f8a2a628889c113d60b54c054d500a5e202724af58801e02cbff74041b0409c3f9d86dda7eea446ec763a69d9 SHA512 5530250de3c0b744bd0df1d2cabc7affa75bc8504dd0b92c0854bc02a96cc8222ef710f3fa2b5ee586da04f4cd4abffd58e5e663a002acc31d106ae479fb0c38
 DIST awscli-1.20.32.tar.gz 2068048 BLAKE2B 396aee12287bad95e825159a4352e3ac259a9e572b593384244fdaa7a9e632cac9fe2115584dcc23cd6feefc6c4f7e6ae5eb1a2a9e7c18c7ac0c750f725204ac SHA512 e46c3e5fc9572ee9d3b4dc186f98801a207b2d9d8d8edfa44676710bf8b175044a7900ef95779cdaf439fc0b492ac933948dd0cc9b0def316468412b50996bc3
 DIST awscli-1.20.33.tar.gz 2067909 BLAKE2B cabdca002d42220286cd3352e8c1b4f21aa28a7898676f7e9403da894c7e2756865d47f4b541ba44acbfc926823671748dbabc0c776ae4767b4ff8d73918ff82 SHA512 3a8b3474eb2056be33aff65bfa3f421f4ff3fbc0ea74f6dec53d7eb961d5f1938b92f7a403b3fe6afa52e403a174bab44b8f5ba71632fd7609f9ba2e1084b4fd
+DIST awscli-1.20.34.tar.gz 2068450 BLAKE2B 93cf9aa129b5d9b30b0fb82aa8508f997ef2d9477498626c98e4a3b2718b0a0f96ca3b5d666cdcfdadbc4bfee28b508cca78e3909da9ad9fd2cb6c2e36844989 SHA512 f7754021133aca4cdefac3a6eba2e2441942530fc9440115a97fab6bde62cdcac0e4529599630cae020764a086c4ea951d4ec8045547084fa4cc8ea3e3b9afc8
 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
diff --git a/app-admin/awscli/awscli-1.20.34.ebuild b/app-admin/awscli/awscli-1.20.34.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.34.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8172ed3caafc..472cecce1980 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 3953af27c297..e981a65df9b0 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,4 +1,5 @@
 DIST virt-viewer-10.0.tar.xz 256372 BLAKE2B 3368164c2f770f8aa963e0fb93e713249b05d31600747b68197864a40bf6fdb221ad44abb8ea5465706543241bd5898353cadf2a3e0917455383283722fdfd4f SHA512 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
+DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
 DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
 DIST virt-viewer-9.0.tar.gz 1176991 BLAKE2B bc4df73575195888b769dddd8de5c0eda9daa257902f3f3ce8099f9096d0cd9be28547c8671decb70e83e5f0de71633793886bfe78bd9ab5f360dc9759afcc5b SHA512 a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
new file mode 100644
index 000000000000..f0e4ed5973db
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="https://virt-manager.org/"
+GIT_HASH="f0cc7103becccbce95bdf0c80151178af2bace5a"
+SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${GIT_HASH}/${PN}-${GIT_HASH}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${GIT_HASH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+libvirt sasl +spice +vnc"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.6
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	libvirt? (
+		>=app-emulation/libvirt-0.10.0:=[sasl?]
+		app-emulation/libvirt-glib
+	)
+	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
+DEPEND="${RDEPEND}
+	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
+BDEPEND="dev-lang/perl
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature libvirt libvirt)
+		$(meson_feature vnc vnc)
+		$(meson_feature spice spice)
+	)
+	meson_src_configure
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 7cfaa4102a1f..2d369d924688 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
index 3a2e87e307f8..ec5282603d2d 100644
--- a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
+++ b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 # gnome-shell schemas are used in pkg_postinst
 COMMON_DEPEND="app-admin/eselect
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index 6d54c60fa824..d033658d49e8 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.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=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 S="${WORKDIR}"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index db203cbff740..91cd896abd3a 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index d855d77a1a0d..f7c931369932 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,3 +2,4 @@ DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f
 DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05
 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
 DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22
+DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
new file mode 100644
index 000000000000..9dc461da301e
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+GENTOO_VER=
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
+	${GENTOO_PATCHSET_URI}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		>=x11-libs/libXfixes-6.0.0
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	x11-misc/xkeyboard-config
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if [[ -n ${GENTOO_VER} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		eapply "${WORKDIR}"/patches-gentoo/*.patch
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+
+			python_optimize
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+
+	# Undo compression of man page
+	find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 9bb71cfceb8e..81fefdbdb2a4 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 5aedf2c3db76..3b56c3963f04 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -21,7 +21,6 @@ DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e5
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
-DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
 DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
@@ -31,8 +30,8 @@ DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52
 DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
-DIST mcfly-0.5.6.tar.gz 202647 BLAKE2B 9acd3eb94c3c36991a2f990d9cab8b327e064e639651c1664e2306ed3e2716609c0c9e8aeed8e4bf26c0e5daab078b61f982342ab06964bede644dda039ae341 SHA512 0e715a292df56170056aef3de9310671e6e6763741b5b918c14f55d74f24f8310a284e22e7697b994d304044a7fafdbc42049694b688f05c5598582ea743da1b
 DIST mcfly-0.5.7.tar.gz 205712 BLAKE2B 88fad8b6c51478bc9b21d58a547daddcf5eebc0f88f71e1bced9b07bf06083f4ea4f48c42db45eb92d668be49c2dd11b7878875fabc8c3f9d94e591bd3b99ad7 SHA512 d8245f9feafe7539d0401f87ca99a7a10e537b9f1cbe163d9eb5b5400758cff46c919829e56eb4f8ce3542b4f131e3f9072eb75d55df753fabc1f9a28483dcc4
+DIST mcfly-0.5.8.tar.gz 207343 BLAKE2B 7d00868fd76866a4ef1b8f41d1563513bf37b9873bb265e33ff9d67e65b36fa8a916f4c6c503bf60a694e670a4bab152bd2935ea36ce75564ef66b91c3c7a20c SHA512 82a834059cdf5b9b2f8136dbede2cd31ed071961d759d35ee8cb6e2283f1a6b0b7633daf834f7387c4bd627e894d530d9f99309d827538137179cc0994103f9a
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
diff --git a/app-shells/mcfly/mcfly-0.5.6.ebuild b/app-shells/mcfly/mcfly-0.5.6.ebuild
deleted file mode 100644
index 8873fee30d3b..000000000000
--- a/app-shells/mcfly/mcfly-0.5.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-ansi_term-0.11.0
-arrayref-0.3.6
-arrayvec-0.5.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-bitflags-1.2.1
-blake2b_simd-0.5.10
-bstr-0.2.12
-byteorder-1.3.4
-cc-1.0.52
-cfg-if-0.1.10
-clap-2.33.0
-constant_time_eq-0.1.5
-crossbeam-utils-0.7.2
-csv-1.1.3
-csv-core-0.1.10
-dirs-2.0.2
-dirs-sys-0.3.4
-either-1.6.1
-getrandom-0.1.14
-getrandom_package-0.1.20
-hermit-abi-0.1.12
-itertools-0.9.0
-itoa-0.4.5
-lazy_static-1.4.0
-libc-0.2.69
-libsqlite3-sys-0.10.0
-linked-hash-map-0.5.3
-lru-cache-0.1.2
-memchr-2.3.3
-numtoa-0.1.0
-pkg-config-0.3.17
-ppv-lite86-0.2.6
-rand-0.7.3
-rand_chacha-0.2.2
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-redox_termios-0.1.1
-redox_users-0.3.4
-regex-1.3.7
-regex-automata-0.1.9
-regex-syntax-0.6.17
-relative-path-1.0.0
-rusqlite-0.15.0
-rust-argon2-0.7.0
-ryu-1.0.4
-serde-1.0.106
-shellexpand-2.0.0
-strsim-0.8.0
-termion-1.5.5
-textwrap-0.11.0
-thread_local-1.0.1
-time-0.1.43
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-vcpkg-0.2.8
-vec_map-0.8.2
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
-HOMEPAGE="https://github.com/cantino/mcfly"
-SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="/usr/bin/mcfly"
-
-src_install() {
-	cargo_src_install
-
-	insinto "/usr/share/${PN}"
-	doins "${PN}".{bash,fish,zsh}
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "To start using ${PN}, add the following to your shell:"
-	elog
-	elog "~/.bashrc"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
-	elog "[[ -f ${p} ]] && source ${p}"
-	elog
-	elog "~/.config/fish/config.fish"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
-	elog "if test -r ${p}"
-	elog "    source ${p}"
-	elog "    mcfly_key_bindings"
-	elog
-	elog "~/.zsh"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
-	elog "[[ -f ${p} ]] && source ${p}"
-}
diff --git a/app-shells/mcfly/mcfly-0.5.8.ebuild b/app-shells/mcfly/mcfly-0.5.8.ebuild
new file mode 100644
index 000000000000..9a8ceff92000
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.5.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.10
+	ansi_term-0.11.0
+	arrayref-0.3.6
+	arrayvec-0.5.1
+	atty-0.2.14
+	autocfg-1.0.0
+	base64-0.11.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.10
+	bstr-0.2.12
+	byteorder-1.3.4
+	cc-1.0.52
+	cfg-if-0.1.10
+	chrono-0.4.19
+	clap-2.33.0
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.7.2
+	csv-1.1.3
+	csv-core-0.1.10
+	dirs-2.0.2
+	dirs-sys-0.3.4
+	either-1.6.1
+	getrandom-0.1.14
+	hermit-abi-0.1.12
+	humantime-2.1.0
+	itertools-0.9.0
+	itoa-0.4.5
+	lazy_static-1.4.0
+	libc-0.2.69
+	libsqlite3-sys-0.10.0
+	linked-hash-map-0.5.3
+	lru-cache-0.1.2
+	memchr-2.3.3
+	num-integer-0.1.44
+	num-traits-0.2.14
+	numtoa-0.1.0
+	pkg-config-0.3.17
+	ppv-lite86-0.2.6
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	redox_syscall-0.1.56
+	redox_termios-0.1.1
+	redox_users-0.3.4
+	regex-1.3.7
+	regex-automata-0.1.9
+	regex-syntax-0.6.17
+	relative-path-1.0.0
+	rusqlite-0.15.0
+	rust-argon2-0.7.0
+	ryu-1.0.4
+	serde-1.0.106
+	shellexpand-2.0.0
+	strsim-0.8.0
+	termion-1.5.5
+	textwrap-0.11.0
+	thread_local-1.0.1
+	time-0.1.43
+	unicode-segmentation-1.6.0
+	unicode-width-0.1.7
+	vcpkg-0.2.8
+	vec_map-0.8.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.8
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/mcfly"
+
+src_install() {
+	cargo_src_install
+
+	insinto /usr/share/${PN}
+	doins ${PN}.{bash,fish,zsh}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "To start using ${PN}, add the following to your shell:"
+	elog
+	elog "~/.bashrc"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
+	elog "[[ -f ${p} ]] && source ${p}"
+	elog
+	elog "~/.config/fish/config.fish"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
+	elog "if test -r ${p}"
+	elog "    source ${p}"
+	elog "    mcfly_key_bindings"
+	elog
+	elog "~/.zsh"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
+	elog "[[ -f ${p} ]] && source ${p}"
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fc0bb89df0aa..73df109c9079 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index a503549af7bd..cba4685041ca 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1 +1 @@
-DIST sqlcl-21.2.0.174.2245.zip 37572475 BLAKE2B 331319acfdba2e09b31ba5f7e01549a37bb4226487487afcb5afe2bf8f933481c1131d8f4821f668cb5b13ff7f14866097565562ad383e09b23c7b2302670abf SHA512 410614af0acde54bc9fbacb0c2168fe049baccca0d3dbf7e9940176abd90250705aac92a69e09dd9c8854b124dab399bb36bbb381156724528e830ce897f022e
+DIST sqlcl-21.2.2.223.0914.zip 37581478 BLAKE2B 098988e17b9f347e4ce6142626174565543e701ad22f8dccb2260b4b1b8f74cd12a0c3824790e403a7dc359e329026eb83a656fde8b49e5317b70813b3fc4b07 SHA512 c5fc99095b731f2f4dc52e01a2a6974fb01d655a4d862a0b89594921183c4019bf9c07562d9f7307af5686770b19c1277e47562c6ae6786530561e13b9fd27b3
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-21.2.2.223.0914.ebuild
similarity index 96%
rename from dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild
rename to dev-db/sqlcl-bin/sqlcl-bin-21.2.2.223.0914.ebuild
index ec65b7343fd3..4abb49d13644 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-21.2.2.223.0914.ebuild
@@ -11,7 +11,7 @@ inherit java-pkg-2
 DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
 HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html"
 SRC_URI="https://download.oracle.com/otn_software/java/sqldeveloper/${MY_P}.zip"
-RESTRICT="bindist mirror"
+RESTRICT="mirror"
 
 LICENSE="OTN"
 SLOT="0"
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 8bca47f30340..422df38572bf 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,2 +1,2 @@
-DIST sqldeveloper-21.2.0.187.1842-no-jre.zip 458192293 BLAKE2B 7aed56d9bddb8c75f2bbe7bd7fdb6c7be470903ea462c44bd650caeb818ad90d87c9415d5a2c9fc5a4622e8184ea12622979a99dda04d47171e9565061da463c SHA512 7f292cd55c460da61841d85ea2269a9c051370503aea621394ff97d6ef2a9adf12403cc88626b6fb446a493a6024dacbf4fa0667a4cbf7c831a6932b7e6dfb61
+DIST sqldeveloper-21.2.1.204.1703-no-jre.zip 458220863 BLAKE2B 0f5bfb3a97667a728db6b8d61178cdfc90db0958ea7e08460de8d854037f775aa5b97e7e334048c5a717acb35db64334358918b45046395b0170f3ff733d3c65 SHA512 4cdff031ea008bb7b31a202487bb98c1748599b7190ba5b82c9c3fbcc86d453e75751585c243ca9f52d255a43e24a720a0929630b3c3742cf8e91cfa980cf3bb
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
diff --git a/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild b/dev-db/sqldeveloper/sqldeveloper-21.2.1.204.1703.ebuild
similarity index 90%
rename from dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild
rename to dev-db/sqldeveloper/sqldeveloper-21.2.1.204.1703.ebuild
index 47c5cd1e77d3..3707f45ec26d 100644
--- a/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-21.2.1.204.1703.ebuild
@@ -28,16 +28,18 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"
 
+S="${WORKDIR}/${PN}"
+
 QA_PREBUILT="
 	opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
 "
 
 pkg_nofetch() {
 	einfo "Please go to"
-	einfo "	${HOMEPAGE}"
+	einfo " ${HOMEPAGE}"
 	einfo "and download"
-	einfo "	Oracle SQL Developer for other platforms"
-	einfo "		${SRC_URI}"
+	einfo " Oracle SQL Developer for other platforms"
+	einfo "         ${SRC_URI}"
 	einfo "and move it to /var/cache/distfiles"
 }
 
@@ -47,7 +49,6 @@ src_prepare() {
 	sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die
 
 	rm -r netbeans/platform/modules/lib/i386 || die
-	#rm -r modules/javafx/{osx-x64,windows-x64} || die
 	rm -r modules/javafx || die
 
 	# they both use jtds, enabling one of them also enables the other one
@@ -74,9 +75,11 @@ src_prepare() {
 src_install() {
 	insinto /opt/${PN}
 	doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}}
-
 	fperms +x /opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
 
+	dodir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+	fperms 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+
 	newbin "${FILESDIR}"/${PN}-r1 ${PN}
 
 	newicon icon.png ${PN}-32x32.png
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 777fd95af600..ec0b508f0f1a 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d40428e0374b..d62e2ed534bf 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,4 +10,5 @@ DIST boto3-1.18.30.tar.gz 407362 BLAKE2B 14cbd75f3a4441d0b0aa3cb9cd1001053be5908
 DIST boto3-1.18.31.tar.gz 407465 BLAKE2B 816833b83f8a9da0ce97ebd5a2636f8d7a9f9170c690c2be57be53f959f191976d2e661057a64b233705dfeb740c599520bf99cc74d385c867192e442cbb1076 SHA512 4dbe54b0beda32f3decbfe378cffc6c20899d4800196c4bf1390365ea0c84836b526f4a23cd2779a3cc365cc863612ade972c96284be7bbfbe8f652b1312c9c4
 DIST boto3-1.18.32.tar.gz 407959 BLAKE2B 6e186599707ab606ab45b05347bfcc512e16c6c4d9793d002aa239eb0d1a0c0ee9e50a05013c7bd0e5b30c05e791646f692faf997e3ee6b35f278bfe888f16f1 SHA512 7b9862a9ca0d9e13e14d45d1cd989abc5e12e45e9f5cff1e52805c0bd39cbd8f27d5c24df5438e27c0a7e3115bb572570656ca09d5a58d93244802464864b38c
 DIST boto3-1.18.33.tar.gz 408557 BLAKE2B 3912205ec8f8ac2687e23c5a3a973d97489baf2df18aea4b1e8dcf8a14ee4157a249583bf487416ba93bd1b52c595f6661ea00a8a6bc861103dc72edd0f1a5d4 SHA512 0ca253a138e6539c95bacb23f39ebd06dedaff3793a04bb92fe70b460a16e0e420cd3d9a35c7d3800af11ab1efe4bd369caecec26e81d2557bc5b0932b095d28
+DIST boto3-1.18.34.tar.gz 408795 BLAKE2B d3960f1479796a0b47dc4d5137efead974f1e9cd658ccc62391673b50809e45007e26a9f6fcded9e1ec79d3b26668e6aeadfbbfed38f63ecb98ec75cf2f0182d SHA512 4537b404c20b76922a407513a1ddbc594f8e948635e73d74ee4e7324f6c7f8855b0931f1fd8f7d9ce68c794cd44544876d1e23bc5cac78289eac53c675c2d4c7
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.34.ebuild b/dev-python/boto3/boto3-1.18.34.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.34.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f3627fc5d685..723a34a1f762 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,4 +10,5 @@ DIST botocore-1.21.30.tar.gz 8081027 BLAKE2B 6566d74873c08ce84f6bd0e6a802e62c6cf
 DIST botocore-1.21.31.tar.gz 8081621 BLAKE2B 78bd0ad2d1371582e97c8ddddb9a0b9f41fd75d701ba2ad49fab0e6f3d4602eb6a06bb51f23f674ef71d8c0bcec39ab545071ec8ef252df1c9d9133d8223a746 SHA512 bdaa85ad59936334e8d0e57a0e6631bb1c4408a0b9a50eb883b9b9dc5df4845da2df0fc64af755c5bb2ce5ee667c449a751263e25c9912bcb335eaa41cbba95e
 DIST botocore-1.21.32.tar.gz 8083411 BLAKE2B f43cffb2b8dba99e9d893dc6842593525a5545878b52680f8418f86f01f1804dfd1439087092a71d1d9933b63e09615c781e52be8eb5176fb18d1808f0125d18 SHA512 a6d8ca645c3b00b04579be86febd232eac8929f1b58582948208d5b1cc82686c76327302c7459123be8e7a44bece1249ece58fe47619082916e383c0ee6c11a9
 DIST botocore-1.21.33.tar.gz 8091142 BLAKE2B 832df8535696227ccd0cfbe16d6084048b5d409f117a1142d97296107466371782ff20d8bd3fbf3bd8a90fe5c23e3b746e55a99014c7203dd5c7c1c1b17fbbb8 SHA512 6618f6b53664a62d10b5edd1845880655e88ff8ef7ed2b35ac0a9b18f0135302d148c12cdc6e588f25a328ac8da5e88174873a021078e8be3dc542da7e1579a8
+DIST botocore-1.21.34.tar.gz 8092134 BLAKE2B ab1ee884adf9dd69883482fe774aeea9f9485cdebcb8d45539b3f1909662f1b4c2eb6041594155acc29e3a90fb4b32cf13eb2f528cb19f27ea3b970e50d2492e SHA512 eece9a9aa9286bea196c576136d7191e712aa500081401d65d5dc6e293c95b8ba8ffb73d1708d62c551a936f5816e1bba0084d8bb5d99e18d4a27ee77392d5ed
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.34.ebuild b/dev-python/botocore/botocore-1.21.34.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 5e9a2fc42af6..d3fdef07db9a 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1 +1,2 @@
 DIST elementpath-2.2.3.gh.tar.gz 234094 BLAKE2B e3e56469250f3fd2135d9173d68cd93af2a6e03830859d03872967d72a6b7a39f4bb9288c341cc47c406ad55d764ad65a16169eb78598eeded48c424245064e8 SHA512 75178c12f42582a391aeb8198a45c732601251655e381cf8961dac2f6467217e5a18effcadcaa7e7206b18f358a70e1e4b170b9e02ba9b25108b1721da50ee4e
+DIST elementpath-2.3.0.gh.tar.gz 237865 BLAKE2B 969a98403ff87bc205cd73372414f81efa0612a3647625c32a2823ffd721c31c59cd6f931d547c18f4b3001417216c26f03ee769792543af9d4e15ae49538594 SHA512 636337f96bb5acbcae06fcde922cf2ca4cd788d5302c8bdf5fd403f7de9ae5569f78b57bcf57c60e941ce876f69894b4c2c9d1d11555825bf574230b086b3aa0
diff --git a/dev-python/elementpath/elementpath-2.3.0.ebuild b/dev-python/elementpath/elementpath-2.3.0.ebuild
new file mode 100644
index 000000000000..a236efdff839
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 6f8459e63bca..393340f3d009 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,4 +1,5 @@
 DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
 DIST google-auth-library-python-oauthlib-0.4.4.gh.tar.gz 48322 BLAKE2B f812b43e1e867090aa3ae4fbda7523324a182f6e1eae39fd865d23279b04cde08ee2263b83d1c2eb3555a8db3a9b01869d8148c0e603ba8fe9698dc8d052fc11 SHA512 5b17ceccca24216a0354513ae2a1b14f2aab9760e0ff0f87840a64de85a730a4115f5e44b359093f4ab0a9ec8fea41bfffb7b5aeca833574419ea6021a382240
 DIST google-auth-library-python-oauthlib-0.4.5.gh.tar.gz 50487 BLAKE2B 1ace58a7b3d3aa0c28606c8345ee71550ea6522a07356e6debbdf6097743425c334a1a5bfae5ff60789f8de71b46ecc9ed973737aacca2c025fb7b2d7efbc539 SHA512 0a4bfab32133c3a8ad79ab9b46d087614bf49d4db54a403792396bdc55c378c5df5d31166354925bca6948d409e8a17328c593f892b73430ea7be6bcd8ef1d4c
+DIST google-auth-library-python-oauthlib-0.4.6.gh.tar.gz 50982 BLAKE2B 93980a69777089125bca9f583cae0b64f9facf699da3ac135561a9cf135122d9e22a6c0be3325d366dd77a2240fb16d5c63633a216cfee07b9fceb2239227c86 SHA512 a20a85c073a6208d72c8f6ceb34544241f599e716b1191bfc52bcc367797efc18d0e2b94d4e433cec692282b00428bcb4d7e73ed48a26e66d6005189d5dddb77
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild
new file mode 100644
index 000000000000..93b3e546254e
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+DOCS=( LICENSE README.rst )
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 5754dfa254f5..ddf0e95783c1 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,2 +1,3 @@
 DIST mediafile-0.6.0.tar.gz 509351 BLAKE2B 5b8d97be6bd7becd44053d2d1b855252161779d5a01e8fea29443db0b3f524ba3b58dfa372b48451da76672ea5fdb521cd8a2a5c6c110d37e637dcfefbc0842b SHA512 7fd7d8a1d53311c22835041c39413d9dc7e1b4d8afc94a8c578aa4de7f65361f6c998062bb1b2804cae1f672c6b8e7c109fcc3e459e2266b8f19a0bde8673945
 DIST mediafile-0.7.0.tar.gz 511379 BLAKE2B 7248d72a45bcea59937d0098fa3ee7458852ab9e4663ed3ba6582b5671531154dc7d3f820a20cf10d1bfe2e594ea202fc2825ac8aba683df08707d2cdb52d9c2 SHA512 5b43aae6066e2122bc37cbdbfda04406d3f4da074df5512a5def9c1ca96ce96163b73d7c7d335518a4a7a41a9d5f195a0e371e908264b6040d3494e9827ccd81
+DIST mediafile-0.8.0.tar.gz 559590 BLAKE2B 21aa22b2369d86fb0b5ec4c7b92c1de65e6d266572d938b92330f391242a87cbadda84157409bca22e8568298f1f15928819f9c929c343de03b4f9ddb0be486a SHA512 772190c719c741a7a0a83c6e04803efaf008624769764b72a92febc13d89da4ad615b344424d2a55a60715e67802935a49aa57d6ee4cfa1d5ea9581851c5ca1b
diff --git a/dev-python/mediafile/mediafile-0.8.0.ebuild b/dev-python/mediafile/mediafile-0.8.0.ebuild
new file mode 100644
index 000000000000..2f819917342b
--- /dev/null
+++ b/dev-python/mediafile/mediafile-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Read and write audio files' tags in Python"
+HOMEPAGE="https://github.com/beetbox/mediafile"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 3887b6160cfb..598ea3a1090d 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
 DIST mkdocs-material-7.2.2.tar.gz 6777834 BLAKE2B 09c5ee5e0e0cef76ca66c8d86941fa044f2650d621a194991f279c09dd64c81c96bdfbe7d37eee5fe0e3837fc6461e7abad3537d92f3fdd178078485665088b5 SHA512 5332246103eb3007df3d2fd7ead4f2f60ce29c0e8a2bef6249db3e14a8e0ce1b2cdaffe4f48f57701d07a1771e275c69a79006ec53cfacff1a885894076188fb
 DIST mkdocs-material-7.2.4.tar.gz 6803091 BLAKE2B 377adcdaa2d24248f0430327a2a4b23fdae6f379ac23f6f609d50dc9c1699e13a92e925d9df24ec8298384228abd8c66c487afafc357edfc83da9c0e2897f422 SHA512 ba5c3a2e95eb32d2f2a3027a1cec7a54c9bdf655b51308e519e57d06fc8475ab74e2905dfeaef9bd1029e7814e5bc6c7610cce0526773bfcd3a92a995ba25c40
+DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
new file mode 100644
index 000000000000..7912d32859ab
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 3acca426d45d..f9f51a0c327e 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1,3 @@
-DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
 DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
 DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
+DIST python-lsp-server-1.2.2.tar.gz 61742 BLAKE2B d0886549d9ebf79bf97be30abb361be1fdee243abf9ed4707e27857122e9721dcc59f968c4ad7d2904ba11f06e6e6dc34593e5255ce0c9c528defdab7b6e3b7e SHA512 afeb0798fef151ab7cb79b3a0b294a30111d4bb409a4a8ad5148f9cb3dfb9a56e0033541b44a2b683bf043fcb31a8d83a788b0c9c22587b6ae532abb288542a6
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
similarity index 90%
rename from dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
rename to dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
index 664b3167fc9e..422d457a5925 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 optfeature
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="all-plugins"
 
@@ -33,6 +33,7 @@ BDEPEND="
 		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
 		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
 		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 		dev-python/yapf[${PYTHON_USEDEP}]
@@ -53,21 +54,21 @@ RDEPEND="
 		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
 		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 		dev-python/yapf[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/pyls-fix-test-with-pylint28.patch"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	# remove pytest-cov dep
 	sed -i -e '0,/addopts/I!d' setup.cfg || die
 
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index f7c4aaefe3e4..715dc3be2119 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
-DIST spyder-kernels-2.1.0-gh.tar.gz 82069 BLAKE2B 04fdf22f887d43a3c9bdb973588af895f07263ee7fed42d1a8f7b1caa25083c8498c28bbe0cd7f8f744082a94bc2906000b34cd6b5b78cb2ea017d0e2950b5ae SHA512 2261f582de5bff4c28463d4bd056cb64edbadabb352cd39b110d21ea004d3118162ca5f715366235789f41c76e6ccbd9064d7f2f7de77663eda89e583368c8d9
+DIST spyder-kernels-2.1.1.tar.gz 82493 BLAKE2B 23c59b6709ba6b1f21a1cc48d20115fba593c44b8b99d8c6f5bd83adcfcc9faae9fb1fe0f86df59f52c922da3c5951308e1c151c53487d33e39b0ddda065f95b SHA512 d1c7f47b02f18095d8584e6f6b3605419af1e016105c4f20bd70cce5d917651e387779d5f36c3ec72bdedd3febd8f7d56739c0cfd48081d448728acf7e3e3114
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild
similarity index 95%
rename from dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild
rename to dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild
index 6e20169fd3b2..342592521f01 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Kernels used by spyder on its ipython console"
 HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
 	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,6 +22,7 @@ RDEPEND="
 	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-7[${PYTHON_USEDEP}]
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index d7d6e1125337..8500136d1956 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,6 @@
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
-DIST spyder-5.1.1.tar.gz 19782262 BLAKE2B 64dcd45b91eba57cb5e435fe4b9d9c2f0884165e68099fa0a354ddfba13fc41022564218ad9661126c18f638dc5d26083494d0a97454e5a1055d01848df896fe SHA512 ba6ee6681ca2c3ae0b41aab57b28747d27141f274bb28331926ad75d9c5011cee604895f7b187853f5d7dc4777d4ca21a954911adb1b063dc1da26ff88cbfa2c
+DIST spyder-5.1.2.tar.gz 23847766 BLAKE2B e8fd06cc4207bdc32a38e96694cdb42746a0bef92186874a6c07f536c9d60ee9274d353512dae7aa866f6fd5cd358d6acf04b8d2b6b606908856adb709fa25b5 SHA512 0d22729a415d56eb132e0899e2840e30b533554e1cee26923346673b65a4978463443ef59d5f52dbd83ea47cba6efa31a74070402286a7b0fbf35e69edfc9200
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
+DIST spyder-docs-78a0ed693dc797a5e2ae79f37b0b7082b1247f16.tar.gz 88214829 BLAKE2B 53fbad2a7bf29ac468e541b632f4ec091a0ec2b7a8296e49788bc0112f805e5e85ae566bd13b5d091d54cb58191d28970eae3fc9259b02323b105885c80ce642 SHA512 670531a26c147d46ffb1f0f03a527ecc3b3f6370a3d110fb9e47d62a025171197ccedd018a7f58f7bcbd88a4ef26adffb4b99e03a5150a29328da807292f9840
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-DIST spyder-docs-ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz 85347412 BLAKE2B 3d7ef7a491a974d3255040998716931cf14d88c74af9f44b6a46edea6d75585c4d9683e03dbc4175c237a7baafe409e4a2ba43a0db666c7d4e96b864e2ee58b8 SHA512 c0f50ad9cd721558484c8dce3cd59c503475e814a3d42e8786b4678a449baff46b13c8ec1227fdc8f8b733c856736ecc4652f0a43db36feab27f2fb10355debc
diff --git a/dev-python/spyder/spyder-5.1.1.ebuild b/dev-python/spyder/spyder-5.1.2.ebuild
similarity index 98%
rename from dev-python/spyder/spyder-5.1.1.ebuild
rename to dev-python/spyder/spyder-5.1.2.ebuild
index 404f796dec26..ae2992d26761 100644
--- a/dev-python/spyder/spyder-5.1.1.ebuild
+++ b/dev-python/spyder/spyder-5.1.2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="ebf13f362a604c5ac127efcddb74a91610d92f59"
+DOCS_PV="78a0ed693dc797a5e2ae79f37b0b7082b1247f16"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -58,7 +58,7 @@ RDEPEND="
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
 	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.1.1[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index b0c71b93dbe2..c46562194975 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,4 @@
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
 DIST tldextract-3.1.0.tar.gz 101874 BLAKE2B 105f34699de2118126dc0f9d68f25999f99211aa8529c2640dd21d303cfb18cd5388819986881e235b8111a21b74d99c6424ad469a66a0ac45c25a0e7c31a21f SHA512 c6c67598b7dd2c8e85008c5061693182eb075e16390b001eb696fd12a0f5666d0a327667a0fd61e4f270003a8cfc97a8fbf7b53a246bab6f9e9ad95943dac9d8
 DIST tldextract-3.1.1.tar.gz 103195 BLAKE2B e0cdf85e22d58bf68705e9c37cfffaa8a9508316e734adf682b14daa50f02b408cbeda9f4554674f0f582b3246e750bbc46c70d7528c1a4af30b55f05e4bf595 SHA512 caec65beca0b2ba8f294043cf2f64839aef9fe472d1a76619bef1ec6b33ac99ccd08c24601c7fd97fef215621c9ec71a34911d3832febdb36d3f8ac9561b1175
+DIST tldextract-3.1.2.tar.gz 103248 BLAKE2B 5612016be7e8cd9b75dc5225f87ebc28635d66a7cacee54af2bd8db6ed6bb26ffe6ee5b4ab9b24473f19f0ad8d9d536e24236106288cd82cf635abef81f9babd SHA512 2c2340a9142d49aa7c0db71b5a7fb1a63e19354a5da8edd7de923e55c8ec03d8a8551f4710c66d6d1aece1d0d78701229ef5ed2ed49bcce44972b7b96747bd77
diff --git a/dev-python/tldextract/tldextract-3.1.2.ebuild b/dev-python/tldextract/tldextract-3.1.2.ebuild
new file mode 100644
index 000000000000..4c780be125f2
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
+HOMEPAGE="https://pypi.org/project/tldextract/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index ffa8c1f874b9..17df0bfa6b70 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index c3c0045d854e..282beee5b6ae 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -10,6 +10,7 @@
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Müller <ulm@gentoo.org>
 # @SUPPORTED_EAPIS: 6 7 8
+# @PROVIDES: elisp-common
 # @BLURB: Eclass for Emacs Lisp packages
 # @DESCRIPTION:
 #
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index da0a50f4e9b9..13e099f48aa8 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
index 5fc92ca3c53f..0924f3a71235 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9046c1c1fd9e..80d8685581f0 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
index 741754ad3601..11c9a2db3274 100644
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ b/media-gfx/scrot/scrot-1.4.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=media-libs/giblib-1.2.3
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 03d552183b8e..478781ebb108 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index f3a87af2e5a1..b81e9185bd62 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	media-libs/freetype
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index fe226c3ba2ab..6210ef76f370 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
index b8ac71b8c473..331c4c43c9db 100644
--- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
index bb58edc80337..722ba8db7fca 100644
--- a/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
+++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index dc9b11ce722c..ee513449bce0 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.33.ebuild
index 0cb9a5d01453..e3d7fa17a19f 100644
--- a/media-sound/mpc/mpc-0.33.ebuild
+++ b/media-sound/mpc/mpc-0.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 7e5eda24cd46..5ed8afa7afd2 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index 4ce38f653315..119b2b4c559d 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
index 64655c017f73..fc2d4914d693 100644
--- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 # Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index ae79013f2cb2..b71bb748febc 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 RESTRICT="binchecks strip"
 
 RDEPEND="app-eselect/eselect-timidity"
diff --git a/media-sound/wildmidi/wildmidi-0.4.4.ebuild b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
index 0756e6b11904..d877bbc835d3 100644
--- a/media-sound/wildmidi/wildmidi-0.4.4.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86"
 IUSE="+alsa openal oss +player"
 
 DEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c79d031c4d32..767ad1ce8e20 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 16bf79d20f5f..b8aca03a0f93 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 06:08:58 +0000
+Thu, 02 Sep 2021 10:09:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 16bf79d20f5f..b8aca03a0f93 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 06:08:58 +0000
+Thu, 02 Sep 2021 10:09:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0285dddc830b..777967fd4bd5 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index aaef107c9cbb..5a76ebff59fd 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2 b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
index 6f526b7a38a3..9fdefa68831d 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
+++ b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=02876f569083daff9874034ee9576174
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index 349f680ad9f0..b93128f498c2 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 PROPERTIES=live
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-24:*
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.8 b/metadata/md5-cache/app-accessibility/speechd-el-2.8
index 606af989d53d..067fb57cdcd0 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.8
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.8.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=fc2e4778154e1931e1c01597b9b65c78
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 04a4010b56de..4712034d78c2 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.34 b/metadata/md5-cache/app-admin/awscli-1.20.34
new file mode 100644
index 000000000000..b549b292345c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.34
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.34[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.34[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.34.tar.gz -> awscli-1.20.34.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 3242af7b01c0..ea412df164d5 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
index 58b212129d25..0261865b17ef 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
index cdfa4457b527..f186a671ad9a 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/adaptive-wrap-0.7.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f597d4059056b3b15e37a2853edafef6
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index 5cdaffaa04bc..3dab17af64fa 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=922905ad92a1fb4d4a4bef6c2b782c52
diff --git a/metadata/md5-cache/app-emacs/apache-mode-2.2.0 b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
index 8b877f110e43..c2cbd5e9bfe0 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-php/apache-mode/archive/2.2.0.tar.gz -> apache-mode-2.2.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9014031c259b08e4280c27eddfc7ae53
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index ba958ee053ca..a7fe84f88cd2 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20190407
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e292fa96a4d01a2eb7dd47d70b69b474
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20201106 b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
index 1ec9722c6469..4bf97eb6f74e 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20201106
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/4e3269b6e702db2dba48cf560563ac883e81e3bf.tar.gz -> apel-10.8_p20201106.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3de0f0267c2fc036e1f272e29196cb5b
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index c5abdd6f05ac..52306f60449c 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.3
+++ b/metadata/md5-cache/app-emacs/async-1.9.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.3.tar.gz -> emacs-async-1.9.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2ed0daef725b93c434757e0e443f51d2
diff --git a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0 b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
index 0213b8e0ea3e..ddce952967d1 100644
--- a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
+++ b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/websocket >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
index 67b12b8b2de8..5c50ae40911b 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.92
+++ b/metadata/md5-cache/app-emacs/auctex-11.92
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c92ca17c6883f54492f4f93aa05f924b
diff --git a/metadata/md5-cache/app-emacs/auctex-12.2 b/metadata/md5-cache/app-emacs/auctex-12.2
index aabbbc2f31ed..6e21fcdf0923 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.2
+++ b/metadata/md5-cache/app-emacs/auctex-12.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auctex-12.3 b/metadata/md5-cache/app-emacs/auctex-12.3
index daf9f4adf88e..fb3429550b2a 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.3
+++ b/metadata/md5-cache/app-emacs/auctex-12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1 b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
index a6d89afc32f3..ba64a8b0e6e5 100644
--- a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
+++ b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/popup >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/auto-complete/archive/v1.5.1.tar.gz -> auto-complete-1.5.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=93ff8c7110b0498fb6980bf946a39b5e
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
index 8a3397e06621..cc2f7fa94a90 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1567a24a5c0c2d9ace1131dfc0885345
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.7 b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
index 9691f9bfdae0..8c98e4c5ec02 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.7
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer app-emacs/css-sort-buffer >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/basic-toolkit-0.7.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=4d5de200e57a6627868ee77effd9530a
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
index 07cb02ff66de..6a6073978b79 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=app-editors/emacs-23.1:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34f40f4aa226d6c2cbef933a1eba7cdf
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106 b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
index 16536860391a..f9bb4e0d88e9 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
+++ b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
@@ -10,5 +10,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/latex-base ) >=app-editors/emacs-23.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/bbdb-3.2.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af9f92628406c7ccd0da3c19af6d0f3c
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
index 849b8ff946f5..bf812003266e 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.11
+++ b/metadata/md5-cache/app-emacs/binclock-1.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a3c3e964327bebdfd0a8740363237d8b
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3 b/metadata/md5-cache/app-emacs/bison-mode-0.3
index 21c4bd356bfa..285530396be6 100644
--- a/metadata/md5-cache/app-emacs/bison-mode-0.3
+++ b/metadata/md5-cache/app-emacs/bison-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=dec06006030600f979fa23d91b0138cc
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index d879b7dac4de..b344fb91ddfd 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20170321
+++ b/metadata/md5-cache/app-emacs/blogmax-20170321
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=075344a425db39cf3b846fd1641cc561
diff --git a/metadata/md5-cache/app-emacs/bm-201905 b/metadata/md5-cache/app-emacs/bm-201905
index 7b229df2bcaa..b7828fbde5f4 100644
--- a/metadata/md5-cache/app-emacs/bm-201905
+++ b/metadata/md5-cache/app-emacs/bm-201905
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joodland/bm/archive/201905.tar.gz -> bm-201905.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=541265409ff659bffce3fc87a3de926f
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
index fb98725ab68a..d74c0baa5f91 100644
--- a/metadata/md5-cache/app-emacs/bongo-1.1
+++ b/metadata/md5-cache/app-emacs/bongo-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=app-emacs/volume >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/bongo/archive/1.1.tar.gz -> bongo-1.1.tar.gz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.1 b/metadata/md5-cache/app-emacs/boxquote-2.1
index 11915f2327c9..e7a79eb83a62 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.1
+++ b/metadata/md5-cache/app-emacs/boxquote-2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.1.tar.gz -> boxquote-2.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=0979523451600bffd9967675c43ff5d5
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0 b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
index 48b391565e2b..dddf76cab189 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/browse-kill-ring/browse-kill-ring/archive/2.0.0.tar.gz -> browse-kill-ring-2.0.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e8cce377e266a6ecc29a5ea15aa18920
diff --git a/metadata/md5-cache/app-emacs/bubblet-0.74-r1 b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
index 90f58ef951f5..f413b03f7015 100644
--- a/metadata/md5-cache/app-emacs/bubblet-0.74-r1
+++ b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=078dc742e0b2b96682d4b5fc1a532f15
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1
index f4394ccaa5b2..b29d7e1c9e86 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/basic-toolkit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=07457a41901ad0dc5246beca8697283a
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
index ebaf08299079..4d00bca1e8f4 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.6
+++ b/metadata/md5-cache/app-emacs/calfw-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=39c928de96cdb0ec10e4c0aa9b786aa2
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.4 b/metadata/md5-cache/app-emacs/chess-2.0.4
index b957ff32479c..89e0db7473f9 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.4
+++ b/metadata/md5-cache/app-emacs/chess-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=29fc64e8772698a8e94b4c2183adccca
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.5 b/metadata/md5-cache/app-emacs/chess-2.0.5
index 8581487a7a22..4ad4ce598cb7 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.5
+++ b/metadata/md5-cache/app-emacs/chess-2.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.5.tar.xz https://dev.gentoo.org/~ulm/distfiles/emacs-chess-sounds-2.0.tar.bz2 https://dev.gentoo.org/~ulm/distfiles/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c0ec273b39d24dd5872ec22bc0f3b1a5
diff --git a/metadata/md5-cache/app-emacs/circe-2.11 b/metadata/md5-cache/app-emacs/circe-2.11
index 6b9a098ded65..d11a743e2f7d 100644
--- a/metadata/md5-cache/app-emacs/circe-2.11
+++ b/metadata/md5-cache/app-emacs/circe-2.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.11.tar.gz -> circe-2.11.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1a20f4d913fa501c763de9d584c396e5
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index 7c1f192187a4..5c4d915bec97 100644
--- a/metadata/md5-cache/app-emacs/cldoc-1.16
+++ b/metadata/md5-cache/app-emacs/cldoc-1.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/slime >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=fb64bcd1b5d2c3eb48e6d2edf5b35153
diff --git a/metadata/md5-cache/app-emacs/color-browser-0.3-r1 b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
index 23cc3bbc2c81..a43a1b285c4b 100644
--- a/metadata/md5-cache/app-emacs/color-browser-0.3-r1
+++ b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9198d4b279ec0d292d206c17f78a72ff
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.73 b/metadata/md5-cache/app-emacs/color-moccur-2.73
index f8fb9cc407f4..33ae2585f4e3 100644
--- a/metadata/md5-cache/app-emacs/color-moccur-2.73
+++ b/metadata/md5-cache/app-emacs/color-moccur-2.73
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=980d0fa568d60aecff6c43b4954e5d10
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
index 25aa5ad86671..d1005af84d1b 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=bf5452351632191d7c2d8894eefe72bc
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.10 b/metadata/md5-cache/app-emacs/company-mode-0.9.10
index 15f412777769..448b218d988e 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.10
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.10
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.10.tar.gz -> company-mode-0.9.10.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7af47fd642b6f3c90e1b7430d7b4703e
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.13 b/metadata/md5-cache/app-emacs/company-mode-0.9.13
index 7aa7bb641d9c..37bd8a8cbbf3 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.13
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.13
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.13.tar.gz -> company-mode-0.9.13.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7af47fd642b6f3c90e1b7430d7b4703e
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index bd0e33633b0b..dda3ed72845f 100644
--- a/metadata/md5-cache/app-emacs/crontab-mode-1.20
+++ b/metadata/md5-cache/app-emacs/crontab-mode-1.20
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=de782acfe893333788d350de966286ad
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index c4cefc0e9bf5..1fbc4e11ae83 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.92
+++ b/metadata/md5-cache/app-emacs/crypt++-2.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=81d8a12dff8369cfdf4807cb29d500b9
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430 b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
index 0d276656681e..7a85ae9cb497 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
+++ b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7f68bc5bce64fbd16468f002c060cd69
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
index 6014bd6bce9e..3facaaa342be 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.2.tar.gz -> csharp-mode-0.9.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=41c54c7b6d88080fef94c04dbbbd1c89
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r2 b/metadata/md5-cache/app-emacs/css-mode-0.11-r2
index 68c4541023b2..fee58e348a30 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r2
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=96f2db1982cb5f28afd4312739e17287
diff --git a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2 b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
index b34e3de8e64a..fc93a490ad98 100644
--- a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
+++ b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/css-sort-buffer-0.2.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=93df5e2ff021985f8304f2f0efb5d616
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.10 b/metadata/md5-cache/app-emacs/csv-mode-1.10
index 27e17f342e85..17c128cc5935 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.10
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.10.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=390c7770be8167c2e1b4c5ccebd8179f
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.9 b/metadata/md5-cache/app-emacs/csv-mode-1.9
index a09a5883da92..fa4c25e53fbb 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.9
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.9.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=fbca9c115ea539557a6410fd7bbdd9d0
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index 9b7d83d9eaad..18ba65c171a1 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=fba97e86a9b234e1f601a7ab8c34c249
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.10 b/metadata/md5-cache/app-emacs/d-mode-2.0.10
index fa1f17d4463e..ac34e954fbe8 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.10
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.10.tar.gz -> d-mode-2.0.10.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1ce20f9973ed6636c74609c0b60f2fbb
diff --git a/metadata/md5-cache/app-emacs/dash-2.16.0 b/metadata/md5-cache/app-emacs/dash-2.16.0
index 417faf536dad..29f777edd0c8 100644
--- a/metadata/md5-cache/app-emacs/dash-2.16.0
+++ b/metadata/md5-cache/app-emacs/dash-2.16.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.16.0.tar.gz -> dash-2.16.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=458cece7a89bda772136ecc61d30aedb
diff --git a/metadata/md5-cache/app-emacs/dash-2.17.0 b/metadata/md5-cache/app-emacs/dash-2.17.0
index ba482f97998b..edae250fa929 100644
--- a/metadata/md5-cache/app-emacs/dash-2.17.0
+++ b/metadata/md5-cache/app-emacs/dash-2.17.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.17.0.tar.gz -> dash-2.17.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=51060b3b02c2aa75f2835128c6baceec
diff --git a/metadata/md5-cache/app-emacs/dash-2.18.1 b/metadata/md5-cache/app-emacs/dash-2.18.1
index 253cecd591d4..402fd2988fd8 100644
--- a/metadata/md5-cache/app-emacs/dash-2.18.1
+++ b/metadata/md5-cache/app-emacs/dash-2.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.18.1.tar.gz -> dash-2.18.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f9820a1ed36d0f9ba77c3eb6729cb085
diff --git a/metadata/md5-cache/app-emacs/dash-2.19.0 b/metadata/md5-cache/app-emacs/dash-2.19.0
index 26af9bd67227..a7c65791ed60 100644
--- a/metadata/md5-cache/app-emacs/dash-2.19.0
+++ b/metadata/md5-cache/app-emacs/dash-2.19.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.19.0.tar.gz -> dash-2.19.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1739ee2204801795d2803b8cfe844936
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index 71007c56b57e..e5a9df4d683d 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d
 _md5_=19d7cd4e6f64e86b219b6d048ead2d15
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.3 b/metadata/md5-cache/app-emacs/ddskk-16.3
index df370f4aea40..c76527cbaea7 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.3
+++ b/metadata/md5-cache/app-emacs/ddskk-16.3
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-16.3_Kutomatsunai.tar.gz -> ddskk-16.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=2cf515e4d0bce249f4e218d02ad3711f
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index 05c5cd9c97b4..884859c4a935 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	ruby-single	9218b301575e94036743625c7b93c513	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=68e6f9bad37891f7b53d2a4666614a2c
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2-r2 b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
index 2395e3a64328..4d6a48d3c2db 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2-r2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/f >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=098794d4cd6c17343c24ddd702f19e63
diff --git a/metadata/md5-cache/app-emacs/develock-0.47 b/metadata/md5-cache/app-emacs/develock-0.47
index 2899d2191604..8eb8bd5e1cd4 100644
--- a/metadata/md5-cache/app-emacs/develock-0.47
+++ b/metadata/md5-cache/app-emacs/develock-0.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.47.el.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=25f6146ad67bb6e1a6b95e860bae5925
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
index e16efaf8f548..baf0daba0cb5 100644
--- a/metadata/md5-cache/app-emacs/df-mode-20050509-r1
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index 69dd33660247..39c4a5c2189e 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.10
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=14506c1dbe66f42bd3aa4b67e4f8dd79
diff --git a/metadata/md5-cache/app-emacs/dircolors-1.0-r2 b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
index b5f8122f69e8..5d45206ef3c7 100644
--- a/metadata/md5-cache/app-emacs/dircolors-1.0-r2
+++ b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5083b45b333e3746b6f47e734b1c24d9
diff --git a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26 b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
index 8c4095ecd20a..d80d635b1e93 100644
--- a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
+++ b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=ba155b4528c27a3edb8c3198a928e938
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
index c90075742a26..9244a1cca167 100644
--- a/metadata/md5-cache/app-emacs/distel-4.1.1
+++ b/metadata/md5-cache/app-emacs/distel-4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD MIT
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8bbad2669cec464d5be5b9ed3114bc73
diff --git a/metadata/md5-cache/app-emacs/doctest-mode-0.4 b/metadata/md5-cache/app-emacs/doctest-mode-0.4
index 4ec9e0b3fbce..832161782a93 100644
--- a/metadata/md5-cache/app-emacs/doctest-mode-0.4
+++ b/metadata/md5-cache/app-emacs/doctest-mode-0.4
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3669c740db36b5f2a0fbb74168c95cf8
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
index a3b05000bb8e..523f4c09c5d8 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0255f9454f782e31e26e29bb993044b
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index 5ec37872de12..5c0e037b971e 100644
--- a/metadata/md5-cache/app-emacs/dropdown-list-20120329
+++ b/metadata/md5-cache/app-emacs/dropdown-list-20120329
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=96ec52ab3306c474bae9d1e0a225c5f4
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
index 842c7d6042dc..92d5a4b25f47 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/bgamari/dts-mode/archive/9ee0854446dcc6c53d2b8d2941051768dba50344.tar.gz -> dts-mode-0.1.0_pre20161103.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e8b695cc744fac577ee31bc10b1aff7b
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.1 b/metadata/md5-cache/app-emacs/dts-mode-0.1.1
index a81e748e2357..0160467b8a73 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.1
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dts-mode-0.1.1.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e62d304eb7f72482075b538ccb5d6d1a
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3 b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
index 09b6db53d390..e5fb5170d809 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.51.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=fd6c5048bc3e0150e4440b356959034f
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.52 b/metadata/md5-cache/app-emacs/ebuild-mode-1.52
index 9249fbd0932e..338ad170e238 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.52
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.52
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.52.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=0ef662e7420c21e39fb6366ee01efa2e
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.53 b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
index d7ab657e9315..279682919453 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.53
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.53
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.53.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=0a4e2b770fc3c8a40d2a8fb6927dc709
diff --git a/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713 b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
index b98b8d7397c5..f85cb5b07d7c 100644
--- a/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
+++ b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/ebuild-mode-1.53 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://gitlab.com/akater/emacs-ebuild-run-mode/-/archive/v20210713/emacs-ebuild-run-mode-v20210713.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=16ccef65393baab3927330d3b9ba1c26
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index 61f0f0c56ef0..535f469d06bd 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=java? ( app-emacs/jde ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=b1043286115f9c52bc14b28009a706a8
diff --git a/metadata/md5-cache/app-emacs/edb-1.32 b/metadata/md5-cache/app-emacs/edb-1.32
index b1844f964b5b..ba53cf4b90ac 100644
--- a/metadata/md5-cache/app-emacs/edb-1.32
+++ b/metadata/md5-cache/app-emacs/edb-1.32
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5685dde303cd36eb202869f846564224
diff --git a/metadata/md5-cache/app-emacs/edit-list-0.3 b/metadata/md5-cache/app-emacs/edit-list-0.3
index 6042ffc6d574..e3f33bfcfa63 100644
--- a/metadata/md5-cache/app-emacs/edit-list-0.3
+++ b/metadata/md5-cache/app-emacs/edit-list-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=027e0de24fa4258414e07822717aa374
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.15 b/metadata/md5-cache/app-emacs/edit-server-1.15
index 353e95a3ea72..4ffcf5fd1ed3 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.15
+++ b/metadata/md5-cache/app-emacs/edit-server-1.15
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
index bfa8b377faae..b7095ba6f210 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=ab4acc1125badd8a54276903d4f6b1a4
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
index cf7a22b7874f..8ba1c42bb41b 100644
--- a/metadata/md5-cache/app-emacs/elscreen-20180321
+++ b/metadata/md5-cache/app-emacs/elscreen-20180321
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=wanderlust? ( app-emacs/wanderlust ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=762284baff9387cb5cc2ccad2a046618
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
index a4401fea1a5b..4a2bc7c52ac2 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a202f1787793953c6d9579a3e5930cb6
diff --git a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92 b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
index 43674f177ab6..ba59c2e179a8 100644
--- a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
+++ b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/hexrgb >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=78e2553a0c8fb127f9c308f088557d22
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
index 1f76c0542914..59e9006354f5 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.632_pre20181112.tar.xz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb29eb789e50daec73b475684b35cdbb
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
index 82ab44bae711..1e2b890bca9c 100644
--- a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/wget-1.8.2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f99c7d791d70edd27f142a4429e75895
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
index bdc707024930..8d1216309c31 100644
--- a/metadata/md5-cache/app-emacs/emhacks-20070920-r1
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
index 1cc6c55a5ae2..0992de9f8e39 100644
--- a/metadata/md5-cache/app-emacs/emms-4.4
+++ b/metadata/md5-cache/app-emacs/emms-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/emms-5.3 b/metadata/md5-cache/app-emacs/emms-5.3
index d92341ebf5d3..839f1d714c12 100644
--- a/metadata/md5-cache/app-emacs/emms-5.3
+++ b/metadata/md5-cache/app-emacs/emms-5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=321e45cc837fb4ed684c5b5a82a45298
diff --git a/metadata/md5-cache/app-emacs/emms-5.4 b/metadata/md5-cache/app-emacs/emms-5.4
index 40ee7efd17d1..fa1f0c016426 100644
--- a/metadata/md5-cache/app-emacs/emms-5.4
+++ b/metadata/md5-cache/app-emacs/emms-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=321e45cc837fb4ed684c5b5a82a45298
diff --git a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1 b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
index 2afd2b8f603c..45689015f6b0 100644
--- a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
+++ b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=d32cf1551c3d22302002a54690e6b724
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
index 6e21a2429497..a0a66826ae2c 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.16.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=97abe50ac0d24e0d59895d4139d0e4ab
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
index 1b76bd8028f3..53588bcb6828 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=d5ca69ce05d176f007ebaa9d6a573573
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index 40890848c168..3daf227e993c 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
 _md5_=e3d3c03f5ad385a9a46cf8471acaee5c
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 8b492cff0128..05d7636b5314 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=2e634c9daca22c728ff0ba82fe71e638
diff --git a/metadata/md5-cache/app-emacs/ess-18.10.2-r1 b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
index e08ad8c672f6..cb95466c1cdb 100644
--- a/metadata/md5-cache/app-emacs/ess-18.10.2-r1
+++ b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-18.10.2.tgz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=1f546bec99b4b01298804660683a5c22
diff --git a/metadata/md5-cache/app-emacs/evil-1.14.0 b/metadata/md5-cache/app-emacs/evil-1.14.0
index c704ed166af8..97f41e1a0225 100644
--- a/metadata/md5-cache/app-emacs/evil-1.14.0
+++ b/metadata/md5-cache/app-emacs/evil-1.14.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.14.0.tar.gz -> evil-1.14.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=889f19f2b5762857269b0db26c8ac52d
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.14 b/metadata/md5-cache/app-emacs/evil-1.2.14
index f0a4f788c0d5..3885f951ec0b 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.14
+++ b/metadata/md5-cache/app-emacs/evil-1.2.14
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.14.tar.gz -> evil-1.2.14.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e497eea5defd958116fc79cf46e2a8f8
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1 b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
index b11bc9401251..62b35dc7077e 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=4177c3f6403c66872818d877654d51b6
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
index 3b56cb1759d9..522572b6059a 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0
+++ b/metadata/md5-cache/app-emacs/f-0.19.0
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a82585d652930b74b5bbb53c08fdb962
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0 b/metadata/md5-cache/app-emacs/f-0.20.0
index a4ca3609759d..cceef7d77b75 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0
+++ b/metadata/md5-cache/app-emacs/f-0.20.0
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e9d8d9b47c8b24b034cd3bf476daf766
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index cd5744b72676..4cb683ff8156 100644
--- a/metadata/md5-cache/app-emacs/fff-20050517
+++ b/metadata/md5-cache/app-emacs/fff-20050517
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-apps/mlocate >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1f2c072727cbe6a2ef352f5435a97880
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12-r2 b/metadata/md5-cache/app-emacs/filladapt-2.12-r2
index 3798c6d24889..b3665f2682ad 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12-r2
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=4d7ab429da39013ba96d143e6dd2739f
diff --git a/metadata/md5-cache/app-emacs/flashcard-2.3.3 b/metadata/md5-cache/app-emacs/flashcard-2.3.3
index 0fcf3d57ed5f..cbfd4206645d 100644
--- a/metadata/md5-cache/app-emacs/flashcard-2.3.3
+++ b/metadata/md5-cache/app-emacs/flashcard-2.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=81f03c744ab65161f1f33fa89ac493ea
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
index 7a28dfeff248..cf52ce8986b3 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 !app-emacs/limit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=ab46a9f2a6f2c3df86e85a352697a42b
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
index 7c481e918639..1bdfb82a9bbd 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/02735dede6603987e8309a76d0bc7a9ff9a5a227.tar.gz -> flim-1.14.9_p20210529.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=fac35bb10b671c92e596783847e7f3e7
diff --git a/metadata/md5-cache/app-emacs/folding-2019.0524.1621 b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
index 74cc8c370508..3392baec82a9 100644
--- a/metadata/md5-cache/app-emacs/folding-2019.0524.1621
+++ b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jaalto/project-emacs--folding-mode/archive/a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a.tar.gz -> folding-2019.0524.1621.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5bfed2527b21ef3c903362f80c4906ec
diff --git a/metadata/md5-cache/app-emacs/ghub-3.2.0 b/metadata/md5-cache/app-emacs/ghub-3.2.0
index 9267bf0f7cd8..844a45172972 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.2.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/graphql-0.1.1 >=app-emacs/treepy-0.0.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.2.0.tar.gz -> ghub-3.2.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=33b47790302bd8a5bcf7ba2fbdd845c6
diff --git a/metadata/md5-cache/app-emacs/ghub-3.3.0 b/metadata/md5-cache/app-emacs/ghub-3.3.0
index 09a56d8b6b90..c00f10f88daf 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.3.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.3.0.tar.gz -> ghub-3.3.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a88314f3dcd67b88efc826df90cd0afd
diff --git a/metadata/md5-cache/app-emacs/ghub-3.4.1 b/metadata/md5-cache/app-emacs/ghub-3.4.1
index 47f5dde78e1f..562c76ee14d0 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.4.1
+++ b/metadata/md5-cache/app-emacs/ghub-3.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.4.1.tar.gz -> ghub-3.4.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a88314f3dcd67b88efc826df90cd0afd
diff --git a/metadata/md5-cache/app-emacs/ghub-3.5.3 b/metadata/md5-cache/app-emacs/ghub-3.5.3
index 1f85d592cb28..603c14119ebc 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.5.3
+++ b/metadata/md5-cache/app-emacs/ghub-3.5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.5.3.tar.gz -> ghub-3.5.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a7698ea221f96fe61395342f6d903ba8
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
index 164540507873..d392ce157428 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ gnuplot
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/gnuplot/archive/refs/tags/0.8.0.tar.gz -> gnuplot-mode-0.8.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=374b4055418face77f249f1eaffc2627
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
index 91c841167d24..b60783350911 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7588f0ca0ffa2911b82800f33795f858
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.5.0 b/metadata/md5-cache/app-emacs/go-mode-1.5.0
index 8c7816ba0f0c..77cd680ec5ab 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.5.0.tar.gz -> go-mode-1.5.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
index 48255b01f73d..93cfd34ae741 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20140929
+++ b/metadata/md5-cache/app-emacs/google-c-style-20140929
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=10e1327d7989e968aa4cbf0e692fb9b2
diff --git a/metadata/md5-cache/app-emacs/graphql-0.1.1 b/metadata/md5-cache/app-emacs/graphql-0.1.1
index 865134f84fc1..f03a54cc92e6 100644
--- a/metadata/md5-cache/app-emacs/graphql-0.1.1
+++ b/metadata/md5-cache/app-emacs/graphql-0.1.1
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-25:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vermiculus/graphql.el/archive/0.1.1.tar.gz -> graphql-0.1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=213055d4f50aa71cc25333214677bbc0
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
index 73abb4ccd5bb..acf3932d4468 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/v0.4.tar.gz -> graphviz-dot-mode-0.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7b0fcfa9a7f0aa959a9ee262ecc7a306
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
index a9b1ee2658f6..3475557791cd 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/243de72e09ddd5cdc4863613af8b749827a5e1cd.tar.gz -> graphviz-dot-mode-0.4.20181118.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9c0190d653c5ef147a1e76149558a263
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index 7ca9fec09bcd..bfb2f7a3d7b7 100644
--- a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
+++ b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=830a4e8cc567efec467d7205993cecbc
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-16.1 b/metadata/md5-cache/app-emacs/haskell-mode-16.1
index 8429726e59ea..25bd63d37fcc 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-16.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=52cdf0da16f2cfc559feedabf27e11db
diff --git a/metadata/md5-cache/app-emacs/helm-3.6.0-r1 b/metadata/md5-cache/app-emacs/helm-3.6.0-r1
index 3c98c2265f47..9ee98a945858 100644
--- a/metadata/md5-cache/app-emacs/helm-3.6.0-r1
+++ b/metadata/md5-cache/app-emacs/helm-3.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.6.0.tar.gz -> helm-3.6.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9901c65ab9361310a4134076e50250d6
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.0 b/metadata/md5-cache/app-emacs/helm-3.8.0
index ec5e90f5a83a..8648d07a4a45 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.0
+++ b/metadata/md5-cache/app-emacs/helm-3.8.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.0.tar.gz -> helm-3.8.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=38cc7135b6c1facc718d9240d50072e0
diff --git a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1 b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
index 989bfd94ccb8..00cf776a515c 100644
--- a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
+++ b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/helm >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm-system-packages/archive/v1.10.1.tar.gz -> helm-system-packages-1.10.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=6f546d7e5e02da8bd885b0f6d354c7fe
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p1019 b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
index f395eab2d0c3..24e26c2b6e48 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p1019
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p1019.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=18e63a7ffc3d28dc8bfa50a432aeb73c
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index 2ca8917d2a9f..2a8c3f0467b7 100644
--- a/metadata/md5-cache/app-emacs/highline-7.2.2
+++ b/metadata/md5-cache/app-emacs/highline-7.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e91a5fd977291a7c06cbed1235c7733a
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.5 b/metadata/md5-cache/app-emacs/howm-1.4.5
index 0afc3ad70b7c..22e2d448a72a 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.5
+++ b/metadata/md5-cache/app-emacs/howm-1.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.5.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=62be48057c4c7105d16dadd69c26a138
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.54 b/metadata/md5-cache/app-emacs/htmlize-1.54
index 09f0b75e83bc..ae0eb8d33862 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.54
+++ b/metadata/md5-cache/app-emacs/htmlize-1.54
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.54.tar.gz -> htmlize-1.54.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=0b42b8ecd2069cfbcfd43fe66040af45
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.55 b/metadata/md5-cache/app-emacs/htmlize-1.55
index e57ec0af2d96..93f31719b563 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.55
+++ b/metadata/md5-cache/app-emacs/htmlize-1.55
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.55.tar.gz -> htmlize-1.55.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=579775b743a32685d3eb2ddcb2b96c23
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index b61fe5f9d3a5..fc19ef23f261 100644
--- a/metadata/md5-cache/app-emacs/httpd-1.1
+++ b/metadata/md5-cache/app-emacs/httpd-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=d911d2d0190f6f5eddaf43f438cb6d0f
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733 b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
index 01e200922029..0d63283d7fcb 100644
--- a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
+++ b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index 6195b91ce4a5..8abd8f1e9926 100644
--- a/metadata/md5-cache/app-emacs/igrep-2.113
+++ b/metadata/md5-cache/app-emacs/igrep-2.113
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=af5bb823f1db18171030d95d7bd2570d
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.6.2 b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
index 162c4e320483..e9aa10f4106e 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.6.2
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=028ef9627de61306d9d99b64f27fefe6
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919 b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
index a6f2e626f3e7..0e9b6a14b611 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
+++ b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dabrahams/initsplit/archive/c941d436eb2b10b01c76a582c5a2b23fb30751aa.tar.gz -> initsplit-1.8_pre20160919.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=9bd99c5892d24e3013e6b9ebc7d8f86a
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index 56d16c7350d1..78ae3e437fd0 100644
--- a/metadata/md5-cache/app-emacs/jam-mode-0.3
+++ b/metadata/md5-cache/app-emacs/jam-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a0facb6928de9a7bc9a0e704bd21f26c
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index ba4de9136c9c..aaf34fdfc2ab 100644
--- a/metadata/md5-cache/app-emacs/jasmin-1.2-r2
+++ b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=69f3f31e55fe19d1ec00e20e32e1fece
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1-r1 b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
index 33ce66700449..a4ac8beab8b9 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1-r1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3:= dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7325589340def371aed01bb5bf4bdc07
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index a904951ea04a..cf7668c23963 100644
--- a/metadata/md5-cache/app-emacs/keywiz-1.4
+++ b/metadata/md5-cache/app-emacs/keywiz-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8c7e9326fd6af3c423f7bf2ebc18288a
diff --git a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1 b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
index d0ce93905562..bc6b9c600895 100644
--- a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
+++ b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=!<app-office/ledger-3.1.2[emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger-mode/archive/v3.1.1.tar.gz -> ledger-mode-3.1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=ed80baa66e1aac1716bf72854d6e0bca
diff --git a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515 b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515
index 99ad5fac3f45..15e31b49598f 100644
--- a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515
+++ b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libgit2-1.0.0 >=app-editors/emacs-26:*[dynamic-loading] >=app
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/magit/libegit2/archive/0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a.tar.gz -> libegit2-0.0.20200515.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0caece6e0270a144822eafb42e952ebe
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
index 914cadcc45b4..e37c21d9e8c1 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c43429b01f078f24a86c9009de00d3f9
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20151025 b/metadata/md5-cache/app-emacs/lua-mode-20151025
index 6f742c9d3238..02fc1b495445 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20151025
+++ b/metadata/md5-cache/app-emacs/lua-mode-20151025
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20151025.tar.gz -> lua-mode-20151025.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=44d5020afb9b06be8386be350e42b969
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20201010 b/metadata/md5-cache/app-emacs/lua-mode-20201010
index 648da0d4262d..251a307516ec 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20201010
+++ b/metadata/md5-cache/app-emacs/lua-mode-20201010
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/v20201010.tar.gz -> lua-mode-20201010.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9cdecc6edb42d13868b26fb8fc35523c
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
index 2d0a98a0f420..c47b1e6b6471 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=97854fe50c3d057a2498b86c1ada7c20
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
index 605d28f75d58..8ad542dbf023 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20200226.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=b15870b18fbaed430a25e9ea31a7a9c1
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.1 b/metadata/md5-cache/app-emacs/magit-2.13.1
index 613947dd07ec..3136032f2a30 100644
--- a/metadata/md5-cache/app-emacs/magit-2.13.1
+++ b/metadata/md5-cache/app-emacs/magit-2.13.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.13.1.tar.gz -> magit-2.13.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=026fb69525df745b6e7c38a104561eae
diff --git a/metadata/md5-cache/app-emacs/magit-2.90.1 b/metadata/md5-cache/app-emacs/magit-2.90.1
index 5193774ceec0..03b205467883 100644
--- a/metadata/md5-cache/app-emacs/magit-2.90.1
+++ b/metadata/md5-cache/app-emacs/magit-2.90.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-3.0.0 >=app-emacs/magit-popup-2.12.4 >=app-emacs/with-editor-2.8.0 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v2.90.1.tar.gz -> magit-2.90.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c6db5d55a19e32db8e2d576e4135361f
diff --git a/metadata/md5-cache/app-emacs/magit-3.0.0 b/metadata/md5-cache/app-emacs/magit-3.0.0
index 49aa1e0952eb..5c7daedab05d 100644
--- a/metadata/md5-cache/app-emacs/magit-3.0.0
+++ b/metadata/md5-cache/app-emacs/magit-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.3 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.0.0.tar.gz -> magit-3.0.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=237a0c4830823833425be6f1feff0dc9
diff --git a/metadata/md5-cache/app-emacs/magit-3.1.0 b/metadata/md5-cache/app-emacs/magit-3.1.0
index 2214643aa225..94116ce4e058 100644
--- a/metadata/md5-cache/app-emacs/magit-3.1.0
+++ b/metadata/md5-cache/app-emacs/magit-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.1.0.tar.gz -> magit-3.1.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a199d013d02a53508148edb98d98f968
diff --git a/metadata/md5-cache/app-emacs/magit-3.2.0 b/metadata/md5-cache/app-emacs/magit-3.2.0
index 211da6d6e7e9..b469bfc7f83b 100644
--- a/metadata/md5-cache/app-emacs/magit-3.2.0
+++ b/metadata/md5-cache/app-emacs/magit-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.2.0.tar.gz -> magit-3.2.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=01518d51fb8d51bba1b849070aa597bb
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.0 b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
index 155e01008938..e5f83f4be6f0 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.0
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.0.tar.gz -> magit-popup-2.13.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e3460323affd0fa1e6ab63f2505e6667
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.2 b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
index c5e08c20d139..e789d33c697b 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.2
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.2.tar.gz -> magit-popup-2.13.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.3 b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
index 7a5524984bdd..50b178a78ff1 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.3.tar.gz -> magit-popup-2.13.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
index eb863591f582..c98d5d1a091d 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=003c00bc5653fc28d86fb246b9bc0087
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.4 b/metadata/md5-cache/app-emacs/markdown-mode-2.4
index 0a9a2b8c91cf..b3cda8d8a391 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.4
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.4
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-text/pandoc dev-python/markdown2 dev-python/markdown ) >=app-ed
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.4.tar.gz -> markdown-mode-2.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f98b28880e33311e54928c6812057dd1
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1 b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
index ef2f6cb03f17..8af76fc2edbc 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.6_pre20191010.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=225702323d3fcdd936ee74eb9bf45622
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
index 4574abf20586..d50f6225d732 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.2.9.tar.gz -> mediawiki-2.2.9.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=46a2f5056f47c4217b4f197fe05133f8
diff --git a/metadata/md5-cache/app-emacs/meson-mode-0.3 b/metadata/md5-cache/app-emacs/meson-mode-0.3
index 454ef89534cb..5897cc26891e 100644
--- a/metadata/md5-cache/app-emacs/meson-mode-0.3
+++ b/metadata/md5-cache/app-emacs/meson-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/wentasah/meson-mode/archive/v0.3.tar.gz -> meson-mode-0.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3e867d52c1972a00b0a4a1458d294ca2
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
index 9c11e423492a..ca8d973025f7 100644
--- a/metadata/md5-cache/app-emacs/mew-6.8
+++ b/metadata/md5-cache/app-emacs/mew-6.8
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=b9d852272c81696f968287068ff7f5b4
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.13 b/metadata/md5-cache/app-emacs/mic-paren-3.13
index 19d2a5370074..17c12a3bea33 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.13
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.13
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mic-paren-3.13.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e1519b2765a9160347b1a02d9b3183b3
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.15 b/metadata/md5-cache/app-emacs/mic-paren-3.15
index 4b5571321b4e..e5cb93da3c82 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.15
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.15
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mic-paren-3.15.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9ee791152bc6c21a60d11de0c10d1863
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
index 63eb0e1e9f64..57532beef85a 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=f58cfa15ef884640381e9a4c3b586859
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
index 12a5a22576e6..b97be63a5297 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.7.tar.gz -> mmm-mode-0.5.7.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c1273665a04e2ca2496d4b4ed3d17237
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index cc898414fd85..3523a6511bc5 100644
--- a/metadata/md5-cache/app-emacs/moccur-edit-2.16
+++ b/metadata/md5-cache/app-emacs/moccur-edit-2.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/color-moccur >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=220e17a2ac4484621fe20637aa03d633
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.60 b/metadata/md5-cache/app-emacs/mpg123-el-1.60
index 76a6dc3c1c8c..77d823be19d4 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.60
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.60
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b28df859f73c204843901b9bcf057d2
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.61 b/metadata/md5-cache/app-emacs/mpg123-el-1.61
index b9ab53cd86d2..db854537c92e 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.61
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.61
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.61.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2df5a5d31240af5a83095b6ff566981
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
index 1b3c17cfa16e..d5f22a73336b 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=50589a3d4fa464af68770f11e71966df
diff --git a/metadata/md5-cache/app-emacs/multi-term-1.4 b/metadata/md5-cache/app-emacs/multi-term-1.4
index c44937d0798a..55549acf8eb5 100644
--- a/metadata/md5-cache/app-emacs/multi-term-1.4
+++ b/metadata/md5-cache/app-emacs/multi-term-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.4.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e0636cae5b688bed903cf4e016f717c1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
index 5bb6c2565fb4..5cf5b59d2d31 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.4.0.tar.gz -> multiple-cursors-1.4.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=19934ddda2983416e762476782a23ddd
diff --git a/metadata/md5-cache/app-emacs/muse-3.20-r1 b/metadata/md5-cache/app-emacs/muse-3.20-r1
index c93590fcf756..8c6755df3127 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20-r1
+++ b/metadata/md5-cache/app-emacs/muse-3.20-r1
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alexott/muse/archive/v3.20.tar.gz -> muse-3.20.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a5bc15f35110be375d19b1f58ba9679f
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1 b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
index 9d15102442a2..935fa440a160 100644
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8f82a0892d0d20fd4f85f28c83b33440
diff --git a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1 b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
index 502e2d21e61d..4bb2ae7b0056 100644
--- a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
+++ b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=359774a25ee966f5690be38cc758152a
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
index 113e4cc49164..18b12e89f7c7 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
index cb97aaa972a3..f30ab24769d3 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
index 73c2e2b14642..6529109b4080 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
@@ -8,5 +8,5 @@ LICENSE=HPND MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20200303.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7ccf14db5981339fbd4cd3214521d145
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
index 1117ad3b4477..86ddf754b51e 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314
@@ -8,5 +8,5 @@ LICENSE=HPND MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210314.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7ccf14db5981339fbd4cd3214521d145
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
index 6caf913ee09e..05c42d8e909d 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-5.8.0.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1dff5e30f6f7b2c943961d23d82999af
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
index 05e4a1721fa6..15a00dfb7ee3 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2e3df112cfd4dc76d9f68f3497d6898d
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0 b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
index 6aed75b624c6..13def4740dde 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=b941f17691c86bff697d68d6f6517b6d
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4 b/metadata/md5-cache/app-emacs/org-mode-9.4
index 5d2727db6517..0e14ca56e50a 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=fede4d363250c1deddd688d1df5614f2
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4.4 b/metadata/md5-cache/app-emacs/org-mode-9.4.4
index e6bcef595d04..942cc8cb24aa 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=fede4d363250c1deddd688d1df5614f2
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index 4c3b2ac69755..e69044853afd 100644
--- a/metadata/md5-cache/app-emacs/outline-magic-0.9
+++ b/metadata/md5-cache/app-emacs/outline-magic-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=76b66b3fec7336bc49333f0d36e9398e
diff --git a/metadata/md5-cache/app-emacs/paredit-24 b/metadata/md5-cache/app-emacs/paredit-24
index 2b75e309e095..1e28cfd38758 100644
--- a/metadata/md5-cache/app-emacs/paredit-24
+++ b/metadata/md5-cache/app-emacs/paredit-24
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-24.el.xz https://dev.gentoo.org/~ulm/distfiles/paredit-23.html.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=179c461c8c22baaa952b5bfcb8ca2adf
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
index ebd67b6bdfa6..0087b875737c 100644
--- a/metadata/md5-cache/app-emacs/pariemacs-3.14
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.22.1 b/metadata/md5-cache/app-emacs/php-mode-1.22.1
index 4d289fcaba9d..3c33ea50e6e3 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.22.1
+++ b/metadata/md5-cache/app-emacs/php-mode-1.22.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.22.1.tar.gz -> php-mode-1.22.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.23.0 b/metadata/md5-cache/app-emacs/php-mode-1.23.0
index fa148a52e620..8b41ca634984 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.23.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.23.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.23.0.tar.gz -> php-mode-1.23.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/planner-3.42-r1 b/metadata/md5-cache/app-emacs/planner-3.42-r1
index fede67503389..7b6d61aae908 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42-r1
+++ b/metadata/md5-cache/app-emacs/planner-3.42-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=app-editor
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/planner-3.42.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=cddd455a6413785e32fd1056ec109509
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.20.1 b/metadata/md5-cache/app-emacs/po-mode-0.20.1
index 055117f1afd0..e33ed2729fe9 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.20.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.20.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.20.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=951dfac7c08706266d78f0254f42b6f5
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index 9479589df1d0..0206a081173b 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=494bee3e7a380d10dbffc5138ec94939
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.0 b/metadata/md5-cache/app-emacs/popwin-1.0.0
index 2f0064e70f3e..5456d1cb13a4 100644
--- a/metadata/md5-cache/app-emacs/popwin-1.0.0
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/m2ym/popwin-el/archive/v1.0.0.tar.gz -> popwin-1.0.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5c43cabeca2c46d5ddc270e090a292aa
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1 b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
index 6cfd31e0e64d..299d0c6fe57e 100644
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=6706411cec44ff9cd9285b46de710bb9
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
index ccf765cefd64..945de955de7f 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.4
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=57c64b4e5b7267dd222c582bca407b58
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index accc8d3ce197..8f665ae53ad5 100644
--- a/metadata/md5-cache/app-emacs/protbuf-1.7-r1
+++ b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=bfe0b38989c433c89989919a7cb5d016
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.1 b/metadata/md5-cache/app-emacs/psgml-1.4.1
index 0f0d2bacb6bc..45010c96e5ea 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.1
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/psgml-1.4.1.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=67138fb6db302c799196d2563d4fc2f5
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
index 8b978a500d47..d49d9a88f9c2 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/7dee1b5a5debac6e56f9107492a413b6c0edb94d.tar.gz -> puppet-mode-0.3.20180813.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5cefddeebf772aee1bf6202bdf3dd42b
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.4 b/metadata/md5-cache/app-emacs/puppet-mode-0.4
index 2113c62dad76..9d60c6be4c1d 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.4
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.4
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.4.tar.gz -> puppet-mode-0.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1af298c63e2e48b5b145785c2d0632d7
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r2 b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
index 38133f6e1e78..fb439d428d96 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_8? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcf4e61d4c54df95f4840aa1aa330543
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.3 b/metadata/md5-cache/app-emacs/python-mode-6.2.3
index c2cda5ed82ff..84f0361940e3 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.3
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=77a866103fd6bdda2f0d983369f37a3a
diff --git a/metadata/md5-cache/app-emacs/quack-0.48 b/metadata/md5-cache/app-emacs/quack-0.48
index b7aab4232ab0..e9bfbdd78b66 100644
--- a/metadata/md5-cache/app-emacs/quack-0.48
+++ b/metadata/md5-cache/app-emacs/quack-0.48
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.48.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=6f686db065171041cf8bab133ce4c2d0
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
index 5e25fb5525e4..ad2452c2039c 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.66
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.66
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e6ee5488e530f7672a3754789b64c349
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index c82c6b7da4e7..792c90ae38c0 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=97bc49dbcab0065ca9521eca2590a456
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index d911b5670233..bcaeab402a76 100644
--- a/metadata/md5-cache/app-emacs/redo+-1.19
+++ b/metadata/md5-cache/app-emacs/redo+-1.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=7377c748b7b3ee970e32b6198d7eb8e2
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index 37a5572c9684..3ef31cc8df9e 100644
--- a/metadata/md5-cache/app-emacs/regress-1.5.1
+++ b/metadata/md5-cache/app-emacs/regress-1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=454d8fdde3e3ea865f8e165779e9cf41
diff --git a/metadata/md5-cache/app-emacs/remember-2.0-r1 b/metadata/md5-cache/app-emacs/remember-2.0-r1
index bbe96e080278..0b04d31eb5e2 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0-r1
+++ b/metadata/md5-cache/app-emacs/remember-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=app-editors/em
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jwiegley/remember/archive/v2.0.tar.gz -> remember-2.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7717fe7ec6d7cf054a36115a58fb1e3f
diff --git a/metadata/md5-cache/app-emacs/revive-2.24 b/metadata/md5-cache/app-emacs/revive-2.24
index 57a85d28f246..c327babd00d4 100644
--- a/metadata/md5-cache/app-emacs/revive-2.24
+++ b/metadata/md5-cache/app-emacs/revive-2.24
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/revive-2.24.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=3dccdc46beff89c1ebb4d15ff43f7acc
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index f8010a28eae9..66f509370678 100644
--- a/metadata/md5-cache/app-emacs/rfcview-0.13
+++ b/metadata/md5-cache/app-emacs/rfcview-0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7c30a40b350b44dcf6a33b05e6f95a21
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0-r1 b/metadata/md5-cache/app-emacs/riece-9.0.0-r1
index a06052f9f387..bc3de9587fba 100644
--- a/metadata/md5-cache/app-emacs/riece-9.0.0-r1
+++ b/metadata/md5-cache/app-emacs/riece-9.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=90e679b73e3471815a6c329c5003fdea
diff --git a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6 b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
index 3fc529fc7272..df23c9314934 100644
--- a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
+++ b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/TreeRex/rnc-mode/archive/1.0.6.tar.gz -> rnc-mode-1.0.6.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=a88ec621d79879fd7772914c6f6f2545
diff --git a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15 b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
index 9dc4f9a51e01..637cc4849f0c 100644
--- a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
+++ b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=b58e0a9163e616caaf9d4d4fcb769c75
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
index e61386e520d0..14b4b2c341dc 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/ruby-2.5.5.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2f92afc0b53f0c61d287aa01b47c5482
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
index a98781ecabe7..63ee02b7bb0c 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2d3b9de0ccc9b153948747c0f7e6e325
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
index 1ee5999e3a5e..03d6dcc4a3d3 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/defe0b586b2a888706507a7bbcdf1201d924cc2d.tar.gz -> ruby-mode-2.7.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2e3546f01128c63904e53f0a99b692ba
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0 b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
index 835da2004439..2946bd9b5444 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/586b679b4ae9685a24003502249920e7721c6e24.tar.gz -> ruby-mode-3.0.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9566ff7441187172a7e775754b24bb7a
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index a0a867502e23..599ca1a930a4 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=c1a209918a690f26dede24b956ebd6d8
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125 b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
index e5e377de6953..6565866d2b68 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20190125.tar.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=6e27e9c8ca0593c7a0c5117a654480ed
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.4.0 b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
index 01076bee1e1a..6295a912e95c 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.4.0
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/0.4.0.tar.gz -> rust-mode-0.4.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=46fbeccadc048af1adb746d0660cb358
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index 975801773ba1..44de681ba2a7 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=26b7b91b1ce43a1548726e13a0386190
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index 923677446eda..8cbd610c0e6f 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/scala >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=0c11d2600ed79ea49d9a69070baf2636
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
index 088d5abfd987..fa01a304fe78 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=691b40f044a1d8813808672c7efb1cda
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
index fe923eb4944c..9347ee1e2cc8 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=ec7289150fac0fb342c2ac2a2265461d
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
index 2ee7f7be62ef..4478061a149a 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-0.5.0_p20150107.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8b3f623a618bf25d264112a35f2b6433
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
index e4d7f7c5a0a8..a78a472c0af7 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f21b6da45eb524b1fa5e5a33f95afd56
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
index fd8f7173e093..d4a4ce83dd43 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=36cd2a8cd177d9cf2564e413b9f252f4
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
index 7ea0bc0a6868..607c15c2dd17 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f.tar.gz -> semi-1.14.7_p20210613.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=df45b860c618af5b17b3c04641775cd1
diff --git a/metadata/md5-cache/app-emacs/session-2.4b b/metadata/md5-cache/app-emacs/session-2.4b
index 28d9d3e70bba..5ff01ccaebec 100644
--- a/metadata/md5-cache/app-emacs/session-2.4b
+++ b/metadata/md5-cache/app-emacs/session-2.4b
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.4b.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=ecc272b50db98a62134bc1c44d6d8b5e
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index 5309757fefae..31a8d3c2f6e5 100644
--- a/metadata/md5-cache/app-emacs/setnu-1.06
+++ b/metadata/md5-cache/app-emacs/setnu-1.06
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f855398be985c9e27b678668fc242604
diff --git a/metadata/md5-cache/app-emacs/slime-2.21 b/metadata/md5-cache/app-emacs/slime-2.21
index e43b9a1c5c2f..a079c7de754c 100644
--- a/metadata/md5-cache/app-emacs/slime-2.21
+++ b/metadata/md5-cache/app-emacs/slime-2.21
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=99cef5113c4d0404f7c7e2f28f96ce1c
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.9 b/metadata/md5-cache/app-emacs/sml-mode-6.9
index 82059a07ef91..feb6e9cfd1cf 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.9
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/sml-mode-6.9.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8a9aacf862113149ae1d968869d6510f
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4.8 b/metadata/md5-cache/app-emacs/sokoban-1.4.8
index 2f5cd5eedc05..1eff3e5336de 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4.8
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.8.tar
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=22eea890fdfa7f597bc1762942844d34
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index 7ff853c4f41f..a7079ce5a0dc 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=b2f045a285858cebfeff26c45f702d5e
diff --git a/metadata/md5-cache/app-emacs/stripes-0.2-r2 b/metadata/md5-cache/app-emacs/stripes-0.2-r2
index 3a00cf7b9f4e..343743263f83 100644
--- a/metadata/md5-cache/app-emacs/stripes-0.2-r2
+++ b/metadata/md5-cache/app-emacs/stripes-0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=55fa2593b7c9292e9044890eb9ff3a4a
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.7.4 b/metadata/md5-cache/app-emacs/sumibi-0.7.4
index b4e42d642ed8..7f646feec67f 100644
--- a/metadata/md5-cache/app-emacs/sumibi-0.7.4
+++ b/metadata/md5-cache/app-emacs/sumibi-0.7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/26504/sumibi-0.7.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=c03ed682ab3cf377d43ebdaf661d4b0d
diff --git a/metadata/md5-cache/app-emacs/teco-7-r2 b/metadata/md5-cache/app-emacs/teco-7-r2
index 69ea431bab12..075507cac1da 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r2
+++ b/metadata/md5-cache/app-emacs/teco-7-r2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=86a0a97d8ca852f51babb3586641b6d0
diff --git a/metadata/md5-cache/app-emacs/template-3.3b b/metadata/md5-cache/app-emacs/template-3.3b
index 2604baa75c2e..77c3acf95111 100644
--- a/metadata/md5-cache/app-emacs/template-3.3b
+++ b/metadata/md5-cache/app-emacs/template-3.3b
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.3b.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=23d681966816d0b3bdde17eb4956326a
diff --git a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5 b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
index afac368bdb15..b2877347303f 100644
--- a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
+++ b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=52e360f6f6f36839a686d1149cc3a307
diff --git a/metadata/md5-cache/app-emacs/thinks-1.12 b/metadata/md5-cache/app-emacs/thinks-1.12
index 894264bd0645..0062aea631d7 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.12
+++ b/metadata/md5-cache/app-emacs/thinks-1.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/thinks.el/archive/v1.12.tar.gz -> thinks-1.12.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=d2d4b38eafb7f7423dbbcbc4f98bde9a
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.4 b/metadata/md5-cache/app-emacs/transient-0.3.4
index d5afe3fe1d55..ed516c02faee 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.4
+++ b/metadata/md5-cache/app-emacs/transient-0.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.4.tar.gz -> transient-0.3.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=07dab04816637d09ea2ce1383c4a1b80
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.5 b/metadata/md5-cache/app-emacs/transient-0.3.5
index 9a300c28d457..8ef9db50860c 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.5
+++ b/metadata/md5-cache/app-emacs/transient-0.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.5.tar.gz -> transient-0.3.5.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=07dab04816637d09ea2ce1383c4a1b80
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.6 b/metadata/md5-cache/app-emacs/transient-0.3.6
index 253b07234138..dec5629bc3df 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.6
+++ b/metadata/md5-cache/app-emacs/transient-0.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.6.tar.gz -> transient-0.3.6.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=07dab04816637d09ea2ce1383c4a1b80
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1 b/metadata/md5-cache/app-emacs/treepy-0.1.1
index 3298131abb29..0e36116260a2 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=aeea164ef25d795b6558eaeed4cdadad
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1 b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
index 2b64173a5376..7708f48d411d 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=01a136a13f8b5e8acdf8d51019a31784
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.2 b/metadata/md5-cache/app-emacs/treepy-0.1.2
index ab933a456d47..f74f47f63f82 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.2
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.2.tar.gz -> treepy-0.1.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=4216527a9322d6ab858ee40c45d84a77
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
index bb01c004b3e5..ef62f0def745 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+ ISC
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=e76c62edb1664ab0ac7eb25f2ca4ad82
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
index 8c42b7ef6396..5fb66ab2835c 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
index 9bd043b8d6da..651545ba7d1b 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 2bc8024ce4df..2791b3c0b0fa 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
 _md5_=5f701a9ba03861a0616d8e480b2646c8
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index c5f76321fe16..1846e8c09204 100644
--- a/metadata/md5-cache/app-emacs/typing-1.1.4
+++ b/metadata/md5-cache/app-emacs/typing-1.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=42a54d5ccf1e0c41e970f270e7cad928
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index 2004dc757cdb..f50065bf20a7 100644
--- a/metadata/md5-cache/app-emacs/uboat-1.2
+++ b/metadata/md5-cache/app-emacs/uboat-1.2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=33cd4e097598d2913d4db0db81e33e02
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.6 b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
index 53b7b8f8af35..bc21926b3003 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.6
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.7 b/metadata/md5-cache/app-emacs/uptimes-3.7
index 213af69c1c7c..7319dcc15151 100644
--- a/metadata/md5-cache/app-emacs/uptimes-3.7
+++ b/metadata/md5-cache/app-emacs/uptimes-3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.7.tar.gz -> uptimes-3.7.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=204e9669ff84a30760a2cf1e179f7ca5
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
index ed6501120f81..fe8196e696bf 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=69977c84df39b326ed9b198ea40e682a
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
index 27127fd5556f..53e08005084b 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.5.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=4df42e42f6fdf4752515b3f30a519651
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1 b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
index 173cd21ac72e..8233ca988589 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=9bbe4b329ef0101820c50af46c7e1d1d
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index 1de4d3330b80..9eaccaca3dc2 100644
--- a/metadata/md5-cache/app-emacs/volume-1.0-r1
+++ b/metadata/md5-cache/app-emacs/volume-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=07dd3d30154daded0e4e58223dcbc814
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
index ff8ebd98b8e8..e697702a826e 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=51f2968bbc9fe9ef9255ec396acb05e8
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
index 9d8b07868b1a..1b30871220e2 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/d9dfa624679afdd5db6ad25429ef86d3dd91401e.tar.gz -> vterm-0.0.1_pre20210618.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c166173f7c46a240b71d08ff2319d7fd
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index 227870b19244..fdad80cd2f40 100644
--- a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
+++ b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/emacs-w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=919189ded4dbe08e72b3e911f4c7c603
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
index 297fce9a1359..70a2bb429ec1 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5b15c148c95529b83eb33d507b8ec4db
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
index be6d6316a448..c511073cd24f 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/769699d60aa033049804083b459ee562b82db77e.tar.gz -> wanderlust-2.15.9_p20210629.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=2e23bedb3326db8309d758ee7cd2f0f0
diff --git a/metadata/md5-cache/app-emacs/websocket-1.10 b/metadata/md5-cache/app-emacs/websocket-1.10
index 416024798094..153eff04da98 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.10
+++ b/metadata/md5-cache/app-emacs/websocket-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/metadata/md5-cache/app-emacs/websocket-1.12 b/metadata/md5-cache/app-emacs/websocket-1.12
index 702442f3be79..edc160608db4 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.12
+++ b/metadata/md5-cache/app-emacs/websocket-1.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.12.tar.gz -> websocket-1.12.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8f2f06d3008a2404bcd497b928f9e8c8
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.0 b/metadata/md5-cache/app-emacs/wgrep-2.3.0
index c5405151b8d1..6373bd073e0b 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.0
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.0.tar.gz -> wgrep-2.3.0.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=86de93ca42271781271c75d7bdc492f3
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.2 b/metadata/md5-cache/app-emacs/wgrep-2.3.2
index dae2f372f46f..908540301f17 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.2
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.2.tar.gz -> wgrep-2.3.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=bb27c1fcdc7f6274c98b903d1d218ac3
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index 81c3cdfd2a71..288259088d63 100644
--- a/metadata/md5-cache/app-emacs/whine-20091222
+++ b/metadata/md5-cache/app-emacs/whine-20091222
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=7367bfc14b56e1d064d2117d0dd29e4d
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
index aea73581b466..870e246ad236 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8654a24ce284787db1207a4bed6c0d4c
diff --git a/metadata/md5-cache/app-emacs/windows-2.53 b/metadata/md5-cache/app-emacs/windows-2.53
index 7cfa8f10300e..fb1992292e89 100644
--- a/metadata/md5-cache/app-emacs/windows-2.53
+++ b/metadata/md5-cache/app-emacs/windows-2.53
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=app-emacs/revive >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/windows-2.53.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1a414a30b7d0e3a3b47f793ec5adb13b
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.3 b/metadata/md5-cache/app-emacs/with-editor-2.8.3
index ae18ea396dce..168a7270318e 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.8.3
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.8.3.tar.gz -> with-editor-2.8.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=1dc78804774f7b958baf8bfb95a1df7a
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.2 b/metadata/md5-cache/app-emacs/with-editor-2.9.2
index bce7ce88cad3..b7ff3e12a8b9 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.2
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.2.tar.gz -> with-editor-2.9.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.4 b/metadata/md5-cache/app-emacs/with-editor-2.9.4
index b966e4af0ba3..c8114c62c780 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.4
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.4.tar.gz -> with-editor-2.9.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.2 b/metadata/md5-cache/app-emacs/with-editor-3.0.2
index b5654a9de10d..af92016dda5c 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.2
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.2.tar.gz -> with-editor-3.0.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=55c0ad9eb1bde1495b35d393fedd9369
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.4 b/metadata/md5-cache/app-emacs/with-editor-3.0.4
index 3ce322ebed74..d7bee0ff54b7 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.4
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.4.tar.gz -> with-editor-3.0.4.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=55c0ad9eb1bde1495b35d393fedd9369
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
index 8cf12ab7afc1..cb7bb5aec5ee 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.9
+++ b/metadata/md5-cache/app-emacs/xclip-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
index ec2139b06b8e..45180ca0183c 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=17f5122b6437dc01a28e212b9b84265f
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1 b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
index 4026a5c2f8b6..b53a1a46ff7e 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5fdb7ec5aa56571e886290e0813b71cb
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
index 61a02c13ca0b..3518b5994398 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
index f9c3d98017a4..7204925b8b35 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.14.tar.gz -> yaml-mode-0.0.14.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=b537b8a5f7a6b955104ba49d1def4dc4
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
index 7b8ddfd50d5c..0303a452c5b0 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.15.tar.gz -> yaml-mode-0.0.15.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=5f52e78d199c5b19c8e988b2ca48b0d2
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.13.0 b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
index 678b5f4b607e..e26c3ce0c9c5 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-0.13.0
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=bd888dc018b439f9ef025d6d6d9c8afa
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3 b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
index 70f615516d5d..451abb1fce08 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/yasnippet >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/metadata/md5-cache/app-emacs/yatex-1.80 b/metadata/md5-cache/app-emacs/yatex-1.80
index d8bb01147780..f2a9a6675954 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.80
+++ b/metadata/md5-cache/app-emacs/yatex-1.80
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.80.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=89ba6ab186f306abd8e72e767d7f8c21
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
index 08a7ce88efe9..d0f90eb07430 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907-r1
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=fe565a3144e8e5005c6464547441fa30
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index ab13d4f0571d..aed14eb63cdb 100644
--- a/metadata/md5-cache/app-emacs/zenirc-2.112-r1
+++ b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
 _md5_=1c4731458aa3e285a538bcf2ae02301e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 178ded6876bd..490db7c9e031 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-10.0_p20210730 b/metadata/md5-cache/app-emulation/virt-viewer-10.0_p20210730
new file mode 100644
index 000000000000..7ed36ca56567
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-viewer-10.0_p20210730
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl >=dev-util/intltool-0.35.0 virtual/pkgconfig >=dev-util/meson-0.57.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.6 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango libvirt? ( >=app-emulation/libvirt-0.10.0:=[sasl?] app-emulation/libvirt-glib ) spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.10 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical console client for connecting to virtual machines
+EAPI=7
+HOMEPAGE=https://virt-manager.org/
+IUSE=+libvirt sasl +spice +vnc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.6 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango libvirt? ( >=app-emulation/libvirt-0.10.0:=[sasl?] app-emulation/libvirt-glib ) spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )
+REQUIRED_USE=|| ( spice vnc )
+SLOT=0
+SRC_URI=https://gitlab.com/virt-viewer/virt-viewer/-/archive/f0cc7103becccbce95bdf0c80151178af2bace5a/virt-viewer-f0cc7103becccbce95bdf0c80151178af2bace5a.tar.bz2 -> virt-viewer-10.0_p20210730.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	493198f00f20d2ecf10552d2737f2f13	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=656a78dddbd810cac06980a9be372ea1
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 6f36c229b565..b60c2fcb1212 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306 b/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
index 94cdd347ad0f..66489d0e0e08 100644
--- a/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
+++ b/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
@@ -3,9 +3,9 @@ DEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-sch
 DESCRIPTION=Manages system defaults for GNOME Shell extensions
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-schemas gnome-base/gnome-shell dev-lang/perl dev-perl/JSON
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~leio/distfiles/eselect-gnome-shell-extensions-20180306.tar.xz
-_md5_=e5afe7a6a1ded75fffe66546fd43eda6
+_md5_=2f70a4c1c334aa769665006f36f85edf
diff --git a/metadata/md5-cache/app-eselect/eselect-timidity-20110513 b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
index ca7e5cbd3f4e..fea585d358a1 100644
--- a/metadata/md5-cache/app-eselect/eselect-timidity-20110513
+++ b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of TiMidity++ patchsets
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=823dd9ad4cd9001e958c8d1ef881ca56
+_md5_=b27e45a501891ea929f683be48f2f2a0
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 5ea8c105ebff..2bdac79f3e04 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.25 b/metadata/md5-cache/app-i18n/ibus-1.5.25
new file mode 100644
index 000000000000..cc09d97a10a8
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.25
@@ -0,0 +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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( 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_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-util/glib-utils virtual/pkgconfig x11-misc/xkeyboard-config emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) unicode? ( app-i18n/unicode-data )
+DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 !gtk? ( x11-libs/gtk+:2 ) ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( 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_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
+REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) introspection ) test? ( gtk ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz
+_eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=65323eae1a50254e75c446646f2ead97
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 5b4c130110e7..710831c12760 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/mcfly-0.5.6 b/metadata/md5-cache/app-shells/mcfly-0.5.6
deleted file mode 100644
index a6dcc227eebe..000000000000
--- a/metadata/md5-cache/app-shells/mcfly-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=dev-db/sqlite:3
-DESCRIPTION=Context-aware bash history search replacement (ctrl-r)
-EAPI=7
-HOMEPAGE=https://github.com/cantino/mcfly
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense
-RDEPEND=dev-db/sqlite:3
-SLOT=0
-SRC_URI=https://github.com/cantino/mcfly/archive/v0.5.6.tar.gz -> mcfly-0.5.6.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/getrandom_package/0.1.20/download -> getrandom_package-0.1.20.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/relative-path/1.0.0/download -> relative-path-1.0.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/shellexpand/2.0.0/download -> shellexpand-2.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06f30464ccfed3a06c7f82a5288f96a0
diff --git a/metadata/md5-cache/app-shells/mcfly-0.5.8 b/metadata/md5-cache/app-shells/mcfly-0.5.8
new file mode 100644
index 000000000000..4797aa659599
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mcfly-0.5.8
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install postinst test unpack
+DEPEND=dev-db/sqlite:3
+DESCRIPTION=Context-aware bash history search replacement (ctrl-r)
+EAPI=8
+HOMEPAGE=https://github.com/cantino/mcfly
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 MIT Unlicense
+RDEPEND=dev-db/sqlite:3
+SLOT=0
+SRC_URI=https://github.com/cantino/mcfly/archive/v0.5.8.tar.gz -> mcfly-0.5.8.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lru-cache/0.1.2/download -> lru-cache-0.1.2.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.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-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/relative-path/1.0.0/download -> relative-path-1.0.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/shellexpand/2.0.0/download -> shellexpand-2.0.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=86d5b5b0307fe5b20943b309abeb820e
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index e38c25d949f6..9451dc39c66c 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/sqlcl-bin-21.2.0.174.2245 b/metadata/md5-cache/dev-db/sqlcl-bin-21.2.2.223.0914
similarity index 86%
rename from metadata/md5-cache/dev-db/sqlcl-bin-21.2.0.174.2245
rename to metadata/md5-cache/dev-db/sqlcl-bin-21.2.2.223.0914
index 09cfd721e8db..efb8dd493045 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-21.2.0.174.2245
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-21.2.2.223.0914
@@ -8,8 +8,8 @@ IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=OTN
 RDEPEND=dev-db/oracle-instantclient dev-java/java-config:2 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
+RESTRICT=mirror
 SLOT=0
-SRC_URI=https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-21.2.0.174.2245.zip
+SRC_URI=https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-21.2.2.223.0914.zip
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88
-_md5_=96f7f753478ebdfaa1f577a07a5918b4
+_md5_=700779b2d3a40a6ac7415e157778166e
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842 b/metadata/md5-cache/dev-db/sqldeveloper-21.2.1.204.1703
similarity index 90%
rename from metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842
rename to metadata/md5-cache/dev-db/sqldeveloper-21.2.1.204.1703
index 14e951728ffd..4db5acee183d 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-21.2.0.187.1842
+++ b/metadata/md5-cache/dev-db/sqldeveloper-21.2.1.204.1703
@@ -10,6 +10,6 @@ LICENSE=OTN
 RDEPEND=>=dev-java/openjdk-8:*[javafx] >=virtual/jre-1.8:* mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist fetch
 SLOT=0
-SRC_URI=sqldeveloper-21.2.0.187.1842-no-jre.zip
+SRC_URI=sqldeveloper-21.2.1.204.1703-no-jre.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88
-_md5_=c46c1cfd3ba35b4a0020bc07579d5164
+_md5_=c59e8c04421327e54fca0a0c3cd97216
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d03e7513b77e..512f707fa5e4 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.34 b/metadata/md5-cache/dev-python/boto3-1.18.34
new file mode 100644
index 000000000000..e0b825da5eed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.34
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.34[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.34[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.34.tar.gz -> boto3-1.18.34.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.34 b/metadata/md5-cache/dev-python/botocore-1.21.34
new file mode 100644
index 000000000000..77d6a52727c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.34
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.34.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/elementpath-2.3.0 b/metadata/md5-cache/dev-python/elementpath-2.3.0
new file mode 100644
index 000000000000..4eabc12433f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elementpath-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=XPath 1.0/2.0 parsers and selectors for ElementTree and lxml
+EAPI=8
+HOMEPAGE=https://github.com/sissaschool/elementpath/ https://pypi.org/project/elementpath/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sissaschool/elementpath/archive/v2.3.0.tar.gz -> elementpath-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c88fb066d29ddc23b57b52ddfc932cd4
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6
new file mode 100644
index 000000000000..a28c3b8b9969
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.6.tar.gz -> google-auth-library-python-oauthlib-0.4.6.gh.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4f76d464ca2b993ee8ad0032f090ec3
diff --git a/metadata/md5-cache/dev-python/mediafile-0.8.0 b/metadata/md5-cache/dev-python/mediafile-0.8.0
new file mode 100644
index 000000000000..ea6f4a83d634
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mediafile-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read and write audio files' tags in Python
+EAPI=8
+HOMEPAGE=https://github.com/beetbox/mediafile
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beetbox/mediafile/archive/v0.8.0.tar.gz -> mediafile-0.8.0.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.6 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.6
new file mode 100644
index 000000000000..f8f17bf0ba9b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.2.6
@@ -0,0 +1,14 @@
+BDEPEND=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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
+IUSE=python_targets_python3_8 python_targets_python3_9 doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymdown-extensions-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.2.6.tar.gz -> mkdocs-material-7.2.6.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e5a0e7ad870851206b76cab9319c4009
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1 b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
deleted file mode 100644
index 459e07c0f278..000000000000
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python Language Server for the Language Server Protocol
-EAPI=7
-HOMEPAGE=https://github.com/python-lsp/python-lsp-server
-IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.0.1.tar.gz
-_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42e5d31742ac0a20c3553ebc4199044c
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.2.2 b/metadata/md5-cache/dev-python/python-lsp-server-1.2.2
new file mode 100644
index 000000000000..6073c51b2535
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pylint-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pylint-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python Language Server for the Language Server Protocol
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server
+IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pylint-2.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.2.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b8167515bb1eff5c16a0a84e31862853
diff --git a/metadata/md5-cache/dev-python/spyder-5.1.1 b/metadata/md5-cache/dev-python/spyder-5.1.2
similarity index 95%
rename from metadata/md5-cache/dev-python/spyder-5.1.1
rename to metadata/md5-cache/dev-python/spyder-5.1.2
index ab6f35c9ae21..8d666716fa5d 100644
--- a/metadata/md5-cache/dev-python/spyder-5.1.1
+++ b/metadata/md5-cache/dev-python/spyder-5.1.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The Scientific Python Development Environment
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.1.1.tar.gz -> spyder-5.1.1.tar.gz https://github.com/spyder-ide/spyder-docs/archive/ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz -> spyder-docs-ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.1.2.tar.gz -> spyder-5.1.2.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78a0ed693dc797a5e2ae79f37b0b7082b1247f16.tar.gz -> spyder-docs-78a0ed693dc797a5e2ae79f37b0b7082b1247f16.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ebf82df9f46504e8210a1c4ae05dd457
+_md5_=c3f4ee5eda6e73ee7f33ed7bf00280dd
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.1.0 b/metadata/md5-cache/dev-python/spyder-kernels-2.1.1
similarity index 67%
rename from metadata/md5-cache/dev-python/spyder-kernels-2.1.0
rename to metadata/md5-cache/dev-python/spyder-kernels-2.1.1
index 98096ead8cac..ea98861bc845 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-2.1.0
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.1.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jupyter_client-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Kernels used by spyder on its ipython console
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jupyter_client-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v2.1.0.tar.gz -> spyder-kernels-2.1.0-gh.tar.gz
+SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v2.1.1.tar.gz -> spyder-kernels-2.1.1.tar.gz
 _eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87c60c4333c410ce9a7072376c3d4ef3
+_md5_=98feda77561ce06c3d0ee2d6ce221e0c
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.2 b/metadata/md5-cache/dev-python/tldextract-3.1.2
new file mode 100644
index 000000000000..0ec4333fe8cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tldextract-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tldextract/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tldextract/tldextract-3.1.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8e2bf99e8347b66007aac31010205ee7
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index a0ca4964e01a..24e6c9f66850 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
index 10a705a6c769..587ee22c4526 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
 EAPI=7
 HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
 SLOT=0
 SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v20.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-20.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6a0b96636a347f5a0fb24f2a182e8d7b
+_md5_=426020bff62e9ceb10310dbf1d7d2f12
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 05ed42d45304..0cba232e174e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/scrot-1.4 b/metadata/md5-cache/media-gfx/scrot-1.4
index d54dcc2f0886..93e7ef15941f 100644
--- a/metadata/md5-cache/media-gfx/scrot-1.4
+++ b/metadata/md5-cache/media-gfx/scrot-1.4
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=feh LGPL-2+
 RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/archive/1.4.tar.gz -> scrot-1.4.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e0df5d157a95e2fec262ec38436a2359
+_md5_=dfffbdaf477fa6661923eab9ad4afa9d
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c2c7a12eb685..57fe175bbf9c 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/giblib-1.2.4-r1 b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
index 11cd1618a65f..a8ba78b371dc 100644
--- a/metadata/md5-cache/media-libs/giblib-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/giblib-1.2.4-r1
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXe
 DESCRIPTION=a graphics library built on top of imlib2
 EAPI=7
 HOMEPAGE=http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=feh
 RDEPEND=media-libs/freetype media-libs/imlib2:=[X] x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=85b044e72c80bce2df56933b23defb06
+_md5_=c9e404e47f17b38f50f22bb5bb192171
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1 b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
index 8ae1e809f1fa..9e3060fd058b 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to play a wide range of module formats
 EAPI=6
 HOMEPAGE=http://mikmod.sourceforge.net/
 IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2+ LGPL-2.1
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.11.1.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b02137bd6bb67af570d5ec547d79213
+_md5_=e1eb66af137e9c05060254001c04c117
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.19 b/metadata/md5-cache/media-libs/libmpdclient-2.19
index 66688a86d5b0..77e2b3acbe6c 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.19
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.19
@@ -5,10 +5,10 @@ DESCRIPTION=Library for interfacing Music Player Daemon (media-sound/mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
 IUSE=doc examples test
-KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	493198f00f20d2ecf10552d2737f2f13	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9242e7a48cda94bd58fce3dc7b460a1f
+_md5_=f6ad289de8293742373d59f6222e2d57
diff --git a/metadata/md5-cache/media-libs/pulseaudio-qt-1.2 b/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
index 939f4ad55d87..2931eb96cd17 100644
--- a/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
+++ b/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Qt bindings for libpulse
 EAPI=7
 HOMEPAGE=https://invent.kde.org/libraries/pulseaudio-qt
 IUSE=debug +handbook doc test
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 media-sound/pulseaudio || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-1.2.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	ae7bc95c18d3cb7a5fe3643a8f630c64	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fc6d38529fa61943e264af795434a782
+_md5_=e62bac5186806d50a6b784b730c1b2ac
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 2f6e038d7742..733a7b1bf34d 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mpc-0.33 b/metadata/md5-cache/media-sound/mpc-0.33
index fac8280ad0aa..497c1d653c3c 100644
--- a/metadata/md5-cache/media-sound/mpc-0.33
+++ b/metadata/md5-cache/media-sound/mpc-0.33
@@ -5,11 +5,11 @@ DESCRIPTION=Commandline client for Music Player Daemon (media-sound/mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc
 IUSE=doc iconv test
-KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.33.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	493198f00f20d2ecf10552d2737f2f13	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df4579257c397c2d600cc092aa1867f8
+_md5_=ea9782b60724e6416937768c8cc49722
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.11 b/metadata/md5-cache/media-sound/mpd-0.22.11
index 33f12c90b991..502b2eb0e942 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.11
+++ b/metadata/md5-cache/media-sound/mpd-0.22.11
@@ -5,7 +5,7 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd test tidal twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.11.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	a99e3ead651192b4866986c9640612da	meson	493198f00f20d2ecf10552d2737f2f13	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8e0f5056dca034484d39b15ab8e2376
+_md5_=ff5cf5365a039c1aa49f384d56cb8a9c
diff --git a/metadata/md5-cache/media-sound/mpg321-0.3.2 b/metadata/md5-cache/media-sound/mpg321-0.3.2
index 5a912c728b56..3edaea6f0724 100644
--- a/metadata/md5-cache/media-sound/mpg321-0.3.2
+++ b/metadata/md5-cache/media-sound/mpg321-0.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=7
 HOMEPAGE=http://mpg321.sourceforge.net/
 IUSE=alsa ipv6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-mpg123 >=media-libs/libao-1:= media-libs/libid3tag:= media-libs/libmad sys-libs/zlib alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg321/mpg321_0.3.2.orig.tar.gz -> mpg321-0.3.2.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=408bc9f623e8df46ba9d501cedaec687
+_md5_=cdfa194c052d5bcd5119bad4b9283dbc
diff --git a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.70 b/metadata/md5-cache/media-sound/pulseaudio-ctl-1.70
index d416eea53ee6..0809166dae83 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-ctl-1.70
+++ b/metadata/md5-cache/media-sound/pulseaudio-ctl-1.70
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=CLI utility to control PulseAudio volume
 EAPI=7
 HOMEPAGE=https://github.com/graysky2/pulseaudio-ctl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=media-sound/pulseaudio
 SLOT=0
 SRC_URI=https://github.com/graysky2/pulseaudio-ctl/archive/v1.70.tar.gz -> pulseaudio-ctl-1.70.tar.gz
-_md5_=bd47ce211c95bf728423ba3bbbf61e40
+_md5_=4dca4eaf1de16688d60b67e16de5878b
diff --git a/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1 b/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
index 8998740797d3..a74d0ad3a64d 100644
--- a/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
+++ b/metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst
 DESCRIPTION=Free and open set of instrument patches
 EAPI=7
 HOMEPAGE=http://freepats.opensrc.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-timidity
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://freepats.opensrc.org/freepats-20060219.tar.bz2
-_md5_=3de7e0b495f6f4b7df9d87da0ecfaee2
+_md5_=1366f1a8f70f33f921bb1d77999e638d
diff --git a/metadata/md5-cache/media-sound/wildmidi-0.4.4 b/metadata/md5-cache/media-sound/wildmidi-0.4.4
index 123e3c11b73f..77a9e1c92e47 100644
--- a/metadata/md5-cache/media-sound/wildmidi-0.4.4
+++ b/metadata/md5-cache/media-sound/wildmidi-0.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI processing library and player using the GUS patch set
 EAPI=7
 HOMEPAGE=http://www.mindwerks.net/projects/wildmidi/
 IUSE=+alsa openal oss +player
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
+KEYWORDS=amd64 arm ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-3+ LGPL-3+
 RDEPEND=player? ( alsa? ( media-libs/alsa-lib ) openal? ( media-libs/openal ) ) media-sound/timidity-freepats
 REQUIRED_USE=player? ( ^^ ( alsa oss openal ) )
 SLOT=0
 SRC_URI=https://github.com/Mindwerks/wildmidi/archive/wildmidi-0.4.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd366c28b7b9829f26ee6c46ddf91edc
+_md5_=4cbe0ccf1421386262044e1afb76e37f
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index afce1f11332e..47a2a3800d19 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0_rc3 b/metadata/md5-cache/net-fs/samba-4.15.0_rc4
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.15.0_rc3
rename to metadata/md5-cache/net-fs/samba-4.15.0_rc4
index ebf4359c129a..d93ada4180dc 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.0_rc3
+++ b/metadata/md5-cache/net-fs/samba-4.15.0_rc4
@@ -10,6 +10,6 @@ RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://samba/rc/samba-4.15.0rc3.tar.gz
+SRC_URI=mirror://samba/rc/samba-4.15.0rc4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	a99e3ead651192b4866986c9640612da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56fac3e3a40b1732b5b4eee044556cd6
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index d87181fda2dc..8ee9955271e4 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
index ad15f55779b6..b5636fc50a8e 100644
--- a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
+++ b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs
 EAPI=6
 HOMEPAGE=https://virtualsquare.org
 IUSE=pcap selinux static-libs
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
 SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=daba51357a488ca215c0d22a6528c1ed
+_md5_=1d8760e6f36071c5c0db3d8b08d9c8e4
diff --git a/metadata/md5-cache/net-misc/vde-9999 b/metadata/md5-cache/net-misc/vde-9999
index 844fe6b6dca3..98b63223a21f 100644
--- a/metadata/md5-cache/net-misc/vde-9999
+++ b/metadata/md5-cache/net-misc/vde-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
 SLOT=0
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0b27fe337c6abdeb7c77b81b1a269f2
+_md5_=212ec47e2bb074bc11ed4612417257d8
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 61304920e401..d42f22363c06 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tinc-1.0.36 b/metadata/md5-cache/net-vpn/tinc-1.0.36
index 9fbeded269ab..119cd97724bc 100644
--- a/metadata/md5-cache/net-vpn/tinc-1.0.36
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.36
@@ -5,10 +5,10 @@ DESCRIPTION=tinc is an easy to configure VPN implementation
 EAPI=7
 HOMEPAGE=http://www.tinc-vpn.org/
 IUSE=+lzo uml vde +zlib
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
 SLOT=0
 SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.36.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=260c49c34c59ed83d2655ea38a35df91
+_md5_=26c43a760655f87fb727c88ca114b83f
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre18 b/metadata/md5-cache/net-vpn/tinc-1.1_pre18
index efb06e187e9e..545a41661002 100644
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre18
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre18
@@ -5,10 +5,10 @@ DESCRIPTION=tinc is an easy to configure VPN implementation
 EAPI=7
 HOMEPAGE=http://www.tinc-vpn.org/
 IUSE=+lzo +ncurses +readline +ssl uml vde upnp +zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
 SLOT=0
 SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre18.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5facee48fab5618b94750a70e744769
+_md5_=604a4cf3da40e27595e5162706a61300
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 9da27460d3a1..1889604abcb0 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212 b/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
index 4878b6a6391d..35b5fbc13f0a 100644
--- a/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
+++ b/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
@@ -4,10 +4,10 @@ DEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-wireless/bluez[obex] sys-libs/read
 DESCRIPTION=A set of tools to manage bluetooth devices for linux
 EAPI=7
 HOMEPAGE=https://github.com/khvzak/bluez-tools
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-wireless/bluez[obex] sys-libs/readline:0
 SLOT=0
 SRC_URI=https://github.com/khvzak/bluez-tools/archive/97efd293491ad7ec96a655665339908f2478b3d1.tar.gz -> bluez-tools-0_p20161212.tar.gz
 _eclasses_=autotools	c7052b276346587968d52ea8eaf5aca1	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b4fa1e8541010a969afea264ef510c68
+_md5_=5aecbb5b300131c926e610f78736a594
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index ac931bd7544f..1f7fb6a6f7ab 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-4.5.3-r1 b/metadata/md5-cache/sci-physics/geant4_vmc-5.3-r1
similarity index 94%
rename from metadata/md5-cache/sci-physics/geant-vmc-4.5.3-r1
rename to metadata/md5-cache/sci-physics/geant4_vmc-5.3-r1
index 5950c998959f..5ea0348740dd 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-4.5.3-r1
+++ b/metadata/md5-cache/sci-physics/geant4_vmc-5.3-r1
@@ -10,6 +10,6 @@ LICENSE=GPL-3
 RDEPEND=<sci-physics/geant-4.11[c++17,opengl,geant3?] sci-physics/root:=[c++17,-vmc] sci-physics/vmc:=[c++17] vgm? ( sci-physics/vgm:= )
 RESTRICT=!examples? ( test ) !geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !test? ( test ) !vgm? ( test )
 SLOT=4
-SRC_URI=https://github.com/vmc-project/geant4_vmc/archive/v5-3.tar.gz -> geant-vmc-4.5.3.tar.gz
+SRC_URI=https://github.com/vmc-project/geant4_vmc/archive/v5-3.tar.gz -> geant4_vmc-5.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4145e5e747533ecd6ca00980884fdb1a
+_md5_=e6faa42afde9e4a51ff3462f324abfa1
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-9999 b/metadata/md5-cache/sci-physics/geant4_vmc-9999
similarity index 97%
rename from metadata/md5-cache/sci-physics/geant-vmc-9999
rename to metadata/md5-cache/sci-physics/geant4_vmc-9999
index fe542d1fa994..1228b5b6d788 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-9999
+++ b/metadata/md5-cache/sci-physics/geant4_vmc-9999
@@ -11,4 +11,4 @@ RDEPEND=sci-physics/geant[c++17,opengl,geant3?] sci-physics/root:=[c++17,-vmc] s
 RESTRICT=!examples? ( test ) !geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !test? ( test ) !vgm? ( test )
 SLOT=4
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=014d42088837b69364efce1b15578f53
+_md5_=ed591ba7678ea5c111390667ae3a2d2d
diff --git a/metadata/md5-cache/sci-physics/vgm-4.8-r1 b/metadata/md5-cache/sci-physics/vgm-4.8-r1
index f3fe7d29d986..810e7839221a 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.8-r1
+++ b/metadata/md5-cache/sci-physics/vgm-4.8-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant-vmc[g4root] )
+DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant4_vmc[g4root] )
 DESCRIPTION=Virtual Geometry Model for High Energy Physics Experiments
 EAPI=7
 HOMEPAGE=https://github.com/vmc-project/vgm/
@@ -12,4 +12,4 @@ RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-8.tar.gz -> vgm-4.8.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fcb6508e7d84ef86528e096c87809427
+_md5_=edee04f926359610eb6a4ffc6dcc4a7d
diff --git a/metadata/md5-cache/sci-physics/vgm-4.9-r1 b/metadata/md5-cache/sci-physics/vgm-4.9-r1
index 27adc16b5ae6..860168ff269d 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.9-r1
+++ b/metadata/md5-cache/sci-physics/vgm-4.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant-vmc[g4root] )
+DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant4_vmc[g4root] )
 DESCRIPTION=Virtual Geometry Model for High Energy Physics Experiments
 EAPI=7
 HOMEPAGE=https://github.com/vmc-project/vgm/
@@ -12,4 +12,4 @@ RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test ) !examples? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-9.tar.gz -> vgm-4.9.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=542fb8cf218eb2b979b8d7f3a32143c3
+_md5_=70b714ef47e968e7892ae30e8d24eebe
diff --git a/metadata/md5-cache/sci-physics/vgm-9999 b/metadata/md5-cache/sci-physics/vgm-9999
index bca6cb214889..fbae5e1b9d60 100644
--- a/metadata/md5-cache/sci-physics/vgm-9999
+++ b/metadata/md5-cache/sci-physics/vgm-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant-vmc[g4root] )
+DEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-physics/root:=[c++17] ) doc? ( app-doc/doxygen[dot] ) test? ( sci-physics/geant[gdml] sci-physics/geant4_vmc[g4root] )
 DESCRIPTION=Virtual Geometry Model for High Energy Physics Experiments
 EAPI=7
 HOMEPAGE=https://github.com/vmc-project/vgm/
@@ -11,4 +11,4 @@ RDEPEND=sci-physics/clhep:= geant4? ( sci-physics/geant[c++17] ) root? ( sci-phy
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test ) !examples? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2451bee8e8db13b0537e4994e0515a9c
+_md5_=5e589f50372bc63527a135b97b5aa149
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index f64984226011..a0d35571d8cc 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/pkgcore-0.12.5 b/metadata/md5-cache/sys-apps/pkgcore-0.12.5
new file mode 100644
index 000000000000..102df8d2cf92
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.5.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 5bde701e0bfa..ae36b1a4a75a 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.2 b/metadata/md5-cache/sys-libs/libseccomp-2.5.2
new file mode 100644
index 000000000000..2311d9fcb45c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.2
@@ -0,0 +1,15 @@
+BDEPEND=python? ( 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_8(-)?,python_targets_python3_9(-)?] ) dev-util/gperf python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( 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_8(-)?,python_targets_python3_9(-)?] ) >=sys-kernel/linux-headers-4.3
+DESCRIPTION=high level interface to Linux seccomp filter
+EAPI=7
+HOMEPAGE=https://github.com/seccomp/libseccomp
+IUSE=python static-libs python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python? ( 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_8(-)?,python_targets_python3_9(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.2/libseccomp-2.5.2.tar.gz
+_eclasses_=distutils-r1	e297e8afd355d60fb9d2d7b37b81214f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=61a747ff0794933b4694736264d98895
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 654992b7a103..99f9265fefc8 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.107 b/metadata/md5-cache/www-apps/chromedriver-bin-93.0.4577.15
similarity index 68%
rename from metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.107
rename to metadata/md5-cache/www-apps/chromedriver-bin-93.0.4577.15
index f23f45d7cc27..139515e742c7 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-92.0.4515.107
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-93.0.4577.15
@@ -8,5 +8,5 @@ LICENSE=google-chrome
 RDEPEND=!www-client/chromium www-client/google-chrome
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/92.0.4515.107/chromedriver_linux64.zip -> chromedriver-bin-92.0.4515.107.linux64.zip )
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/93.0.4577.15/chromedriver_linux64.zip -> chromedriver-bin-93.0.4577.15.linux64.zip )
 _md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 79190915b1ff..b2501b9cd42c 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/kitty-0.23.1 b/metadata/md5-cache/x11-terms/kitty-0.23.1
new file mode 100644
index 000000000000..39935d7b043a
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.23.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=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] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-misc/xkeyboard-config x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug wayland python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-misc/xkeyboard-config x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.23.1/kitty-0.23.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=054ada021c9501256c6468e94a8f44f9
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1
new file mode 100644
index 000000000000..38b8a9f90358
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.23.1/kitty-0.23.1.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	08d890890f70fe0096093016e55438d5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	e73b9df80596ab8f9c542c01196dec23	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bfabdc8957c0f5d7ed02adeff8669c46
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 16bf79d20f5f..b8aca03a0f93 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 06:08:58 +0000
+Thu, 02 Sep 2021 10:09:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 98b10d4426e9..c96d7622476d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Sep  2 06:08:58 AM UTC 2021
+Thu Sep  2 10:09:01 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5a719c18a920..fb8ff00bed32 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 06:30:01 +0000
+Thu, 02 Sep 2021 10:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 059c97456388..3af8ad3d2af3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2ddadd01a2c6c0952f7869826627a49650324702 1630560829 2021-09-02T05:33:49+00:00
+490bce3b38e19ffaff17ecb504703cdc06e6d4c7 1630577063 2021-09-02T10:04:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c25f18c3676d..249bd1f48cba 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1630562701 Thu 02 Sep 2021 06:05:01 AM UTC
+1630577101 Thu 02 Sep 2021 10:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 16bf79d20f5f..b8aca03a0f93 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Sep 2021 06:08:58 +0000
+Thu, 02 Sep 2021 10:09:01 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 78aafd57c24e..d054ad66484e 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9bc46ea7f7c8..3595610f5117 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -2,4 +2,4 @@ DIST samba-4.13.10.tar.gz 18450805 BLAKE2B 3e9e1c951efe45b1954428c479aefc715b1ff
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b SHA512 0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
 DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
-DIST samba-4.15.0rc3.tar.gz 18868496 BLAKE2B 0dd6e5d560ee47adfe312ce1c174b8e9209bdcdd6aecb15aa757f290269ac4604fbb523c23d05aa29a1d420c2f9b42047bafcb4c62e71625749794791f064f82 SHA512 a217e7397479856d604b288e4f681bdcb26b097c382d073c87cfcb704ebb54840075e3fed454407e59689edfba0795f5d2b351d14b6cc1402764869b12f13a83
+DIST samba-4.15.0rc4.tar.gz 19134766 BLAKE2B c4c56c78d19494ecf7a29e77100163bd93db074aabcd893781c269c58d8a802ad5f7b4a343555a07b6ce2ebf3ccf0977561389979a93b823f0f3c40946684b3f SHA512 98be630381e3b3ec89cdd4733a6d5cf3dca6b6f56ee6c0f91c33888af286280fa73f24a6f9ad4066fb02f41de7142a73e995fe8052716e54e740dc8292d36686
diff --git a/net-fs/samba/samba-4.15.0_rc3.ebuild b/net-fs/samba/samba-4.15.0_rc4.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.15.0_rc3.ebuild
rename to net-fs/samba/samba-4.15.0_rc4.ebuild
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 20082df960e7..58d374c2e99b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
index 3cdfaa0d67a4..48c1a5d22c19 100644
--- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -14,13 +14,13 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
index 0d3dd7100e23..97b492902bf5 100644
--- a/net-misc/vde/vde-9999.ebuild
+++ b/net-misc/vde/vde-9999.ebuild
@@ -13,13 +13,13 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
 	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 3f8b26402e74..84914da40b75 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index 5094bc4d00f9..e22c1b81a520 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+lzo uml vde +zlib"
 
 DEPEND="
diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index 6ffcb15a2051..20539694eac6 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 08cf2ee35a60..5805b915dc42 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
index 87c36ffc4986..6585af370e24 100644
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/khvzak/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/dbus-glib
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d106621500d3..0e4678e227b4 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index cfbb183277d5..d3312969f74d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -183,14 +183,6 @@ app-i18n/man-pages-it
 # Bug #610094, #715874, #731860, #739486, removal in 30 days.
 sci-biology/wgs-assembler
 
-# David Seifert <soap@gentoo.org> (2021-08-05)
-# Unmaintained, tons of issues, fails to build with GCC 11.
-# Bug #631598, #690024, #735960, #749038, #761415, #761667,
-# #778557, #786789, #799179, removal in 30 days.
-app-backup/bareos
-dev-libs/bareos-fastlzlib
-dev-python/bareos
-
 # Sam James <sam@gentoo.org> (2021-08-05)
 # Fails to build with GCC 11. No activity upstream.
 # bug #740308, bug #789816. Removal on 2021-09-05.
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 0e75a5958bb4..59da6b5d43f4 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -8,3 +8,4 @@ move dev-python/python-backoff dev-python/backoff
 move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs
 move dev-python/python-podman dev-python/podman-py
 move dev-python/u-msgpack dev-python/u-msgpack-python
+move sci-physics/geant-vmc sci-physics/geant4_vmc
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 758e7d989501..90dc4cc4bac4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7544,10 +7544,10 @@ sci-physics/geant:geant3 - Add compatibility for geant321 to geant4
 sci-physics/geant:inventor - Add support for Open Inventor SGI toolkit via Coin3D
 sci-physics/geant:raytracerx - Enable raytracing for physics events
 sci-physics/geant:vrml - Enable output of geant4 in vrml formats
-sci-physics/geant-vmc:g4root - Build G4Root (interface for GEANT4 simulation with a ROOT geometry)
-sci-physics/geant-vmc:geant3 - Build with Geant4 G3toG4 library
-sci-physics/geant-vmc:mtroot - Build MTRoot (provides ROOT IO manager classes with multi-threading support)
-sci-physics/geant-vmc:vgm - Enable the Virtual Geometry Model (sci-physics/vgm)
+sci-physics/geant4_vmc:g4root - Build G4Root (interface for GEANT4 simulation with a ROOT geometry)
+sci-physics/geant4_vmc:geant3 - Build with Geant4 G3toG4 library
+sci-physics/geant4_vmc:mtroot - Build MTRoot (provides ROOT IO manager classes with multi-threading support)
+sci-physics/geant4_vmc:vgm - Enable the Virtual Geometry Model (sci-physics/vgm)
 sci-physics/hepmc:cm - Build with cm instead of default mm for length units
 sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units
 sci-physics/lammps:cuda - Enable cuda non-bonded kernels
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 4d73d4a58737..da325924ed6a 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/geant-vmc/Manifest b/sci-physics/geant-vmc/Manifest
deleted file mode 100644
index f28791df07e5..000000000000
--- a/sci-physics/geant-vmc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST geant-vmc-4.5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
new file mode 100644
index 000000000000..ddfb4b445a2e
--- /dev/null
+++ b/sci-physics/geant4_vmc/Manifest
@@ -0,0 +1 @@
+DIST geant4_vmc-5.3.tar.gz 7411643 BLAKE2B 31a486aa32f879093753aab09798eabf1a936f0aa246bb97c7f055eefb789c9c5a5097c14ce47b05a99f3cc2b46bea6edeba2af80ee362bb8fee039ee711eddc SHA512 918ce3ca4a4fb329f00000fce00dae3d4a4c9f348553f31bf474f727c1e67242b5ff28fe7dc5d3ab12d1174663b1dd96b654b5baf7edfa662ab3f66687792e94
diff --git a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild
similarity index 87%
rename from sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
rename to sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild
index cafdbf75e099..503e3d2f17a6 100644
--- a/sci-physics/geant-vmc/geant-vmc-4.5.3-r1.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-5.3-r1.ebuild
@@ -7,11 +7,11 @@ inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
 else
-	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
-	SRC_URI="https://github.com/vmc-project/geant4_vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/geant4_vmc-${MY_PV}"
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
similarity index 87%
rename from sci-physics/geant-vmc/geant-vmc-9999.ebuild
rename to sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
index b22fc0afcbf8..e5a8d12edb26 100644
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild
+++ b/sci-physics/geant4_vmc/geant4_vmc-9999.ebuild
@@ -7,11 +7,11 @@ inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vmc-project/geant4_vmc.git"
+	EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
 else
-	MY_PV=$(ver_rs 1-2 - $(ver_cut 2-))
-	SRC_URI="https://github.com/vmc-project/geant4_vmc/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/geant4_vmc-${MY_PV}"
+	MY_PV=$(ver_rs 1- -)
+	SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sci-physics/geant-vmc/metadata.xml b/sci-physics/geant4_vmc/metadata.xml
similarity index 100%
rename from sci-physics/geant-vmc/metadata.xml
rename to sci-physics/geant4_vmc/metadata.xml
diff --git a/sci-physics/vgm/vgm-4.8-r1.ebuild b/sci-physics/vgm/vgm-4.8-r1.ebuild
index 2719bc7a3502..0b5ee6471a34 100644
--- a/sci-physics/vgm/vgm-4.8-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.8-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
 		sci-physics/geant[gdml]
-		sci-physics/geant-vmc[g4root]
+		sci-physics/geant4_vmc[g4root]
 	)"
 RESTRICT="
 	!geant4? ( test )
diff --git a/sci-physics/vgm/vgm-4.9-r1.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
index b7b9482e355c..b9d0ad2bcca2 100644
--- a/sci-physics/vgm/vgm-4.9-r1.ebuild
+++ b/sci-physics/vgm/vgm-4.9-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
 		sci-physics/geant[gdml]
-		sci-physics/geant-vmc[g4root]
+		sci-physics/geant4_vmc[g4root]
 	)"
 RESTRICT="
 	!geant4? ( test )
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild
index bd7c83ff458e..a2b21203209d 100644
--- a/sci-physics/vgm/vgm-9999.ebuild
+++ b/sci-physics/vgm/vgm-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	test? (
 		sci-physics/geant[gdml]
-		sci-physics/geant-vmc[g4root]
+		sci-physics/geant4_vmc[g4root]
 	)"
 RESTRICT="
 	!geant4? ( test )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dab07be72faf..e54a2c8c27b6 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 29e3002c36a1..5c0dc3ee42af 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1 +1,2 @@
 DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
+DIST pkgcore-0.12.5.tar.gz 624424 BLAKE2B ebd6c0976e6b509e98a085a99f8b1d87e2239eae8b5171a4e027495febf532f67a129ae5d55f4722746d0b74c658772d75cfe52477fcdabc765d26849dda072d SHA512 0833588cd01d732d71e11d4e7e9735884a69cad971e50dbed7285a03a89eb51c396663a4ffe5f179a9fc3019bfc80e959e1e41f1df8f6d73939a41c137bbb062
diff --git a/sys-apps/pkgcore/pkgcore-0.12.5.ebuild b/sys-apps/pkgcore/pkgcore-0.12.5.ebuild
new file mode 100644
index 000000000000..5c7eeb03645d
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 10babf5148d1..ae0a9f15aeea 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index ef91c9f44608..55539be93ca9 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1 +1,2 @@
 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af
+DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac
diff --git a/sys-libs/libseccomp/libseccomp-2.5.2.ebuild b/sys-libs/libseccomp/libseccomp-2.5.2.ebuild
new file mode 100644
index 000000000000..eea16fa2bbf5
--- /dev/null
+++ b/sys-libs/libseccomp/libseccomp-2.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 multilib-minimal
+
+DESCRIPTION="high level interface to Linux seccomp filter"
+HOMEPAGE="https://github.com/seccomp/libseccomp"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
+	PRERELEASE="2.6.0"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}
+	dev-util/gperf
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )
+"
+# We need newer kernel headers; we don't keep strict control of the exact
+# version here, just be safe and pull in the latest stable ones. #551248
+DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/libseccomp-python-shared.patch"
+	)
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-python
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+do_python() {
+	# setup.py reads VERSION_RELEASE from the environment
+	local -x VERSION_RELEASE=${PRERELEASE-${PV}}
+	pushd "${BUILD_DIR}/src/python" >/dev/null || die
+	"$@"
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use python ; then
+		# setup.py expects libseccomp.so to live in "../.libs"
+		# Copy the python files to the right place for this.
+		rm -r "${BUILD_DIR}/src/python" || die
+		cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die
+		local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}"
+		do_python distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python ; then
+		do_python distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "${PN}.la" -delete || die
+	einstalldocs
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 1abfa7be84d2..c6375d7282fb 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index a739c2baf25a..fb243258eec0 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-92.0.4515.107.linux64.zip 5980285 BLAKE2B 43dde423b473825b8ac8ef6ac391a3f309b35a9f10494482f7a651817b0bc819657225a8e8aea33bd4096fefb5e1c6de09d5e24950ef2a9764c9a127a767a465 SHA512 844c0e04bbbfd286617af2d7facd3d6cf7d3491b1e78120f8e0a95676c49647da1e129464892cacc55644011864f57e9769b668a6099bf49cf82d65ebcb68cf1
+DIST chromedriver-bin-93.0.4577.15.linux64.zip 6088169 BLAKE2B 9ad6b7bea9cdfa1e3ac3bd13a275d4c7b4b70fc8c6191091445d7a4b1e607c6ad5266db492dd47d03f2a3aa31e997f583d93475b0d05f6ab2f8e08ebaa3ad840 SHA512 22782ec5578f3f6b244ba79c3b62d1c355c1128f1bd489b39d65cde1dd46174f1c32adf5175215d1557fdd136b5af164865d01c46e773a955bd951222b665d86
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-92.0.4515.107.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-93.0.4577.15.ebuild
similarity index 100%
rename from www-apps/chromedriver-bin/chromedriver-bin-92.0.4515.107.ebuild
rename to www-apps/chromedriver-bin/chromedriver-bin-93.0.4577.15.ebuild
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3eeec827c745..5d7077d1de7e 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e1a1774bb2ae..41c4a129750f 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -2,3 +2,4 @@ DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
+DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
new file mode 100644
index 000000000000..be10def6c282
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
@@ -0,0 +1,41 @@
+# 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 python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index e1a1774bb2ae..41c4a129750f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -2,3 +2,4 @@ DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
+DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
diff --git a/x11-terms/kitty/kitty-0.23.1.ebuild b/x11-terms/kitty/kitty-0.23.1.ebuild
new file mode 100644
index 000000000000..ee7d59c7435c
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.23.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit optfeature python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-1.5.0:=
+	media-libs/lcms
+	media-libs/libcanberra
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	x11-libs/libxcb[xkb]
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-misc/xkeyboard-config
+	x11-terms/kitty-terminfo
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+
+DEPEND="${RDEPEND}
+	media-libs/mesa[X]
+	sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.21.2-flags.patch
+	"${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
+	"${FILESDIR}"/${PN}-0.20.1-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+		# also disable wayland tests
+		sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
+		sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+	tc-export CC
+}
+
+src_compile() {
+	"${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		--update-check-interval=0 \
+		linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/*
+	dobin linux-package/bin/kitty
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index c44f75410aaa..3de9db8b97a2 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -11,5 +11,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
+		<bugs-to>https://github.com/kovidgoyal/kitty/issues</bugs-to>
+		<doc>https://sw.kovidgoyal.net/kitty</doc>
+		<changelog>https://sw.kovidgoyal.net/kitty/changelog</changelog>
 	</upstream>
 </pkgmetadata>