diff --git a/metadata/md5-cache/app-vim/apkbuild-vim-20210723 b/metadata/md5-cache/app-vim/apkbuild-vim-20210723
new file mode 100644
index 0000000000..eab45fecd0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/apkbuild-vim-20210723
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: edit and work with APKBUILD files
+EAPI=7
+HOMEPAGE=https://gitlab.alpinelinux.org/Leo/apkbuild.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://gitlab.alpinelinux.org/Leo/apkbuild.vim/-/archive/423e6948efcbec2d708345ae21d9566cad3ad304/apkbuild.vim-423e6948efcbec2d708345ae21d9566cad3ad304.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=1a0d778d6357dedfe00fe910a9751373
diff --git a/metadata/md5-cache/app-vim/css-color-20210530 b/metadata/md5-cache/app-vim/css-color-20210530
new file mode 100644
index 0000000000..29bb9fdf2f
--- /dev/null
+++ b/metadata/md5-cache/app-vim/css-color-20210530
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: preview colours in source code while editing
+EAPI=7
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=5056 https://github.com/ap/vim-css-color
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/ap/vim-css-color/archive/7337c35588e9027b516f80f03c3b9621a271e168.tar.gz -> css-color-20210530.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=1d4a2c7a76f226845f88e6b61bd5086e
diff --git a/metadata/md5-cache/app-vim/gemini-vim-20210625 b/metadata/md5-cache/app-vim/gemini-vim-20210625
new file mode 100644
index 0000000000..99cbc2ec32
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gemini-vim-20210625
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: syntax highlighting for Gemini Text, the text/gemini media type
+EAPI=7
+HOMEPAGE=https://sr.ht/~torresjrjr/gemini.vim/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://git.sr.ht/~torresjrjr/gemini.vim/archive/d5d2767dbcfd7ceb8dd53f13162458a824e650c9.tar.gz -> gemini-vim-20210625.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=0a3c1c2956e58c6f8ac469ab4a6b6f19
diff --git a/metadata/md5-cache/app-vim/nerdtree-git-20210728 b/metadata/md5-cache/app-vim/nerdtree-git-20210728
new file mode 100644
index 0000000000..978d6b64e5
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nerdtree-git-20210728
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-vim/nerdtree dev-vcs/git app-vim/themis )
+DEFINED_PHASES=install postinst postrm test
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display git status flags in NERDTree
+EAPI=7
+HOMEPAGE=https://github.com/Xuyuanp/nerdtree-git-plugin
+INHERIT=vim-plugin
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=app-vim/nerdtree dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Xuyuanp/nerdtree-git-plugin/archive/ff9b14f14dceecb6c08cb05053ad649c3b6ac250.tar.gz -> nerdtree-git-20210728.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=d01e16f2369add6a3265f413e6f1a9ef
diff --git a/metadata/md5-cache/app-vim/rainbow-3.4.0_p20200528 b/metadata/md5-cache/app-vim/rainbow-3.4.0_p20200528
new file mode 100644
index 0000000000..9b7a9268cc
--- /dev/null
+++ b/metadata/md5-cache/app-vim/rainbow-3.4.0_p20200528
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Rainbow Parentheses Improved
+EAPI=7
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4176 https://github.com/luochen1990/rainbow
+INHERIT=readme.gentoo-r1 vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/luochen1990/rainbow/archive/4d15633cdaf61602e1d9fd216a77fc02e0881b2d.tar.gz -> rainbow-3.4.0_p20200528.tar.gz
+_eclasses_=readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=6c7e5a35f34408cc5df6a2bbd698be67
diff --git a/metadata/md5-cache/app-vim/tex-conceal-20210409 b/metadata/md5-cache/app-vim/tex-conceal-20210409
new file mode 100644
index 0000000000..a5796ce269
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tex-conceal-20210409
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: extends the Conceal feature for LaTeX
+EAPI=7
+HOMEPAGE=https://github.com/KeitaNakamura/tex-conceal.vim
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/KeitaNakamura/tex-conceal.vim/archive/822712d80b4ad5bc5c241ab0a778ede812ec501f.tar.gz -> tex-conceal-20210409.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=9721207567f136fb044d4ddf4bd012e6
diff --git a/metadata/md5-cache/app-vim/themis-1.5.5 b/metadata/md5-cache/app-vim/themis-1.5.5
new file mode 100644
index 0000000000..b3322428f9
--- /dev/null
+++ b/metadata/md5-cache/app-vim/themis-1.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare test
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=A testing framework for Vim script
+EAPI=7
+HOMEPAGE=https://github.com/thinca/vim-themis
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/thinca/vim-themis/archive/refs/tags/v1.5.5.tar.gz -> themis-1.5.5.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=1d011cedee40fb04506b2a371bd30110
diff --git a/metadata/md5-cache/app-vim/vim-sensible-1.2 b/metadata/md5-cache/app-vim/vim-sensible-1.2
new file mode 100644
index 0000000000..c2cd47177d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-sensible-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a universal set of defaults that (hopefully) everyone can agree on
+EAPI=7
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4391 https://github.com/tpope/vim-sensible
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-sensible/archive/refs/tags/v1.2.tar.gz -> vim-sensible-1.2.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=29f090322cae4616ba4c48962cf2d0fa
diff --git a/metadata/md5-cache/dev-cpp/fbthrift-2021.06.14.00 b/metadata/md5-cache/dev-cpp/fbthrift-2021.06.14.00
deleted file mode 100644
index 11e48865db..0000000000
--- a/metadata/md5-cache/dev-cpp/fbthrift-2021.06.14.00
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/zstd ~dev-cpp/fizz-2021.06.14.00:= ~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.06.14.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
-DESCRIPTION=Facebook's branch of Apache Thrift, including a new C++ server
-EAPI=7
-HOMEPAGE=https://github.com/facebook/fbthrift
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/zstd ~dev-cpp/fizz-2021.06.14.00:= ~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.06.14.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/facebook/fbthrift/archive/v2021.06.14.00.tar.gz -> fbthrift-2021.06.14.00.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_=1e3187a632e3396346d4804fb485622a
diff --git a/metadata/md5-cache/dev-cpp/fbthrift-2021.06.28.00 b/metadata/md5-cache/dev-cpp/fbthrift-2021.08.02.00
similarity index 63%
rename from metadata/md5-cache/dev-cpp/fbthrift-2021.06.28.00
rename to metadata/md5-cache/dev-cpp/fbthrift-2021.08.02.00
index 941295933c..da535f87bf 100644
--- a/metadata/md5-cache/dev-cpp/fbthrift-2021.06.28.00
+++ b/metadata/md5-cache/dev-cpp/fbthrift-2021.08.02.00
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/zstd ~dev-cpp/fizz-2021.06.28.00:= ~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.06.28.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
+DEPEND=app-arch/zstd ~dev-cpp/fizz-2021.08.02.00:= ~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.08.02.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
 DESCRIPTION=Facebook's branch of Apache Thrift, including a new C++ server
 EAPI=7
 HOMEPAGE=https://github.com/facebook/fbthrift
 INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=app-arch/zstd ~dev-cpp/fizz-2021.06.28.00:= ~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.06.28.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
