diff --git a/metadata/md5-cache/app-arch/tarlz-0.19-r1 b/metadata/md5-cache/app-arch/tarlz-0.19-r2
similarity index 87%
rename from metadata/md5-cache/app-arch/tarlz-0.19-r1
rename to metadata/md5-cache/app-arch/tarlz-0.19-r2
index de7312469c..3bdc9f7054 100644
--- a/metadata/md5-cache/app-arch/tarlz-0.19-r1
+++ b/metadata/md5-cache/app-arch/tarlz-0.19-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=configure unpack
 DEPEND=app-arch/lzlib:0= || ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
 DESCRIPTION=A parallel archiver combining tar and lzip
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=app-arch/lzlib:0=
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.19.tar.lz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=1bf3401ba8c2c18659db2677a6c95c5c
+_md5_=6a05aca23d4c321ace5795cac7610b86
diff --git a/metadata/md5-cache/app-editors/atom-1.55.0 b/metadata/md5-cache/app-editors/atom-1.55.0
deleted file mode 100644
index c4573e93d8..0000000000
--- a/metadata/md5-cache/app-editors/atom-1.55.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=net-print/cups 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 xdg
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/atom/atom/releases/download/v1.55.0/atom-amd64.tar.gz -> atom-1.55.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=8d32baba092340809abd63891173b70b
diff --git a/metadata/md5-cache/app-editors/atom-bin-1.55.0-r1 b/metadata/md5-cache/app-editors/atom-bin-1.55.0-r1
new file mode 100644
index 0000000000..5cdb9e4c25
--- /dev/null
+++ b/metadata/md5-cache/app-editors/atom-bin-1.55.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+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 xdg
+IUSE=alsa cups ssl test X
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core app-crypt/libsecret dev-libs/atk dev-libs/nss alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) ssl? ( dev-libs/openssl ) X? ( x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ 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? ( test )
+SLOT=0
+SRC_URI=https://github.com/atom/atom/releases/download/v1.55.0/atom-amd64.tar.gz -> atom-bin-1.55.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=969407923a1757c8afdc88d2fb4778ea
diff --git a/metadata/md5-cache/app-misc/brightness-control-2.0_p20200629 b/metadata/md5-cache/app-misc/brightness-control-2.0_p20200629
deleted file mode 100644
index 3159b36069..0000000000
--- a/metadata/md5-cache/app-misc/brightness-control-2.0_p20200629
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( dev-python/cx_Freeze[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cx_Freeze[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Qt Brightness Controller in Python
-EAPI=7
-HOMEPAGE=https://github.com/lordamit/Brightness
-INHERIT=distutils-r1 desktop
-IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=python_single_target_python3_7? ( dev-python/QtPy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/QtPy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/lordamit/Brightness/archive/39c297e98621e4604e8fbeb4a155a224418460ed.tar.gz -> brightness-control-2.0_p20200629.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=83bcbc644dbcafd3f966bf2f0ee02f15
diff --git a/metadata/md5-cache/app-misc/brightness-control-2.0_p20210331 b/metadata/md5-cache/app-misc/brightness-control-2.0_p20210331
new file mode 100644
index 0000000000..79ed213d6d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/brightness-control-2.0_p20210331
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_7? ( dev-python/cx_Freeze[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cx_Freeze[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cx_Freeze[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Qt Brightness Controller in Python
+EAPI=7
+HOMEPAGE=https://github.com/lordamit/Brightness
+INHERIT=distutils-r1 desktop
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=python_single_target_python3_7? ( dev-python/QtPy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/QtPy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/QtPy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/lordamit/Brightness/archive/ea7434ae53681c591daa2ced0d107f4b4bb6f997.tar.gz -> brightness-control-2.0_p20210331.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-single-r1	c7de0087e87a282f2faec351822e097c	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=9c6f9b977f61b09311775f0cc7dc069f
diff --git a/metadata/md5-cache/app-misc/cpufetch-0.94_p20210406 b/metadata/md5-cache/app-misc/cpufetch-0.94_p20210406
new file mode 100644
index 0000000000..db6f82690a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/cpufetch-0.94_p20210406
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Simplistic yet fancy CPU architecture fetching tool
+EAPI=7
+HOMEPAGE=https://github.com/Dr-Noob/cpufetch
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/Dr-Noob/cpufetch/archive/ec2ad4fef60b0e26f40b818a3968de7e83fb466c.tar.gz -> cpufetch-0.94_p20210406.tar.gz
+_md5_=e625f7746296cd30eab9f491e64ff935
diff --git a/metadata/md5-cache/app-misc/navi-9999 b/metadata/md5-cache/app-misc/navi-9999
index 298cd9cc5f..1005bc3a58 100644
--- a/metadata/md5-cache/app-misc/navi-9999
+++ b/metadata/md5-cache/app-misc/navi-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=app-shells/fzf
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/anyhow/1.0.32/download -> anyhow-1.0.32.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/3.0.0-beta.2/download -> clap-3.0.0-beta.2.crate https://crates.io/api/v1/crates/clap_derive/3.0.0-beta.2/download -> clap_derive-3.0.0-beta.2.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/derive_more/0.14.1/download -> derive_more-0.14.1.crate https://crates.io/api/v1/crates/directories-next/1.0.1/download -> directories-next-1.0.1.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.0/download -> dirs-sys-next-0.1.0.crate https://crates.io/api/v1/crates/edit/0.1.2/download -> edit-0.1.2.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.15/download -> hermit-abi-0.1.15.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/os_str_bytes/2.4.0/download -> os_str_bytes-2.4.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/raw_tty/0.1.0/download -> raw_tty-0.1.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.2/download -> rust-argon2-0.8.2.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/shellwords/1.1.0/download -> shellwords-1.1.0.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.40/download -> syn-1.0.40.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.12.1/download -> textwrap-0.12.1.crate https://crates.io/api/v1/crates/thiserror/1.0.20/download -> thiserror-1.0.20.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.20/download -> thiserror-impl-1.0.20.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.0.0-beta.2/download -> clap-3.0.0-beta.2.crate https://crates.io/api/v1/crates/clap_derive/3.0.0-beta.2/download -> clap_derive-3.0.0-beta.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/edit/0.1.3/download -> edit-0.1.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.92/download -> libc-0.2.92.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/os_str_bytes/2.4.0/download -> os_str_bytes-2.4.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/shellwords/1.1.0/download -> shellwords-1.1.0.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.16/download -> terminal_size-0.1.16.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.12.1/download -> textwrap-0.12.1.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	cargo	9addecaaccf5f5938f36c0163768a6e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=961fa3e0ef193afa0e4e9b7073c717d0
+_md5_=4876a100fef90ec476c7bb5b4cdbb785
diff --git a/metadata/md5-cache/app-misc/tai-0.0.4 b/metadata/md5-cache/app-misc/tai-0.0.4
new file mode 100644
index 0000000000..909ed50224
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tai-0.0.4
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=tai (Terminal Ascii Image) tool to convert images to ascii
+EAPI=7
+HOMEPAGE=https://github.com/mustafasalih1993/tai
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://www.github.com/mustafasalih1993/tai/archive/v0.0.4.tar.gz -> tai-0.0.4.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytemuck/1.5.1/download -> bytemuck-1.5.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download -> crossbeam-epoch-0.9.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/weezl/0.1.4/download -> weezl-0.1.4.crate
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	cargo	9addecaaccf5f5938f36c0163768a6e6
+_md5_=758c9f1671219ef52cf20984e0e0563b
diff --git a/metadata/md5-cache/app-shells/zsh-history-to-fish-0.3.0 b/metadata/md5-cache/app-shells/zsh-history-to-fish-0.3.0
new file mode 100644
index 0000000000..2c4ace79ae
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-history-to-fish-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bring your ZSH history to Fish shell
+EAPI=7
+HOMEPAGE=https://github.com/rsalmei/zsh-history-to-fish https://pypi.org/project/portio
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/z/zsh-history-to-fish/zsh-history-to-fish-0.3.0.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35
+_md5_=1f3e2e332e0e57d64c5ce380e238f613
diff --git a/metadata/md5-cache/net-misc/gmid-1.6 b/metadata/md5-cache/net-misc/gmid-1.6
index 0ee685e14b..d04d827892 100644
--- a/metadata/md5-cache/net-misc/gmid-1.6
+++ b/metadata/md5-cache/net-misc/gmid-1.6
@@ -4,12 +4,12 @@ DEPEND=acct-user/gemini dev-libs/libevent !libressl? ( dev-libs/libretls ) libre
 DESCRIPTION=simple and secure Gemini server
 EAPI=7
 HOMEPAGE=https://www.omarpolo.com/pages/gmid.html
-INHERIT=toolchain-funcs
+INHERIT=ssl-cert toolchain-funcs
 IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=acct-user/gemini dev-libs/libevent !libressl? ( dev-libs/libretls ) libressl? ( dev-libs/libressl )
 SLOT=0
 SRC_URI=https://git.omarpolo.com/gmid/snapshot/gmid-1.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=4fe0c3e2c777cca43016d5ead8c4e0d4
+_eclasses_=ssl-cert	a9ab3ee655f5ee43246ff3999cfedfe6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=444abc6bc9289a56e8cd269541c49dba
diff --git a/metadata/md5-cache/net-misc/gmid-9999 b/metadata/md5-cache/net-misc/gmid-9999
index 9f2ce95513..e9f3f1e357 100644
--- a/metadata/md5-cache/net-misc/gmid-9999
+++ b/metadata/md5-cache/net-misc/gmid-9999
@@ -4,11 +4,11 @@ DEPEND=acct-user/gemini dev-libs/libevent !libressl? ( dev-libs/libretls ) libre
 DESCRIPTION=simple and secure Gemini server
 EAPI=7
 HOMEPAGE=https://www.omarpolo.com/pages/gmid.html
-INHERIT=toolchain-funcs git-r3
+INHERIT=ssl-cert toolchain-funcs git-r3
 IUSE=libressl
 LICENSE=ISC
 PROPERTIES=live
 RDEPEND=acct-user/gemini dev-libs/libevent !libressl? ( dev-libs/libretls ) libressl? ( dev-libs/libressl )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4fe0c3e2c777cca43016d5ead8c4e0d4
+_eclasses_=ssl-cert	a9ab3ee655f5ee43246ff3999cfedfe6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=444abc6bc9289a56e8cd269541c49dba
diff --git a/metadata/md5-cache/sys-boot/bmaptools-3.6 b/metadata/md5-cache/sys-boot/bmaptools-3.6
new file mode 100644
index 0000000000..16913fcbda
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/bmaptools-3.6
@@ -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(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bmaptool is a tool for creating and copyng files using block maps
+EAPI=7
+HOMEPAGE=https://github.com/intel/bmap-tools
+INHERIT=distutils-r1 udev
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/six 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/intel/bmap-tools/archive/refs/tags/v3.6.tar.gz -> bmaptools-3.6.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	543b53e4d003ebd889082f4673e52af5	python-r1	a0dcde4775c7b2f7530678fc8143340e	distutils-r1	2ac0db834bfc8d76a5ad34d536d15b35	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=519ec6ea50bf8dd0b7f0ca4f8a3f8a53
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a05fd41f09..886aeb1007 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -26,14 +26,14 @@ app-admin/gnome-passwordsafe 4.0-r1 4.1: A password manager for GNOME
 app-admin/krapplet 0.1.0-r1 0.2.0 0.3.1: Krapplet (keyring applet): a Linux graphical password manager
 app-admin/s-tui 1.0.2 1.1.1 9999: Stress-Terminal UI monitoring tool
 app-arch/libarchive-qt 2.0.2 9999: A Qt based archiving solution with libarchive backend
-app-arch/tarlz 0.19-r1: A parallel archiver combining tar and lzip
+app-arch/tarlz 0.19-r2: A parallel archiver combining tar and lzip
 app-arch/unalz 0.65: Extract ALZ archives
 app-backup/b2 2.1.0: The command-line tool for BackBlaze's B2 product.
 app-backup/timeshift 20.11.1: A system restore utility for Linux
 app-crypt/autofirma 1.6.5-r1: Spanish government's electronic signature application for online procedures
 app-crypt/configuradorfnmt 1.0.1: Spanish government certificate request generator
 app-crypt/reop 2.1.1: reasonable expectation of privacy
-app-editors/atom 1.55.0: A hackable text editor for the 21st Century
+app-editors/atom-bin 1.55.0-r1: A hackable text editor for the 21st Century
 app-editors/bluegriffon-bin 3.1: The Open Source next-gen Web Editor based on the rendering engine of Firefox
 app-editors/featherpad 0.17.2 0.18.0: Lightweight Qt5 Plain-Text Editor for Linux
 app-editors/kitscenarist 0.7.2_rc9: Simple and powerful application for creating screenplays.
@@ -47,9 +47,10 @@ app-eselect/eselect-scheme 1.0.0: Manages scheme implementations
 app-i18n/fcitx-skk 0.1.4: An input method engine for Fcitx
 app-misc/afetch 2.1.0: Simple system info written in C
 app-misc/apidb 4.3.0_beta 5.0.0_alpha 5.0.0_alpha8 5.0.0_alpha19 5.0.0_alpha20 5.8.0_beta: API Generator for Database acces.
-app-misc/brightness-control 2.0_p20200629: Qt Brightness Controller in Python
+app-misc/brightness-control 2.0_p20210331: Qt Brightness Controller in Python
 app-misc/brightnessctl 0.5.1 9999: A program to read and control device brightness
 app-misc/cheat 4.0.2 4.2.0 4.2.0-r2: cheat allows you to create and view interactive cheatsheets on the command-line
+app-misc/cpufetch 0.94_p20210406: Simplistic yet fancy CPU architecture fetching tool
 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 9999: Simple drag-and-drop source/sink for X and Wayland
@@ -66,7 +67,7 @@ app-misc/pfetch 0.6.0: A pretty system information tool written in POSIX sh
 app-misc/pup-bin 0.4.0: 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/tai 0.0.3: tai (Terminal Ascii Image) tool to convert images to ascii
+app-misc/tai 0.0.3 0.0.4: 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
 app-misc/termdown 1.17.0: Countdown timer and stopwatch in your terminal
@@ -91,6 +92,7 @@ app-shells/ohmyzsh 9999: A framework for managing your zsh configuration.
 app-shells/starship 0.51.0: The minimal, blazing-fast, and infinitely customizable prompt for any shell!
 app-shells/zsh-autosuggestions 0.6.4: Fish-like autosuggestions for zsh
 app-shells/zsh-histdb 0_pre20200405: A slightly better history for zsh
+app-shells/zsh-history-to-fish 0.3.0: Bring your ZSH history to Fish shell
 app-text/OCRmyPDF 11.6.2 11.7.0 11.7.1: OCRmyPDF adds an OCR text layer to scanned PDF files
 app-text/katarakt 0.2: Simple PDF viewer
 app-text/komikku 0.24.0 0.26.1: An online/offline manga reader for GNOME
@@ -525,6 +527,7 @@ sys-apps/sampler-bin 1.1.0: visualizer for shell commands, executions and alerti
 sys-apps/systemd-bootchart 234: systemd boot performance graphing tool
 sys-auth/mrsh 2.12 2.12-r1: Mrsh is a set of remote shell programs that use munge authentication.
 sys-block/systemd-swap 4.4.0 9999: Script for creating swap space from zram swaps, swap files and swap partitions.
+sys-boot/bmaptools 3.6: Bmaptool is a tool for creating and copyng files using block maps
 sys-boot/customrescuecd-x86-grub 0.1: Grub menu entries for the .iso image of customrescuecd
 sys-boot/customrescuecd-x86_64-grub 0.1: Grub menu entries for the .iso image of customrescuecd
 sys-cluster/AXL 0.3.0: AXL provides a common C interface to transfer files in an HPC storage hierarchy.
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 424870c3ae..8b563dcf02 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Apr 2021 09:20:00 +0000
+Wed, 07 Apr 2021 09:05:09 +0000