diff --git a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.54.2 b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.54.2
index 833ef7ce9d..085db7f63b 100644
--- a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.54.2
+++ b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.54.2
@@ -11,4 +11,4 @@ RESTRICT=mirror strip bindist
 SLOT=0
 SRC_URI=amd64? ( https://update.code.visualstudio.com/1.54.2/linux-x64/stable -> visual-studio-code-bin-1.54.2-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.54.2/linux-armhf/stable -> visual-studio-code-bin-1.54.2-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.54.2/linux-arm64/stable -> visual-studio-code-bin-1.54.2-arm64.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=d3da2fcacd6233f8d0e9125fd8bdcc12
+_md5_=fcf83a41e980d185b2b0dec2006a06f4
diff --git a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.0 b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.0
index ef3f18fbfb..0a670f3c25 100644
--- a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.0
+++ b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.0
@@ -11,4 +11,4 @@ RESTRICT=mirror strip bindist
 SLOT=0
 SRC_URI=amd64? ( https://update.code.visualstudio.com/1.55.0/linux-x64/stable -> visual-studio-code-bin-1.55.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.55.0/linux-armhf/stable -> visual-studio-code-bin-1.55.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.55.0/linux-arm64/stable -> visual-studio-code-bin-1.55.0-arm64.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=d3da2fcacd6233f8d0e9125fd8bdcc12
+_md5_=fcf83a41e980d185b2b0dec2006a06f4
diff --git a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.2 b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.2
index b8c46abb8d..3d69e87ee5 100644
--- a/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.2
+++ b/metadata/md5-cache/app-editors/visual-studio-code-bin-1.55.2
@@ -11,4 +11,4 @@ RESTRICT=mirror strip bindist
 SLOT=0
 SRC_URI=amd64? ( https://update.code.visualstudio.com/1.55.2/linux-x64/stable -> visual-studio-code-bin-1.55.2-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.55.2/linux-armhf/stable -> visual-studio-code-bin-1.55.2-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.55.2/linux-arm64/stable -> visual-studio-code-bin-1.55.2-arm64.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=d3da2fcacd6233f8d0e9125fd8bdcc12
+_md5_=fcf83a41e980d185b2b0dec2006a06f4
diff --git a/metadata/md5-cache/app-misc/afetch-2.1.0 b/metadata/md5-cache/app-misc/afetch-2.1.0
index 36afedafb1..f52c06b231 100644
--- a/metadata/md5-cache/app-misc/afetch-2.1.0
+++ b/metadata/md5-cache/app-misc/afetch-2.1.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Simple system info written in C
 EAPI=7
 HOMEPAGE=https://github.com/13-CF/afetch/
-INHERIT=savedconfig
+INHERIT=savedconfig toolchain-funcs
 IUSE=savedconfig savedconfig
 KEYWORDS=~amd64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/13-CF/afetch/archive/refs/tags/V2.1.0.tar.gz -> afetch-2.1.0.tar.gz
-_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
-_md5_=64f74259919d78ac5bd418b46a9ebcc5
+_eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=151d354964558c4c0fac1be30d58892b
diff --git a/metadata/md5-cache/app-misc/brightnessctl-0.5.1 b/metadata/md5-cache/app-misc/brightnessctl-0.5.1
index bcb44471b8..405dcc9480 100644
--- a/metadata/md5-cache/app-misc/brightnessctl-0.5.1
+++ b/metadata/md5-cache/app-misc/brightnessctl-0.5.1
@@ -4,10 +4,12 @@ DEPEND=systemd? ( sys-apps/systemd ) udev? ( virtual/udev )
 DESCRIPTION=A program to read and control device brightness
 EAPI=7
 HOMEPAGE=https://github.com/Hummer12007/brightnessctl
+INHERIT=toolchain-funcs
 IUSE=systemd udev
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=systemd? ( sys-apps/systemd ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/Hummer12007/brightnessctl/archive/0.5.1.tar.gz -> brightnessctl-0.5.1.tar.gz
-_md5_=bfbee5e56b37a264f43a486b8477c300
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=47bc626562481b40f5bb81ea2ebc1e12
diff --git a/metadata/md5-cache/app-misc/far2l-2.3.20210419_alpha b/metadata/md5-cache/app-misc/far2l-2.3.20210419_alpha
index b477e42529..435cf8477e 100644
--- a/metadata/md5-cache/app-misc/far2l-2.3.20210419_alpha
+++ b/metadata/md5-cache/app-misc/far2l-2.3.20210419_alpha
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-util/cmake-3.2.2 sys-devel/m4 sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-apps/gawk dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DESCRIPTION=Linux port of Far Manager
+BDEPEND=sys-devel/m4 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Linux port of FAR Manager v2
 EAPI=7
 HOMEPAGE=https://github.com/elfmz/far2l
-INHERIT=cmake xdg-utils wxwidgets python-r1
-IUSE=+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+INHERIT=cmake xdg wxwidgets python-r1
+IUSE=+ssl sftp samba nfs webdav +archive +wxwidgets python python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/gawk dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+RDEPEND=dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/elfmz/far2l/archive/v2021-04-19_alpha.tar.gz -> far2l-2.3.20210419_alpha.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	wxwidgets	407be90c398e52298054aff2093912a3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
-_md5_=141f43607f006950199611a2ca847f2c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	wxwidgets	407be90c398e52298054aff2093912a3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535
+_md5_=3996d6afcc24e0e0e3403df9b28b68e5
diff --git a/metadata/md5-cache/app-misc/far2l-9999 b/metadata/md5-cache/app-misc/far2l-9999
index 47ba42e8c5..ea98580247 100644
--- a/metadata/md5-cache/app-misc/far2l-9999
+++ b/metadata/md5-cache/app-misc/far2l-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-util/cmake-3.2.2 sys-devel/m4 sys-devel/make dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-apps/gawk dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
-DESCRIPTION=Linux port of Far Manager
+BDEPEND=sys-devel/m4 dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Linux port of FAR Manager v2
 EAPI=7
 HOMEPAGE=https://github.com/elfmz/far2l
-INHERIT=cmake xdg-utils wxwidgets python-r1 git-r3
-IUSE=+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+INHERIT=cmake xdg wxwidgets python-r1 git-r3
+IUSE=+ssl sftp samba nfs webdav +archive +wxwidgets python python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-apps/gawk dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
+RDEPEND=dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 app-arch/libarchive ) python? ( || ( ( dev-lang/python:3.9 dev-python/virtualenv[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/virtualenv[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/virtualenv[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	wxwidgets	407be90c398e52298054aff2093912a3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=141f43607f006950199611a2ca847f2c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	wxwidgets	407be90c398e52298054aff2093912a3	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=3996d6afcc24e0e0e3403df9b28b68e5
diff --git a/metadata/md5-cache/dev-cpp/gsl-lite-0.38.0 b/metadata/md5-cache/dev-cpp/gsl-lite-0.38.0
index 2361b6eff9..5cd3a33e0f 100644
--- a/metadata/md5-cache/dev-cpp/gsl-lite-0.38.0
+++ b/metadata/md5-cache/dev-cpp/gsl-lite-0.38.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gsl-lite/gsl-lite/archive/v0.38.0.tar.gz -> gsl-lite-0.38.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=c88d8e14eec360cd19f64da8f69d3ca6
+_md5_=be8ca76d805ace35456d6cef754a55e3
diff --git a/metadata/md5-cache/dev-libs/imsg-compat-6.8.1 b/metadata/md5-cache/dev-libs/imsg-compat-6.8.1
deleted file mode 100644
index b23ef5ada7..0000000000
--- a/metadata/md5-cache/dev-libs/imsg-compat-6.8.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=linux port of OpenBSD imsg
-EAPI=7
-HOMEPAGE=https://man.openbsd.org/imsg_init.3 https://github.com/bsd-ac/imsg-compat
-IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=ISC
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/bsd-ac/imsg-compat/archive/6.8.1.tar.gz -> imsg-compat-6.8.1.tar.gz
-_md5_=0c12af0aa7c31d3ce1a3ab0befbf51a1
diff --git a/metadata/md5-cache/dev-libs/imsg-compat-6.8.2 b/metadata/md5-cache/dev-libs/imsg-compat-6.8.2
new file mode 100644
index 0000000000..047d1f0745
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/imsg-compat-6.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=linux port of OpenBSD imsg
+EAPI=7
+HOMEPAGE=https://man.openbsd.org/imsg_init.3 https://github.com/bsd-ac/imsg-compat
+INHERIT=toolchain-funcs
+IUSE=static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bsd-ac/imsg-compat/archive/6.8.2.tar.gz -> imsg-compat-6.8.2.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=13937ddbcbed9584dcaa215e5ce68a61
diff --git a/metadata/md5-cache/dev-libs/imsg-compat-9999 b/metadata/md5-cache/dev-libs/imsg-compat-9999
index 73b8d03bfc..834bd11b68 100644
--- a/metadata/md5-cache/dev-libs/imsg-compat-9999
+++ b/metadata/md5-cache/dev-libs/imsg-compat-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=configure install unpack
 DESCRIPTION=linux port of OpenBSD imsg
 EAPI=7
 HOMEPAGE=https://man.openbsd.org/imsg_init.3 https://github.com/bsd-ac/imsg-compat
-INHERIT=git-r3
+INHERIT=toolchain-funcs git-r3
 IUSE=static-libs test
 LICENSE=ISC
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=0c12af0aa7c31d3ce1a3ab0befbf51a1
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=13937ddbcbed9584dcaa215e5ce68a61
diff --git a/metadata/md5-cache/dev-util/xdp-tools-1.1.0 b/metadata/md5-cache/dev-util/xdp-tools-1.1.0
index 27737faec6..90820a632b 100644
--- a/metadata/md5-cache/dev-util/xdp-tools-1.1.0
+++ b/metadata/md5-cache/dev-util/xdp-tools-1.1.0
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/libbpf-0.0.7 net-libs/libpcap sys-libs/zlib virtual/libelf sys
 DESCRIPTION=Utilities and example programs for use with XDP
 EAPI=7
 HOMEPAGE=https://github.com/xdp-project/xdp-tools
-INHERIT=linux-info llvm multilib
+INHERIT=linux-info llvm multilib toolchain-funcs
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libbpf-0.0.7 net-libs/libpcap sys-libs/zlib virtual/libelf
-RESTRICT=strip
+RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/xdp-project/xdp-tools/archive/v1.1.0.tar.gz -> xdp-tools-1.1.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	9a7b0b234f4be44fe82e04eefb36e8f2
-_md5_=60cac2a676be8dae9f7bdc1ddca2c8bd
+_md5_=24b5eb9722257d8252987c31c626f31d
diff --git a/metadata/md5-cache/gui-apps/paperde-0.1.1 b/metadata/md5-cache/gui-apps/paperde-0.1.1
new file mode 100644
index 0000000000..e8cf5dcd7a
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/paperde-0.1.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libdbusmenu-qt dev-libs/wayland dev-libs/wayland-protocols dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5[wayland,X] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[X] gui-libs/libcprime gui-libs/libcsys dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple, sleek QT based DE for wayland using wayfire
+EAPI=7
+HOMEPAGE=https://gitlab.com/cubocore/paper/paperde
+INHERIT=cmake xdg
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/libdbusmenu-qt dev-libs/wayland dev-libs/wayland-protocols dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5[wayland,X] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[X] gui-libs/libcprime gui-libs/libcsys >=gui-wm/wayfire-0.7.0[X] sys-apps/xdg-desktop-portal x11-misc/qt5ct
+SLOT=0
+SRC_URI=https://gitlab.com/cubocore/paper/paperde/-/archive/v0.1.1/paperde-v0.1.1.tar.gz -> paperde-0.1.1.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=b271aee4f8cdc04c088d6e0656247d03
diff --git a/metadata/md5-cache/gui-apps/tiramisu-0_p20201110 b/metadata/md5-cache/gui-apps/tiramisu-0_p20201110
deleted file mode 100644
index 7989db1bdb..0000000000
--- a/metadata/md5-cache/gui-apps/tiramisu-0_p20201110
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/glib:2[dbus]
-DESCRIPTION=minimalistic desktop notifications provider
-EAPI=7
-HOMEPAGE=https://github.com/Sweets/tiramisu
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2[dbus]
-SLOT=0
-SRC_URI=https://github.com/Sweets/tiramisu/archive/8eb946dae0e2f98d3850d89e1bb535640e8c3266.tar.gz -> tiramisu-0_p20201110.tar.gz
-_md5_=1d9b59917dcf615bbd446f818060dac3
diff --git a/metadata/md5-cache/gui-apps/tiramisu-1.0 b/metadata/md5-cache/gui-apps/tiramisu-1.0_p20201110
similarity index 62%
rename from metadata/md5-cache/gui-apps/tiramisu-1.0
rename to metadata/md5-cache/gui-apps/tiramisu-1.0_p20201110
index 4fe182b291..81ac0251e0 100644
--- a/metadata/md5-cache/gui-apps/tiramisu-1.0
+++ b/metadata/md5-cache/gui-apps/tiramisu-1.0_p20201110
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DEPEND=dev-libs/glib:2[dbus]
 DESCRIPTION=minimalistic desktop notifications provider
 EAPI=7
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2[dbus]
 SLOT=0
-SRC_URI=https://github.com/Sweets/tiramisu/archive/1.0.tar.gz -> tiramisu-1.0.tar.gz
+SRC_URI=https://github.com/Sweets/tiramisu/archive/8eb946dae0e2f98d3850d89e1bb535640e8c3266.tar.gz -> tiramisu-1.0_p20201110.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=0804bb4b83346895e3111b47567ca68c
+_md5_=c971f2f48f6e82a45cabb51ce597bd39
diff --git a/metadata/md5-cache/gui-apps/wev-1.0.0 b/metadata/md5-cache/gui-apps/wev-1.0.0
index c0db6d0697..f19a413e0d 100644
--- a/metadata/md5-cache/gui-apps/wev-1.0.0
+++ b/metadata/md5-cache/gui-apps/wev-1.0.0
@@ -1,12 +1,14 @@
 BDEPEND=app-text/scdoc dev-libs/wayland-protocols dev-util/wayland-scanner virtual/pkgconfig
-DEFINED_PHASES=prepare
+DEFINED_PHASES=compile prepare
 DEPEND=dev-libs/wayland x11-libs/libxkbcommon
 DESCRIPTION=Wayland event viewer
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~sircmpwn/wev
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/libxkbcommon
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/wev/archive/1.0.0.tar.gz -> wev-1.0.0.tar.gz
-_md5_=646c2ea320b471a118145e75c362d4b9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=307db4e88cf2415aee4d5c118d0b2e2e
diff --git a/metadata/md5-cache/media-sound/hushboard-0.0_pre20210317 b/metadata/md5-cache/media-sound/hushboard-0.0_pre20210317
new file mode 100644
index 0000000000..e725c52163
--- /dev/null
+++ b/metadata/md5-cache/media-sound/hushboard-0.0_pre20210317
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mutes your microphone while you are typing
+EAPI=7
+HOMEPAGE=https://kryogenix.org/code/hushboard/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libappindicator dev-python/pycairo[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-xlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/stuartlangridge/hushboard/archive/c16611c539be111891116a737b02c5fb359ad1fc.tar.gz -> hushboard-0.0_pre20210317.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
+_md5_=e2d8bd5d1c05df3a4d9183bd810d1dd4
diff --git a/metadata/md5-cache/media-sound/hushboard-9999 b/metadata/md5-cache/media-sound/hushboard-9999
new file mode 100644
index 0000000000..f53c203990
--- /dev/null
+++ b/metadata/md5-cache/media-sound/hushboard-9999
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Mutes your microphone while you are typing
+EAPI=7
+HOMEPAGE=https://kryogenix.org/code/hushboard/
+INHERIT=distutils-r1 git-r3
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=dev-libs/libappindicator dev-python/pycairo[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-xlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=e2d8bd5d1c05df3a4d9183bd810d1dd4
diff --git a/metadata/md5-cache/media-sound/ncpamixer-1.3.3.1 b/metadata/md5-cache/media-sound/ncpamixer-1.3.3.1
index c1bafd7a4b..cfe67e0459 100644
--- a/metadata/md5-cache/media-sound/ncpamixer-1.3.3.1
+++ b/metadata/md5-cache/media-sound/ncpamixer-1.3.3.1
@@ -12,4 +12,4 @@ RDEPEND=media-sound/pulseaudio sys-libs/ncurses
 SLOT=0
 SRC_URI=https://github.com/fulhax/ncpamixer/archive/1.3.3.1.tar.gz -> ncpamixer-1.3.3.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=a83bf519b0800be20af5a1920c9cfc0f
+_md5_=1ec2ef03a008a6b8dbdaa26eec3da006
diff --git a/metadata/md5-cache/media-sound/ncpamixer-9999 b/metadata/md5-cache/media-sound/ncpamixer-9999
deleted file mode 100644
index 49adca788b..0000000000
--- a/metadata/md5-cache/media-sound/ncpamixer-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-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-sound/pulseaudio sys-libs/ncurses
-DESCRIPTION=A ncurses mixer for PulseAudio inspired by pavucontrol
-EAPI=7
-HOMEPAGE=https://github.com/fulhax/ncpamixer
-INHERIT=cmake git-r3
-IUSE=+wide
-LICENSE=MIT
-PROPERTIES=live
-RDEPEND=media-sound/pulseaudio sys-libs/ncurses
-SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a83bf519b0800be20af5a1920c9cfc0f
diff --git a/metadata/md5-cache/media-video/mpv-mpris-0.5 b/metadata/md5-cache/media-video/mpv-mpris-0.5
index b8725bb280..22f143a270 100644
--- a/metadata/md5-cache/media-video/mpv-mpris-0.5
+++ b/metadata/md5-cache/media-video/mpv-mpris-0.5
@@ -1,13 +1,15 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=compile install postinst
 DEPEND=media-video/mpv:=[cplugins,libmpv] dev-libs/glib
 DESCRIPTION=MPRIS plugin for mpv
 EAPI=7
 HOMEPAGE=https://github.com/hoyon/mpv-mpris
+INHERIT=toolchain-funcs
 IUSE=+autoload
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-video/mpv:=[cplugins,libmpv] dev-libs/glib
 SLOT=0
 SRC_URI=https://github.com/hoyon/mpv-mpris/archive/0.5.tar.gz -> mpv-mpris-0.5.tar.gz
-_md5_=65b0f5cf002c54ce80999ff9e60b273e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=b7239eef5fe636dd0399a3ef17e9dcb2
diff --git a/metadata/md5-cache/media-video/mpv-mpris-9999 b/metadata/md5-cache/media-video/mpv-mpris-9999
index 468bf6da16..8ed9a8bea1 100644
--- a/metadata/md5-cache/media-video/mpv-mpris-9999
+++ b/metadata/md5-cache/media-video/mpv-mpris-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst unpack
+DEFINED_PHASES=compile install postinst unpack
 DEPEND=media-video/mpv:=[cplugins,libmpv] dev-libs/glib
 DESCRIPTION=MPRIS plugin for mpv
 EAPI=7
 HOMEPAGE=https://github.com/hoyon/mpv-mpris
-INHERIT=git-r3
+INHERIT=toolchain-funcs git-r3
 IUSE=+autoload
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-video/mpv:=[cplugins,libmpv] dev-libs/glib
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=65b0f5cf002c54ce80999ff9e60b273e
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=b7239eef5fe636dd0399a3ef17e9dcb2
diff --git a/metadata/md5-cache/sys-apps/sampler-bin-1.1.0 b/metadata/md5-cache/sys-apps/sampler-bin-1.1.0
index cfa6e92f88..e1b81a868a 100644
--- a/metadata/md5-cache/sys-apps/sampler-bin-1.1.0
+++ b/metadata/md5-cache/sys-apps/sampler-bin-1.1.0
@@ -5,7 +5,6 @@ HOMEPAGE=https://sampler.dev
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib
-RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sqshq/sampler/releases/download/v1.1.0/sampler-1.1.0-linux-amd64 -> sampler-bin-1.1.0
-_md5_=4d5b0078b91e49838959c9ac3d88a9e3
+_md5_=dd21d8ee5748907529525e98f0b62d42
diff --git a/metadata/md5-cache/sys-process/nq-0.4 b/metadata/md5-cache/sys-process/nq-0.4
index e7447a838b..a57f194e40 100644
--- a/metadata/md5-cache/sys-process/nq-0.4
+++ b/metadata/md5-cache/sys-process/nq-0.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Unix command line queue utility
 EAPI=7
 HOMEPAGE=https://git.vuxu.org/nq/about/
+INHERIT=toolchain-funcs
 IUSE=-shell +tq test
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
@@ -11,4 +12,5 @@ REQUIRED_USE=shell? ( !test )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.vuxu.org/nq/snapshot/nq-0.4.tar.gz
-_md5_=7bcf42e8190321fc3dc4f09656871457
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=a33631ab51c55fce60ffc502c0b64a07
diff --git a/metadata/md5-cache/www-apps/jackett-bin-0.17.866 b/metadata/md5-cache/www-apps/jackett-bin-0.17.933
similarity index 59%
rename from metadata/md5-cache/www-apps/jackett-bin-0.17.866
rename to metadata/md5-cache/www-apps/jackett-bin-0.17.933
index db497afe2e..0de0bd620b 100644
--- a/metadata/md5-cache/www-apps/jackett-bin-0.17.866
+++ b/metadata/md5-cache/www-apps/jackett-bin-0.17.933
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=acct-user/jackett app-crypt/mit-krb5 dev-libs/icu dev-util/lttng-ust
 RESTRICT=strip
 SLOT=0
-SRC_URI=amd64? ( https://github.com/Jackett/Jackett/releases/download/v0.17.866/Jackett.Binaries.LinuxAMDx64.tar.gz -> jackett-bin-0.17.866-amd64.tar.gz ) arm? ( https://github.com/Jackett/Jackett/releases/download/v0.17.866/Jackett.Binaries.LinuxARM32.tar.gz -> jackett-bin-0.17.866-arm.tar.gz ) arm64? ( https://github.com/Jackett/Jackett/releases/download/v0.17.866/Jackett.Binaries.LinuxARM64.tar.gz -> jackett-bin-0.17.866-arm64.tar.gz )
+SRC_URI=amd64? ( https://github.com/Jackett/Jackett/releases/download/v0.17.933/Jackett.Binaries.LinuxAMDx64.tar.gz -> jackett-bin-0.17.933-amd64.tar.gz ) arm? ( https://github.com/Jackett/Jackett/releases/download/v0.17.933/Jackett.Binaries.LinuxARM32.tar.gz -> jackett-bin-0.17.933-arm.tar.gz ) arm64? ( https://github.com/Jackett/Jackett/releases/download/v0.17.933/Jackett.Binaries.LinuxARM64.tar.gz -> jackett-bin-0.17.933-arm64.tar.gz )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
 _md5_=12ec0afd3e16912a41117039a0707b9d
diff --git a/metadata/md5-cache/www-apps/uwebsockets-19.1.0 b/metadata/md5-cache/www-apps/uwebsockets-19.2.0
similarity index 74%
rename from metadata/md5-cache/www-apps/uwebsockets-19.1.0
rename to metadata/md5-cache/www-apps/uwebsockets-19.2.0
index 74cc958530..b2aca588a6 100644
--- a/metadata/md5-cache/www-apps/uwebsockets-19.1.0
+++ b/metadata/md5-cache/www-apps/uwebsockets-19.2.0
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/usockets-0.6.0
 SLOT=0
-SRC_URI=https://github.com/uNetworking/uWebSockets/archive/v19.1.0.tar.gz -> uwebsockets-19.1.0.tar.gz
+SRC_URI=https://github.com/uNetworking/uWebSockets/archive/v19.2.0.tar.gz -> uwebsockets-19.2.0.tar.gz
 _md5_=a99f14ce808e1157d4d6032cba28906b
diff --git a/metadata/md5-cache/www-servers/hinsightd-0.9.0 b/metadata/md5-cache/www-servers/hinsightd-0.9.0
index 5fcc031757..86b85dd436 100644
--- a/metadata/md5-cache/www-servers/hinsightd-0.9.0
+++ b/metadata/md5-cache/www-servers/hinsightd-0.9.0
@@ -1,15 +1,16 @@
-BDEPEND=dev-util/ninja filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile install postinst
-DEPEND=acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl
+BDEPEND=dev-util/ninja virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl
 DESCRIPTION=hinsightd a http/1.1 webserver with (hopefully) minimal goals
 EAPI=7
 HOMEPAGE=https://gitlab.com/tiotags/hin9
-INHERIT=fcaps
-IUSE=+filecaps
+INHERIT=fcaps lua-single
+IUSE=+filecaps +lua_single_target_lua5-1
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl filecaps? ( sys-libs/libcap )
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl filecaps? ( sys-libs/libcap )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b
-_md5_=8c61ececd2f86d39fe302b00a835484d
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=97015b2b2a0c06a3b51fe7233965ff2e
diff --git a/metadata/md5-cache/www-servers/hinsightd-9999 b/metadata/md5-cache/www-servers/hinsightd-9999
index e31890aa8d..605393351f 100644
--- a/metadata/md5-cache/www-servers/hinsightd-9999
+++ b/metadata/md5-cache/www-servers/hinsightd-9999
@@ -1,14 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-vcs/git-1.8.2.1[curl] filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl
+BDEPEND=dev-util/ninja virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=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 ) acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl
 DESCRIPTION=hinsightd a http/1.1 webserver with (hopefully) minimal goals
 EAPI=7
 HOMEPAGE=https://gitlab.com/tiotags/hin9
-INHERIT=git-r3 fcaps
-IUSE=+filecaps
+INHERIT=git-r3 fcaps lua-single
+IUSE=+filecaps lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl filecaps? ( sys-libs/libcap )
+RDEPEND=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 ) acct-user/hinsightd acct-group/hinsightd sys-libs/liburing sys-libs/zlib dev-libs/openssl filecaps? ( sys-libs/libcap )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	fcaps	da689a8e04bbbb3518888ff668fee45b
-_md5_=770ea0448ef78b57ad8dcbb8d6e71ca0
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	fcaps	da689a8e04bbbb3518888ff668fee45b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	lua-utils	736947973cfbc9de01fdb8548f942f82	lua-single	f91b5656f00869c220a6e35ae0521c54
+_md5_=0a8f0e1123e205972d26f9a7d22f0a10
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7f30f8378a..7a73c70fa0 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -58,7 +58,7 @@ app-misc/cpufetch 0.94_p20210409: Simplistic yet fancy CPU architecture fetching
 app-misc/ddcui 0.1.2: Graphical user interface for ddcutil - control monitor settings
 app-misc/doublecmd-bin 0.9.10: Free cross platform open source file manager with two panels side by side.
 app-misc/dragon 1.1.1: Simple drag-and-drop source/sink for X and Wayland
-app-misc/far2l 2.3.20210419_alpha 9999: Linux port of Far Manager
+app-misc/far2l 2.3.20210419_alpha 9999: Linux port of FAR Manager v2
 app-misc/fetsh 1.8 1.9 9999: A fetch written in POSIX shell without any external commands
 app-misc/fff 2.2: A simple file manager written in bash
 app-misc/ghq 1.1.0 1.1.5: Remote repository management made easy
@@ -162,7 +162,7 @@ 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/cgicc 3.2.19: A C++ class library for writing CGI applications
 dev-libs/hts_engine 1.10: HMM-based speech synthesis system (HTS) engine and API
-dev-libs/imsg-compat 6.8.1 9999: linux port of OpenBSD imsg
+dev-libs/imsg-compat 6.8.2 9999: linux port of OpenBSD imsg
 dev-libs/libcloudproviders 0.3.1: DBus API that allows cloud storage sync clients to expose their services.
 dev-libs/libdwarf 20210305: The DWARF Debugging Information Format
 dev-libs/libnodave 0.8.5.1-r1: Connect to and exchange data with Siemens PLCs
@@ -400,11 +400,11 @@ gui-apps/foot 1.7.1 1.7.2 9999: A fast, lightweight and minimalistic Wayland ter
 gui-apps/foot-terminfo 1.7.1 1.7.2 9999: Terminfo for foot, a great Wayland terminal emulator
 gui-apps/mpvpaper 1.0 1.1 9999: A video wallpaper program for wlroots based wayland compositors
 gui-apps/nwg-launchers 0.4.3 0.4.4 9999: GTK+ launchers for sway, i3 and some other WMs
-gui-apps/paperde 0_p20210310 0.1.0_alpha 9999: Simple, sleek QT based DE for wayland using wayfire
+gui-apps/paperde 0_p20210310 0.1.0_alpha 0.1.1 9999: Simple, sleek QT based DE for wayland using wayfire
 gui-apps/sfwbar 0.9.4 0.9.6 0.9.7: Sway Floating Window Bar
 gui-apps/swaykbdd 1.0: Per-window keyboard layout switcher for Sway
 gui-apps/swaylock-effects 1.6.2 1.6.3 9999: Swaylock, with fancy effects
-gui-apps/tiramisu 0_p20201110 1.0 9999: minimalistic desktop notifications provider
+gui-apps/tiramisu 1.0_p20201110 9999: minimalistic desktop notifications provider
 gui-apps/wdisplays 1.0-r3 9999: GUI display configurator for wlroots compositors
 gui-apps/wev 1.0.0: Wayland event viewer
 gui-apps/wlr-randr 0.1.0 0.2.0 9999: xrandr clone for wlroots compositors
@@ -459,9 +459,10 @@ media-plugins/qt-jpegxl-image-plugin 9999: Qt plug-in to allow Qt and KDE based
 media-plugins/whysynth 20170701_p20180323: A software synthesizer plugin for the DSSI Soft Synth Interface
 media-sound/6pm 0.9: 6PM is a polyphonic, touch-sensitive, realtime phase modulation synthesizer
 media-sound/add64 3.8.0 3.9.3: Add64 is a realtime additive/subtractive-synthesis softsynth
+media-sound/hushboard 0.0_pre20210317 9999: Mutes your microphone while you are typing
 media-sound/ibniz 1.18: virtual machine designed for extremely compact low-level audiovisual programs
 media-sound/loudgain 0.6.8: Versatile ReplayGain 2.0 loudness normalizer
-media-sound/ncpamixer 1.3.3.1 9999: A ncurses mixer for PulseAudio inspired by pavucontrol
+media-sound/ncpamixer 1.3.3.1: A ncurses mixer for PulseAudio inspired by pavucontrol
 media-sound/noson-app 4.4.9: The essential to control music from your SONOS devices on Linux platforms
 media-sound/nuclear-bin 0.6.12: Nuclear is a streaming program that pulls content from free sources on internet
 media-sound/pianobooster 1.0.0: A MIDI player/game that displays notes and teaches you how to play the piano
@@ -600,10 +601,10 @@ sys-process/nq 0.4: Unix command line queue utility
 sys-process/nvtop 1.1.0 9999: NVIDIA GPUs htop like monitoring tool
 www-apps/code-server-bin 3.9.1 3.9.2 3.9.3: VS Code in the browser (binary version with unbundled node and ripgrep)
 www-apps/gogs 0.12.3: Gogs is a self-hosted Git service written in Go
-www-apps/jackett-bin 0.17.866 9999: API Support for your favorite torrent trackers
+www-apps/jackett-bin 0.17.933 9999: API Support for your favorite torrent trackers
 www-apps/selfoss 2.18-r1: The multipurpose rss reader, live stream, mashup, aggregation web application
 www-apps/twint 2.1.20-r1: Twitter scraping & OSINT tool written in Python that doesn't use Twitter's API
-www-apps/uwebsockets 19.1.0 9999: ultra fast, simple, secure & standards compliant web I/O
+www-apps/uwebsockets 19.2.0 9999: ultra fast, simple, secure & standards compliant web I/O
 www-client/badwolf 1.1.0 9999: Minimalist and privacy-oriented WebKitGTK+ browser
 www-client/browsh-bin 1.6.4: A fully-modern text-based browser, rendering to TTY and browsers
 www-client/torbrowser-launcher 0.3.3 9999: A program to download, updated, and run the Tor Browser Bundle
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cba23802b5..05e65526ad 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 22 Apr 2021 07:50:41 +0000
+Fri, 23 Apr 2021 09:05:02 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b836b0ff5c..8e45e9282c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -11,10 +11,12 @@ app-misc/apidb:mariadb - Build MariaDB Layer
 app-misc/apidb:postgresql - Build PostgreSQL Layer
 app-misc/far2l:archive - Multiarc extended archives support
 app-misc/far2l:nfs - NFS support in NetRocks
+app-misc/far2l:python - Python scripting support
 app-misc/far2l:samba - SMB support in NetRocks
 app-misc/far2l:sftp - SFTP support in NetRocks
 app-misc/far2l:ssl - FTPS support in NetRocks
 app-misc/far2l:webdav - WebDav support in NetRocks
+app-misc/far2l:wxwidgets - GUI backend support
 app-misc/mat2:sandbox - Enable sandboxing functionality through sys-apps/bubblewrap
 app-misc/mat2:video - Use media-video/ffmpeg for video support
 app-misc/ntfy:dbus - Support for desktop notifications