+RDEPEND=app-arch/zstd ~dev-cpp/fizz-2021.08.02.00:= ~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog ~dev-cpp/wangle-2021.08.02.00:= dev-libs/libfmt dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
-SRC_URI=https://github.com/facebook/fbthrift/archive/v2021.06.28.00.tar.gz -> fbthrift-2021.06.28.00.tar.gz
+SRC_URI=https://github.com/facebook/fbthrift/archive/v2021.08.02.00.tar.gz -> fbthrift-2021.08.02.00.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_=2fc2ea9bf39b4cf6b3537efd30070e80
diff --git a/metadata/md5-cache/dev-cpp/fizz-2021.06.28.00 b/metadata/md5-cache/dev-cpp/fizz-2021.06.28.00
deleted file mode 100644
index bc02bc2940..0000000000
--- a/metadata/md5-cache/dev-cpp/fizz-2021.06.28.00
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0= dev-cpp/gtest
-DESCRIPTION=C++14 implementation of the TLS-1.3 standard
-EAPI=7
-HOMEPAGE=https://github.com/facebookincubator/fizz
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/facebookincubator/fizz/archive/v2021.06.28.00.tar.gz -> fizz-2021.06.28.00.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_=aee712c7f6cb95525d9c0d5b3fe2fa88
diff --git a/metadata/md5-cache/dev-cpp/fizz-2021.06.14.00 b/metadata/md5-cache/dev-cpp/fizz-2021.08.02.00
similarity index 86%
rename from metadata/md5-cache/dev-cpp/fizz-2021.06.14.00
rename to metadata/md5-cache/dev-cpp/fizz-2021.08.02.00
index 186f3e1783..d278b1190e 100644
--- a/metadata/md5-cache/dev-cpp/fizz-2021.06.14.00
+++ b/metadata/md5-cache/dev-cpp/fizz-2021.08.02.00
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0= dev-cpp/gtest
+DEPEND=~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0= dev-cpp/gtest
 DESCRIPTION=C++14 implementation of the TLS-1.3 standard
 EAPI=7
 HOMEPAGE=https://github.com/facebookincubator/fizz
 INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0=
+RDEPEND=~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/libsodium dev-libs/openssl:0=
 SLOT=0
-SRC_URI=https://github.com/facebookincubator/fizz/archive/v2021.06.14.00.tar.gz -> fizz-2021.06.14.00.tar.gz
+SRC_URI=https://github.com/facebookincubator/fizz/archive/v2021.08.02.00.tar.gz -> fizz-2021.08.02.00.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_=aee712c7f6cb95525d9c0d5b3fe2fa88
diff --git a/metadata/md5-cache/dev-cpp/folly-2021.06.28.00 b/metadata/md5-cache/dev-cpp/folly-2021.06.28.00
deleted file mode 100644
index e8580d95f0..0000000000
--- a/metadata/md5-cache/dev-cpp/folly-2021.06.28.00
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 <app-arch/snappy-1.1.9 app-arch/zstd dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/boost[context,threads] dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt sys-libs/binutils-libs sys-libs/zlib
-DESCRIPTION=An open-source C++ library developed and used at Facebook
-EAPI=7
-HOMEPAGE=https://github.com/facebook/folly
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-arch/lz4 <app-arch/snappy-1.1.9 app-arch/zstd dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/boost[context,threads] dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt sys-libs/binutils-libs sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/facebook/folly/archive/v2021.06.28.00.tar.gz -> folly-2021.06.28.00.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_=a3f33b1317a85e20f75c6cc3f35dfe16
diff --git a/metadata/md5-cache/dev-cpp/folly-2021.06.14.00 b/metadata/md5-cache/dev-cpp/folly-2021.08.02.00
similarity index 92%
rename from metadata/md5-cache/dev-cpp/folly-2021.06.14.00
rename to metadata/md5-cache/dev-cpp/folly-2021.08.02.00
index 60eb91db97..82fc732f1f 100644
--- a/metadata/md5-cache/dev-cpp/folly-2021.06.14.00
+++ b/metadata/md5-cache/dev-cpp/folly-2021.08.02.00
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/lz4 <app-arch/snappy-1.1.9 app-arch/zstd dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/boost[context,threads] dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt sys-libs/binutils-libs sys-libs/zlib
 SLOT=0
-SRC_URI=https://github.com/facebook/folly/archive/v2021.06.14.00.tar.gz -> folly-2021.06.14.00.tar.gz
+SRC_URI=https://github.com/facebook/folly/archive/v2021.08.02.00.tar.gz -> folly-2021.08.02.00.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_=a3f33b1317a85e20f75c6cc3f35dfe16
diff --git a/metadata/md5-cache/dev-cpp/wangle-2021.06.28.00 b/metadata/md5-cache/dev-cpp/wangle-2021.06.28.00
deleted file mode 100644
index 591a301f56..0000000000
--- a/metadata/md5-cache/dev-cpp/wangle-2021.06.28.00
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/fizz-2021.06.28.00:= ~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
-DESCRIPTION=Framework providing common client/server abstractions
-EAPI=7
-HOMEPAGE=https://github.com/facebook/wangle
-INHERIT=cmake
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=~dev-cpp/fizz-2021.06.28.00:= ~dev-cpp/folly-2021.06.28.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
-SLOT=0
-SRC_URI=https://github.com/facebook/wangle/archive/v2021.06.28.00.tar.gz -> wangle-2021.06.28.00.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_=5e25e097b16ed6e975e284a5dbab99c9
diff --git a/metadata/md5-cache/dev-cpp/wangle-2021.06.14.00 b/metadata/md5-cache/dev-cpp/wangle-2021.08.02.00
similarity index 81%
rename from metadata/md5-cache/dev-cpp/wangle-2021.06.14.00
rename to metadata/md5-cache/dev-cpp/wangle-2021.08.02.00
index 2bf2c9003c..97b5e0f61c 100644
--- a/metadata/md5-cache/dev-cpp/wangle-2021.06.14.00
+++ b/metadata/md5-cache/dev-cpp/wangle-2021.08.02.00
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-cpp/fizz-2021.06.14.00:= ~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
+DEPEND=~dev-cpp/fizz-2021.08.02.00:= ~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
 DESCRIPTION=Framework providing common client/server abstractions
 EAPI=7
 HOMEPAGE=https://github.com/facebook/wangle
 INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=~dev-cpp/fizz-2021.06.14.00:= ~dev-cpp/folly-2021.06.14.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
+RDEPEND=~dev-cpp/fizz-2021.08.02.00:= ~dev-cpp/folly-2021.08.02.00:= dev-cpp/gflags dev-cpp/glog dev-libs/double-conversion dev-libs/libevent dev-libs/libfmt dev-libs/openssl:0=
 SLOT=0
