diff --git a/metadata/md5-cache/dev-libs/ftl-1.0_p20210308 b/metadata/md5-cache/dev-libs/ftl-1.0_p20210308
new file mode 100644
index 0000000000..d1010fbcc1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ftl-1.0_p20210308
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre ) virtual/fortran
+DESCRIPTION=The Fortran Template Library (FTL) is a general purpose library for Fortran 2003
+EAPI=7
+HOMEPAGE=https://github.com/SCM-NV/ftl/
+INHERIT=fortran-2 toolchain-funcs
+IUSE=pcre test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=pcre? ( dev-libs/libpcre ) virtual/fortran
+REQUIRED_USE=test? ( pcre )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SCM-NV/ftl/archive/97b8292e893ad147ca44e42bcd56d23e9a8259fb.tar.gz -> ftl-1.0_p20210308.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	fortran-2	b4796813ccda91c9c0d3463fc90aa969
+_md5_=f41206de71952c8e9fdb8dc367ac247e
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.40 b/metadata/md5-cache/dev-python/cloudscraper-1.2.40
index f4aa06e173..9438cd486a 100644
--- a/metadata/md5-cache/dev-python/cloudscraper-1.2.40
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.40
@@ -1,6 +1,6 @@
 BDEPEND=test? ( >=dev-python/requests-2.9.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-libs/nodejs )
 DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
 EAPI=7
 HOMEPAGE=https://github.com/venomous/cloudscraper
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.40.tar.gz -> cloudscraper-1.2.40.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=8d2bb525af976235a71ac86dbb0af273
+_md5_=0b11439c68f068add44d91908ce36db2
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.46 b/metadata/md5-cache/dev-python/cloudscraper-1.2.46
index 47249407fe..81dfafeb04 100644
--- a/metadata/md5-cache/dev-python/cloudscraper-1.2.46
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.46
@@ -1,6 +1,6 @@
 BDEPEND=test? ( >=dev-python/requests-2.9.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-libs/nodejs )
 DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
 EAPI=7
 HOMEPAGE=https://github.com/venomous/cloudscraper
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.46.tar.gz -> cloudscraper-1.2.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=8b698b9234b38596d760eb907b87d589
+_md5_=0b11439c68f068add44d91908ce36db2
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.56 b/metadata/md5-cache/dev-python/cloudscraper-1.2.56
index 21fee87d4e..3ae61776b5 100644
--- a/metadata/md5-cache/dev-python/cloudscraper-1.2.56
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.56
@@ -1,6 +1,6 @@
 BDEPEND=test? ( >=dev-python/requests-2.9.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-libs/nodejs )
 DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
 EAPI=7
 HOMEPAGE=https://github.com/venomous/cloudscraper
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.56.tar.gz -> cloudscraper-1.2.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1
-_md5_=73f84cc4b4ec740ee285af6a2220c5b3
+_md5_=0b11439c68f068add44d91908ce36db2
diff --git a/metadata/md5-cache/games-board/rmahjong-0.4_p20201106 b/metadata/md5-cache/games-board/rmahjong-0.4_p20201106
index 283fe86d71..af5a056e2a 100644
--- a/metadata/md5-cache/games-board/rmahjong-0.4_p20201106
+++ b/metadata/md5-cache/games-board/rmahjong-0.4_p20201106
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spirali/rmahjong/archive/7a37ade640bc24eb2cc9f0ad6c7ce26773be2856.tar.gz -> rmahjong-0.4_p20201106.tar.gz https://github.com/KDE/kmahjongg/raw/master/icons/48-apps-kmahjongg.png -> kmahjongg_rmahjong.png
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=30ebfdc104c441dfc994b1cf8126bbad
+_md5_=ce5b141abc4fab786e1e1d771b97aa6d
diff --git a/metadata/md5-cache/gui-wm/cage-0.1.3 b/metadata/md5-cache/gui-wm/cage-0.1.3
new file mode 100644
index 0000000000..27637b7224
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/cage-0.1.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=gui-libs/wlroots-0.13 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
+DESCRIPTION=A Wayland kiosk
+EAPI=7
+HOMEPAGE=https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage
+INHERIT=meson
+IUSE=-X
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=gui-libs/wlroots-0.13 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
+SLOT=0
+SRC_URI=https://github.com/Hjdskes/cage/archive/v0.1.3.tar.gz -> cage-0.1.3.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47
+_md5_=a2f06bd91a245c5aeb42e5bb751d8a8e
diff --git a/metadata/md5-cache/gui-wm/cage-9999 b/metadata/md5-cache/gui-wm/cage-9999
index 31af43cdd1..56f1986182 100644
--- a/metadata/md5-cache/gui-wm/cage-9999
+++ b/metadata/md5-cache/gui-wm/cage-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=gui-libs/wlroots-0.11 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
+DEPEND=>=gui-libs/wlroots-0.13 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
 DESCRIPTION=A Wayland kiosk
 EAPI=7
 HOMEPAGE=https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage
