gentoo resync : 20.03.2021

25 files changed, 45 insertions, 197 deletions

diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fa7a99c18d6f..415ae279b9c3 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/banner-1.3.3 b/metadata/md5-cache/app-misc/banner-1.3.3
deleted file mode 100644
index f5223d31de53..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!games-misc/bsd-games
-DESCRIPTION=The well known banner program for Linux
-EAPI=5
-HOMEPAGE=http://cedar-solutions.com
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cc1e6b121784dbabb02973c0b732ffd
diff --git a/metadata/md5-cache/app-misc/banner-1.3.4 b/metadata/md5-cache/app-misc/banner-1.3.4
deleted file mode 100644
index bd44988c3d4d..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The well known banner program for Linux
-EAPI=7
-HOMEPAGE=http://cedar-solutions.com/
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!games-misc/bsd-games
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.4.tar.gz
-_md5_=2d94fdc785b021533296ce272927893b
diff --git a/metadata/md5-cache/app-misc/banner-1.3.5 b/metadata/md5-cache/app-misc/banner-1.3.5
index 26a1fbf9b0c4..8acb796aca02 100644
--- a/metadata/md5-cache/app-misc/banner-1.3.5
+++ b/metadata/md5-cache/app-misc/banner-1.3.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=The well known banner program for Linux
 EAPI=7
 HOMEPAGE=https://github.com/pronovic/banner
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!games-misc/bsd-games
 SLOT=0
 SRC_URI=https://github.com/pronovic/banner/archive/BANNER_V1.3.5.tar.gz
-_md5_=bfa71d36e499632da08b719ac3420129
+_md5_=7120d8c037259470d98701f7f87c59f1
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62 b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
index 2a2f96ae6fc8..79928935212a 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
+++ b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=7
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
 IUSE=cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_62_RTM/src/nss-3.62.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b50b9ff882d6009e48bd71ccde9e0f63
+_md5_=56d80241b466e1befa89c018e016aaac
diff --git a/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1 b/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1
deleted file mode 100644
index 39cd96714023..000000000000
--- a/metadata/md5-cache/app-misc/dfshow-0.8.2_beta-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=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=prepare
-DEPEND=dev-libs/libconfig:= sys-libs/ncurses:0=
-DESCRIPTION=DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT
-EAPI=7
-HOMEPAGE=https://github.com/roberthawdon/dfshow
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libconfig:= sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/roberthawdon/dfshow/archive/v0.8.2-beta.tar.gz -> dfshow-0.8.2_beta.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a2e608a7422f4609cb3859b4f3411fde
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
deleted file mode 100644
index f3f2c8387b23..000000000000
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Allows you to pair any remote control with your computer or media center
-EAPI=7
-HOMEPAGE=https://flirc.tv/
-IUSE=+qt5
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=afb9a76ecd44a8d387d55d390d214b15
diff --git a/metadata/md5-cache/app-misc/flirc-3.24.0 b/metadata/md5-cache/app-misc/flirc-3.24.0
deleted file mode 100644
index 12e95f025d7a..000000000000
--- a/metadata/md5-cache/app-misc/flirc-3.24.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Allows you to pair any remote control with your computer or media center
-EAPI=7
-HOMEPAGE=https://flirc.tv/
-IUSE=+qt5
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.24.0-amd64 -> flirc-3.24.0_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.24.0-armhf -> flirc-3.24.0_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.24.0-i386 -> flirc-3.24.0_x86.deb )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
-_md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2 b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
index 077e5a852f11..b2dea2977da3 100644
--- a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
+++ b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/geneweb acct-group/geneweb dev-ml/jingoo:= dev-ml/uunf:= >=dev-ml/markup-1.0.0:= dev-ml/unidecode:= dev-ml/calendars:= dev-ml/cppo test? ( dev-ml/ounit )
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/geneweb acct-group/geneweb dev-ml/jingoo:= dev-ml/uunf:= >=dev-ml/markup-1.0.0:= dev-ml/unidecode:= dev-ml/calendars:= dev-ml/cppo test? ( dev-ml/ounit2 )
 DESCRIPTION=Genealogy software program with a Web interface
 EAPI=7
 HOMEPAGE=https://github.com/geneweb/geneweb