-SRC_URI=https://github.com/facebook/wangle/archive/v2021.06.14.00.tar.gz -> wangle-2021.06.14.00.tar.gz
+SRC_URI=https://github.com/facebook/wangle/archive/v2021.08.02.00.tar.gz -> wangle-2021.08.02.00.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_=5e25e097b16ed6e975e284a5dbab99c9
diff --git a/metadata/md5-cache/dev-libs/cglm-0.8.2-r1 b/metadata/md5-cache/dev-libs/cglm-0.8.2-r1
deleted file mode 100644
index 7608c4936d..0000000000
--- a/metadata/md5-cache/dev-libs/cglm-0.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/meson doc? ( dev-python/sphinx ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=OpenGL Mathematics (glm) for C
-EAPI=7
-HOMEPAGE=https://github.com/recp/cglm
-INHERIT=meson
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/recp/cglm/archive/refs/tags/v0.8.2.tar.gz -> cglm-0.8.2.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	meson	5bc3f1b890f90cc00cf1d1dddc10233e
-_md5_=11de7e297a1b513e3780e82271bb061e
diff --git a/metadata/md5-cache/dev-libs/cglm-0.8.4 b/metadata/md5-cache/dev-libs/cglm-0.8.4
new file mode 100644
index 0000000000..24752f50d2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cglm-0.8.4
@@ -0,0 +1,13 @@
+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-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=OpenGL Mathematics (glm) for C
+EAPI=7
+HOMEPAGE=https://github.com/recp/cglm
+INHERIT=python-any-r1 docs meson
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/recp/cglm/archive/refs/tags/v0.8.4.tar.gz -> cglm-0.8.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	901d9e22c7a848a1196502edf060f330	docs	7c38d94fa7c1b4235fe571dc09e018df	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	meson	5bc3f1b890f90cc00cf1d1dddc10233e
+_md5_=b2c3b93455bb6e8929e1999570b2a9db
diff --git a/metadata/md5-cache/dev-libs/libphonenumber-8.12.29 b/metadata/md5-cache/dev-libs/libphonenumber-8.12.30
similarity index 91%
rename from metadata/md5-cache/dev-libs/libphonenumber-8.12.29
rename to metadata/md5-cache/dev-libs/libphonenumber-8.12.30
index 8222ab52f1..d89b5b5a08 100644
--- a/metadata/md5-cache/dev-libs/libphonenumber-8.12.29
+++ b/metadata/md5-cache/dev-libs/libphonenumber-8.12.30
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/icu dev-libs/protobuf dev-libs/boost >=dev-java/java-config-2.2.0-r3
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/google/libphonenumber/archive/v8.12.29.tar.gz -> libphonenumber-8.12.29.tar.gz
+SRC_URI=https://github.com/google/libphonenumber/archive/v8.12.30.tar.gz -> libphonenumber-8.12.30.tar.gz
 _eclasses_=java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	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_=98e5db6527d2bafb72942e58fc157f37
diff --git a/metadata/md5-cache/dev-vcs/lazygit-0.28.1 b/metadata/md5-cache/dev-vcs/lazygit-0.28.1
deleted file mode 100644
index fcf9a2d357..0000000000
--- a/metadata/md5-cache/dev-vcs/lazygit-0.28.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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.1.tar.gz -> lazygit-0.28.1.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
-_md5_=06beb5f1e52d3f21802e604ca39e6c0e
diff --git a/metadata/md5-cache/dev-vcs/lazygit-0.27.4 b/metadata/md5-cache/dev-vcs/lazygit-0.29
similarity index 84%
rename from metadata/md5-cache/dev-vcs/lazygit-0.27.4
rename to metadata/md5-cache/dev-vcs/lazygit-0.29
index c5a62b0d6d..2f511a403e 100644
--- a/metadata/md5-cache/dev-vcs/lazygit-0.27.4
+++ b/metadata/md5-cache/dev-vcs/lazygit-0.29
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=sys-libs/glibc
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/jesseduffield/lazygit/archive/v0.27.4.tar.gz -> lazygit-0.27.4.tar.gz
+SRC_URI=https://github.com/jesseduffield/lazygit/archive/v0.29.tar.gz -> lazygit-0.29.tar.gz
 _eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	91472d4e18894e738c69b415e236a664	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec
 _md5_=06beb5f1e52d3f21802e604ca39e6c0e
diff --git a/metadata/md5-cache/games-fps/crispy-doom-5.10.3 b/metadata/md5-cache/games-fps/crispy-doom-5.10.3
new file mode 100644
index 0000000000..a56248a95c
--- /dev/null
+++ b/metadata/md5-cache/games-fps/crispy-doom-5.10.3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A limit-removing enhanced-resolution Doom source port based on Chocolate Doom
+EAPI=7
+HOMEPAGE=https://github.com/fabiangreffrath/crispy-doom
+INHERIT=autotools prefix python-any-r1 xdg
+IUSE=doc libsamplerate +midi png truecolor vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.10.3.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	prefix	d04f14b297013ad1410550c0757f14f8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-any-r1	901d9e22c7a848a1196502edf060f330	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	e73b9df80596ab8f9c542c01196dec23
+_md5_=80afad5cdacabdd3fea7a4c1179b0784
diff --git a/metadata/md5-cache/net-im/guilded-bin-1.0.9101267 b/metadata/md5-cache/net-im/guilded-bin-1.0.9105465
similarity index 88%
rename from metadata/md5-cache/net-im/guilded-bin-1.0.9101267
rename to metadata/md5-cache/net-im/guilded-bin-1.0.9105465
index a796fe2dcd..1bb828693e 100644
--- a/metadata/md5-cache/net-im/guilded-bin-1.0.9101267
+++ b/metadata/md5-cache/net-im/guilded-bin-1.0.9105465
@@ -10,6 +10,6 @@ LICENSE=all-rights-reserved
 RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core app-crypt/libsecret dev-libs/libappindicator net-print/cups media-libs/alsa-lib sys-apps/util-linux x11-misc/xdg-utils x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXtst dev-libs/nss
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=https://www.guilded.gg/downloads/Guilded-Linux.deb
+SRC_URI=https://www.guilded.gg/downloads/Guilded-Linux.deb -> guilded-bin-1.0.9105465.deb
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	pax-utils	fce6ad998516159787b92e8043167889	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg-utils	27f9a2f19502b925ac117bd657aa2979	xdg	e73b9df80596ab8f9c542c01196dec23
-_md5_=e2bd1668f03c573f7620e73d399fbc50
+_md5_=78432e8c80fbdfafd356fb659c91d30f
diff --git a/metadata/md5-cache/net-misc/can-utils-2021.08.0 b/metadata/md5-cache/net-misc/can-utils-2021.08.0
new file mode 100644
index 0000000000..e2e36f2dcf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/can-utils-2021.08.0
@@ -0,0 +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 virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=SocketCAN userspace utilities and tools
+EAPI=7
+HOMEPAGE=https://github.com/linux-can/can-utils
+INHERIT=autotools systemd
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/linux-can/can-utils/archive/v2021.08.0.tar.gz -> can-utils-2021.08.0.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	systemd	c846b9e02ac8293bfc9ca38a195c2a18
+_md5_=855cb1a63b96740db3ca891ba87f4432
diff --git a/metadata/md5-cache/sys-cluster/TCL-1.0 b/metadata/md5-cache/sys-cluster/TCL-1.0
index ccccc7e0ea..a9dc397fab 100644
--- a/metadata/md5-cache/sys-cluster/TCL-1.0
+++ b/metadata/md5-cache/sys-cluster/TCL-1.0
@@ -5,12 +5,12 @@ DESCRIPTION=Transparent Checkpointing Library
 EAPI=8
 HOMEPAGE=https://github.com/bsc-pm/TCL
 INHERIT=autotools
-IUSE=debug fti instrumentation scr veloc
+IUSE=tcl-debug tcl-instrumentation tcl-instrumentation-debug fti scr veloc
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=virtual/mpi fti? ( sys-cluster/fti ) scr? ( sys-cluster/scr ) veloc? ( sys-cluster/veloc )
-REQUIRED_USE=|| ( fti scr veloc )
+REQUIRED_USE=|| ( fti scr veloc ) || ( tcl-debug tcl-instrumentation tcl-instrumentation-debug )
 SLOT=0
 SRC_URI=https://github.com/bsc-pm/TCL/archive/refs/tags/v1.0.tar.gz -> TCL-1.0.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1
-_md5_=df952030f7c6977a750333e81d44ec5e
+_md5_=7f6cd36f8bba0a72da9f16c802cc30cb
diff --git a/metadata/md5-cache/sys-cluster/extrae-3.8.3-r9 b/metadata/md5-cache/sys-cluster/extrae-3.8.3-r10
similarity index 54%
rename from metadata/md5-cache/sys-cluster/extrae-3.8.3-r9
rename to metadata/md5-cache/sys-cluster/extrae-3.8.3-r10
index 79e4545660..377a7022c4 100644
--- a/metadata/md5-cache/sys-cluster/extrae-3.8.3-r9
+++ b/metadata/md5-cache/sys-cluster/extrae-3.8.3-r10
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-text/ghostscript-gpl dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra ) 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 preinst prepare setup
-DEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2 dev-libs/papi !<sys-cluster/openmpi-4.0.5-r1 !>=sys-cluster/openmpi-4.0.5-r1[libompitrace] sys-libs/zlib virtual/mpi || ( sys-libs/libunwind sys-libs/llvm-libunwind ) || ( sys-devel/binutils:* sys-libs/binutils-libs ) clustering? ( sys-cluster/clusteringsuite[treedbscan] ) dyninst? ( dev-libs/boost:= dev-libs/libdwarf sys-cluster/dyninst virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) openshmem? ( sys-cluster/SOS ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( sci-libs/fftw sys-cluster/spectral ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2 dev-libs/papi !sys-cluster/openmpi[libompitrace(+)] sys-libs/libunwind sys-libs/zlib virtual/mpi || ( sys-devel/binutils:* sys-libs/binutils-libs ) clustering? ( sys-cluster/clusteringsuite[treedbscan] ) dyninst? ( dev-libs/boost:= dev-libs/libdwarf sys-cluster/dyninst virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) openshmem? ( sys-cluster/SOS ) peruse? ( sys-cluster/openmpi[peruse(-)] ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( sci-libs/fftw sys-cluster/spectral ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Instrumentation framework to generate execution traces of parallel runtimes
 EAPI=7
 HOMEPAGE=https://github.com/bsc-performance-tools/extrae
 INHERIT=autotools java-pkg-opt-2 python-single-r1
-IUSE=clustering doc dyninst heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall memkind merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml elibc_FreeBSD java python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=+instrument-dynamic-memory +instrument-io +instrument-syscall clustering dlsym doc dyninst heterogeneous inotify memkind merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml elibc_FreeBSD java python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2 dev-libs/papi !<sys-cluster/openmpi-4.0.5-r1 !>=sys-cluster/openmpi-4.0.5-r1[libompitrace] sys-libs/zlib virtual/mpi || ( sys-libs/libunwind sys-libs/llvm-libunwind ) || ( sys-devel/binutils:* sys-libs/binutils-libs ) clustering? ( sys-cluster/clusteringsuite[treedbscan] ) dyninst? ( dev-libs/boost:= dev-libs/libdwarf sys-cluster/dyninst virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) openshmem? ( sys-cluster/SOS ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( sci-libs/fftw sys-cluster/spectral ) java? ( virtual/jre:1.8 ) virtual/opencl java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) java? ( pthread )
+RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2 dev-libs/papi !sys-cluster/openmpi[libompitrace(+)] sys-libs/libunwind sys-libs/zlib virtual/mpi || ( sys-devel/binutils:* sys-libs/binutils-libs ) clustering? ( sys-cluster/clusteringsuite[treedbscan] ) dyninst? ( dev-libs/boost:= dev-libs/libdwarf sys-cluster/dyninst virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) openshmem? ( sys-cluster/SOS ) peruse? ( sys-cluster/openmpi[peruse(-)] ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( sci-libs/fftw sys-cluster/spectral ) java? ( virtual/jre:1.8 ) virtual/opencl java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( instrument-dynamic-memory instrument-io instrument-syscall ) java? ( pthread )
 SLOT=0
 SRC_URI=https://github.com/bsc-performance-tools/extrae/archive/3.8.3.tar.gz -> extrae-3.8.3.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	java-utils-2	ac9fb9efa5413c5fb85a4203fe930e88	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	08d890890f70fe0096093016e55438d5	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75
-_md5_=d5bf1e1d9c89ad6916c89ac3fd19c39c
+_md5_=3fd5b2b2f7084cf0675012d633a52bb9
diff --git a/metadata/md5-cache/sys-cluster/libyogrt-1.24 b/metadata/md5-cache/sys-cluster/libyogrt-1.24
index 428791d291..fbd760e8d0 100644
--- a/metadata/md5-cache/sys-cluster/libyogrt-1.24
+++ b/metadata/md5-cache/sys-cluster/libyogrt-1.24
@@ -12,4 +12,4 @@ RDEPEND=slurm? ( sys-cluster/slurm )
 SLOT=0
 SRC_URI=https://github.com/LLNL/libyogrt/archive/refs/tags/1.24.tar.gz -> libyogrt-1.24.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1
-_md5_=4a98094a27fa800e67c2360a69d98417
+_md5_=233571e5bb8be93856f4e1d859694312
diff --git a/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818 b/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818
new file mode 100644
index 0000000000..59b367baa4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nanox-0.15_p20210818
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=ayudame? ( sys-cluster/temanejo[-ompss] ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) gasnet? ( sys-cluster/gasnet ) hwloc? ( sys-apps/hwloc ) memkind? ( dev-libs/memkind ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) sqlite? ( dev-db/sqlite ) opencl? ( dev-util/opencl-headers )
+DESCRIPTION=Nanos++ is a runtime designed to serve as runtime support in parallel environments
+EAPI=8
+HOMEPAGE=https://pm.bsc.es/nanox https://github.com/bsc-pm/nanox
+INHERIT=autotools docs
+IUSE=nanox-debug +nanox-instrumentation nanox-instrumentation-debug +nanox-performance allocator ayudame dlb +extrae gasnet hwloc memkind memtracker mpi opencl papi sqlite resiliency task-callback +threads doc
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=ayudame? ( sys-cluster/temanejo[-ompss] ) dlb? ( sys-cluster/dlb ) extrae? ( sys-cluster/extrae[nanos] ) gasnet? ( sys-cluster/gasnet ) hwloc? ( sys-apps/hwloc ) memkind? ( dev-libs/memkind ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) sqlite? ( dev-db/sqlite ) opencl? ( virtual/opencl )
+REQUIRED_USE=|| ( nanox-debug nanox-instrumentation nanox-instrumentation-debug nanox-performance ) nanox-instrumentation? ( extrae ) nanox-instrumentation-debug? ( extrae )
+SLOT=0
+SRC_URI=https://github.com/bsc-pm/nanox/archive/a9df6936128ebe10374350c719a0fba74bc89803.tar.gz -> nanox-0.15_p20210818.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1	docs	7c38d94fa7c1b4235fe571dc09e018df
+_md5_=1d2a189fe399056881380d251529e2ad
diff --git a/metadata/md5-cache/sys-cluster/paraver-kernel-4.9.0 b/metadata/md5-cache/sys-cluster/paraver-kernel-4.9.0
new file mode 100644
index 0000000000..e22b39b80d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/paraver-kernel-4.9.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib sys-cluster/libbsctools:= extrae? ( sys-cluster/extrae ) otf2? ( sys-cluster/otf2 )
+DESCRIPTION=paraver kernel library
+EAPI=8
+HOMEPAGE=http://tools.bsc.es/paraver https://github.com/bsc-performance-tools/paraver-kernel
+INHERIT=autotools
+IUSE=extended-objects extrae ompss openmp otf2
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib sys-cluster/libbsctools:= extrae? ( sys-cluster/extrae ) otf2? ( sys-cluster/otf2 )
+REQUIRED_USE=extrae? ( openmp )
+SLOT=0
+SRC_URI=https://github.com/bsc-performance-tools/paraver-kernel/archive/refs/tags/v4.9.0.tar.gz -> paraver-kernel-4.9.0.tar.gz
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1
+_md5_=7ae28ff1d6e3002e289d4b2010ab74dd
diff --git a/metadata/md5-cache/sys-cluster/spath-0.0.2 b/metadata/md5-cache/sys-cluster/spath-0.0.2
index a87718b41d..5f76887833 100644
--- a/metadata/md5-cache/sys-cluster/spath-0.0.2
+++ b/metadata/md5-cache/sys-cluster/spath-0.0.2
@@ -5,13 +5,13 @@ DESCRIPTION=Path manipulation functions
 EAPI=7
 HOMEPAGE=https://github.com/ECP-VeloC/spath
 INHERIT=cmake
-IUSE=lsf +mpi slurm test
+IUSE=+mpi slurm test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=mpi? ( virtual/mpi )
-REQUIRED_USE=?? ( lsf slurm ) test? ( mpi )
+REQUIRED_USE=test? ( mpi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ECP-VeloC/spath/archive/v0.0.2.tar.gz -> spath-0.0.2.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_=48f4701c36a030e8101f4183d8bde802
+_md5_=611d1bada4ceee34e516403e3fd25ea5
diff --git a/metadata/md5-cache/sys-cluster/temanejo-1.3 b/metadata/md5-cache/sys-cluster/temanejo-1.3
index 3e6b637f1e..137619be58 100644
--- a/metadata/md5-cache/sys-cluster/temanejo-1.3
+++ b/metadata/md5-cache/sys-cluster/temanejo-1.3
@@ -7,8 +7,8 @@ INHERIT=autotools
 IUSE=doc ompss +ompt +socket stdout
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=
+RDEPEND=ompss? ( !sys-cluster/nanox[ayudame] )
 SLOT=0
 SRC_URI=http://fs.hlrs.de/projects/temanejo/temanejo-1.3.tar.gz
 _eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	multilib	97566c1a256d07b00848aa767e38a352	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c7052b276346587968d52ea8eaf5aca1
-_md5_=2706092ca8156b8c1f872912784ce16f
+_md5_=52974cf4dec69ef51477733ceddc2ef9
diff --git a/metadata/md5-cache/sys-cluster/veloc-1.2 b/metadata/md5-cache/sys-cluster/veloc-1.2
deleted file mode 100644
index ed18b642df..0000000000
--- a/metadata/md5-cache/sys-cluster/veloc-1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/cmake-2.8 doc? ( dev-python/sphinx ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=slurm? ( sys-cluster/slurm ) app-shells/pdsh >=dev-libs/boost-1.60.0 sys-cluster/AXL sys-cluster/er virtual/mpi
-DESCRIPTION=Very-Low Overhead Checkpointing System
-EAPI=7
-HOMEPAGE=https://github.com/ECP-VeloC/VELOC
-INHERIT=cmake distutils-r1
-IUSE=alps lsf python +slurm doc python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=slurm? ( sys-cluster/slurm ) app-shells/pdsh >=dev-libs/boost-1.60.0 sys-cluster/AXL sys-cluster/er virtual/mpi python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=?? ( alps lsf slurm ) || ( python_targets_python3_8 )
-RESTRICT=python? ( test )
-SLOT=0
-SRC_URI=https://github.com/ECP-VeloC/VELOC/archive/veloc-1.2.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	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f
-_md5_=9a301e635e9e9b92f5baccb42c953a94
diff --git a/metadata/md5-cache/sys-cluster/veloc-1.5 b/metadata/md5-cache/sys-cluster/veloc-1.5
new file mode 100644
index 0000000000..b06e61a502
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/veloc-1.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-2.8 doc? ( dev-python/sphinx ) dev-util/ninja dev-util/cmake 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(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=comm-queue-ipc? ( dev-libs/boost ) slurm? ( sys-cluster/slurm ) app-shells/pdsh dev-libs/openssl sys-cluster/AXL sys-cluster/er virtual/mpi
+DESCRIPTION=Very-Low Overhead Checkpointing System
+EAPI=7
+HOMEPAGE=https://github.com/ECP-VeloC/VELOC
+INHERIT=cmake distutils-r1
+IUSE=+comm-queue-ipc comm-queue-socket python +slurm doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=comm-queue-ipc? ( dev-libs/boost ) slurm? ( sys-cluster/slurm ) app-shells/pdsh dev-libs/openssl sys-cluster/AXL sys-cluster/er virtual/mpi 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=^^ ( comm-queue-ipc comm-queue-socket ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/ECP-VeloC/VELOC/archive/refs/tags/1.5.tar.gz -> veloc-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	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	python-utils-r1	08d890890f70fe0096093016e55438d5	python-r1	e20b80360497e6215aed0dd4ca7d6bad	distutils-r1	e297e8afd355d60fb9d2d7b37b81214f
+_md5_=64530aad432c668e0bc6cca8e294bc5a
diff --git a/metadata/md5-cache/x11-misc/rofi-file-browser-extended-1.2.0-r2 b/metadata/md5-cache/x11-misc/rofi-file-browser-extended-1.2.0-r2
deleted file mode 100644
index a16f4f57ce..0000000000
--- a/metadata/md5-cache/x11-misc/rofi-file-browser-extended-1.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 x11-misc/rofi x11-libs/cairo
-DESCRIPTION=A file browser for rofi
-EAPI=7
-HOMEPAGE=https://github.com/marvinkreis/rofi-file-browser-extended
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 x11-misc/rofi
-SLOT=0
-SRC_URI=https://github.com/marvinkreis/rofi-file-browser-extended/archive/refs/tags/1.2.0.tar.gz -> rofi-file-browser-extended-1.2.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_=6104b76a08599eb7eaf89a3dfd327503
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 261cf7a66e..4ab2477a05 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -146,9 +146,17 @@ app-text/lizard 1.17.7: A simple code complexity analyser, supports most of the
 app-text/mdbook 0.4.9 0.4.10 0.4.11 0.4.12: 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/apkbuild-vim 20210723: vim plugin: edit and work with APKBUILD files
+app-vim/css-color 20210530: vim plugin: preview colours in source code while editing
+app-vim/gemini-vim 20210625: vim plugin: syntax highlighting for Gemini Text, the text/gemini media type
+app-vim/nerdtree-git 20210728: vim plugin: display git status flags in NERDTree
 app-vim/openbsd-style 1.1: vim plugin: indent code according to the OpenBSD and FreeBSD style(9)
 app-vim/python-syntax 20201215: vim plugin: Enhanced Python syntax highlighting
+app-vim/rainbow 3.4.0_p20200528: vim plugin: Rainbow Parentheses Improved
+app-vim/tex-conceal 20210409: vim plugin: extends the Conceal feature for LaTeX
+app-vim/themis 1.5.5: A testing framework for Vim script
 app-vim/vim-nix 9999: vim plugin: Vim configuration files for Nix
+app-vim/vim-sensible 1.2: vim plugin: a universal set of defaults that (hopefully) everyone can agree on
 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
 dev-R/Matrix 1.3.4: Sparse and Dense Matrix Classes and Methods
@@ -239,9 +247,9 @@ dev-R/yaml 2.2.1: Methods to Convert R Data to YAML and Back
 dev-cpp/cli11 1.9.1 2.0.0: Command line parser for C++11
 dev-cpp/drogon 1.7.1: C++14/17 based HTTP web application framework
 dev-cpp/dtl 1.19_p20210531: diff template library written by C++
-dev-cpp/fbthrift 2021.06.14.00 2021.06.28.00: Facebook's branch of Apache Thrift, including a new C++ server
-dev-cpp/fizz 2021.06.14.00 2021.06.28.00: C++14 implementation of the TLS-1.3 standard
-dev-cpp/folly 2021.06.14.00 2021.06.28.00: An open-source C++ library developed and used at Facebook
+dev-cpp/fbthrift 2021.08.02.00: Facebook's branch of Apache Thrift, including a new C++ server
+dev-cpp/fizz 2021.08.02.00: C++14 implementation of the TLS-1.3 standard
+dev-cpp/folly 2021.08.02.00: An open-source C++ library developed and used at Facebook
 dev-cpp/gsl-lite 0.38.0: C++ Guideline Support Library implementation
 dev-cpp/indicators 2.2: Activity indicators for modern C++
 dev-cpp/mastodonpp 0.5.7 9999: C++ wrapper for the Mastodon and Pleroma APIs.
@@ -254,7 +262,7 @@ dev-cpp/tiny-dnn 1.0.0_alpha3: header only, dependency-free deep learning framew
 dev-cpp/trantor 1.5.1: Non-blocking I/O tcp network lib based on c++14/17
 dev-cpp/vectorwrapper 1.1.2 9999: A template vector wrapper class for C++
 dev-cpp/vexcl 1.4.2-r1: VexCL - Vector expression template library for OpenCL
-dev-cpp/wangle 2021.06.14.00 2021.06.28.00: Framework providing common client/server abstractions
+dev-cpp/wangle 2021.08.02.00: Framework providing common client/server abstractions
 dev-cpp/xdgpp 0_pre20201007: C++17 header-only implementation of the XDG Base Directory Specification
 dev-db/pg_repack 1.4.6: Reorganize tables in PostgreSQL databases with minimal locks
 dev-db/rum 1.3.7: RUM access method - inverted index with additional information in posting lists
@@ -285,7 +293,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/boinc-zip 7.18 7.18-r1: 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/cglm 0.8.3 0.8.4 9999: OpenGL Mathematics (glm) for C
 dev-libs/feedbackd 0.0.0: A daemon to provide haptic feedback on events
 dev-libs/fsst 0_pre20200830: Fast Static Symbol Table: fast text compression that allows random access
 dev-libs/ftl 1.0_p20210308: The Fortran Template Library (FTL) is a general purpose library for Fortran 2003
@@ -296,7 +304,7 @@ dev-libs/libcloudproviders 0.3.1: DBus API that allows cloud storage sync client
 dev-libs/libdatrie 0.2.13: Double-Array Trie Library
 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
-dev-libs/libphonenumber 8.12.29: library for parsing, formatting, and validating international phone numbers
+dev-libs/libphonenumber 8.12.30: library for parsing, formatting, and validating international phone numbers
 dev-libs/libthai 0.1.28: A a set of Thai language support routines
 dev-libs/memkind 1.11.0: user extensible heap manager built on top of jemalloc
 dev-libs/monero-seed 0.1.0: 14-word mnemonic seed for Monero
@@ -609,7 +617,7 @@ dev-vcs/git-repo-updater 0.5.1-r1: Easily update multiple git repositories at on
 dev-vcs/gitahead 2.6.3: Graphical Git client to help understand and manage source code history
 dev-vcs/gitqlient 1.3.2 1.4.0 9999: Multi-platform Git client written with Qt
 dev-vcs/got 0_p20210217: Portable version of the Game of Trees version control system
-dev-vcs/lazygit 0.27.4 0.28.1 0.28.2 9999: Lazygit, a simple terminal UI for git commands
+dev-vcs/lazygit 0.28.2 0.29 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
@@ -630,7 +638,7 @@ games-engines/fs2_open 21.2.0: FreeSpace2 Source Code Project game engine
 games-engines/instead 3.3.5 9999: INSTEAD text-based quest game engine
 games-engines/luxtorpeda 25.0.0: Steam Play compatibility tool to run games using native Linux engines
 games-engines/nxengine-evo 2.6.4: rewrite of the jump-and-run platformer Doukutsu Monogatari(Cave Story)
-games-fps/crispy-doom 5.10.0 5.10.1 5.10.2: A limit-removing enhanced-resolution Doom source port based on Chocolate Doom
+games-fps/crispy-doom 5.10.0 5.10.1 5.10.2 5.10.3: 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
@@ -794,7 +802,7 @@ net-im/cawbird 1.4.1: Cawbird is a fork of the Corebird Twitter client from Baed
 net-im/discord-canary-bin 0.0.126-r1: All-in-one voice and text chat
 net-im/discord-ptb-bin 0.0.25: All-in-one voice and text chat
 net-im/go-sendxmpp 0_pre20200423: A little tool to send messages to an XMPP contact or MUC
-net-im/guilded-bin 1.0.9101267: Drop Discord, get Guilded
+net-im/guilded-bin 1.0.9105465: Drop Discord, get Guilded
 net-im/kaidan 0.7.0 0.8.0: A simple, user-friendly Jabber/XMPP client for every device!
 net-im/nheko 0.8.1 0.8.2 0.8.2-r1: Desktop client for Matrix using Qt and C++14
 net-im/ruqola 1.3.1: Rocket.Chat client for the KDE desktop
@@ -806,7 +814,7 @@ net-libs/usockets 0.7.1_p20210214-r2 9999: tiny eventing, networking & crypto fo
 net-mail/remail 0.13: A set of tools for crypted mailing lists
 net-misc/FORT-validator 1.4.1 1.4.2 1.5.0: FORT validator is an open source RPKI validator
 net-misc/amfora 1.8.0: A fancy terminal browser for the Gemini protocol.
-net-misc/can-utils 2020.02.04 2020.12.0-r1 9999-r3: CAN userspace utilities and tools
+net-misc/can-utils 2020.02.04 2020.12.0-r1 2021.08.0 9999-r3: CAN userspace utilities and tools
 net-misc/castor 0.8.15 0.8.16: A graphical browser for plain-text protocols
 net-misc/eg25-manager 0.3.0: Daemon for managing the Quectel EG25 modem
 net-misc/freetube-bin 0.11.3 0.12.0: https://github.com/FreeTubeApp/FreeTube
@@ -897,7 +905,7 @@ sys-cluster/dlb 2.1-r2: Dynamically react to application imbalance by modifying
 sys-cluster/dtcmp 1.1.2: Datatype Compare Library for sorting and ranking distributed data using MPI
 sys-cluster/dyninst 11.0.1: Tools for binary instrumentation, analysis, and modification
 sys-cluster/er 0.0.4: High-level distributed erasure coding lib combining shuffile and redset
-sys-cluster/extrae 3.8.3-r9: Instrumentation framework to generate execution traces of parallel runtimes
+sys-cluster/extrae 3.8.3-r10: Instrumentation framework to generate execution traces of parallel runtimes
 sys-cluster/fti 1.6: Fault Tolerance Interface
 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.
@@ -909,9 +917,11 @@ sys-cluster/lwgrp 1.0.3: Light-weight Group Library
 sys-cluster/mrnet 5.0.1_p20180510-r3: A Multicast/Reduction Network
 sys-cluster/muster 1.0.1: Massively Scalable Clustering
 sys-cluster/nanos6 2.6: runtime that implements the OmpSs-2 parallel programming model
+sys-cluster/nanox 0.15_p20210818: Nanos++ is a runtime designed to serve as runtime support in parallel environments
 sys-cluster/neutron 17.1.1 17.1.2: A virtual network service for Openstack
 sys-cluster/nova 22.2.0 22.2.1: Cloud computing fabric controller
 sys-cluster/otf2 2.3-r1: highly scalable, memory efficient event trace data format
+sys-cluster/paraver-kernel 4.9.0: paraver kernel library
 sys-cluster/pcs 0.10.8-r3: Pacemaker/Corosync Configuration System
 sys-cluster/placement 4.0.0: A HTTP service for managing, selecting, and claiming cloud resources.
 sys-cluster/portals4 1.0_alpha1_p20190109-r2: low-level network API for high-performance networking
@@ -926,7 +936,7 @@ sys-cluster/spectral 3.4.1: Signal processing to select representative regions f
 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/temanejo 1.3: a debugger for task-parallel programming
-sys-cluster/veloc 1.2: Very-Low Overhead Checkpointing System
+sys-cluster/veloc 1.5: Very-Low Overhead Checkpointing System
 sys-firmware/pinephone-firmware 20210809: Firmwares files for PinePhone
 sys-fs/btrfs-heatmap 9: Python 3 script to draw a heatmap of a btrfs filesystem
 sys-fs/diskonaut 0.10.0 0.11.0 9999: Terminal disk space visual navigator
@@ -991,7 +1001,6 @@ x11-misc/i3lock-color 2.13.2 2.13.4 9999: The world's most popular non-default c
 x11-misc/i3lock-fancy-rapid 0.0.0_pre20201109-r1 0.0.0_pre20210421: A faster implementation of i3lock-fancy
 x11-misc/i3status-rust 0.14.1: A feature-rich and resource-friendly replacement for i3status, written in Rust.
 x11-misc/ksnip 1.8.1 1.9.0: Ksnip is a Qt based cross-platform screenshot tool
-x11-misc/rofi-file-browser-extended 1.2.0-r2: A file browser for rofi
 x11-misc/squeekboard 1.14.0: Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone
 x11-misc/tbsm 0.5: A pure bash session or application launcher. Inspired by cdm, tdm and krunner
 x11-misc/xbanish 1.7: Banish the mouse cursor when typing, show it again when the mouse moves
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 717ff7e57d..990f4bfa56 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 19 Aug 2021 06:36:29 +0000
+Fri, 20 Aug 2021 19:06:14 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 949c1a9993..4c87317649 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -395,8 +395,10 @@ sys-cluster/SOS:total-data-ordering-never - Never use total data ordering optimi
 sys-cluster/SOS:ucx - Use ucx transport
 sys-cluster/SOS:xpmem - Use xpmem transport
 sys-cluster/TCL:fti - Enable sys-cluster/fti backend
-sys-cluster/TCL:instrumentation - Build the instrumentation version
 sys-cluster/TCL:scr - Enable sys-cluster/scr backend
+sys-cluster/TCL:tcl-debug - Build the debug version
+sys-cluster/TCL:tcl-instrumentation - Build the instrumentation version
+sys-cluster/TCL:tcl-instrumentation-debug - Build the instrumentation-debug version
 sys-cluster/TCL:veloc - Enable sys-cluster/veloc backend
 sys-cluster/cinder:api - Installs the initscripts for the cinder api service
 sys-cluster/cinder:iscsi - Allow using an iSCSI remote storage server as pool for disk image storage
@@ -415,8 +417,9 @@ sys-cluster/dlb:instrumentation - enable sys-cluster/extrae instrumentation
 sys-cluster/dyninst:openmp - Enable parallel code parsing
 sys-cluster/dyninst:valgrind - Enable annotations for Valgrind analysis
 sys-cluster/extrae:clustering - Enable sys-cluster/clusteringsuite support
+sys-cluster/extrae:dlsym - Use dlsym instead of PMPI
 sys-cluster/extrae:doc - Generates the documentation of this instrumentation package
-sys-cluster/extrae:dyninst - Build with dyninst
+sys-cluster/extrae:dyninst - Build with sys-cluster/dyninst
 sys-cluster/extrae:heterogeneous - Enable support for heterogeneous tracing
 sys-cluster/extrae:inotify - Enable inotify support
 sys-cluster/extrae:instrument-dynamic-memory - Enables instrumentation for dynamic memory (malloc, free, realloc) calls
@@ -432,13 +435,14 @@ sys-cluster/extrae:openmp - Enable support for tracing OpenMP
 sys-cluster/extrae:openshmem - OpenSHMEM to be used for the instrumentation package
 sys-cluster/extrae:parallel-merge - Build the parallel mergers (mpimpi2prv/mpimpi2dim) based on MPI
 sys-cluster/extrae:pebs-sampling - enable PEBS sampling
+sys-cluster/extrae:peruse - Enable gathering information with PerUse
 sys-cluster/extrae:posix-clock - Use POSIX clock (clock_gettime call) instead of low level timing routines. Use this option if the system where you install the instrumentation package modifies the frequency of its processors at runtime.
 sys-cluster/extrae:pthread - Enable support for tracing pthread library
-sys-cluster/extrae:sampling - Enable PAPI sampling support
+sys-cluster/extrae:sampling - Enable dev-libs/papi sampling support
 sys-cluster/extrae:single-mpi-lib - Produces a single instrumentation library for MPI that contains both Fortran and C wrappers. Applications that call the MPI library from both C and Fortran languages need this flag to be enabled.
 sys-cluster/extrae:sionlib - Enable support for sys-cluster/sionlib
 sys-cluster/extrae:smpss - Enable support for tracing SMP-superscalar
-sys-cluster/extrae:spectral - This package enables support for on-line spectral analysis.
+sys-cluster/extrae:spectral - This package enables support for on-line sys-cluster/spectral analysis.
 sys-cluster/extrae:xml - Enable support for XML configuration
 sys-cluster/fti:fi-io - Enables the I/O failure injection mechanism
 sys-cluster/fti:fortran - Enables the build of a Fortran wrapper
@@ -467,6 +471,24 @@ sys-cluster/nanos6:extrae - to generate execution traces for offline performance
 sys-cluster/nanos6:memkind - Add support for dev-libs/memkind in memory allocator
 sys-cluster/nanos6:papi - enable dev-libs/papi support
 sys-cluster/nanos6:unwind - to generate sample-based profiling
+sys-cluster/nanox:allocator - Enables Allocator module
+sys-cluster/nanox:ayudame - Enables ayudame support from sys-cluster/temanejo
+sys-cluster/nanox:dlb - build with sys-cluster/dlb library support
+sys-cluster/nanox:extrae - build with sys-cluster/extrae support
+sys-cluster/nanox:gasnet - Enable sys-cluster/gasnet support
+sys-cluster/nanox:hwloc - Enable sys-apps/hwloc support
+sys-cluster/nanox:memkind - Enables dev-libs/memkind support
+sys-cluster/nanox:memtracker - Enables Memtracker module
+sys-cluster/nanox:nanox-debug - Enable generation of debug version
+sys-cluster/nanox:nanox-instrumentation - Enable generation of instrumentation version
+sys-cluster/nanox:nanox-instrumentation-debug - Enable generation of instrumentation-debug version
+sys-cluster/nanox:nanox-performance - Enable generation of performance version
+sys-cluster/nanox:opencl - Enables openCL support
+sys-cluster/nanox:papi - enable dev-libs/papi support
+sys-cluster/nanox:resiliency - Enables task-level resiliency
+sys-cluster/nanox:sqlite - enable dev-db/sqlite support
+sys-cluster/nanox:task-callback - Enables task callback feature
+sys-cluster/nanox:threads - Enable user level threads
 sys-cluster/neutron:compute-only - Only install things needed on compute hosts
 sys-cluster/neutron:dhcp - Installs the initscripts for the neutron dhcp service
 sys-cluster/neutron:haproxy - haproxy backend support
@@ -483,6 +505,11 @@ sys-cluster/nova:novncproxy - Installs the initscripts for the nova novncproxy s
 sys-cluster/nova:openvswitch - Installs openvswitch for the neutron openvswitch support
 sys-cluster/nova:rabbitmq - Installs the rabbitmq server
 sys-cluster/otf2:sionlib - Enable sys-cluster/sionlibl support
+sys-cluster/paraver-kernel:extended-objects - Enable extra number of objects
+sys-cluster/paraver-kernel:extrae - Enable extrae support
+sys-cluster/paraver-kernel:ompss - Enable OmpSs parallel version
+sys-cluster/paraver-kernel:openmp - Enable OpenMP parallel version
+sys-cluster/paraver-kernel:otf2 - Enable otf2 support
 sys-cluster/portals4:knem - Use sys-cluster/knem for bulk message transfer
 sys-cluster/portals4:me-triggered - Enable extended (non-standard) triggered operations. Experimental
 sys-cluster/portals4:pmi - Enable PMI support
@@ -526,7 +553,6 @@ sys-cluster/sionlibl:parutils - Enable compilation of parutils (used for benchma
 sys-cluster/sionlibl:pthreads - configure SIONlib to use pthreads for locking
 sys-cluster/sionlibl:python - enable python support
 sys-cluster/sionlibl:sionfwd - enable I/O forwarding with sys-cluster/SIONfwd
-sys-cluster/spath:lsf - Use LFS (Load Sharing Facility) as resource manager
 sys-cluster/spath:slurm - Use sys-cluster/slurm as resource manager
 sys-cluster/spectral:extrae - Add sys-cluster/extrae support
 sys-cluster/spectral:libbsctools - Add sys-cluster/libbsctools support
@@ -539,8 +565,8 @@ sys-cluster/temanejo:ompss - enable ompss plugin
 sys-cluster/temanejo:ompt - Acquire debugging events through OMPT (OpenMP, OmpSs)
 sys-cluster/temanejo:socket - Enable connection to socket
 sys-cluster/temanejo:stdout - Enable output to stdout
-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:comm-queue-ipc - Use ipc as the communication protocol between client library and active backend
+sys-cluster/veloc:comm-queue-socket - Use socket as the communication protocol between client library and active backend
 sys-cluster/veloc:slurm - Use sys-cluster/slurm as resource manager
 sys-fs/erofs-utils:fuse - Enable support for Filesystem in Userspace via sys-fs/fuse
 sys-fs/erofs-utils:uuid - Allow interaction with libuuid in sys-apps/util-linux. It's recommended turn on