@@ -8,7 +8,7 @@ INHERIT=meson git-r3
 IUSE=-X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=gui-libs/wlroots-0.11 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
+RDEPEND=>=gui-libs/wlroots-0.13 x11-libs/libxkbcommon X? ( gui-libs/wlroots[X] x11-libs/libxkbcommon[X] )
 SLOT=0
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	meson	e43eef9331f54965a573ed380854ff47	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4a75aeecebe4b61d7f4ae81212066d71
+_md5_=a2f06bd91a245c5aeb42e5bb751d8a8e
diff --git a/metadata/md5-cache/kde-apps/kclock-0.4.0 b/metadata/md5-cache/kde-apps/kclock-0.4.0
new file mode 100644
index 0000000000..28c781f1bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kclock-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-qt/qtdbus-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtmultimedia-5.12.0:5 >=dev-qt/qtquickcontrols2-5.12.0:5 >=dev-qt/qtsvg-5.12.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 kde-frameworks/kirigami-addons:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A convergent clock application for Plasma
+EAPI=7
+HOMEPAGE=https://apps.kde.org/kclock/
+INHERIT=ecm
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtmultimedia-5.12.0:5 >=dev-qt/qtquickcontrols2-5.12.0:5 >=dev-qt/qtsvg-5.12.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 kde-frameworks/kirigami-addons:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/kclock/0.4/kclock-0.4.0.tar.xz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	ecm	8eb670c6f910afdaaa41ec056d9198a7
+_md5_=cfd9e8d2a54ae10084df1c89df9428c7
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-addons-0.1 b/metadata/md5-cache/kde-frameworks/kirigami-addons-0.1
new file mode 100644
index 0000000000..1e7502fdd6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-addons-0.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.57.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-qt/qtquickcontrols-5.15.0:5 >=dev-qt/qtquickcontrols2-5.15.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kirigami-5.57.0:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Convergent visual components for Kirigami-based applications
+EAPI=7
+HOMEPAGE=https://invent.kde.org/libraries/kirigami-addons
+INHERIT=ecm
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2+ LGPL-3
+RDEPEND=>=dev-qt/qtquickcontrols-5.15.0:5 >=dev-qt/qtquickcontrols2-5.15.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/kirigami-addons/0.1/kirigami-addons-0.1.tar.xz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	virtualx	d828f8a6cfc731f2683d0967d3f2f95a	ecm	8eb670c6f910afdaaa41ec056d9198a7
+_md5_=ce70744dbf87297f71b02a34f866af5e
diff --git a/metadata/md5-cache/mail-client/heirloom-mailx-12.5 b/metadata/md5-cache/mail-client/heirloom-mailx-12.5
index 3f71a4e8bf..eb23cf29df 100644
--- a/metadata/md5-cache/mail-client/heirloom-mailx-12.5
+++ b/metadata/md5-cache/mail-client/heirloom-mailx-12.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/liblockfile dev-libs/libbsd virtual/mta mail-client/mailx-support dev-libs/openssl
+DEPEND=net-libs/liblockfile dev-libs/libbsd sys-libs/binutils-libs virtual/mta mail-client/mailx-support dev-libs/openssl
 DESCRIPTION=The mailx utility from CentOS
 EAPI=7
 HOMEPAGE=https://www.debian.org/
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=net-libs/liblockfile dev-libs/libbsd virtual/mta mail-client/mailx-support dev-libs/openssl !virtual/mailx !mail-client/nail !net-mail/mailutils !mail-client/mailx
+RDEPEND=net-libs/liblockfile dev-libs/libbsd sys-libs/binutils-libs virtual/mta mail-client/mailx-support dev-libs/openssl !virtual/mailx !mail-client/nail !net-mail/mailutils !mail-client/mailx
 SLOT=0
 SRC_URI=https://yorune.pl/gentoo/mail-client/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz
-_md5_=5054cb3e1a797eb4b7c287a2ec8ceb40
+_md5_=0badb79343ad63aad3f50b86020d3c46
diff --git a/metadata/md5-cache/net-misc/purritobin-0.5.2 b/metadata/md5-cache/net-misc/purritobin-0.5.2
index 83b485ba08..f92b051063 100644
--- a/metadata/md5-cache/net-misc/purritobin-0.5.2
+++ b/metadata/md5-cache/net-misc/purritobin-0.5.2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
+BDEPEND=test? ( sys-apps/coreutils ) virtual/pkgconfig
+DEFINED_PHASES=configure install test
 DEPEND=net-libs/usockets[ssl] acct-user/purritobin acct-group/purritobin www-apps/uwebsockets
 DESCRIPTION=minimalistic commandline pastebin
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PurritoBin/PurritoBin/archive/0.5.2.tar.gz -> purritobin-0.5.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=64774b8a7f5397c432333937596a8d6f
+_md5_=f1f9c7e79b9eac0b6feaaed8269c4e97
diff --git a/metadata/md5-cache/net-misc/purritobin-9999 b/metadata/md5-cache/net-misc/purritobin-9999
index 1359cddd4b..8b3e07e01b 100644
--- a/metadata/md5-cache/net-misc/purritobin-9999
+++ b/metadata/md5-cache/net-misc/purritobin-9999
@@ -1,5 +1,5 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install unpack
+BDEPEND=test? ( sys-apps/coreutils ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install test unpack
 DEPEND=net-libs/usockets[ssl] acct-user/purritobin acct-group/purritobin www-apps/uwebsockets
 DESCRIPTION=minimalistic commandline pastebin
 EAPI=7
@@ -12,4 +12,4 @@ RDEPEND=net-libs/usockets[ssl] acct-user/purritobin acct-group/purritobin
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=64774b8a7f5397c432333937596a8d6f
+_md5_=f1f9c7e79b9eac0b6feaaed8269c4e97
diff --git a/metadata/md5-cache/sys-cluster/sionlib-1.7.6 b/metadata/md5-cache/sys-cluster/sionlib-1.7.6
new file mode 100644
index 0000000000..13ebfc450c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/sionlib-1.7.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 >=dev-python/pypy3-7.3.0:0 ) mpi? ( virtual/mpi ) ompi? ( sys-libs/libomp virtual/mpi ) openmp? ( sys-libs/libomp ) fortran? ( virtual/fortran )
+DESCRIPTION=Scalable I/O library for parallel access to task-local files
+EAPI=7
+HOMEPAGE=https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html
+INHERIT=flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+IUSE=+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 >=dev-python/pypy3-7.3.0:0 ) mpi? ( virtual/mpi ) ompi? ( sys-libs/libomp virtual/mpi ) openmp? ( sys-libs/libomp ) fortran? ( virtual/fortran )
+SLOT=0
+SRC_URI=http://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.6 -> sionlib-1.7.6.tar.gz
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	fortran-2	b4796813ccda91c9c0d3463fc90aa969	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9
+_md5_=08f0a54221d836aced3887c2ab9e6a20
diff --git a/metadata/md5-cache/sys-fs/erofs-utils-1.1 b/metadata/md5-cache/sys-fs/erofs-utils-1.1
deleted file mode 100644
index 5f77c7af6a..0000000000
--- a/metadata/md5-cache/sys-fs/erofs-utils-1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 prepare
-DEPEND=lz4? ( >=app-arch/lz4-1.9 ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=Userspace tools for EROFS images
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
-INHERIT=autotools
-IUSE=lz4 +uuid
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=lz4? ( >=app-arch/lz4-1.9 ) uuid? ( sys-apps/util-linux )
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8f2f199ebebe4f631fa7c43f038fb9f4
diff --git a/metadata/md5-cache/sys-fs/erofs-utils-1.2 b/metadata/md5-cache/sys-fs/erofs-utils-1.2
deleted file mode 100644
index c9b7a28c3a..0000000000
--- a/metadata/md5-cache/sys-fs/erofs-utils-1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 prepare
-DEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( >=app-arch/lz4-1.9 ) selinux? ( sys-libs/libselinux ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=Userspace tools for EROFS images
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
-INHERIT=autotools
-IUSE=fuse lz4 selinux +uuid
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( >=app-arch/lz4-1.9 ) selinux? ( sys-libs/libselinux ) uuid? ( sys-apps/util-linux )
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.2.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=606fff81f77dc86fed7fb6b958834c06
diff --git a/metadata/md5-cache/sys-fs/erofs-utils-1.2.1 b/metadata/md5-cache/sys-fs/erofs-utils-1.2.1
index 856db24f15..e669a7fc6c 100644
--- a/metadata/md5-cache/sys-fs/erofs-utils-1.2.1
+++ b/metadata/md5-cache/sys-fs/erofs-utils-1.2.1
@@ -4,12 +4,12 @@ DEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( >=app-arch/lz4-1.9 ) selinux? ( sys-libs/l
 DESCRIPTION=Userspace tools for EROFS images
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
-INHERIT=autotools
+INHERIT=autotools flag-o-matic
 IUSE=fuse lz4 selinux +uuid
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( >=app-arch/lz4-1.9 ) selinux? ( sys-libs/libselinux ) uuid? ( sys-apps/util-linux )
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.2.1.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=1f64d1dbdb5e484cfae0273f266452a6
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88
+_md5_=f801ad36f0340b8b75917e61f52be3ee
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 80cbb8c871..54a8a9bf28 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -161,6 +161,7 @@ dev-lang/quickjs 2020.11.08: Small embeddable Javascript engine
 dev-lang/wren 0.3.0: The Wren Programming Language
 dev-libs/StringiFor 1.1.1: StringiFor, Strings Fortran Manipulator, yet another strings Fortran module
 dev-libs/cgicc 3.2.19: A C++ class library for writing CGI applications
+dev-libs/ftl 1.0_p20210308: The Fortran Template Library (FTL) is a general purpose library for Fortran 2003
 dev-libs/hts_engine 1.10: HMM-based speech synthesis system (HTS) engine and API
 dev-libs/imsg-compat 6.8.2 9999: linux port of OpenBSD imsg
 dev-libs/libcloudproviders 0.3.1: DBus API that allows cloud storage sync clients to expose their services.
@@ -414,9 +415,11 @@ gui-apps/wofi 1.2.2 1.2.3 1.2.4 9999: Wofi is a launcher/menu program for wlroot
 gui-libs/libcprime 4.1.0 4.2.0_alpha 4.2.0 9999: Library for managing settings of CoreApps
 gui-libs/libcsys 4.1.0 4.2.0_alpha 4.2.0 9999: Library for managing the device
 gui-libs/webp-pixbuf-loader 0.0.1: WebP Image format GdkPixbuf loader
-gui-wm/cage 0.1.2.1 9999: A Wayland kiosk
+gui-wm/cage 0.1.2.1 0.1.3 9999: A Wayland kiosk
 gui-wm/dwl 0.2: dwm for Wayland
+kde-apps/kclock 0.4.0: A convergent clock application for Plasma
 kde-apps/krecorder 9999: A convergent audio recording application for Plasma
+kde-frameworks/kirigami-addons 0.1: Convergent visual components for Kirigami-based applications
 kde-misc/geminipart 20210413: KPart for viewing text/gemini files
 kde-misc/kio-gemini 20210413: Gemini KIO slave
 kde-misc/plasma-applet-thermal-monitor 1.3.0: Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors
@@ -576,11 +579,12 @@ sys-cluster/pcs 0.10.7 0.10.8 0.10.8-r2: Pacemaker/Corosync Configuration System
 sys-cluster/rankstr 0.0.2: Split an MPI communicator into subcomms based on string values
 sys-cluster/redset 0.0.4 0.0.5: Low-level distributed erasure coding lib to protect datasets of MPI applications
 sys-cluster/shuffile 0.0.3 0.0.4: SHUFFILE Shuffle files between processes
+sys-cluster/sionlib 1.7.6: Scalable I/O library for parallel access to task-local files
 sys-cluster/veloc 1.2: Very-Low Overhead Checkpointing System
 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
 sys-fs/dwarfs 0.4.1 0.5.4: A fast very high compression read-only FUSE file system
-sys-fs/erofs-utils 1.1 1.2 1.2.1 9999: Userspace tools for EROFS images
+sys-fs/erofs-utils 1.2.1 9999: Userspace tools for EROFS images
 sys-fs/fscrypt 0.3.0-r1: Tool for managing Linux filesystem encryption
 sys-fs/gcsfuse 0.34.1: A user-space file system for interacting with Google Cloud Storage
 sys-fs/gfs2-utils 3.2.0 3.3.0: Shared-disk cluster file system
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f53625c77f..8ee4cf552e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Apr 2021 23:35:01 +0000
+Sun, 25 Apr 2021 20:34:59 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4ee0e56e2d..999c62913e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -261,6 +261,15 @@ sys-cluster/nanos6:execution-workflow - Enable execution using the Execution Wor
 sys-cluster/nanos6:extrae - to generate execution traces for offline performance analysis with paraver
 sys-cluster/nanos6:papi - enable dev-libs/papi support
 sys-cluster/nanos6:unwind - to generate sample-based profiling
+sys-cluster/sionlib:cxx - Disable C++ support
+sys-cluster/sionlib:debug - enable SIONlib debug
+sys-cluster/sionlib:fortran - Enable Fortran support
+sys-cluster/sionlib:mpi - enable mpi
+sys-cluster/sionlib:ompi - enable hybrid openmp mpi
+sys-cluster/sionlib:openmp - enable openmp
+sys-cluster/sionlib:parutils - Enable compilation of parutils (used for benchmarking)
+sys-cluster/sionlib:pthreads - configure SIONlib to use pthreads for locking
+sys-cluster/sionlib:python - enable python support
 sys-cluster/veloc:alps - Use ALPS (Application Level Placement Scheduler) as resource manager
 sys-cluster/veloc:lsf - Use LFS (Load Sharing Facility) as resource manager
 sys-cluster/veloc:slurm - Use sys-cluster/slurm as resource manager