@@ -11,4 +11,4 @@ RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geneweb/geneweb/archive/v7.0.0.tar.gz -> geneweb-7.0.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d85b198efc33359659b5a75c08b023d
+_md5_=bbc248c457b288c788cf6b2540670fa9
diff --git a/metadata/md5-cache/app-misc/mc-4.8.25-r1 b/metadata/md5-cache/app-misc/mc-4.8.25-r1
deleted file mode 100644
index e2a9307dd219..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.25-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.25.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=666d03297db4b3280542e54a923b2b36
diff --git a/metadata/md5-cache/app-misc/nnn-3.6 b/metadata/md5-cache/app-misc/nnn-3.6
new file mode 100644
index 000000000000..c4491756db5d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/nnn-3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DESCRIPTION=The missing terminal file browser for X
+EAPI=7
+HOMEPAGE=https://github.com/jarun/nnn
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+SLOT=0
+SRC_URI=https://github.com/jarun/nnn/archive/v3.6.tar.gz -> nnn-3.6.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=06d04e9f87d5617396f4cce2cfa7cafe
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r2 b/metadata/md5-cache/app-misc/note-1.3.3-r2
deleted file mode 100644
index 54bfa1bfd8c0..000000000000
--- a/metadata/md5-cache/app-misc/note-1.3.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl virtual/perl-Storable dev-perl/Config-General crypt? ( dev-perl/Crypt-CBC dev-perl/Crypt-Blowfish dev-perl/Crypt-DES ) mysql? ( dev-perl/DBD-mysql ) dev-lang/perl
-DESCRIPTION=A note taking perl program
-EAPI=6
-HOMEPAGE=https://www.daemon.de/NOTE
-IUSE=crypt dbm general mysql text
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/TermReadKey dev-perl/Term-ReadLine-Perl virtual/perl-Storable dev-perl/Config-General crypt? ( dev-perl/Crypt-CBC dev-perl/Crypt-Blowfish dev-perl/Crypt-DES ) mysql? ( dev-perl/DBD-mysql ) dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.daemon.de/idisk/Apps/note/note-1.3.3.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=edeff7cc2f947438ce487f474d3c606f
diff --git a/metadata/md5-cache/app-misc/oneko-1.2-r2 b/metadata/md5-cache/app-misc/oneko-1.2-r2
deleted file mode 100644
index daca76ac91b3..000000000000
--- a/metadata/md5-cache/app-misc/oneko-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=5
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7debdebf97b916a2357e3b2fb34e04c8
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p5 b/metadata/md5-cache/app-misc/oneko-1.2_p5
deleted file mode 100644
index 390a29a7b051..000000000000
--- a/metadata/md5-cache/app-misc/oneko-1.2_p5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
-EAPI=7
-HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=582e5c2559ba186d31e2a8093fa03ccd
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
index 9a589ced71f4..06035ee74345 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
 DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
 EAPI=7
 HOMEPAGE=http://www.daidouji.com/oneko/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=public-domain
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1102f4357bb60429bdb6793bd361415b
+_md5_=359801083db587c29a1da6d05a4ba2fc
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.8 b/metadata/md5-cache/app-misc/pax-utils-1.2.8
deleted file mode 100644
index 149a042d9f9d..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug kernel_linux python seccomp python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.8.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.8.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81dce67866b9a21b3dc9a8ebbc4ff18f
diff --git a/metadata/md5-cache/app-misc/physlock-11-r1 b/metadata/md5-cache/app-misc/physlock-11-r1
deleted file mode 100644
index 07c7173afe2a..000000000000
--- a/metadata/md5-cache/app-misc/physlock-11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/pam
-DESCRIPTION=lightweight Linux console locking tool
-EAPI=6
-HOMEPAGE=https://github.com/muennich/physlock
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/pam
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v11.tar.gz -> physlock-11.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96bb0a55cc83e4493861ecec3d5209a8
diff --git a/metadata/md5-cache/app-misc/physlock-13 b/metadata/md5-cache/app-misc/physlock-13
deleted file mode 100644
index 3a7c6eb75cc0..000000000000
--- a/metadata/md5-cache/app-misc/physlock-13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-libs/pam elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Lightweight Linux console locking tool
-EAPI=7
-HOMEPAGE=https://github.com/muennich/physlock
-IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/pam
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/muennich/physlock/archive/v13.tar.gz -> physlock-13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c0b6bff5e9136a6ed013f48c999d3ce
diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2
new file mode 100644
index 000000000000..8fd05d8c6412
--- /dev/null
+++ b/metadata/md5-cache/app-misc/recoll-1.29.2
@@ -0,0 +1,15 @@
+BDEPEND=qt5? ( dev-qt/linguist-tools:5 )
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DESCRIPTION=Personal full text search package
+EAPI=7
+HOMEPAGE=https://www.lesbonscomptes.com/recoll/
+IUSE=camelcase chm doc +inotify qt5 session +spell webengine kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip
+REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a0d9cf123b1b1b607b06a3c0044a5a36
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0 b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
index 18b3113077c5..8d79d1c5193a 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Resolve GCC flag -march=native
 EAPI=7
 HOMEPAGE=https://github.com/hartwork/resolve-march-native
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-devel/gcc-4.2 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/1.0.0.tar.gz -> resolve-march-native-1.0.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c390e78a0c30861ead8bb4f9fce0b318
+_md5_=def171c73495667836bd551bc921432c
diff --git a/metadata/md5-cache/app-misc/rlwrap-0.43 b/metadata/md5-cache/app-misc/rlwrap-0.43
index 5e5e46baa77d..fcbbc10d06eb 100644
--- a/metadata/md5-cache/app-misc/rlwrap-0.43
+++ b/metadata/md5-cache/app-misc/rlwrap-0.43
@@ -4,9 +4,9 @@ DESCRIPTION=GNU readline wrapper
 EAPI=6
 HOMEPAGE=https://github.com/hanslub42/rlwrap
 IUSE=debug
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz
-_md5_=2b71363c1d9025b4255d058126584d4e
+_md5_=98c0d6b8c226ba274355cb4ba722c7bf
diff --git a/metadata/md5-cache/app-misc/scrub-2.5.2 b/metadata/md5-cache/app-misc/scrub-2.5.2
deleted file mode 100644
index b737333dda19..000000000000
--- a/metadata/md5-cache/app-misc/scrub-2.5.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=write patterns on disk/file
-EAPI=6
-HOMEPAGE=https://github.com/chaos/scrub
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/chaos/scrub/archive/2.5.2.tar.gz -> scrub-2.5.2.tar.gz
-_md5_=f28dc03e2342690fe7dba9a34a52df59
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.8 b/metadata/md5-cache/app-misc/spacenavd-0.8
index 43c255f654d6..4c033457c7e4 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.8
+++ b/metadata/md5-cache/app-misc/spacenavd-0.8
@@ -5,10 +5,10 @@ DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
 EAPI=7
 HOMEPAGE=http://spacenav.sourceforge.net/
 IUSE=X kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.8/spacenavd-0.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=174a6b9b3e009dfb8d23f3e5fdfb8d6d
