diff --git a/metadata/md5-cache/app-accessibility/rhvoice-1.2.4 b/metadata/md5-cache/app-accessibility/rhvoice-1.2.4
deleted file mode 100644
index 5a8ec9b713..0000000000
--- a/metadata/md5-cache/app-accessibility/rhvoice-1.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-cpp/cli11 dev-libs/rapidxml dev-libs/utfcpp dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=TTS engine with extended languages support (including Russian)
-EAPI=7
-HOMEPAGE=https://rhvoice.su https://github.com/RHVoice/RHVoice
-INHERIT=cmake multilib
-IUSE=ao bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils l10n_en l10n_eo l10n_ky l10n_ru l10n_uk l10n_ka l10n_tt l10n_pt-BR
-KEYWORDS=~amd64 ~x86
-LICENSE=l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+ l10n_en? ( CC-BY-NC-ND-4.0 ) l10n_eo? ( CC-BY-NC-ND-4.0 ) l10n_ky? ( CC-BY-NC-ND-4.0 ) l10n_ru? ( CC-BY-NC-ND-4.0 ) l10n_uk? ( CC-BY-NC-ND-4.0 ) l10n_ka? ( free-noncomm ) l10n_tt? ( free-noncomm )
-RDEPEND=!dev-libs/hts_engine media-libs/sonic ao? ( media-libs/libao ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech-dispatcher? ( app-accessibility/speech-dispatcher ) server? ( dev-libs/glib[dbus] >=dev-cpp/glibmm-2.66.1:2 )
-REQUIRED_USE=|| ( ao portaudio pulseaudio )
-SLOT=0
-SRC_URI=https://github.com/RHVoice/RHVoice/archive/refs/tags/1.2.4.tar.gz -> rhvoice-1.2.4.tar.gz l10n_en? ( https://github.com/RHVoice/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) l10n_ru? ( https://github.com/RHVoice/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz https://github.com/RHVoice/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz )
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=7da7585d2dd861ead25f05cad28c49f9
diff --git a/metadata/md5-cache/app-accessibility/rhvoice-1.4.2 b/metadata/md5-cache/app-accessibility/rhvoice-1.4.2
new file mode 100644
index 0000000000..7a04b0a4d5
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/rhvoice-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-cpp/cli11 dev-libs/rapidxml dev-libs/utfcpp dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=TTS engine with extended languages support (including Russian)
+EAPI=7
+HOMEPAGE=https://rhvoice.su https://github.com/RHVoice/RHVoice
+INHERIT=cmake multilib
+IUSE=ao cli client portaudio +pulseaudio +server +speech-dispatcher utils l10n_en l10n_eo l10n_ky l10n_ru l10n_uk l10n_ka l10n_tt l10n_mk l10n_pt-BR
+KEYWORDS=~amd64 ~x86
+LICENSE=l10n_pt-BR? ( CC-BY-SA-4.0 ) l10n_mk? ( AGPL-3 ) BSD GPL-2 GPL-3+ LGPL-2.1+ l10n_en? ( CC-BY-NC-ND-4.0 ) l10n_eo? ( CC-BY-NC-ND-4.0 ) l10n_ky? ( CC-BY-NC-ND-4.0 ) l10n_ru? ( CC-BY-NC-ND-4.0 ) l10n_uk? ( CC-BY-NC-ND-4.0 ) l10n_ka? ( free-noncomm ) l10n_tt? ( free-noncomm )
+RDEPEND=!dev-libs/hts_engine ao? ( media-libs/libao ) client? ( sys-apps/dbus ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) server? ( dev-libs/glib[dbus] >=dev-cpp/glibmm-2.66.1:2 ) speech-dispatcher? ( app-accessibility/speech-dispatcher )
+REQUIRED_USE=|| ( ao portaudio pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/rhvoice/rhvoice/archive/refs/tags/1.4.2.tar.gz -> rhvoice-1.4.2.tar.gz l10n_en? ( https://github.com/rhvoice/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) l10n_ru? ( https://github.com/rhvoice/aleksandr-hq-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-aleksandr-hq-4.0.tar.gz https://github.com/rhvoice/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz https://github.com/rhvoice/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz https://github.com/rhvoice/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy.tar.gz ) l10n_uk? ( https://github.com/rhvoice/volodymyr-ukr/archive/refs/tags/4.0.tar.gz -> rhvoice-volodymyr-4.0.tar.gz )
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=c37be08b7ea6e33083e07c5d781c8e0c
diff --git a/metadata/md5-cache/app-dicts/dictd-meta-1 b/metadata/md5-cache/app-dicts/dictd-meta-1
new file mode 100644
index 0000000000..692b77b349
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/dictd-meta-1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=dictd english dictionaries metapackage
+EAPI=8
+HOMEPAGE=http://www.dict.org
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-dicts/dictd-devils app-dicts/dictd-elements app-dicts/dictd-foldoc app-dicts/dictd-gazetteer app-dicts/dictd-jargon app-dicts/dictd-misc app-dicts/dictd-vera app-dicts/dictd-wn || ( app-dicts/dictd-gcide app-dicts/dictd-web1913 )
+SLOT=0
+_md5_=d8d9857d210b7b6665b0166cbebfe2a0
diff --git a/metadata/md5-cache/app-dicts/dictd-misc-1.5_alpha2 b/metadata/md5-cache/app-dicts/dictd-misc-1.5_alpha2
new file mode 100644
index 0000000000..3295e42816
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/dictd-misc-1.5_alpha2
@@ -0,0 +1,11 @@
+BDEPEND=>=app-text/dictd-1.13.0-r3
+DEFINED_PHASES=compile install
+DESCRIPTION=Hitchcock's and Easton's Bible Dictionaries
+EAPI=8
+HOMEPAGE=http://www.dict.org
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.13.0-r3
+SLOT=0
+SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dict-misc/1.5A-2/dict-misc_1.5A.orig.tar.gz https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/dict-misc/1.5A-2/dict-misc_1.5A-2.diff.gz
+_md5_=492ada3a3a05ab2ecf2649859f1c9c32
diff --git a/metadata/md5-cache/app-editors/atom-bin-1.57.0-r1 b/metadata/md5-cache/app-editors/atom-bin-1.57.0-r2
similarity index 78%
rename from metadata/md5-cache/app-editors/atom-bin-1.57.0-r1
rename to metadata/md5-cache/app-editors/atom-bin-1.57.0-r2
index 543724b0c7..d028c469e4 100644
--- a/metadata/md5-cache/app-editors/atom-bin-1.57.0-r1
+++ b/metadata/md5-cache/app-editors/atom-bin-1.57.0-r2
@@ -3,12 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A hackable text editor for the 21st Century
 EAPI=7
 HOMEPAGE=https://atom.io/
-INHERIT=desktop optfeature xdg
+INHERIT=desktop xdg
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core app-crypt/libsecret dev-libs/atk dev-libs/nss dev-libs/openssl dev-libs/openssl-compat dev-vcs/git media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libnotify x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/atom/atom/releases/download/v1.57.0/atom-amd64.tar.gz -> atom-bin-1.57.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=98d7ffda1307d3ca972db0c28f6491e6
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=8190149a2e3e0926fbe86c57d46682bf
diff --git a/metadata/md5-cache/app-misc/apidb-5.11.0_beta b/metadata/md5-cache/app-misc/apidb-5.11.0_beta
index 7c3626be4c..4f9412d4f4 100644
--- a/metadata/md5-cache/app-misc/apidb-5.11.0_beta
+++ b/metadata/md5-cache/app-misc/apidb-5.11.0_beta
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libxml2 dev-libs/boost dev-libs/octetos-coreutils dev-libs/octe
 SLOT=0
 SRC_URI=https://github.com/azaeldevel/apidb/archive/5.11.0-beta.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=26a939ce46ce82e211256cdde69514f4
+_md5_=cb854230a8b03ed147cf4eb05831a34a
diff --git a/metadata/md5-cache/dev-util/beautysh-6.0.1 b/metadata/md5-cache/app-misc/ssmtool-0.1.11
similarity index 51%
rename from metadata/md5-cache/dev-util/beautysh-6.0.1
rename to metadata/md5-cache/app-misc/ssmtool-0.1.11
index 2617557f13..445b9aef67 100644
--- a/metadata/md5-cache/dev-util/beautysh-6.0.1
+++ b/metadata/md5-cache/app-misc/ssmtool-0.1.11
@@ -1,15 +1,16 @@
-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(-)?]
+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/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=This program takes upon itself the hard task of beautifying Bash scripts
+DEPEND=dev-python/pymorphy2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pymorphy2-dicts-ru[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=A simple sentence mining tool written in PyQt5
 EAPI=7
-HOMEPAGE=http://uncrustify.sourceforge.net/
-INHERIT=distutils-r1
+HOMEPAGE=https://github.com/FreeLanguageTools/ssmtool/ https://pypi.org/project/ssmtool/
+INHERIT=distutils-r1 desktop
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
 RDEPEND=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/lovesegfault/beautysh/archive/refs/tags/6.0.1.tar.gz -> beautysh-6.0.1.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=c78843cf2ac351b5f1f624fb3e174399
+SRC_URI=mirror://pypi/s/ssmtool/ssmtool-0.1.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=b4b8477dde5d7c56ed9edaf20456ad3e
diff --git a/metadata/md5-cache/app-vim/openbsd-style-1.1 b/metadata/md5-cache/app-vim/openbsd-style-1.1
new file mode 100644
index 0000000000..16e9e4999b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/openbsd-style-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
+DESCRIPTION=vim plugin: indent code according to the OpenBSD and FreeBSD style(9)
+EAPI=7
+HOMEPAGE=https://wiki.freebsd.org/DevTools
+INHERIT=vim-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
+SLOT=0
+SRC_URI=https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/editors/vim/files/openbsd.vim?rev=1.1 -> openbsd-style-1.1.vim
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_md5_=3dc928e8f364e23e4ee42dfd6a8a27b7
diff --git a/metadata/md5-cache/dev-lang/fennel-0.9.1 b/metadata/md5-cache/dev-lang/fennel-0.9.1
index 51d8583e5f..ccd238c582 100644
--- a/metadata/md5-cache/dev-lang/fennel-0.9.1
+++ b/metadata/md5-cache/dev-lang/fennel-0.9.1
@@ -1,16 +1,16 @@
-BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 DEFINED_PHASES=install setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Fennel is a lisp that compiles to Lua
 EAPI=7
 HOMEPAGE=https://fennel-lang.org/
 INHERIT=lua-single
-IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://git.sr.ht/~technomancy/fennel/archive/0.9.1.tar.gz -> fennel-0.9.1.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	lua-utils	a2950af9f524361296ff10564515822c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f
-_md5_=c9b709f5a56508b3345e4d4b0bdc738c
+_md5_=38162c4482e001f6adc87e0ce8925989
diff --git a/metadata/md5-cache/dev-lang/fennel-0.9.2 b/metadata/md5-cache/dev-lang/fennel-0.9.2
index 974bd981a9..5ff3597413 100644
--- a/metadata/md5-cache/dev-lang/fennel-0.9.2
+++ b/metadata/md5-cache/dev-lang/fennel-0.9.2
@@ -1,16 +1,16 @@
-BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 DEFINED_PHASES=install setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Fennel is a lisp that compiles to Lua
 EAPI=7
 HOMEPAGE=https://fennel-lang.org/
 INHERIT=lua-single
-IUSE=lua_single_target_luajit lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://git.sr.ht/~technomancy/fennel/archive/0.9.2.tar.gz -> fennel-0.9.2.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	lua-utils	a2950af9f524361296ff10564515822c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f
-_md5_=17feb713cc03e63a2061580d3368322c
+_md5_=38162c4482e001f6adc87e0ce8925989
diff --git a/metadata/md5-cache/dev-lang/fennel-9999 b/metadata/md5-cache/dev-lang/fennel-9999
index e9feaa7327..69e8a657a8 100644
--- a/metadata/md5-cache/dev-lang/fennel-9999
+++ b/metadata/md5-cache/dev-lang/fennel-9999
@@ -1,15 +1,15 @@
-BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install setup unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 DESCRIPTION=Fennel is a lisp that compiles to Lua
 EAPI=7
 HOMEPAGE=https://fennel-lang.org/
 INHERIT=lua-single git-r3
-IUSE=lua_single_target_luajit lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	lua-utils	a2950af9f524361296ff10564515822c	lua-single	42a0ce9ea0dccefeb9279fda02fc5e5f	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=17feb713cc03e63a2061580d3368322c
+_md5_=38162c4482e001f6adc87e0ce8925989
diff --git a/metadata/md5-cache/dev-libs/boinc-zip-7.16.16 b/metadata/md5-cache/dev-libs/boinc-zip-7.18
similarity index 52%
rename from metadata/md5-cache/dev-libs/boinc-zip-7.16.16
rename to metadata/md5-cache/dev-libs/boinc-zip-7.18
index e5d8ab9792..c1970ae121 100644
--- a/metadata/md5-cache/dev-libs/boinc-zip-7.16.16
+++ b/metadata/md5-cache/dev-libs/boinc-zip-7.18
@@ -1,12 +1,12 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Wrapper for the zip/unzip functions to expose to BOINC clients
-EAPI=7
+EAPI=8
 HOMEPAGE=https://boinc.berkeley.edu/trac/wiki/FileCompression
 INHERIT=autotools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Info-ZIP LGPL-3+
 SLOT=0
-SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.16.tar.gz -> boinc-7.16.16.tar.gz
+SRC_URI=https://github.com/boinc/boinc/archive/client_release/7.18/7.18.0.tar.gz -> boinc-7.18.0.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=cdcd1122b7f25c742c47cbcb8b8a6a5d
+_md5_=19d78f8ea15a1d2697995e55e057acae
diff --git a/metadata/md5-cache/dev-libs/libansilove-1.2.8 b/metadata/md5-cache/dev-libs/libansilove-1.2.8
new file mode 100644
index 0000000000..baa7ece29d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libansilove-1.2.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/gd[png]
+DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
+EAPI=7
+HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=media-libs/gd[png]
+SLOT=0
+SRC_URI=https://github.com/ansilove/libansilove/archive/refs/tags/1.2.8.tar.gz -> libansilove-1.2.8.tar.gz
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=5c046c144e01d3491fef8b41e124bc5f
diff --git a/metadata/md5-cache/dev-libs/libansilove-9999 b/metadata/md5-cache/dev-libs/libansilove-9999
new file mode 100644
index 0000000000..7b8978b012
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libansilove-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/gd[png]
+DESCRIPTION=library to convert ANSi and artscene related file formats into PNG images
+EAPI=7
+HOMEPAGE=https://github.com/ansilove/libansilove
+INHERIT=cmake git-r3
+LICENSE=BSD-2
+PROPERTIES=live
+RDEPEND=media-libs/gd[png]
+SLOT=0
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=5c046c144e01d3491fef8b41e124bc5f
diff --git a/metadata/md5-cache/dev-python/DAWG-Python-0.7.2 b/metadata/md5-cache/dev-python/DAWG-Python-0.7.2
new file mode 100644
index 0000000000..9773da1f89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/DAWG-Python-0.7.2
@@ -0,0 +1,15 @@
+BDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/DAWG-Python/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/D/DAWG-Python/DAWG-Python-0.7.2.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
+_md5_=37c6b9529e19f6a70f49ba4bba743e0d
diff --git a/metadata/md5-cache/dev-python/cx-oracle-8.1.0 b/metadata/md5-cache/dev-python/cx-oracle-8.2.1
similarity index 79%
rename from metadata/md5-cache/dev-python/cx-oracle-8.1.0
rename to metadata/md5-cache/dev-python/cx-oracle-8.2.1
index 9052e4e60d..5bc44ccf13 100644
--- a/metadata/md5-cache/dev-python/cx-oracle-8.1.0
+++ b/metadata/md5-cache/dev-python/cx-oracle-8.2.1
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-db/oracle-instantclient
 DESCRIPTION=Python interface to Oracle
-EAPI=7
+EAPI=8
 HOMEPAGE=https://oracle.github.io/python-cx_Oracle/ https://pypi.org/project/cx-Oracle/
 INHERIT=distutils-r1
 IUSE=examples python_targets_python3_8 python_targets_python3_9
@@ -10,7 +10,8 @@ KEYWORDS=~amd64
 LICENSE=Computronix
 RDEPEND=dev-db/oracle-instantclient 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
 SLOT=0
-SRC_URI=mirror://pypi/c/cx_Oracle/cx_Oracle-8.1.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=deb5be2bdd352b39146a468058f04778
+SRC_URI=mirror://pypi/c/cx_Oracle/cx_Oracle-8.2.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
+_md5_=7dc78f32530d86687edfb6c11379eaed
diff --git a/metadata/md5-cache/dev-python/pymorphy2-0.9.1 b/metadata/md5-cache/dev-python/pymorphy2-0.9.1
new file mode 100644
index 0000000000..1bae0a0ce9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymorphy2-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/docopt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pymorphy2-dicts-ru[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/DAWG-Python[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Morphological analyzer (POS tagger + inflection engine) for Russian language.
+EAPI=7
+HOMEPAGE=https://github.com/kmike/pymorphy2 https://pypi.org/project/pymorphy2/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymorphy2/pymorphy2-0.9.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
+_md5_=13e6837e55dea505b1795eab1b6fa858
diff --git a/metadata/md5-cache/dev-python/pymorphy2-dicts-ru-2.4.417127.4579844 b/metadata/md5-cache/dev-python/pymorphy2-dicts-ru-2.4.417127.4579844
new file mode 100644
index 0000000000..ebc122cbc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymorphy2-dicts-ru-2.4.417127.4579844
@@ -0,0 +1,15 @@
+BDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Russian dictionary for PyMorphy2
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pymorphy2-dicts-ru/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymorphy2-dicts-ru/pymorphy2-dicts-ru-2.4.417127.4579844.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
+_md5_=6161440a1f5e818b93cde7eb65f3fba6
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.7.1 b/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.7.1
deleted file mode 100644
index e92e8ae021..0000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=KaTeX Sphinx extension for rendering of math in HTML pages
-EAPI=7
-HOMEPAGE=https://github.com/hagenw/sphinxcontrib-katex
-INHERIT=distutils-r1
-IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sphinx-2.4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-katex/sphinxcontrib-katex-0.7.1.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=1371ddac17da3eebb2393954cade624e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.8.6 b/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.8.6
new file mode 100644
index 0000000000..8fd5bf107e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-katex-0.8.6
@@ -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(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) 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=KaTeX Sphinx extension for rendering of math in HTML pages
+EAPI=7
+HOMEPAGE=https://github.com/hagenw/sphinxcontrib-katex
+INHERIT=distutils-r1
+IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-3.5.4[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(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sphinxcontrib-katex/sphinxcontrib-katex-0.8.6.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
+_md5_=26ddddf3937ea3fe75506a307c12a816
diff --git a/metadata/md5-cache/dev-util/beautysh-6.1.0 b/metadata/md5-cache/dev-util/beautysh-6.1.0
deleted file mode 100644
index 38ea1de851..0000000000
--- a/metadata/md5-cache/dev-util/beautysh-6.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=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/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bash beautifier for the masses
-EAPI=7
-HOMEPAGE=https://github.com/lovesegfault/beautysh https://pypi.python.org/pypi/beautysh
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=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/lovesegfault/beautysh/archive/refs/tags/v6.1.0.tar.gz -> beautysh-6.1.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=1b4efa143faeafc04d5ada60c9f79f80
diff --git a/metadata/md5-cache/dev-vcs/gitqlient-1.4.0 b/metadata/md5-cache/dev-vcs/gitqlient-1.4.0
new file mode 100644
index 0000000000..c48e3dcceb
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/gitqlient-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multi-platform Git client written with Qt
+EAPI=7
+HOMEPAGE=https://github.com/francescmm/GitQlient
+INHERIT=desktop qmake-utils xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/francescmm/GitQlient/archive/v1.4.0.tar.gz -> gitqlient-1.4.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=06bb6b0d53fb667face5d201572716cc
diff --git a/metadata/md5-cache/dev-vcs/lazygit-0.28.2 b/metadata/md5-cache/dev-vcs/lazygit-0.28.2
new file mode 100644
index 0000000000..a57702f2cf
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/lazygit-0.28.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install test unpack
+DEPEND=sys-libs/glibc
+DESCRIPTION=Lazygit, a simple terminal UI for git commands
+EAPI=7
+HOMEPAGE=https://github.com/jesseduffield/lazygit
+INHERIT=golang-build golang-vcs-snapshot
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/jesseduffield/lazygit/archive/v0.28.2.tar.gz -> lazygit-0.28.2.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
+_md5_=06beb5f1e52d3f21802e604ca39e6c0e
diff --git a/metadata/md5-cache/games-misc/Fallout3Terminal-0_pre20191105 b/metadata/md5-cache/games-misc/Fallout3Terminal-0_pre20191105
index f7a242990b..0b871a683d 100644
--- a/metadata/md5-cache/games-misc/Fallout3Terminal-0_pre20191105
+++ b/metadata/md5-cache/games-misc/Fallout3Terminal-0_pre20191105
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=app-shells/bash media-sound/sox sys-apps/pv x11-terms/cool-retro-term
 SLOT=0
 SRC_URI=https://github.com/fohtla/Fallout3Terminal/archive/04cad950ca949d1a437a5718b40d3d0b9e33ee0d.tar.gz -> Fallout3Terminal-0_pre20191105.tar.gz
-_md5_=5414c88b523b998d2566f0404fd6f8d5
+_md5_=2e1cd6bf15b14f92732a12a44a2ee028
diff --git a/metadata/md5-cache/games-misc/bonsai-0_pre20210201 b/metadata/md5-cache/games-misc/bonsai-0_pre20210201
new file mode 100644
index 0000000000..5267731000
--- /dev/null
+++ b/metadata/md5-cache/games-misc/bonsai-0_pre20210201
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=bonsai tree generator written in bash
+EAPI=8
+HOMEPAGE=https://gitlab.com/jallbrit/bonsai.sh
+KEYWORDS=~amd64
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://gitlab.com/jallbrit/bonsai.sh/-/archive/5e6e6aa7f44e1a770d9c56687ad1b660c409de00/bonsai.sh-5e6e6aa7f44e1a770d9c56687ad1b660c409de00.tar.bz2
+_md5_=f6ef57f97fdabbab0488a50b1208fe33
diff --git a/metadata/md5-cache/games-misc/cbonsai-1.2.1 b/metadata/md5-cache/games-misc/cbonsai-1.2.1
new file mode 100644
index 0000000000..bdb2c951a5
--- /dev/null
+++ b/metadata/md5-cache/games-misc/cbonsai-1.2.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=grow bonsai trees in your terminal
+EAPI=8
+HOMEPAGE=https://gitlab.com/jallbrit/cbonsai
+KEYWORDS=~amd64
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://gitlab.com/jallbrit/cbonsai/-/archive/v1.2.1/cbonsai-v1.2.1.tar.bz2 -> cbonsai-1.2.1.tar.bz2
+_md5_=5052aa1c0468387acca5e491cd8c0634
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-thermal-monitor-1.3.0 b/metadata/md5-cache/kde-misc/plasma-applet-thermal-monitor-1.3.0
index 980c4d5618..760e5a1995 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-thermal-monitor-1.3.0
+++ b/metadata/md5-cache/kde-misc/plasma-applet-thermal-monitor-1.3.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!kde-misc/plasma-applet-thermal-monitor:0 >=kde-frameworks/plasma-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=kde-frameworks/plasma:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors
 EAPI=7
 HOMEPAGE=https://store.kde.org/p/998915/ https://gitlab.com/agurenko/plasma-applet-thermal-monitor
-INHERIT=ecm
+INHERIT=ecm optfeature
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=!kde-misc/plasma-applet-thermal-monitor:0 >=kde-frameworks/plasma-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=kde-frameworks/plasma:5 kde-plasma/ksysguard:5[lm-sensors] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://gitlab.com/agurenko/plasma-applet-thermal-monitor/-/archive/1.3.0/plasma-applet-thermal-monitor-1.3.0.tar.gz
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	ecm	8eb670c6f910afdaaa41ec056d9198a7
-_md5_=4629c96f40ca7a883a50ab3919e8cf46
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	ecm	8eb670c6f910afdaaa41ec056d9198a7	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_md5_=63a2de5d8ec0b0eedee2fb9fcbc19149
diff --git a/metadata/md5-cache/media-gfx/ansilove-4.1.5 b/metadata/md5-cache/media-gfx/ansilove-4.1.5
new file mode 100644
index 0000000000..9004ce11bf
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ansilove-4.1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libansilove
+DESCRIPTION=ANSI and ASCII art to PNG converter (using libansilove)
+EAPI=7
+HOMEPAGE=https://github.com/ansilove/ansilove/
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-libs/libansilove
+SLOT=0
+SRC_URI=https://github.com/ansilove/ansilove/archive/refs/tags/4.1.5.tar.gz -> ansilove-4.1.5.tar.gz
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=da14f1cf2a560dc9b496d0860d007d47
diff --git a/metadata/md5-cache/media-gfx/ansilove-9999 b/metadata/md5-cache/media-gfx/ansilove-9999
new file mode 100644
index 0000000000..d1af4525b6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ansilove-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libansilove
+DESCRIPTION=ANSI and ASCII art to PNG converter (using libansilove)
+EAPI=7
+HOMEPAGE=https://github.com/ansilove/ansilove/
+INHERIT=cmake git-r3
+LICENSE=BSD-2
+PROPERTIES=live
+RDEPEND=dev-libs/libansilove
+SLOT=0
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	xdg-utils	27f9a2f19502b925ac117bd657aa2979	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
+_md5_=da14f1cf2a560dc9b496d0860d007d47
diff --git a/metadata/md5-cache/media-gfx/azpainter-3.0.1 b/metadata/md5-cache/media-gfx/azpainter-3.0.3
similarity index 92%
rename from metadata/md5-cache/media-gfx/azpainter-3.0.1
rename to metadata/md5-cache/media-gfx/azpainter-3.0.3
index 9596e0e7f1..e0dc65a74d 100644
--- a/metadata/md5-cache/media-gfx/azpainter-3.0.1
+++ b/metadata/md5-cache/media-gfx/azpainter-3.0.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXcursor:= x11-libs/libXi:= media-libs/freetype:= media-libs/fontconfig:= sys-libs/zlib:= media-libs/libpng:= media-libs/libjpeg-turbo:= media-libs/libwebp:= media-libs/tiff:=
 SLOT=0/3
-SRC_URI=https://gitlab.com/azelpg/azpainter/-/archive/v3.0.1/azpainter-v3.0.1.tar.gz
+SRC_URI=https://gitlab.com/azelpg/azpainter/-/archive/v3.0.3/azpainter-v3.0.3.tar.gz
 _eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=7c19312a5ee2d1639f3bd381decfa62e
diff --git a/metadata/md5-cache/media-libs/sonic-0.3.0_pre20210316 b/metadata/md5-cache/media-libs/sonic-0.3.0_pre20210316
deleted file mode 100644
index aca4ef7a57..0000000000
--- a/metadata/md5-cache/media-libs/sonic-0.3.0_pre20210316
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sci-libs/fftw
-DESCRIPTION=Simple library to speed up or slow down speech
-EAPI=7
-HOMEPAGE=https://github.com/waywardgeek/sonic
-INHERIT=multilib toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=sci-libs/fftw
-SLOT=0
-SRC_URI=https://github.com/waywardgeek/sonic/archive/ba331411f17702e01f6c2d7016eefebaa695871f.tar.gz -> sonic-0.3.0_pre20210316.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=581c5f6613ab7235a892a31bdc193088
diff --git a/metadata/md5-cache/net-misc/lyrics-in-terminal-1.4.2 b/metadata/md5-cache/net-misc/lyrics-in-terminal-1.4.2
index c199020649..ff9ced69fd 100644
--- a/metadata/md5-cache/net-misc/lyrics-in-terminal-1.4.2
+++ b/metadata/md5-cache/net-misc/lyrics-in-terminal-1.4.2
@@ -1,15 +1,15 @@
-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(-)?]
+BDEPEND=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=Command Line Lyrics fetcher for MPRIS media players
 EAPI=7
 HOMEPAGE=https://github.com/Jugran/lyrics-in-terminal
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-libs/ncurses 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 )
+RDEPEND=dev-python/dbus-python[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(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Jugran/lyrics-in-terminal/archive/1.4.2.tar.gz -> lyrics-in-terminal-1.4.2.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9
-_md5_=f086cf4e3067d45a70fbfae5103ef87e
+_md5_=d5d5aefcf70ab219ed68e872f9557d1c
diff --git a/metadata/md5-cache/net-wireless/iwdgui-0.1.0 b/metadata/md5-cache/net-wireless/iwdgui-0.1.0
new file mode 100644
index 0000000000..e739a5f65e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwdgui-0.1.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/glib dev-libs/gobject-introspection dev-python/dbus-python x11-libs/gtk+:3 dev-python/netifaces net-wireless/iwd 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-libs/glib dev-libs/gobject-introspection dev-python/dbus-python x11-libs/gtk+:3 dev-python/netifaces net-wireless/iwd dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical frontend for IWD, Intel's iNet Wireless Daemon
+EAPI=7
+HOMEPAGE=https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui
+INHERIT=distutils-r1 xdg
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib dev-libs/gobject-introspection dev-python/dbus-python x11-libs/gtk+:3 dev-python/netifaces net-wireless/iwd 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
+SLOT=0
+SRC_URI=mirror://pypi/i/iwdgui/iwdgui-0.1.0.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=0e7fb0146af386301ce0d37a20329bc5
diff --git a/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.16 b/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.16
index 3b6cd09a44..fb940d9050 100644
--- a/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.16
+++ b/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.16
@@ -1,14 +1,13 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~sci-misc/boinc-7.16.16 ~dev-libs/boinc-zip-7.16.16
-DESCRIPTION=use non-BOINC apps with BOINC
-EAPI=7
+DEFINED_PHASES=configure install
+DEPEND=~sci-misc/boinc-7.16.16 >=dev-libs/boinc-zip-7.16.16
+DESCRIPTION=Wrapper to use non-BOINC apps with BOINC
+EAPI=8
 HOMEPAGE=https://boinc.berkeley.edu/trac/wiki/WrapperApp
-INHERIT=autotools toolchain-funcs
-KEYWORDS=~amd64 ~x86
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3+ regexp-UofT
-RDEPEND=~sci-misc/boinc-7.16.16 ~dev-libs/boinc-zip-7.16.16
+RDEPEND=~sci-misc/boinc-7.16.16 >=dev-libs/boinc-zip-7.16.16
 SLOT=0
-SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.16.tar.gz -> boinc-7.16.16.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=de4b788ba4b3b543d9de7f78455c8dc4
+SRC_URI=https://github.com/boinc/boinc/archive/client_release/7.16/7.16.16.tar.gz -> boinc-7.16.16.tar.gz
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
+_md5_=859177b20a296e60160894f756bb7169
diff --git a/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.17 b/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.17
new file mode 100644
index 0000000000..cf4ea30192
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/boinc-wrapper-7.16.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=~sci-misc/boinc-7.16.17 >=dev-libs/boinc-zip-7.16.17
+DESCRIPTION=Wrapper to use non-BOINC apps with BOINC
+EAPI=8
+HOMEPAGE=https://boinc.berkeley.edu/trac/wiki/WrapperApp
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+ regexp-UofT
+RDEPEND=~sci-misc/boinc-7.16.17 >=dev-libs/boinc-zip-7.16.17
+SLOT=0
+SRC_URI=https://github.com/boinc/boinc/archive/client_release/7.16/7.16.17.tar.gz -> boinc-7.16.17.tar.gz
+_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352
+_md5_=859177b20a296e60160894f756bb7169
diff --git a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9 b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9
deleted file mode 100644
index c40af57a95..0000000000
--- a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install setup
-DEPEND=dev-libs/boost:= sci-libs/ann mpi? ( virtual/mpi ) || ( dev-lang/python:3.9 dev-lang/python:3.8 >=dev-python/pypy3-7.3.0:0 )
-DESCRIPTION=Expose the main performance trends in applications computation structure
-EAPI=7
-HOMEPAGE=https://tools.bsc.es/cluster-analysis https://github.com/bsc-performance-tools/clustering-suite
-INHERIT=python-any-r1
-IUSE=doc mpi old-pcfparser
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost:= sci-libs/ann mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-2.6.9-src.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-any-r1	901d9e22c7a848a1196502edf060f330
-_md5_=ebcbfb9291843b76d8cf83731ad92b7b
diff --git a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r2 b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r2
deleted file mode 100644
index 50fb6ca855..0000000000
--- a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/boost:= sci-libs/ann sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 >=dev-python/pypy3-7.3.0:0 )
-DESCRIPTION=Expose the main performance trends in applications computation structure
-EAPI=8
-HOMEPAGE=https://tools.bsc.es/cluster-analysis https://github.com/bsc-performance-tools/clustering-suite
-INHERIT=python-any-r1
-IUSE=doc mpi muster
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost:= sci-libs/ann sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster )
-SLOT=0
-SRC_URI=https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-2.6.9-src.tar.bz2
-_eclasses_=toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-any-r1	901d9e22c7a848a1196502edf060f330
-_md5_=c4ceb5f84acd70fe58c8adf3e053d077
diff --git a/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3 b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3
new file mode 100644
index 0000000000..f865f7788f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/clusteringsuite-2.6.9-r3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=app-arch/bzip2 dev-libs/boost:= sci-libs/ann sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 >=dev-python/pypy3-7.3.0:0 )
+DESCRIPTION=Expose the main performance trends in applications computation structure
+EAPI=7
+HOMEPAGE=https://tools.bsc.es/cluster-analysis https://github.com/bsc-performance-tools/clustering-suite
+INHERIT=autotools python-any-r1
+IUSE=doc mpi muster
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/bzip2 dev-libs/boost:= sci-libs/ann sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster )
+SLOT=0
+SRC_URI=https://codeload.github.com/bsc-performance-tools/clustering-suite/tar.gz/refs/tags/2.6.9 -> clusteringsuite-2.6.9.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-any-r1	901d9e22c7a848a1196502edf060f330
+_md5_=bde6ccb78cb17316190418f69713535d
diff --git a/metadata/md5-cache/sys-cluster/libbsctools-1.0.6 b/metadata/md5-cache/sys-cluster/libbsctools-1.0.6-r2
similarity index 94%
rename from metadata/md5-cache/sys-cluster/libbsctools-1.0.6
rename to metadata/md5-cache/sys-cluster/libbsctools-1.0.6-r2
index 9b7b71180f..05ce777c36 100644
--- a/metadata/md5-cache/sys-cluster/libbsctools-1.0.6
+++ b/metadata/md5-cache/sys-cluster/libbsctools-1.0.6-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/libbsctools/archive/refs/tags/1.0.6.tar.gz -> libbsctools-1.0.6.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	2a36908d5f63f41614b450a2459567da
-_md5_=d0b8a79fef0df6cf87bcd9aa08d09b1f
+_md5_=8f4f4cd18695b92043b7e2e2dbeb21f3
diff --git a/metadata/md5-cache/sys-cluster/synapse-2.0.1 b/metadata/md5-cache/sys-cluster/synapse-2.0.1
new file mode 100644
index 0000000000..3b5b5d751c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/synapse-2.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= sys-cluster/mrnet
+DESCRIPTION=synapse
+EAPI=8
+HOMEPAGE=https://github.com/bsc-performance-tools/synapse
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= sys-cluster/mrnet
+SLOT=0
+SRC_URI=https://github.com/bsc-performance-tools/synapse/archive/refs/tags/2.0.1.tar.gz -> synapse-2.0.1.tar.gz
+_md5_=ed3650e459726193b462736d6898cf49
diff --git a/metadata/md5-cache/x11-misc/caffeine-ng-3.5.1 b/metadata/md5-cache/x11-misc/caffeine-ng-3.5.1
index 18a214999b..83882b777b 100644
--- a/metadata/md5-cache/x11-misc/caffeine-ng-3.5.1
+++ b/metadata/md5-cache/x11-misc/caffeine-ng-3.5.1
@@ -1,16 +1,15 @@
-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(-)?]
+BDEPEND=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 postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3 >=dev-python/pyxdg-0.25 dev-python/dbus-python >=dev-python/docopt-0.6.2 >=dev-python/setproctitle-1.1.10 dev-python/setuptools >=dev-python/wheel-0.29.0 dev-python/setuptools_scm dev-libs/libappindicator:3 x11-libs/gtk+:3
-DESCRIPTION=Aplication able to temporarily inhibit the screensaver.
+DESCRIPTION=Aplication able to temporarily inhibit the screensaver
 EAPI=7
 HOMEPAGE=https://github.com/caffeine-ng/caffeine-ng
 INHERIT=distutils-r1 gnome2-utils
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 >=dev-python/pyxdg-0.25 dev-python/dbus-python >=dev-python/docopt-0.6.2 >=dev-python/setproctitle-1.1.10 dev-python/setuptools >=dev-python/wheel-0.29.0 dev-python/setuptools_scm dev-libs/libappindicator:3 x11-libs/gtk+:3 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 )
+RDEPEND=>=dev-python/ewmh-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyxdg-0.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docopt-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pulsectl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setproctitle-1.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libappindicator:3 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 )
 SLOT=0
 SRC_URI=https://github.com/caffeine-ng/caffeine-ng/releases/download/v3.5.1/caffeine-ng-3.5.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	xdg-utils	27f9a2f19502b925ac117bd657aa2979	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3
