diff --git a/metadata/md5-cache/app-shells/fzf-tab-0_pre20220331 b/metadata/md5-cache/app-shells/fzf-tab-0_pre20220331-r1
similarity index 86%
rename from metadata/md5-cache/app-shells/fzf-tab-0_pre20220331
rename to metadata/md5-cache/app-shells/fzf-tab-0_pre20220331-r1
index f2a9251887..c33dc13a84 100644
--- a/metadata/md5-cache/app-shells/fzf-tab-0_pre20220331
+++ b/metadata/md5-cache/app-shells/fzf-tab-0_pre20220331-r1
@@ -7,9 +7,9 @@ INHERIT=readme.gentoo-r1
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-shells/zsh app-shells/fzf
+RDEPEND=app-shells/fzf app-shells/zsh
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aloxaf/fzf-tab/archive/103330fdbeba07416d5f90b391eee680cd20d2d6.tar.gz -> fzf-tab-0_pre20220331.tar.gz
 _eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=425dd19b880c5d9abd3d7e25baae456f
+_md5_=69be2a920224084d14ab1f57678ec328
diff --git a/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0 b/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0
deleted file mode 100644
index de40cab09c..0000000000
--- a/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=app-shells/zsh-4.3.11 app-misc/tmux dev-ruby/bundler dev-ruby/pry dev-ruby/pry-byebug dev-ruby/rspec-wait ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Fish-like autosuggestions for zsh
-EAPI=8
-HOMEPAGE=https://github.com/zsh-users/zsh-autosuggestions
-INHERIT=readme.gentoo-r1 ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=app-shells/zsh-4.3.11 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/zsh-users/zsh-autosuggestions/archive/v0.7.0.tar.gz -> zsh-autosuggestions-0.7.0.tar.gz
-_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	ruby-ng	840098b934fa20199984384b02780370	ruby-fakegem	08015e64ff76dc2e2b177418bc2acb08
-_md5_=4b084f229528e8d499e1ec0b1c46cc80
diff --git a/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0-r1 b/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0-r1
new file mode 100644
index 0000000000..d4cbec2d42
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-autosuggestions-0.7.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-shells/zsh-4.3.11 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) app-misc/tmux dev-ruby/bundler dev-ruby/pry dev-ruby/pry-byebug dev-ruby/rspec:3 dev-ruby/rspec-wait virtual/rubygems )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DESCRIPTION=Fish-like autosuggestions for zsh
+EAPI=8
+HOMEPAGE=https://github.com/zsh-users/zsh-autosuggestions
+INHERIT=readme.gentoo-r1 ruby-ng
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=app-shells/zsh-4.3.11
+REQUIRED_USE=test? ( || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zsh-users/zsh-autosuggestions/archive/v0.7.0.tar.gz -> zsh-autosuggestions-0.7.0.tar.gz
+_eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	ruby-ng	840098b934fa20199984384b02780370
+_md5_=08a92be62d4d08bce846d8b56a6085be
diff --git a/metadata/md5-cache/dev-python/simplemma-0.3.0 b/metadata/md5-cache/dev-python/simplemma-0.3.0
deleted file mode 100644
index 577ebbca13..0000000000
--- a/metadata/md5-cache/dev-python/simplemma-0.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple multilingual lemmatizer for Python.
-EAPI=8
-HOMEPAGE=https://github.com/adbar/simplemma https://pypi.org/project/simplemma/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adbar/simplemma/archive/refs/tags/v0.3.0.tar.gz -> simplemma-0.3.0.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	python-utils-r1	59dddabd6a41ab69723654916142f63b	python-r1	8638751691200e941f26fe0ac3aef1d1	distutils-r1	e91901adfcf0640d2daa4dc863ff5377
-_md5_=2386988882c41b8503ec8c7a322b9448
diff --git a/metadata/md5-cache/dev-python/simplemma-0.5.0 b/metadata/md5-cache/dev-python/simplemma-0.6.0
similarity index 97%
rename from metadata/md5-cache/dev-python/simplemma-0.5.0
rename to metadata/md5-cache/dev-python/simplemma-0.6.0
index b01c8ebe87..79cfeb3d77 100644
--- a/metadata/md5-cache/dev-python/simplemma-0.5.0
+++ b/metadata/md5-cache/dev-python/simplemma-0.6.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/adbar/simplemma/archive/refs/tags/v0.5.0.tar.gz -> simplemma-0.5.0.tar.gz
+SRC_URI=https://github.com/adbar/simplemma/archive/refs/tags/v0.6.0.tar.gz -> simplemma-0.6.0.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	python-utils-r1	59dddabd6a41ab69723654916142f63b	python-r1	8638751691200e941f26fe0ac3aef1d1	distutils-r1	e91901adfcf0640d2daa4dc863ff5377
 _md5_=30609632706b1e8a48d3d3fb7fdaede6
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index efa3259c32..a12ffb36cf 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -157,7 +157,7 @@ app-shells/fish-command-timer 0.1.3 0.1.3_p20201002: Fish shell extension for pr
 app-shells/fish-history-merge 0_pre20201121: Plugin that modifies built-in up-or-search command to merge the command history
 app-shells/fishtape 3.0.1: 100% pure-Fish test runner
 app-shells/fzf-fish 8.1 8.2: Augment your fish command line with fzf key bindings
-app-shells/fzf-tab 0_pre20220331: Replace zsh's default completion selection menu with fzf
+app-shells/fzf-tab 0_pre20220331-r1: Replace zsh's default completion selection menu with fzf
 app-shells/k 0.0.5: Directory listings for zsh with git features
 app-shells/mrsh 9999: minimal strictly POSIX compliant shell
 app-shells/nice-exit-code 0_pre20200117: ZSH plugin that maps exit status code to human readable string
@@ -168,7 +168,7 @@ app-shells/spark-fish 1.2.0: Sparklines for Fish
 app-shells/vivid 0.7.0-r2 0.8.0: A themeable LS_COLORS generator with a rich filetype datebase
 app-shells/zoxide 0.7.2: A smarter cd command for your terminal
 app-shells/zsh-async 1.8.5: Run multiple asynchronous jobs with callbacks
-app-shells/zsh-autosuggestions 0.6.4 0.7.0: Fish-like autosuggestions for zsh
+app-shells/zsh-autosuggestions 0.6.4 0.7.0-r1: Fish-like autosuggestions for zsh
 app-shells/zsh-histdb 0_pre20200405: A slightly better history for zsh
 app-shells/zsh-history-substring-search 1.0.2: ZSH port of Fish history search (up arrow)
 app-shells/zsh-history-to-fish 0.3.0: Bring your ZSH history to Fish shell
@@ -690,7 +690,7 @@ dev-python/scramp 1.4.1: A pure-Python implementation of the SCRAM authenticatio
 dev-python/scrapy 2.5.1: A high-level Web Crawling and Web Scraping framework
 dev-python/sdnotify 0.3.2: Python implementation of the systemd sd_notify protocol
 dev-python/sentence-splitter 1.4-r1: Sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder
-dev-python/simplemma 0.3.0 0.5.0: A simple multilingual lemmatizer for Python.
+dev-python/simplemma 0.6.0: A simple multilingual lemmatizer for Python.
 dev-python/skia-pathops 0.6.0_p2 0.7.2: Python bindings for the Skia Path Ops
 dev-python/skills 0.3.0: Python Implementation of the TrueSkill, Glicko and Elo Ranking Algorithms
 dev-python/sortedcollections 2.1.0: Apache2 licensed Python sorted collections library
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 211758b928..b5da6cd2a1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Apr 2022 19:49:16 +0000
+Wed, 06 Apr 2022 21:34:19 +0000