diff --git a/metadata/md5-cache/dev-java/openjdk-sts-bin-13.0.2_p8 b/metadata/md5-cache/dev-java/openjdk-sts-bin-13.0.2_p8
deleted file mode 100644
index 992167c4cd..0000000000
--- a/metadata/md5-cache/dev-java/openjdk-sts-bin-13.0.2_p8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups examples -gentoo-vm headless-awt source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2-with-classpath-exception
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.29-r7:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs splitdebug
-SLOT=13
-SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2+8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2+8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2+8/OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2+8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30291bb7dbdc8729ea68af44059082c3
diff --git a/metadata/md5-cache/dev-java/openjdk-sts-bin-14.0.1_p7 b/metadata/md5-cache/dev-java/openjdk-sts-bin-14.0.1_p7-r1
similarity index 100%
rename from metadata/md5-cache/dev-java/openjdk-sts-bin-14.0.1_p7
rename to metadata/md5-cache/dev-java/openjdk-sts-bin-14.0.1_p7-r1
diff --git a/metadata/md5-cache/media-libs/libavif-9999 b/metadata/md5-cache/media-libs/libavif-9999
new file mode 100644
index 0000000000..4624cac0a1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libavif-9999
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dav1d? ( media-libs/dav1d ) libaom? ( >=media-libs/libaom-1.1 ) rav1e? ( media-video/rav1e[capi] ) media-libs/libpng virtual/jpeg
+DESCRIPTION=Library for encoding and decoding .avif files
+EAPI=7
+HOMEPAGE=https://github.com/AOMediaCodec/libavif
+IUSE=dav1d +libaom rav1e
+LICENSE=BSD-2
+PROPERTIES=live
+RDEPEND=dav1d? ( media-libs/dav1d ) libaom? ( >=media-libs/libaom-1.1 ) rav1e? ( media-video/rav1e[capi] ) media-libs/libpng virtual/jpeg
+REQUIRED_USE=|| ( dav1d libaom )
+SLOT=0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c4bba6c215fd0bdf2d6c974a27f3a3c
diff --git a/metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0 b/metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0-r1
similarity index 84%
rename from metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0
rename to metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0-r1
index b215547d50..2ffd1e8b73 100644
--- a/metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0
+++ b/metadata/md5-cache/sys-libs/solo-udev-rules-4.0.0-r1
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst
+DEFINED_PHASES=compile install postinst postrm
 DEPEND=virtual/udev
 DESCRIPTION=udev rules for the Solo FIDO2 & U2F USB+NFC security key
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=https://github.com/solokeys/solo/archive/4.0.0.tar.gz -> solo-4.0.0.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=8ca451243f0c4b0c71d809b644e71396
+_md5_=281a154ad6523c969b8cab83769c0a10
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 11993f97ba..d97a98f614 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -28,7 +28,7 @@ app-text/katarakt 0.2: Simple PDF viewer
 app-text/mdbook 0.3.7: Creates a book from markdown files
 app-text/noweb 2.12: a literate programming tool, lighter than web
 dev-games/surgescript 0.5.4.3 9999: scripting language made for opensurge
-dev-java/openjdk-sts-bin 13.0.2_p8 14.0.1_p7: Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported
+dev-java/openjdk-sts-bin 14.0.1_p7-r1: Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported
 dev-lang/aldor 1.2.0_p20190730: The Aldor Programming Language
 dev-lang/fbc 1.06.0 1.07.0 1.07.1: A free/open source, multi-platform BASIC compiler.
 dev-libs/StringiFor 1.1.1: StringiFor, Strings Fortran Manipulator, yet another strings Fortran module
@@ -141,7 +141,7 @@ media-gfx/azpainter 2.1.5: Full color painting software for Linux for illustrati
 media-gfx/oxipng 2.3.0: A lossless PNG compression optimizer
 media-gfx/svgcleaner 0.9.5: svgcleaner could help you to clean up your SVG files from the unnecessary data.
 media-libs/amdvlk 2020.1.4 2020.2.1: AMD Open Source Driver for Vulkan
-media-libs/libavif 0.6.4: Library for encoding and decoding .avif files
+media-libs/libavif 0.6.4 9999: Library for encoding and decoding .avif files
 media-plugins/alsa-sndio 0.2: Sndio audio sink and source for GStreamer
 media-plugins/gst-plugins-sndio 1.8.0.1: Sndio audio sink and source for GStreamer
 media-plugins/whysynth 20170701_p20180323: A software synthesizer plugin for the DSSI Soft Synth Interface
@@ -188,7 +188,7 @@ sys-cluster/rankstr 0.0.2: Split an MPI communicator into subcomms based on stri
 sys-cluster/redset 0.0.4: Low-level distributed erasure coding lib to protect datasets of MPI applications
 sys-cluster/shuffile 0.0.3: SHUFFILE Shuffle files between processes
 sys-cluster/veloc 1.2: Very-Low Overhead Checkpointing System
-sys-libs/solo-udev-rules 4.0.0: udev rules for the Solo FIDO2 & U2F USB+NFC security key
+sys-libs/solo-udev-rules 4.0.0-r1: udev rules for the Solo FIDO2 & U2F USB+NFC security key
 sys-process/gotop 3.5.1: A terminal based graphical activity monitor inspired by gtop and vtop
 sys-process/iotop-c 0_pre20140824: top utility for IO (C port)
 www-apps/twint 2.1.18: Twitter scraping & OSINT tool written in Python that doesn't use Twitter's API
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 703b26d1f6..4b196d5c61 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Apr 2020 11:35:49 +0000
+Thu, 23 Apr 2020 13:35:05 +0000