+_md5_=2dde2581b6d44cf7f355446355cdb02b
diff --git a/metadata/md5-cache/app-misc/wipe-2.3.1 b/metadata/md5-cache/app-misc/wipe-2.3.1
index b3961d1f7f5d..ccdf7bc8fecd 100644
--- a/metadata/md5-cache/app-misc/wipe-2.3.1
+++ b/metadata/md5-cache/app-misc/wipe-2.3.1
@@ -1,11 +1,11 @@
+BDEPEND=>=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 install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Secure file wiping utility based on Peter Gutman's patterns
-EAPI=6
+EAPI=7
 HOMEPAGE=http://wipe.sourceforge.net/
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34c0801827d2f7a48aa15dc4eec83b9d
+_md5_=499770f2ee07c2afb7f44869643e5260
diff --git a/metadata/md5-cache/app-misc/worker-3.8.3-r100 b/metadata/md5-cache/app-misc/worker-3.8.3-r100
deleted file mode 100644
index 296aa4ac1486..000000000000
--- a/metadata/md5-cache/app-misc/worker-3.8.3-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup
-DEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
-EAPI=7
-HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
-IUSE=avfs debug dbus examples libnotify lua +magic xinerama xft lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
-SLOT=0
-SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63bfd37860f4f45b8d1e1f01a69b45a1