diff --git a/metadata/md5-cache/app-shells/nice-exit-code-0_pre20200117 b/metadata/md5-cache/app-shells/nice-exit-code-0_pre20200117
new file mode 100644
index 0000000000..e870582088
--- /dev/null
+++ b/metadata/md5-cache/app-shells/nice-exit-code-0_pre20200117
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=ZSH plugin that maps exit status code to human readable string
+EAPI=7
+HOMEPAGE=https://github.com/bric3/nice-exit-code
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-shells/zsh
+SLOT=0
+SRC_URI=https://github.com/bric3/nice-exit-code/archive/de7ac733d28705b5e9989b9c8231ac88eb33d841.tar.gz -> nice-exit-code-0_pre20200117.tar.gz
+_md5_=7565264bdc48dfcc0afdcbc596469cc4
diff --git a/metadata/md5-cache/app-shells/zsh-histdb-0_pre20200405 b/metadata/md5-cache/app-shells/zsh-histdb-0_pre20200405
new file mode 100644
index 0000000000..3c03e39f6b
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-histdb-0_pre20200405
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=A slightly better history for zsh
+EAPI=7
+HOMEPAGE=https://github.com/larkery/zsh-histdb
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-shells/zsh dev-db/sqlite
+SLOT=0
+SRC_URI=https://github.com/larkery/zsh-histdb/archive/7c34b558cca374b6c8727fc08868f2bc044fd162.tar.gz -> zsh-histdb-0_pre20200405.tar.gz
+_md5_=a19b2512fb1d5fc26946af5a5851bf23
diff --git a/metadata/md5-cache/dev-python/baron-0.9 b/metadata/md5-cache/dev-python/baron-0.9
new file mode 100644
index 0000000000..f9bb7dcd46
--- /dev/null
+++ b/metadata/md5-cache/dev-python/baron-0.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Full Syntax Tree for python to make writing refactoring code a realist task
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/baron https://baron.pycqa.org
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/baron/archive/0.9.tar.gz -> baron-0.9.tar.gz
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0fc15e5d7e877ab188027059663b4041
diff --git a/metadata/md5-cache/net-misc/FORT-validator-1.2.1 b/metadata/md5-cache/net-misc/FORT-validator-1.2.1
new file mode 100644
index 0000000000..7ccad21806
--- /dev/null
+++ b/metadata/md5-cache/net-misc/FORT-validator-1.2.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf sys-devel/automake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
+DESCRIPTION=FORT validator is an open source RPKI validator
+EAPI=7
+HOMEPAGE=https://fortproject.net/validator?2
+IUSE=caps libressl +filecaps
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/rsync filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://github.com/NICMx/FORT-validator/archive/v1.2.1.tar.gz -> FORT-validator-1.2.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=60bc405f5b98a90d8fda9e06174a9c76
diff --git a/metadata/md5-cache/net-misc/wayback_machine_downloader-2.2.1 b/metadata/md5-cache/net-misc/wayback_machine_downloader-2.2.1
new file mode 100644
index 0000000000..15d5be4524
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wayback_machine_downloader-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Download an entire website from the Wayback Machine
+EAPI=7
+HOMEPAGE=https://github.com/hartator/wayback-machine-downloader
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://rubygems.org/gems/wayback_machine_downloader-2.2.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e889f9cca22dab68bba8f35c9cacb3af
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index ba4cae90e6..f86f136bd2 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -27,6 +27,8 @@ app-portage/portage-lostfiles 0.2.0: A simple script to identify files not track
 app-portage/portconf 1.6.8-r1 9999: /etc/portage cleaner
 app-portage/showbuild 0.9.1-r1: Script to follow log of running portage builds
 app-shells/k 0.0.5: Directory listings for zsh with git features
+app-shells/nice-exit-code 0_pre20200117: ZSH plugin that maps exit status code to human readable string
+app-shells/zsh-histdb 0_pre20200405: A slightly better history for zsh
 app-text/OCRmyPDF 9.7.2: OCRmyPDF adds an OCR text layer to scanned PDF files
 app-text/katarakt 0.2: Simple PDF viewer
 app-text/mdbook 0.3.7: Creates a book from markdown files
@@ -59,6 +61,7 @@ dev-python/asyncpg 0.20.1: A fast PostgreSQL Database Client Library for Python/
 dev-python/atomiclong 0.1.1 9999: An AtomicLong type using CFFI.
 dev-python/autoflake 1.3.1: Removes unused imports and unused variables as reported by pyflakes
 dev-python/backrefs 4.3.0: Wrapper around re or regex that adds additional back references
+dev-python/baron 0.9: Full Syntax Tree for python to make writing refactoring code a realist task
 dev-python/black 19.10_beta0-r1: The uncompromising Python code formatter
 dev-python/bracex 2.0.0: Bash style brace expansion for Python
 dev-python/cchardet 2.1.6: cChardet is high speed universal character encoding detector
@@ -201,11 +204,12 @@ media-video/vidify-audiosync 0.3.0: Audio synchronization feature for vidify
 net-dialup/tio 1.32: Simple TTY terminal application
 net-im/biboumi 8.4 9.0_pre20200419: XMPP gateway to IRC
 net-mail/remail 0.9: A set of tools for crypted mailing lists
-net-misc/FORT-validator 1.2.0: FORT validator is an open source RPKI validator
+net-misc/FORT-validator 1.2.0 1.2.1: FORT validator is an open source RPKI validator
 net-misc/lyricwikia 0.1.11: Python API to get song lyrics from LyricWikia
 net-misc/openbgpd 6.6_p0 9999: OpenBGPD is a free implementation of BGPv4
 net-misc/purritobin 0.1.3 9999: minimalistic commanline pastebin
 net-misc/tinyssh 20190101: A small SSH server with state-of-the-art cryptography
+net-misc/wayback_machine_downloader 2.2.1: Download an entire website from the Wayback Machine
 net-misc/wsdd 0.5: A Web Service Discovery host daemon.
 net-p2p/trezord-go 2.0.29: TREZOR Communication Daemon
 net-p2p/yggdrasil-go 0.3.13-r1 0.3.14: An experiment in scalable routing as an encrypted IPv6 overlay network
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f12ce8a449..281aecb7ec 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 01 May 2020 18:15:57 +0000
+Sat, 02 May 2020 10:04:59 +0000