diff --git a/metadata/md5-cache/app-arch/tarlz-0.19 b/metadata/md5-cache/app-arch/tarlz-0.19-r1
similarity index 74%
rename from metadata/md5-cache/app-arch/tarlz-0.19
rename to metadata/md5-cache/app-arch/tarlz-0.19-r1
index 834342b01a..de7312469c 100644
--- a/metadata/md5-cache/app-arch/tarlz-0.19
+++ b/metadata/md5-cache/app-arch/tarlz-0.19-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=unpack
-DEPEND=app-arch/lzlib || ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
+DEPEND=app-arch/lzlib:0= || ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
 DESCRIPTION=A parallel archiver combining tar and lzip
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
 INHERIT=unpacker
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=app-arch/lzlib
+RDEPEND=app-arch/lzlib:0=
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.19.tar.lz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	unpacker	517f16af48ee3ab88180dd58b5143213
-_md5_=a4a83dfda4629e1caf38eff2405b7a12
+_md5_=1bf3401ba8c2c18659db2677a6c95c5c
diff --git a/metadata/md5-cache/dev-java/openjdk-sts-bin-15.0.2_p7 b/metadata/md5-cache/dev-java/openjdk-sts-bin-15.0.2_p7
index e53551dd43..a66f7310f9 100644
--- a/metadata/md5-cache/dev-java/openjdk-sts-bin-15.0.2_p7
+++ b/metadata/md5-cache/dev-java/openjdk-sts-bin-15.0.2_p7
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-ja
 RESTRICT=preserve-libs splitdebug
 SLOT=15
 SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2+7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2+7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2+7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2+7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	3a5fd6d2dc28e64872910bdd6c6b8d7b	eapi7-ver	f9ec87e93172b25ce65a85303dc06964
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	eapi7-ver	f9ec87e93172b25ce65a85303dc06964
 _md5_=e43899794295aa09d32101c5ff046ac0
diff --git a/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730 b/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730
index 38818d1743..2613eaa951 100644
--- a/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730
+++ b/metadata/md5-cache/dev-lang/aldor-1.2.0_p20190730
@@ -1,15 +1,15 @@
 BDEPEND=virtual/yacc doc? ( virtual/latex-base ) emacs? ( app-text/noweb ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare prerm unpack
-DEPEND=boehm-gc? ( dev-libs/boehm-gc ) emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jdk:1.8 )
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup unpack
+DEPEND=boehm-gc? ( dev-libs/boehm-gc ) emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=The Aldor Programming Language
 EAPI=7
 HOMEPAGE=http://pippijn.github.io/aldor
-INHERIT=autotools elisp-common
-IUSE=+boehm-gc doc emacs java
+INHERIT=autotools elisp-common java-pkg-opt-2
+IUSE=+boehm-gc doc emacs java elibc_FreeBSD java
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jre:1.8 )
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/pippijn/aldor/archive/13e5b90eecc79ec6704efb333c4c100187520e80.tar.gz -> aldor-1.2.0_p20190730.tar.gz doc? ( http://aldor.org/docs/libaldor.pdf.gz ) emacs? ( http://hemmecke.de/aldor/aldor.el.nw )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	elisp-common	36f97076abd90f943a34f8bcd58b5bcc
-_md5_=d294e05bcbbd70c1bd6d3a28e3d510b6
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	elisp-common	36f97076abd90f943a34f8bcd58b5bcc	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
+_md5_=3e7ce44c6c71c6569dcdfda470058913
diff --git a/metadata/md5-cache/games-action/multimc-0.6.12 b/metadata/md5-cache/games-action/multimc-0.6.12
index 8beccfa87c..855df219e3 100644
--- a/metadata/md5-cache/games-action/multimc-0.6.12
+++ b/metadata/md5-cache/games-action/multimc-0.6.12
@@ -1,14 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtxml:5 >=virtual/jdk-1.8.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtxml:5 >=virtual/jdk-1.8.0 >=dev-java/java-config-2.2.0-r3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An advanced Qt5-based open-source launcher for Minecraft
 EAPI=7
 HOMEPAGE=https://multimc.org https://github.com/MultiMC/MultiMC5
-INHERIT=desktop xdg cmake
+INHERIT=desktop java-pkg-2 xdg cmake
+IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtxml:5 sys-libs/zlib >=virtual/jre-1.8.0 virtual/opengl x11-libs/libXrandr
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtxml:5 sys-libs/zlib >=virtual/jre-1.8.0 virtual/opengl x11-libs/libXrandr >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/MultiMC/MultiMC5/archive/0.6.12.tar.gz -> multimc-0.6.12.tar.gz https://github.com/MultiMC/libnbtplusplus/archive/multimc-0.6.1.tar.gz -> libnbtplusplus-multimc-0.6.1.tar.gz https://github.com/MultiMC/quazip/archive/multimc-3.tar.gz -> quazip-multimc-3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=a7942614b57f56f78a055fa4ca63b8be
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
+_md5_=4b532c95e75e8c091779dcc737e2bf24
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 839b261705..29844aef48 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -26,7 +26,7 @@ app-admin/gnome-passwordsafe 4.0-r1 4.1: A password manager for GNOME
 app-admin/krapplet 0.1.0-r1 0.2.0 0.3.1: Krapplet (keyring applet): a Linux graphical password manager
 app-admin/s-tui 1.0.2 1.1.1 9999: Stress-Terminal UI monitoring tool
 app-arch/libarchive-qt 2.0.2 9999: A Qt based archiving solution with libarchive backend
-app-arch/tarlz 0.19: A parallel archiver combining tar and lzip
+app-arch/tarlz 0.19-r1: A parallel archiver combining tar and lzip
 app-arch/unalz 0.65: Extract ALZ archives
 app-backup/b2 2.1.0: The command-line tool for BackBlaze's B2 product.
 app-backup/timeshift 20.11.1: A system restore utility for Linux
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 23b2869b72..66f475a9e3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Apr 2021 18:50:40 +0000
+Fri, 02 Apr 2021 10:05:43 +0000