-_md5_=f41288e7f4f1d18146d4015a405b71a7
+_md5_=e4ab4ac159fff141f721e2f24de0c6b3
diff --git a/metadata/md5-cache/x11-misc/caffeine-ng-9999 b/metadata/md5-cache/x11-misc/caffeine-ng-9999
deleted file mode 100644
index 4d4a4554c8..0000000000
--- a/metadata/md5-cache/x11-misc/caffeine-ng-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-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(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:3 >=dev-python/pyxdg-0.25 dev-python/dbus-python >=dev-python/docopt-0.6.2 >=dev-python/setproctitle-1.1.10 dev-python/setuptools >=dev-python/wheel-0.29.0 dev-python/setuptools_scm dev-libs/libappindicator:3 x11-libs/gtk+:3 x11-libs/libnotify
-DESCRIPTION=Aplication able to temporarily inhibit the screensaver.
-EAPI=7
-HOMEPAGE=https://github.com/caffeine-ng/caffeine-ng
-INHERIT=distutils-r1 gnome2-utils git-r3
-IUSE=python_targets_python3_8 python_targets_python3_9
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=dev-python/pygobject:3 >=dev-python/pyxdg-0.25 dev-python/dbus-python >=dev-python/docopt-0.6.2 >=dev-python/setproctitle-1.1.10 dev-python/setuptools >=dev-python/wheel-0.29.0 dev-python/setuptools_scm dev-libs/libappindicator:3 x11-libs/gtk+:3 x11-libs/libnotify 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
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	xdg-utils	27f9a2f19502b925ac117bd657aa2979	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=8192e7ebdd95b161e7e35736f308b839
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index cac1cc453e..9c92bc6a99 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -23,7 +23,7 @@ acct-user/purritobin 0: User for net-misc/purritobin
 acct-user/trezord 0: User for TREZOR Bridge
 acct-user/wsdd 0: User for net-misc/wsdd
 app-accessibility/mimic1 1.3.0.1 9999: Mycroft's TTS engine, based on CMU's Flite (Festival Lite)
-app-accessibility/rhvoice 1.2.4: TTS engine with extended languages support (including Russian)
+app-accessibility/rhvoice 1.4.2: TTS engine with extended languages support (including Russian)
 app-accessibility/speakup-tools 20121017: Tools to customize speakup module
 app-admin/antidot 0.6.1 0.6.2: Cleans up your $HOME from those pesky dotfiles
 app-admin/chezmoi 1.8.10 2.0.12: Manage your dotfiles across multiple machines, securely
@@ -49,10 +49,12 @@ app-dicts/dictd-foldoc 20180405: The Free On-line Dictionary of Computing for di
 app-dicts/dictd-gazetteer 1.3: The original U.S. Gazetteer Place and Zipcode Files for dict
 app-dicts/dictd-gcide 0.48.5: Collaborative International Dictionary of English (incl. Webster 1913) for dict
 app-dicts/dictd-jargon 4.2.3-r2: The Jargon File for dict
+app-dicts/dictd-meta 1: dictd english dictionaries metapackage
+app-dicts/dictd-misc 1.5_alpha2: Hitchcock's and Easton's Bible Dictionaries
 app-dicts/dictd-moby-thesaurus 1.0: Grady Ward's Moby Thesaurus; 35000 root words and 2.5 million synonyms
 app-dicts/dictd-mueller 3.1-r1: V. K. Mueller English-Russian Dictionary
 app-dicts/dictd-web1913 0.5.0_p1: Webster's Revised Unabridged Dictionary (1913) for dict
-app-editors/atom-bin 1.57.0-r1: A hackable text editor for the 21st Century
+app-editors/atom-bin 1.57.0-r2: A hackable text editor for the 21st Century
 app-editors/featherpad 0.17.2 0.18.0: Lightweight Qt5 Plain-Text Editor for Linux
 app-editors/imhex 1.8.1-r1: A hex editor for reverse engineers, programmers, and eyesight
 app-editors/kitscenarist 0.7.2_rc9: Simple and powerful application for creating screenplays.
@@ -94,6 +96,7 @@ app-misc/pfetch 0.6.0: A pretty system information tool written in POSIX sh
 app-misc/pup 0.4.0_p1: Parsing HTML at the command line
 app-misc/rdfind 1.4.1: Find duplicate files
 app-misc/rememberthemilk 1.3.0: Freemium simple to-do tasks manager
+app-misc/ssmtool 0.1.11: A simple sentence mining tool written in PyQt5
 app-misc/tai 0.0.4 0.0.5: tai (Terminal Ascii Image) tool to convert images to ascii
 app-misc/tealdeer 1.4.1: A very fast implementation of tldr in Rust.
 app-misc/telegram-send 0.25-r1: Send messages and files over Telegram from the command-line
@@ -141,6 +144,7 @@ app-text/lizard 1.17.7: A simple code complexity analyser, supports most of the
 app-text/mdbook 0.4.7 0.4.8 0.4.9 0.4.10: Creates a book from markdown files
 app-text/noweb 2.12: a literate programming tool, lighter than web
 app-text/stdman 2019.08.27 2020.11.17 9999: Formatted C++ stdlib man pages (cppreference)
+app-vim/openbsd-style 1.1: vim plugin: indent code according to the OpenBSD and FreeBSD style(9)
 app-vim/vim-nix 9999: vim plugin: Vim configuration files for Nix
 dev-R/BH 1.75.0.0: Boost C++ Header Files
 dev-R/MASS 7.3.54: Support Functions and Datasets for variables and Ripley's MASS
@@ -274,7 +278,7 @@ dev-lang/gleam 0.16.0: A statically typed functional language for the BEAM
 dev-lang/quickjs 2020.11.08 2021.03.27: Small embeddable Javascript engine
 dev-lang/wren 0.3.0: The Wren Programming Language
 dev-libs/StringiFor 1.1.1: StringiFor, Strings Fortran Manipulator, yet another strings Fortran module
-dev-libs/boinc-zip 7.16.16: Wrapper for the zip/unzip functions to expose to BOINC clients
+dev-libs/boinc-zip 7.18: Wrapper for the zip/unzip functions to expose to BOINC clients
 dev-libs/cgicc 3.2.19: A C++ class library for writing CGI applications
 dev-libs/cglm 0.8.2-r1 0.8.3 9999: OpenGL Mathematics (glm) for C
 dev-libs/feedbackd 0.0.0-r9: A daemon to provide haptic feedback on events
@@ -282,6 +286,7 @@ dev-libs/fsst 0_pre20200830: Fast Static Symbol Table: fast text compression tha
 dev-libs/ftl 1.0_p20210308: The Fortran Template Library (FTL) is a general purpose library for Fortran 2003
 dev-libs/hts_engine 1.10: HMM-based speech synthesis system (HTS) engine and API
 dev-libs/imsg-compat 6.8.2 9999: linux port of OpenBSD imsg
+dev-libs/libansilove 1.2.8 9999: library to convert ANSi and artscene related file formats into PNG images
 dev-libs/libcloudproviders 0.3.1: DBus API that allows cloud storage sync clients to expose their services.
 dev-libs/libdwarf 20210528: The DWARF Debugging Information Format
 dev-libs/libnodave 0.8.5.1-r2: Connect to and exchange data with Siemens PLCs
@@ -314,6 +319,7 @@ dev-perl/GitLab-API-v4 0.26: A complete GitLab API v4 client
 dev-perl/HTTP-Tiny-Multipart 0.08: Add post_multipart to HTTP::Tiny
 dev-perl/List-Compare 0.55: Compare elements of two or more lists
 dev-php/pecl-inotify 3.0.0: Inotify binding for PHP
+dev-python/DAWG-Python 0.7.2: Pure-python reader for DAWGs (DAFSAs) created by dawgdic C++ library.
 dev-python/MutatorMath 3.0.1: A library for piecewise linear interpolation in multiple dimensions
 dev-python/WSME 0.10.0: Simplify the writing of REST APIs, and extend them with additional protocols.
 dev-python/XenAPI 2.14: Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform
@@ -358,7 +364,7 @@ dev-python/convertdate 2.3.0 2.3.1: Utils for converting between date formats an
 dev-python/cu2qu 1.6.7: Cubic-to-quadratic bezier curve conversion
 dev-python/curio 0.9 1.4-r1 1.5: Curio is a coroutine-based library for concurrent systems programming
 dev-python/cursive 0.2.2-r1: Cursive implements OpenStack-specific validation of digital signatures.
-dev-python/cx-oracle 8.1.0: Python interface to Oracle
+dev-python/cx-oracle 8.2.1: Python interface to Oracle
 dev-python/dacite 1.6.0: This module simplifies creation of data classes (PEP 557) from dictionaries
 dev-python/daff 1.3.46: The daff can produce and apply tabular diffs
 dev-python/databases 0.4.3: Async database support for Python.
@@ -456,6 +462,8 @@ dev-python/pyinquirer 1.0.3_p20200708 9999: A Python module for common interacti
 dev-python/pyinstaller 4.2: Bundles a Python application and all its dependencies into a single package.
 dev-python/pykeepass 4.0.0: Python library to interact with keepass databases (supports KDBX3 and KDBX4)
 dev-python/pymeeus 0.3.13 0.4.2: Python implementation of Jean Meeus astronomical routines
+dev-python/pymorphy2 0.9.1: Morphological analyzer (POS tagger + inflection engine) for Russian language.
+dev-python/pymorphy2-dicts-ru 2.4.417127.4579844: Russian dictionary for PyMorphy2
 dev-python/pypandoc 1.6.3: Pypandoc provides a thin wrapper for pandoc, a universal document converter
 dev-python/pypowervm 1.1.24: Python binding for the PowerVM REST API
 dev-python/pysaml2 6.1.0: Python implementation of SAML Version 2 to be used in a WSGI environment
@@ -507,7 +515,7 @@ dev-python/skia-pathops 0.4.1 0.6.0_p2: Python bindings for the Skia Path Ops
 dev-python/skills 0.3.0: Python Implementation of the TrueSkill, Glicko and Elo Ranking Algorithms
 dev-python/sphinx-argparse 0.2.5: Sphinx extension that automatically documents argparse commands and options
 dev-python/sphinx-click 3.0.0 3.0.1: Sphinx plugin to automatically document click-based applications
-dev-python/sphinxcontrib-katex 0.7.1: KaTeX Sphinx extension for rendering of math in HTML pages
+dev-python/sphinxcontrib-katex 0.8.6: KaTeX Sphinx extension for rendering of math in HTML pages
 dev-python/sphinxcontrib-napoleon 0.7: Allow a different format in dosctrings for better clarity
 dev-python/sphinxcontrib-restbuilder 0.3: A Sphinx builder/writer to output reStructuredText (rst) files
 dev-python/spotipy 2.17.1: A light weight Python library for the Spotify Web API
@@ -552,7 +560,6 @@ dev-scheme/guile-gi 0.3.1 9999: Bindings for GObject Introspection and libgirepo
 dev-scheme/owl-lisp 0.2 9999: Purely functional dialect of Scheme
 dev-util/FoBiS 3.0.5: FoBiS.py, a Fortran Building System for poor men
 dev-util/afdko 3.6.2: Adobe Font Development Kit for OpenType
-dev-util/beautysh 6.0.1 6.1.0: Bash beautifier for the masses
 dev-util/cdecl 9.10: Composing and deciphering C (or C++) declarations or casts, aka "gibberish."
 dev-util/codespell 2.0.0 2.1.0: Check text files for common misspellings
 dev-util/devscripts 2.21.2 2.21.3: Scripts to make the life of a Debian Package maintainer easier
@@ -575,8 +582,8 @@ dev-vcs/git-blame-someone-else 0_pre20180613: Blame someone else for your bad co
 dev-vcs/git-cu 0.5.0: Helps to keep your local git repositories organized
 dev-vcs/git-repo-updater 0.5.1-r1: Easily update multiple git repositories at once
 dev-vcs/gitahead 2.6.3: Graphical Git client to help understand and manage source code history
-dev-vcs/gitqlient 1.3.2 9999: Multi-platform Git client written with Qt
-dev-vcs/lazygit 0.27.4 0.28.1 9999: Lazygit, a simple terminal UI for git commands
+dev-vcs/gitqlient 1.3.2 1.4.0 9999: Multi-platform Git client written with Qt
+dev-vcs/lazygit 0.27.4 0.28.1 0.28.2 9999: Lazygit, a simple terminal UI for git commands
 games-action/ATLauncher 3.4.3.1: Minecraft launcher which integrates multiple different ModPacks
 games-action/blackvoxel 2.42 9999: Blackvoxel Video Game
 games-action/netrek-brmh 2.6.0: brmh client for netrek
@@ -599,6 +606,8 @@ games-engines/nxengine-evo 2.6.4: rewrite of the jump-and-run platformer Doukuts
 games-fps/crispy-doom 5.10.0 5.10.1: A limit-removing enhanced-resolution Doom source port based on Chocolate Doom
 games-fps/quakespasm 0.93.2-r1 9999: Modern, cross-platform Quake 1 engine based on FitzQuake
 games-misc/Fallout3Terminal 0_pre20191105: A recreation of the Fallout 3 terminal via a linux bash script!
+games-misc/bonsai 0_pre20210201: bonsai tree generator written in bash
+games-misc/cbonsai 1.2.1: grow bonsai trees in your terminal
 games-puzzle/atris 1.0.7: Alizarin tetris
 games-puzzle/krank 8: Little casual game
 games-puzzle/superflu-riteurnz 1.0.0: Artisanal video-game about Superflu, the useless super-hero (french)
@@ -680,7 +689,8 @@ media-fonts/symbola 7.17 13.00: Unicode font for Latin, IPA Extensions, Greek, C
 media-fonts/unscii 2.1: Set of bitmapped Unicode fonts based on classic system fonts
 media-fonts/warframe-fonts 0_pre20191111: Fonts from the Warframe game
 media-gfx/akira 0.0.13 9999: Native Linux App for UI and UX Design built in Vala and GTK.
-media-gfx/azpainter 3.0.1: Full color painting software for Linux for illustration drawing
+media-gfx/ansilove 4.1.5 9999: ANSI and ASCII art to PNG converter (using libansilove)
+media-gfx/azpainter 3.0.3: Full color painting software for Linux for illustration drawing
 media-gfx/bonzomatic 2021.03.07 9999: Live shader coding tool and Shader Showdown workhorse
 media-gfx/dehinter 3.1.0: Python bindings for GitHub's cmark
 media-gfx/dustr 9999: light and interactive tool your crops need
@@ -709,7 +719,6 @@ media-libs/libbpg 0.9.8: Better Portable Graphics reference implementation
 media-libs/libjxl 9999: JPEG XL image format reference implementation
 media-libs/rtmidi 4.0.0: A set of C++ classes that provide a common API for realtime MIDI input/output
 media-libs/skia 80_p20191220-r1: A complete 2D graphic library for drawing Text, Geometries, and Images
-media-libs/sonic 0.3.0_pre20210316: Simple library to speed up or slow down speech
 media-libs/svt-hevc 1.5.0 9999: Scalable Video Technology for HEVC (SVT-HEVC Encoder)
 media-libs/svt-vp9 0.3.0 9999: Scalable Video Technology for VP9 (SVT-VP9 Encoder)
 media-libs/vips 8.10.6: VIPS Image Processing Library
@@ -801,6 +810,7 @@ net-p2p/nuxhash 1.0.0_beta2_p20191013: NiceHash cryptocurrency mining client for
 net-p2p/trezord-go 2.0.29-r1 2.0.30: TREZOR Communication Daemon
 net-p2p/yggdrasil-go 0.3.13-r1 0.3.14 0.3.15: An experiment in scalable routing as an encrypted IPv6 overlay network
 net-voip/calls 0.3.4: Phone dialer and call handler
+net-wireless/iwdgui 0.1.0: A graphical frontend for IWD, Intel's iNet Wireless Daemon
 net-wireless/rtl8192eu 0_pre20210403: Realtek 8192EU driver module for Linux kernel
 net-wireless/rtl8821ce 0_pre20210321: Realtek RTL8821CE Driver module for Linux kernel
 net-wireless/rtl8821cu 0_pre20210327: Realtek 8821CU/RTL8811CU module for Linux kernel
@@ -821,7 +831,7 @@ sci-libs/slicot 5.0_p20101122: Subroutine Library in Systems and Control Theory
 sci-mathematics/chaco 2.2: Software for Partitioning Graphs
 sci-mathematics/frama-c 22.0: Framework for analysis of source codes written in C
 sci-mathematics/why3 1.3.3 1.4.0: Platform for deductive program verification
-sci-misc/boinc-wrapper 7.16.16: use non-BOINC apps with BOINC
+sci-misc/boinc-wrapper 7.16.16 7.16.17: Wrapper to use non-BOINC apps with BOINC
 sci-physics/SU2 7.1.1: SU2: An Open-Source Suite for Multiphysics Simulation and Design
 sys-apps/0xFFFF 0.8 0.9: The 0pen Free Fiasco Firmware Flasher
 sys-apps/dool 0.8_pre20191010-r1 9999: Versatile replacement for vmstat, iostat and ifstat (clone of dstat)
@@ -844,14 +854,14 @@ sys-boot/customrescuecd-x86_64-grub 0.1: Grub menu entries for the .iso image of
 sys-cluster/AXL 0.4.0: AXL provides a common C interface to transfer files in an HPC storage hierarchy.
 sys-cluster/KVTree 1.1.1: KVTree provides a fully extensible C data structure modeled after Perl hashes
 sys-cluster/cinder 17.1.0: Cinder is the OpenStack Block storage service, a spin out of nova-volumes
-sys-cluster/clusteringsuite 2.6.9 2.6.9-r2: Expose the main performance trends in applications computation structure
+sys-cluster/clusteringsuite 2.6.9-r3: Expose the main performance trends in applications computation structure
 sys-cluster/dlb 2.1-r2: Dynamically react to application imbalance by modifying the number of resources
 sys-cluster/er 0.0.4: High-level distributed erasure coding lib combining shuffile and redset
 sys-cluster/extrae 3.8.3-r6: Instrumentation framework to generate execution traces of parallel runtimes
 sys-cluster/genders 1.28.1: Static cluster configuration database used for cluster configuration management.
 sys-cluster/heat 15.0.0: A CloudFormation-compatible openstack-native cloud orchestration engine.
 sys-cluster/launchmon 1.0.2_p20210430-r1: software infrastructure that enables HPC run-time tools to co-locate tool daemons with a parallel job
-sys-cluster/libbsctools 1.0.6: libbsctools
+sys-cluster/libbsctools 1.0.6-r2: libbsctools
 sys-cluster/libi 5.0.1_p20180510: A framework for bootstrapping extreme scale software systems
 sys-cluster/mrnet 5.0.1_p20180510-r3: A Multicast/Reduction Network
 sys-cluster/muster 1.0.1: Massively Scalable Clustering
@@ -866,6 +876,7 @@ sys-cluster/shuffile 0.0.4: SHUFFILE Shuffle files between processes
 sys-cluster/sionlib 1.7.6-r1: Scalable I/O library for parallel access to task-local files
 sys-cluster/spectral 3.4.1: Signal processing techniques to select representative regions from Paraver traces
 sys-cluster/swift 2.26.0 2.27.0: A highly available, distributed, and eventually consistent object/blob store
+sys-cluster/synapse 2.0.1: synapse
 sys-cluster/veloc 1.2: Very-Low Overhead Checkpointing System
 sys-firmware/pinephone-firmware 20201030: Firmwares files for PinePhone
 sys-fs/btrfs-heatmap 9: Python 3 script to draw a heatmap of a btrfs filesystem
@@ -921,7 +932,7 @@ x11-libs/sdl-fakeqwerty 0_pre20191217: Fixes non-QWERTY keyboards on Prison Arch
 x11-misc/aerial-sddm-theme 0_pre20191018 9999: SDDM theme with Apple TV Aerial videos
 x11-misc/betterlockscreen 3.1.1 3.2.0 9999: sweet looking lockscreen for linux system
 x11-misc/betterlockscreen_rapid 0.0.0_pre20210701 0.0.0_pre20210708: A rapid and good-looking screen locker
-x11-misc/caffeine-ng 3.5.1 9999: Aplication able to temporarily inhibit the screensaver.
+x11-misc/caffeine-ng 3.5.1: Aplication able to temporarily inhibit the screensaver
 x11-misc/gammy 0.9.60 0.9.64: Adaptive screen brightness/temperature
 x11-misc/gromit-mpx 1.4 9999: Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool
 x11-misc/i3lock-color 2.13.2 2.13.4 9999: The world's most popular non-default computer lockscreen
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2eec199ba1..d93cf52a30 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Jul 2021 06:08:05 +0000
+Mon, 19 Jul 2021 10:06:19 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index eaafa07666..0081508b98 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -344,7 +344,6 @@ sys-cluster/cinder:tgt - Enable tgt storage backend support
 sys-cluster/cinder:volume - Installs the initscripts for the cinder volume service
 sys-cluster/clusteringsuite:mpi - enable mpi for distributed version
 sys-cluster/clusteringsuite:muster - enable support for sys-cluster/muster algorithms
-sys-cluster/clusteringsuite:old-pcfparser - enable compilation with old pcfparser
 sys-cluster/dlb:hwloc - add sys-apps/hwlocsupport
 sys-cluster/dlb:instrumentation - enable sys-cluster/extrae instrumentation
 sys-cluster/extrae:boost - Search for boost
@@ -421,6 +420,9 @@ sys-cluster/swift:container - adds swift container support
 sys-cluster/swift:memcached - adds memcached support
 sys-cluster/swift:object - adds swift object support
 sys-cluster/swift:proxy - adds swift proxy support
+sys-cluster/synapse:libi - Use libi as tree instantiation method instead of ssh
+sys-cluster/synapse:slurm - Use slurm as libi tree instantiation method instead of ssh
+sys-cluster/synapse:threadsafe - Build threasafe version of lightweight MRNet and XPlat libraries
 sys-cluster/veloc:alps - Use ALPS (Application Level Placement Scheduler) as resource manager
 sys-cluster/veloc:lsf - Use LFS (Load Sharing Facility) as resource manager
 sys-cluster/veloc:slurm - Use sys-cluster/slurm as resource manager