2021-03-16 19:36:15 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-16 19:36:18 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-03-16 19:36:18 +0000
commit: e61cf1bcd4978b7e12530e2a535878121d4cea28 (patch)
tree: e1b9f9d570d5c6a35d81d77a98cda184e8976120
parent: Merge updates from master (diff)
download: gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.tar.gz
gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.tar.bz2
gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.zip
94 files changed, 146 insertions, 1091 deletions
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.0 b/metadata/md5-cache/app-arch/wimlib-1.13.0
deleted file mode 100644
index 85c70e526fc4..000000000000
--- a/metadata/md5-cache/app-arch/wimlib-1.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=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 prepare
-DEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools )
-DESCRIPTION=The open source Windows Imaging (WIM) library
-EAPI=7
-HOMEPAGE=https://wimlib.net/
-IUSE=cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
-RDEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0= ) iso? ( app-arch/cabextract app-cdr/cdrtools )
-REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wimlib.net/downloads/wimlib-1.13.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a366431b0d99508fc3d36c83586f80c4
diff --git a/metadata/md5-cache/app-crypt/aescrypt-3.0.6b b/metadata/md5-cache/app-crypt/aescrypt-3.0.6b
deleted file mode 100644
index 02e062db5c30..000000000000
--- a/metadata/md5-cache/app-crypt/aescrypt-3.0.6b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile
-DESCRIPTION=Advanced file encryption using AES
-EAPI=7
-HOMEPAGE=https://www.aescrypt.com/
-IUSE=static
-KEYWORDS=~amd64
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=https://www.aescrypt.com/download/v3/aescrypt-3.0.6b.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ce0c8426888fddf9d32b9d961ad0b29
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
deleted file mode 100644
index 36001508b87f..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 app-misc/lockfile-progs
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.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	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=30bd9348cde168901cc5599226992248
diff --git a/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1 b/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
deleted file mode 100644
index 71567bc3e9a1..000000000000
--- a/metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-libs/ncurses:0=[unicode]
-DESCRIPTION=Modal editor inspired by vim
-EAPI=7
-HOMEPAGE=http://kakoune.org/ https://github.com/mawww/kakoune
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Unlicense
-RDEPEND=sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://github.com/mawww/kakoune/archive/v2020.01.16.tar.gz -> kakoune-2020.01.16.tar.gz
-_md5_=facbe827a2cf50f8c32d4e1316d35557
diff --git a/metadata/md5-cache/app-editors/ne-3.3.0 b/metadata/md5-cache/app-editors/ne-3.3.0
deleted file mode 100644
index 61b3e1abb27e..000000000000
--- a/metadata/md5-cache/app-editors/ne-3.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[tinfo]
-DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
-EAPI=6
-HOMEPAGE=http://ne.di.unimi.it/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=[tinfo] dev-lang/perl
-SLOT=0
-SRC_URI=http://ne.di.unimi.it/ne-3.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f17799316c9892642e42787729b90a5d
diff --git a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1 b/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
deleted file mode 100644
index f8baacccc0aa..000000000000
--- a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
-EAPI=7
-HOMEPAGE=http://gxemul.sourceforge.net/
-IUSE=debug X
-KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/gxemul/GXemul/0.6.0/gxemul-0.6.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a0222beb53ef22fd259c0d04d4beab93
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/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/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/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
diff --git a/metadata/md5-cache/app-office/calcurse-4.4.0-r1 b/metadata/md5-cache/app-office/calcurse-4.4.0-r1
deleted file mode 100644
index 721f24d284b6..000000000000
--- a/metadata/md5-cache/app-office/calcurse-4.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile prepare setup
-DEPEND=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_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses:0= >=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=a text-based calendar and scheduling application
-EAPI=6
-HOMEPAGE=https://calcurse.org/
-IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD-2
-RDEPEND=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_7? ( dev-python/httplib2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) sys-libs/ncurses:0=
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://calcurse.org/files/calcurse-4.4.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3140f425bc708c56d2532a917e4302c3
diff --git a/metadata/md5-cache/app-text/diction-1.13 b/metadata/md5-cache/app-text/diction-1.13
deleted file mode 100644
index 74de87f29e51..000000000000
--- a/metadata/md5-cache/app-text/diction-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gettext virtual/libintl
-DESCRIPTION=Diction and style checkers for english and german texts
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.moria.de/~michael/diction/diction-1.13.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_=eea393696455d4ae9f067638a9a5b742
diff --git a/metadata/md5-cache/app-text/llpp-30 b/metadata/md5-cache/app-text/llpp-30
deleted file mode 100644
index 9044fb0d940a..000000000000
--- a/metadata/md5-cache/app-text/llpp-30
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=>=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec:= sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-misc/xsel app-arch/bzip2 app-text/asciidoc dev-ml/lablgl:=[glut,ocamlopt?] media-libs/libXcm x11-libs/libXau x11-libs/libXdmcp x11-libs/libXmu dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=7
-HOMEPAGE=https://github.com/moosotc/llpp
-IUSE=+ocamlopt
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3
-RDEPEND=>=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec:= sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-misc/xsel
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=https://github.com/moosotc/llpp/archive/v30.tar.gz -> llpp-30.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7205b23770fa58ed2c6b545090e4c97
diff --git a/metadata/md5-cache/app-text/par-1.52-r1 b/metadata/md5-cache/app-text/par-1.52-r1
deleted file mode 100644
index 89df0bd0c4ae..000000000000
--- a/metadata/md5-cache/app-text/par-1.52-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!dev-util/par !app-arch/par
-DESCRIPTION=a paragraph reformatter, vaguely similar to fmt, but better
-EAPI=6
-HOMEPAGE=http://www.nicemice.net/par/
-KEYWORDS=~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=par
-SLOT=0
-SRC_URI=http://www.nicemice.net/par/Par152.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f24101ba3af8840e49ad3f0a4834bd6
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r1 b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
deleted file mode 100644
index 6e0e1ff61ceb..000000000000
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 >=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=An XSLT Parser in C++
-EAPI=6
-HOMEPAGE=http://www.gingerall.org/sablotron.html
-IUSE=perl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/expat-1.95.6-r1
-SLOT=0
-SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8266008f83a05063b439cf38322f2010
diff --git a/metadata/md5-cache/app-text/yodl-4.02.01 b/metadata/md5-cache/app-text/yodl-4.02.01
deleted file mode 100644
index 15ecd8275f63..000000000000
--- a/metadata/md5-cache/app-text/yodl-4.02.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-util/icmake-8.00.00
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=6
-HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.01/yodl-4.02.01.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2faee8c3960fed9b68c474172dede51c
diff --git a/metadata/md5-cache/app-text/yodl-4.02.02-r1 b/metadata/md5-cache/app-text/yodl-4.02.02-r1
deleted file mode 100644
index f323d6b3d9ce..000000000000
--- a/metadata/md5-cache/app-text/yodl-4.02.02-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/icmake-8.00.00 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric )
-DEFINED_PHASES=compile install prepare pretend
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=7
-HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.02/yodl-4.02.02.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c75933a88b2850d7673008073ad54f3
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
deleted file mode 100644
index 4728366c9821..000000000000
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-text/mupdf:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
-DESCRIPTION=PDF plug-in for zathura
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/mupdf:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
-SLOT=0
-SRC_URI=https://github.com/pwmt/zathura-pdf-mupdf/archive/0.3.5.tar.gz -> zathura-pdf-mupdf-0.3.5.tar.gz
-_eclasses_=meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cac714d198a752f730f7f28106b16ef
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.7 b/metadata/md5-cache/dev-db/unixODBC-2.3.7
deleted file mode 100644
index c55384719ccd..000000000000
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install test
-DEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex
-DESCRIPTION=A complete ODBC driver manager
-EAPI=7
-HOMEPAGE=http://www.unixodbc.org/
-IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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 LGPL-2.1
-RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=172d111286c0eb1f624b4cdb40a4b382
diff --git a/metadata/md5-cache/dev-go/delve-1.3.0 b/metadata/md5-cache/dev-go/delve-1.3.0
deleted file mode 100644
index da4dd2b90530..000000000000
--- a/metadata/md5-cache/dev-go/delve-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=7
-HOMEPAGE=https://github.com/go-delve/delve
-KEYWORDS=~amd64
-LICENSE=MIT BSD BSD-2 Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/go-delve/delve/archive/v1.3.0.tar.gz -> delve-1.3.0.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d059124e2989b29cef961148f002702d
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.76 b/metadata/md5-cache/dev-lang/jimtcl-0.76
deleted file mode 100644
index 6110f18b0045..000000000000
--- a/metadata/md5-cache/dev-lang/jimtcl-0.76
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip
-DESCRIPTION=Small footprint implementation of Tcl programming language
-EAPI=5
-HOMEPAGE=http://jim.tcl.tk/
-IUSE=doc static-libs
-KEYWORDS=amd64 arm ~arm64 ~m68k ~mips ~s390 x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.76 -> jimtcl-0.76.zip
-_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	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=637187c314cc876f782feb35f671b38a
diff --git a/metadata/md5-cache/dev-lang/mlton-20130715 b/metadata/md5-cache/dev-lang/mlton-20130715
deleted file mode 100644
index f675fbeae82a..000000000000
--- a/metadata/md5-cache/dev-lang/mlton-20130715
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup unpack
-DEPEND=dev-libs/gmp:* doc? ( virtual/latex-base )
-DESCRIPTION=Standard ML optimizing compiler and libraries
-EAPI=5
-HOMEPAGE=http://www.mlton.org
-IUSE=binary doc
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=HPND MIT
-RDEPEND=dev-libs/gmp:*
-SLOT=0/20130715
-SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20130715.src.tgz ) binary? ( amd64? ( mirror://sourceforge/mlton/mlton-20130715-1.amd64-linux.tgz ) x86? ( mirror://sourceforge/mlton/mlton-20130715-1.x86-linux.tgz ) )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdb9d9e2461c79215ec388dd1b3da4ff
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 3e684975acfd..b4ba16ececb1 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare pretend setup test unpack
 DEPEND=dev-libs/gmp:* bootstrap-smlnj? ( dev-lang/smlnj ) !bootstrap-smlnj? ( !amd64? ( dev-lang/smlnj ) ) pax_kernel? ( sys-apps/elfix ) doc? ( virtual/latex-base )
 DESCRIPTION=Standard ML optimizing compiler and libraries
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.mlton.org
+INHERIT=check-reqs multibuild pax-utils
 IUSE=binary bootstrap-smlnj stage3 doc pax_kernel
 KEYWORDS=~amd64 ~x86
 LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2545507face1a7609f5d6d1590d09bf8
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=95f3c66df46c11efd9ff7c45962157a9
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
deleted file mode 100644
index 47818ad6b0a4..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure prepare test
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) dev-libs/libffi:= >=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=Poly/ML is a full implementation of Standard ML
-EAPI=6
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) dev-libs/libffi:=
-RESTRICT=!test? ( test )
-SLOT=0/5.6
-SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e216c6201cf09684e817b483f537483c
diff --git a/metadata/md5-cache/dev-lang/sassc-3.6.0 b/metadata/md5-cache/dev-lang/sassc-3.6.0
deleted file mode 100644
index b5fe6b92f435..000000000000
--- a/metadata/md5-cache/dev-lang/sassc-3.6.0
+++ /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/libsass:=
-DESCRIPTION=A libsass command line driver
-EAPI=7
-HOMEPAGE=https://github.com/sass/sassc
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libsass:=
-SLOT=0
-SRC_URI=https://github.com/sass/sassc/archive/3.6.0.tar.gz -> sassc-3.6.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b244b9e979fc50eb396e909cff5ddc7
diff --git a/metadata/md5-cache/dev-libs/antlr-c-3.5.2 b/metadata/md5-cache/dev-libs/antlr-c-3.5.2
deleted file mode 100644
index 2792f8e433c1..000000000000
--- a/metadata/md5-cache/dev-libs/antlr-c-3.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] ) >=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=The ANTLR3 C Runtime
-EAPI=5
-HOMEPAGE=https://www.antlr3.org/
-IUSE=debug debugger doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=506207a5b12fc75befe50912b6399d18
diff --git a/metadata/md5-cache/dev-libs/libcss-0.8.0-r2 b/metadata/md5-cache/dev-libs/libcss-0.8.0-r2
deleted file mode 100644
index 469f9a9a99e8..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.8.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.4.0 >=dev-util/netsurf-buildsystem-1.7-r1 virtual/pkgconfig test? ( dev-lang/perl )
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.4.0
-RESTRICT=!test? ( test )
-SLOT=0/0.8.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.8.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=970d03de55377019a02bebc3bccf9a4d
diff --git a/metadata/md5-cache/dev-libs/libcss-0.9.0-r1 b/metadata/md5-cache/dev-libs/libcss-0.9.0-r1
deleted file mode 100644
index 9d756d2bf71d..000000000000
--- a/metadata/md5-cache/dev-libs/libcss-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/netsurf-buildsystem-1.7-r1 virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/libparserutils dev-libs/libwapcaplet test? ( dev-lang/perl )
-DESCRIPTION=CSS parser and selection engine, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libcss/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet
-RESTRICT=!test? ( test )
-SLOT=0/0.9.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libcss-0.9.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=52d153749a4790034db5363c530be4b8
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
deleted file mode 100644
index eab2fb18ce2c..000000000000
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r1
+++ /dev/null
@@ -1,16 +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=compile configure install prepare
-DEPEND=python? ( 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(-)] )
-DESCRIPTION=simplified, portable interface to several low-level networking routines
-EAPI=7
-HOMEPAGE=https://github.com/ofalk/libdnet
-IUSE=python static-libs test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=python? ( 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(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0360dcae47d4cdee050bda580dc3a0dd
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3 b/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3
deleted file mode 100644
index 919fe8014a58..000000000000
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library for the MaxMind DB file format
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/libmaxminddb
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-SLOT=0/0.0.7
-SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.4.3/libmaxminddb-1.4.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=338d87a512f48cd3de89ad856665e121
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1 b/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1
deleted file mode 100644
index 11c811c5ae96..000000000000
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=test? ( dev-perl/IPC-Run3 )
-DESCRIPTION=C library for the MaxMind DB file format
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/libmaxminddb
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0/0.0.7
-SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.5.0/libmaxminddb-1.5.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b18605c5c8a95cf0aae7f4b25baa9c16
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-9999 b/metadata/md5-cache/dev-libs/libmaxminddb-9999
index a7b446acb441..c6bc96056819 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-9999
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-9999
@@ -4,10 +4,11 @@ DEPEND=test? ( dev-perl/IPC-Run3 )
 DESCRIPTION=C library for the MaxMind DB file format
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/libmaxminddb
+INHERIT=toolchain-funcs git-r3
 IUSE=test
 LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0.0.7
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4a0ceb13cd70a796fbb8fc511c73b877
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	git-r3	3e7ec3d6619213460c85e2aa48398441
+_md5_=30c16f871a77994cd3eea12bdc95c512
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2 b/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2
deleted file mode 100644
index a4b3a80c3a71..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 ) dev-util/netsurf-buildsystem
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
-RESTRICT=!test? ( test )
-SLOT=0/0.2.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44a3490303705019575b0cb2acb496bc
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1 b/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1
deleted file mode 100644
index c0a3c4d142cb..000000000000
--- a/metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem
-DEFINED_PHASES=compile install
-DESCRIPTION=framebuffer abstraction library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libnsfb/
-IUSE=sdl test vnc wayland X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4 ) vnc? ( >=net-libs/libvncserver-0.9.9-r2 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libxcb-1.9.1 >=x11-libs/xcb-util-0.3.9-r1 >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )
-RESTRICT=!test? ( test )
-SLOT=0/0.2.1
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsfb-0.2.1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=96c6112a343136650b940784f96777eb
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2 b/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2
deleted file mode 100644
index 8a3c29d97312..000000000000
--- a/metadata/md5-cache/dev-libs/libnsutils-0.0.5-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-util/netsurf-buildsystem
-DESCRIPTION=base64 and time library, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.0.5
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnsutils-0.0.5-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95c9113b7402c342a3a9ea68424eb2c5
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
deleted file mode 100644
index 220c1819a47a..000000000000
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
+++ /dev/null
@@ -1,15 +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=configure install prepare setup
-DEPEND=tpm? ( app-crypt/trousers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=PKCS#11 provider cryptographic hardware
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/opencryptoki
-IUSE=debug libressl +tpm
-KEYWORDS=~amd64 ~arm ~s390 ~x86
-LICENSE=CPL-0.5
-RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/opencryptoki/3.4.1/opencryptoki-v3.4.1.tgz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0539319b3015f685047bcd4b5df580bd
diff --git a/metadata/md5-cache/dev-libs/papi-5.5.1 b/metadata/md5-cache/dev-libs/papi-5.5.1
deleted file mode 100644
index bb767dde9630..000000000000
--- a/metadata/md5-cache/dev-libs/papi-5.5.1
+++ /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=configure install prepare setup
-DEPEND=dev-libs/libpfm virtual/mpi virtual/fortran
-DESCRIPTION=Performance Application Programming Interface
-EAPI=7
-HOMEPAGE=http://icl.cs.utk.edu/papi/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libpfm virtual/mpi virtual/fortran
-SLOT=0
-SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-5.5.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fortran-2	b4796813ccda91c9c0d3463fc90aa969	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a763847dc57ba3e433253fd600f869b
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
deleted file mode 100644
index 29b8f3557c6e..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/protobuf-3:0 virtual/pkgconfig >=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 prepare test
-DEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Protocol Buffers implementation in C
-EAPI=7
-HOMEPAGE=https://github.com/protobuf-c/protobuf-c
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/protobuf-3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0
-SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=55d1c0ddca76a8fc9e985ee8b4340fb2
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.5.0 b/metadata/md5-cache/dev-libs/softhsm-2.5.0
deleted file mode 100644
index 1361cf7ad767..000000000000
--- a/metadata/md5-cache/dev-libs/softhsm-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gcc:=[cxx] virtual/pkgconfig test? ( dev-util/cppunit )
-DEFINED_PHASES=configure install
-DEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
-DESCRIPTION=A software PKCS#11 implementation
-EAPI=7
-HOMEPAGE=https://www.opendnssec.org/
-IUSE=bindist gost libressl migration-tool test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.5.0.tar.gz
-_md5_=6a939b5aaa201237be69c099cb5609fd
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.2 b/metadata/md5-cache/dev-ml/labltk-8.06.2
deleted file mode 100644
index aaaccc26cdf2..000000000000
--- a/metadata/md5-cache/dev-ml/labltk-8.06.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?] >=dev-ml/findlib-1.5.5-r1 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
-EAPI=5
-HOMEPAGE=https://forge.ocamlcore.org/projects/labltk/
-IUSE=+ocamlopt X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=QPL-1.0 LGPL-2
-RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]
-SLOT=0/8.06.2
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1628/labltk-8.06.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c16857c60af8b9b5e4d474b13d59838
diff --git a/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0 b/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
deleted file mode 100644
index 396912692c85..000000000000
--- a/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Storable-2.0.0 >=dev-perl/XML-Twig-3.160.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Parse nmap scan data with perl
-EAPI=6
-HOMEPAGE=https://nmapparser.wordpress.com/ https://metacpan.org/release/Nmap-Parser
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/perl-Storable-2.0.0 >=dev-perl/XML-Twig-3.160.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AP/APERSAUD/Nmap-Parser-1.36.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b407545cc30feccd23c429f8cda42881
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.5 b/metadata/md5-cache/dev-python/httmock-1.2.5
deleted file mode 100644
index 2892f45a0090..000000000000
--- a/metadata/md5-cache/dev-python/httmock-1.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-1.0.0[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(-)] ) 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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A mocking library for requests
-EAPI=7
-HOMEPAGE=https://github.com/patrys/httmock
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[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(-)] 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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/patrys/httmock/archive/1.2.5.tar.gz -> httmock-1.2.5.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cab2018826ce5eddeedeb3c1b46a75a
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1 b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
deleted file mode 100644
index 728b26ddd04b..000000000000
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python classes to extract information from the Linux kernel /proc files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
-IUSE=python_targets_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://cdn.kernel.org/pub/software/libs/python/python-linux-procfs/python-linux-procfs-0.6.1.tar.xz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8d32071b818fde948b3ae5843eeb6eb3
diff --git a/metadata/md5-cache/dev-util/bcpp-20150811-r1 b/metadata/md5-cache/dev-util/bcpp-20150811-r1
deleted file mode 100644
index 55e00c007e62..000000000000
--- a/metadata/md5-cache/dev-util/bcpp-20150811-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Indents C/C++ source code
-EAPI=6
-HOMEPAGE=https://invisible-island.net/bcpp/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/bcpp/bcpp-20150811.tgz
-_md5_=5d3272f58a5737fea69b562bd2060ab8
diff --git a/metadata/md5-cache/net-analyzer/arp-scan-1.9.6 b/metadata/md5-cache/net-analyzer/arp-scan-1.9.6
deleted file mode 100644
index 80b3dfd1706c..000000000000
--- a/metadata/md5-cache/net-analyzer/arp-scan-1.9.6
+++ /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=net-libs/libpcap
-DESCRIPTION=ARP scanning and fingerprinting tool
-EAPI=7
-HOMEPAGE=https://github.com/royhills/arp-scan
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/royhills/arp-scan/archive/1.9.6.tar.gz -> arp-scan-1.9.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b2bc764ea283dfdafd67d236084b1bb
diff --git a/metadata/md5-cache/net-analyzer/arping-2.21 b/metadata/md5-cache/net-analyzer/arping-2.21
index eb3132893e0b..3e15c10254a4 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.21
+++ b/metadata/md5-cache/net-analyzer/arping-2.21
@@ -1,9 +1,10 @@
 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 filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=postinst prepare
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 test? ( dev-libs/check dev-python/subunit )
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] test? ( dev-libs/check dev-python/subunit )
 DESCRIPTION=A utility to see if a specific IP is taken and what MAC owns it
 EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
+INHERIT=autotools fcaps
 IUSE=test +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] fileca
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ThomasHabets/arping/archive/arping-2.21.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91362a16da07eec6e87a5bf877f898b5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	fcaps	da689a8e04bbbb3518888ff668fee45b
+_md5_=cebd509a7e8c3652a335b58bb7d9959f
diff --git a/metadata/md5-cache/net-analyzer/arping-9999 b/metadata/md5-cache/net-analyzer/arping-9999
index c5853ce80ed5..85a199b8e8fc 100644
--- a/metadata/md5-cache/net-analyzer/arping-9999
+++ b/metadata/md5-cache/net-analyzer/arping-9999
@@ -1,13 +1,15 @@
-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 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+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 >=dev-vcs/git-1.8.2.1[curl] filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=postinst prepare unpack
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 dev-libs/check
-DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] test? ( dev-libs/check dev-python/subunit )
+DESCRIPTION=A utility to see if a specific IP is taken and what MAC owns it
 EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
-IUSE=+filecaps
+INHERIT=autotools git-r3 fcaps
+IUSE=test +filecaps
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)] filecaps? ( sys-libs/libcap )
+RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37fab5a20dedc482391ce8042b311052
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	git-r3	3e7ec3d6619213460c85e2aa48398441	fcaps	da689a8e04bbbb3518888ff668fee45b
+_md5_=22d113367c65fe91da038fbda253bde0
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7.2 b/metadata/md5-cache/net-analyzer/arpon-2.7.2
deleted file mode 100644
index 13d7bbcb6945..000000000000
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
-EAPI=6
-HOMEPAGE=http://arpon.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e83a7b3611eaee74cf5c4865ca4ff2c9
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1 b/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
deleted file mode 100644
index d623599c27a0..000000000000
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
-EAPI=7
-HOMEPAGE=http://arpon.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5532eabc9cc376832c6e55be5ad576bf
diff --git a/metadata/md5-cache/net-analyzer/arpon-3.0 b/metadata/md5-cache/net-analyzer/arpon-3.0
index d5904d827080..b0cc29c436b8 100644
--- a/metadata/md5-cache/net-analyzer/arpon-3.0
+++ b/metadata/md5-cache/net-analyzer/arpon-3.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
 EAPI=7
 HOMEPAGE=http://arpon.sourceforge.net/
+INHERIT=cmake
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-3.0-ng.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82d22624765a895d42e1a9cb46364df2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	314a813be2f09820e8978cdee941e501
+_md5_=9e22adda6b8f0d88528b8728bdcbda4e
diff --git a/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2 b/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2
deleted file mode 100644
index f2a93061d6ea..000000000000
--- a/metadata/md5-cache/net-analyzer/barnyard2-1.9-r2
+++ /dev/null
@@ -1,14 +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=configure install postinst prepare
-DEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:*[server] )
-DESCRIPTION=Parser for Snort unified/unified2 files
-EAPI=7
-HOMEPAGE=https://github.com/firnsy/barnyard2 https://firnsy.com/projects
-IUSE=debug gre mpls mysql odbc postgres static
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:*[server] )
-SLOT=0
-SRC_URI=https://github.com/firnsy/barnyard2/archive/v2-1.9.tar.gz -> barnyard2-1.9-github.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=72db4d6fc1f48d82a362a75d6d4ed873
diff --git a/metadata/md5-cache/net-analyzer/bwping-2.1 b/metadata/md5-cache/net-analyzer/bwping-2.1
deleted file mode 100644
index 5b44cfc4a71b..000000000000
--- a/metadata/md5-cache/net-analyzer/bwping-2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=test
-DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
-EAPI=7
-HOMEPAGE=https://bwping.sourceforge.io/
-KEYWORDS=amd64 ~sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/bwping/2.1/bwping-2.1.tar.gz
-_md5_=79c3a531c10e6fa894849be94fb1d214
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
deleted file mode 100644
index 4b300dac1a12..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
+++ /dev/null
@@ -1,14 +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=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-IUSE=libressl
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.13.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b89968b324f79d20d3b1906adc82e83
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
deleted file mode 100644
index bcf533542c7f..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
+++ /dev/null
@@ -1,14 +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=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.14.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ef6efeb26d2d116cc32b2c1c4ce71190
diff --git a/metadata/md5-cache/net-analyzer/fping-4.4 b/metadata/md5-cache/net-analyzer/fping-4.4
deleted file mode 100644
index 73cd2f3b6553..000000000000
--- a/metadata/md5-cache/net-analyzer/fping-4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=configure install postinst
-DESCRIPTION=A utility to ping multiple hosts at once
-EAPI=7
-HOMEPAGE=https://fping.org/ https://github.com/schweikert/fping/
-IUSE=ipv6 suid +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=fping
-RDEPEND=filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://fping.org/dist/fping-4.4.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b
-_md5_=1af517d48530dccff093703b75979c8a
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.85 b/metadata/md5-cache/net-analyzer/ipsumdump-1.85
deleted file mode 100644
index f367b179569c..000000000000
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.85
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo
-DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
-EAPI=6
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
-IUSE=+ipv6 +nanotimestamp
-KEYWORDS=~amd64 ~x86
-LICENSE=the-Click-license
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.85.tar.gz
-_md5_=b7bae135feec2f319c094efa5b3920fc
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86
deleted file mode 100644
index 7ca22b972f99..000000000000
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.86
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
-DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
-EAPI=6
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
-IUSE=+ipv6 +nanotimestamp
-KEYWORDS=~amd64 ~x86
-LICENSE=the-Click-license
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
-_md5_=37dbefaab0a17999e02afd2c9edbee94
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
index f6fb59e411c8..5bc6ec86bc99 100644
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
+++ b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl sys-apps/texinfo
 DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
+DEPEND=net-libs/libpcap dev-libs/expat virtual/os-headers
 DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
 EAPI=7
-HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
+HOMEPAGE=https://read.seas.harvard.edu/~kohler/ipsumdump/
 IUSE=+ipv6 +nanotimestamp
 KEYWORDS=~amd64 ~x86
 LICENSE=the-Click-license
 RDEPEND=net-libs/libpcap
 SLOT=0
-SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
-_md5_=42dd5a129cb225604511fca82d0a7fd4
+SRC_URI=https://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
+_md5_=75b344a4b245dd9caf90dcc3237bdc24
diff --git a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919 b/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919
deleted file mode 100644
index 9a0b1813527a..000000000000
--- a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20190919
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap[ipv6(+)]
-DESCRIPTION=Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets
-EAPI=7
-HOMEPAGE=https://www.si6networks.com/tools/ipv6toolkit/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap[ipv6(+)] sys-apps/hwids
-SLOT=0
-SRC_URI=https://github.com/fgont/ipv6toolkit/archive/20de5f297f73b6a8115d1eac52adfe0b6df5b3ed.tar.gz -> ipv6toolkit-2.1_p20190919.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6aef120894043e4911a07037bbea0fcd
diff --git a/metadata/md5-cache/net-analyzer/masscan-1.0.5 b/metadata/md5-cache/net-analyzer/masscan-1.0.5
deleted file mode 100644
index 6e533e3ddfa2..000000000000
--- a/metadata/md5-cache/net-analyzer/masscan-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Mass IP port scanner
-EAPI=6
-HOMEPAGE=https://github.com/robertdavidgraham/masscan
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=https://github.com/robertdavidgraham/masscan/archive/1.0.5.tar.gz -> masscan-1.0.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0b56e5f9756a5b9074214d09eb979ddc
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1
deleted file mode 100644
index 2ca76b06663b..000000000000
--- a/metadata/md5-cache/net-analyzer/nethogs-0.8.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
-EAPI=6
-HOMEPAGE=https://github.com/raboof/nethogs
-KEYWORDS=amd64 ~arm ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.5.tar.gz -> nethogs-0.8.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c9ae81d3d1daa574e7318615e8b1c0ce
diff --git a/metadata/md5-cache/net-analyzer/netio-1.32-r1 b/metadata/md5-cache/net-analyzer/netio-1.32-r1
deleted file mode 100644
index edc9a57c99f0..000000000000
--- a/metadata/md5-cache/net-analyzer/netio-1.32-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=measures net throughput with NetBIOS and TCP/IP protocols
-EAPI=6
-HOMEPAGE=https://web.ars.de/netio/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=free-noncomm
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://web.ars.de/wp-content/uploads/2017/04/netio132.zip
-_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_=e50f39ae8e4ee640ba51975d0fdff4ea
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r2 b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
index 300660f45349..259b6acfe65a 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r2
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
@@ -11,4 +11,4 @@ RDEPEND=filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=372313c97e62b44f0cc6fca34e6beaa0
+_md5_=a73f380b2ae89d1598ecb388a1ba8a75
diff --git a/metadata/md5-cache/net-analyzer/netselect-9999 b/metadata/md5-cache/net-analyzer/netselect-9999
index 98316c63e0a1..9a5b40eb2863 100644
--- a/metadata/md5-cache/net-analyzer/netselect-9999
+++ b/metadata/md5-cache/net-analyzer/netselect-9999
@@ -1,12 +1,14 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Ultrafast implementation of ping
 EAPI=7
 HOMEPAGE=http://apenwarr.ca/netselect/
-IUSE=ipv6
+INHERIT=fcaps git-r3 toolchain-funcs
+IUSE=ipv6 +filecaps
 LICENSE=BSD
 PROPERTIES=live
+RDEPEND=filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=39ad243ce779bbf376136c7815511dd2
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	3e7ec3d6619213460c85e2aa48398441	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c64a99c33267aed77e5b8e7cff7d5c42
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.8 b/metadata/md5-cache/net-analyzer/pypacker-4.8
deleted file mode 100644
index 3f0a2aecb133..000000000000
--- a/metadata/md5-cache/net-analyzer/pypacker-4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DESCRIPTION=Fast and simple packet creation and parsing library for Python
-EAPI=7
-HOMEPAGE=https://gitlab.com/mike01/pypacker
-IUSE=examples python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.8/pypacker-v4.8.tar.gz -> pypacker-4.8.tar.gz
-_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=99e613ee5cc6d017ca943dc6a5a4e9cb
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3 b/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3
deleted file mode 100644
index 441c4c3752dd..000000000000
--- a/metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) >=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=Ncurses SIP Messages flow viewer
-EAPI=6
-HOMEPAGE=https://github.com/irontec/sngrep
-IUSE=eep gnutls ipv6 openssl pcre unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=[unicode?] openssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls )
-REQUIRED_USE=gnutls? ( !openssl )
-SLOT=0
-SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6e96835589abd8eb3aa14f97158f553
diff --git a/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1 b/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1
deleted file mode 100644
index cac3b1aea4a7..000000000000
--- a/metadata/md5-cache/net-analyzer/tcping-1.3.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Ping implementation that uses the TCP protocol
-EAPI=7
-HOMEPAGE=https://github.com/mkirchner/tcping
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=62f4802ca21d3059cbc67cec416e5953
diff --git a/metadata/md5-cache/net-analyzer/tracebox-0.4.4 b/metadata/md5-cache/net-analyzer/tracebox-0.4.4
deleted file mode 100644
index 931f13f96148..000000000000
--- a/metadata/md5-cache/net-analyzer/tracebox-0.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=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=configure prepare
-DEPEND=>=net-libs/libcrafter-0.3_p20171019 dev-lang/lua:0= dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) sniffer? ( net-libs/libnetfilter_queue )
-DESCRIPTION=A Middlebox Detection Tool
-EAPI=7
-HOMEPAGE=http://www.tracebox.org/
-IUSE=curl sniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libcrafter-0.3_p20171019 dev-lang/lua:0= dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) sniffer? ( net-libs/libnetfilter_queue )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/tracebox/tracebox/archive/v0.4.4.tar.gz -> tracebox-0.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5fd03631e6da84d1537a4947231a17b0
diff --git a/metadata/md5-cache/net-libs/daq-2.0.6-r1 b/metadata/md5-cache/net-libs/daq-2.0.6-r1
deleted file mode 100644
index d6dfe834339b..000000000000
--- a/metadata/md5-cache/net-libs/daq-2.0.6-r1
+++ /dev/null
@@ -1,14 +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=configure install postinst prepare
-DEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 )
-DESCRIPTION=Data Acquisition library, for packet I/O
-EAPI=7
-HOMEPAGE=https://www.snort.org/
-IUSE=ipv6 +afpacket +dump +pcap nfq ipq static-libs
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) nfq? ( >=net-firewall/iptables-1.4.10 dev-libs/libdnet net-libs/libnetfilter_queue ) pcap? ( >=net-libs/libpcap-1.0.0 )
-SLOT=0
-SRC_URI=https://www.snort.org/downloads/snort/daq-2.0.6.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e061364592ea01a3dceae14bdfc2d4d2
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1 b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
deleted file mode 100644
index d0c288613015..000000000000
--- a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Minimalistic netlink library
-EAPI=7
-HOMEPAGE=https://netfilter.org/projects/libmnl/
-IUSE=examples static-libs split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.3.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=428962b103a9f9b20f17e23d562a485a
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.14_p1 b/metadata/md5-cache/net-libs/libtrace-4.0.14_p1
deleted file mode 100644
index afb9b66fea1b..000000000000
--- a/metadata/md5-cache/net-libs/libtrace-4.0.14_p1
+++ /dev/null
@@ -1,14 +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=configure install prepare
-DEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl ) app-doc/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig virtual/yacc
-DESCRIPTION=A library and tools for trace processing
-EAPI=7
-HOMEPAGE=https://research.wand.net.nz/software/libtrace.php
-IUSE=doc ncurses numa static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl )
-SLOT=0
-SRC_URI=https://github.com/LibtraceTeam/libtrace/archive//4.0.14-1.tar.gz -> libtrace-4.0.14_p1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d219858a5a8764e14d6c6bb496be2562
diff --git a/metadata/md5-cache/net-misc/geoipupdate-3.1.0 b/metadata/md5-cache/net-misc/geoipupdate-3.1.0
deleted file mode 100644
index 14d132d25c23..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-3.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=net-misc/curl sys-libs/zlib
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=6
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl sys-libs/zlib !<dev-libs/geoip-1.6.0
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/releases/download/v3.1.0/geoipupdate-3.1.0.tar.gz
-_md5_=8a2c02a1f4f3d36bd7f87ee913e3d474
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1 b/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
deleted file mode 100644
index ad7bd41543c0..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.3.tar.gz -> geoipupdate-4.0.3.tar.gz https://files.adjust.com/geoipupdate-vendor-4.0.3.tar
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=7883f2da6f9d0ae9f5c190cbc814d432
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.4 b/metadata/md5-cache/net-misc/geoipupdate-4.0.4
deleted file mode 100644
index c17c79495f42..000000000000
--- a/metadata/md5-cache/net-misc/geoipupdate-4.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
-EAPI=7
-HOMEPAGE=https://github.com/maxmind/geoipupdate
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.4.tar.gz -> geoipupdate-4.0.4.tar.gz
-_eclasses_=golang-base	904cd4c642d6923795b9bd99b6fe0e74	golang-vcs-snapshot	b9726cec9cc93f8884b4634e4ddacdec
-_md5_=01b6f953994d7b67747ddd057dd8f859
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.2 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.2
deleted file mode 100644
index c27d5be3f3db..000000000000
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=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=GTK+ based UDisks2 frontend
-EAPI=5
-HOMEPAGE=http://mount-gtk.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
-SLOT=0
-SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9a7ef75e621f72c3dd232ed8a86a929e
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.4 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.4
deleted file mode 100644
index 9e642fe36001..000000000000
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=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=GTK+ based UDisks2 frontend
-EAPI=6
-HOMEPAGE=http://mount-gtk.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
-SLOT=0
-SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.4.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d9269f87e8a9106ac29bc5a112ba6d3
diff --git a/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1 b/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
index 27336150179e..be72743157b1 100644
--- a/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
+++ b/metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig >=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=configure prepare
-DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:= virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
 DESCRIPTION=GTK+ based UDisks2 frontend
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mount-gtk.sourceforge.net/
+INHERIT=autotools flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.28 sys-fs/udisks:2 x11-libs/c++-gtk-utils:0 x11-libs/libX11 x11-libs/libnotify:=
 SLOT=0
 SRC_URI=mirror://sourceforge/mount-gtk/mount-gtk-1.4.5.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5d9269f87e8a9106ac29bc5a112ba6d3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=db3cd3ea91d0d2ae002ef0e3ad9c15a1
diff --git a/metadata/md5-cache/x11-misc/gxmessage-2.20.4 b/metadata/md5-cache/x11-misc/gxmessage-2.20.4
deleted file mode 100644
index 6ab3f1eca9b4..000000000000
--- a/metadata/md5-cache/x11-misc/gxmessage-2.20.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-libs/gtk+-2.20:2 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A GTK+ based xmessage clone
-EAPI=7
-HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3 public-domain
-RDEPEND=>=x11-libs/gtk+-2.20:2
-SLOT=0
-SRC_URI=mirror://gnu/gxmessage/gxmessage-2.20.4.tar.gz
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07587fd6a6eb8b34ef1d55660abd5500
diff --git a/metadata/md5-cache/x11-misc/gxmessage-3.4.3 b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
index b82cf350948f..7ad78d004a72 100644
--- a/metadata/md5-cache/x11-misc/gxmessage-3.4.3
+++ b/metadata/md5-cache/x11-misc/gxmessage-3.4.3
@@ -1,13 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-util/intltool-0.40.1 sys-devel/gettext
+BDEPEND=>=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=install postinst postrm preinst prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GTK+ based xmessage clone
 EAPI=7
 HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
+INHERIT=xdg
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3 public-domain
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnu/gxmessage/gxmessage-3.4.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-3.4.3.tar.gz
-_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbd3080c0bdc4779c0ff3692d84a4a06
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=6c86eedd2da39db39169c84b33e0e59b
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.9 b/metadata/md5-cache/x11-misc/kapow-1.5.9
deleted file mode 100644
index 4f78305f4cba..000000000000
--- a/metadata/md5-cache/x11-misc/kapow-1.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
-DESCRIPTION=A punch clock program designed to easily keep track of your hours
-EAPI=7
-HOMEPAGE=https://gottcode.org/kapow/
-IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/kapow/kapow-1.5.9-src.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aca18796ebebfeb5e8b8189b8454e78f
diff --git a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1 b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1
deleted file mode 100644
index 4b2b9807e159..000000000000
--- a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==x11-misc/lineakd-0.9.0* x11-base/xorg-proto
-DESCRIPTION=Mute/unmute and other macros for LINEAK
-EAPI=5
-HOMEPAGE=http://lineak.sourceforge.net
-IUSE=debug
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND==x11-misc/lineakd-0.9.0*
-SLOT=0
-SRC_URI=mirror://sourceforge/lineak/lineak-defaultplugin-0.9.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_=fc716c04e481f89bac864dc947bb6688
diff --git a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
index 1407d6eadc76..c8b811aeeeb2 100644
--- a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
+++ b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2
@@ -3,12 +3,10 @@ DEPEND==x11-misc/lineakd-0.9.0* x11-base/xorg-proto
 DESCRIPTION=Mute/unmute and other macros for LINEAK
 EAPI=7
 HOMEPAGE=http://lineak.sourceforge.net
-INHERIT=multilib
 IUSE=debug
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND==x11-misc/lineakd-0.9.0*
 SLOT=0
 SRC_URI=mirror://sourceforge/lineak/lineak-defaultplugin-0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=197cf4df42b4ece9ccbadc2fa78e19c8
+_md5_=2b8842d4b0019076c42ca24dcfcb91bf
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.6-r1 b/metadata/md5-cache/x11-misc/piedock-1.6.6-r1
deleted file mode 100644
index c5fdbf77d559..000000000000
--- a/metadata/md5-cache/x11-misc/piedock-1.6.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
-EAPI=6
-HOMEPAGE=http://markusfisch.de/PieDock
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=http://markusfisch.de/downloads/piedock-1.6.6.tar.bz2 https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> piedock-1.6.6-gcc6.patch
-_md5_=ede2ba6779d108ad6117706f38aa777f
diff --git a/metadata/md5-cache/x11-misc/piedock-1.6.9 b/metadata/md5-cache/x11-misc/piedock-1.6.9
index ef4f864d3a6c..89a30b77d66d 100644
--- a/metadata/md5-cache/x11-misc/piedock-1.6.9
+++ b/metadata/md5-cache/x11-misc/piedock-1.6.9
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig >=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=configure prepare
-DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 DESCRIPTION=A little bit like the famous OS X dock but in shape of a pie menu
-EAPI=6
+EAPI=7
 HOMEPAGE=http://markusfisch.de/PieDock https://github.com/markusfisch/PieDock
+INHERIT=autotools
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=media-libs/libpng:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXrender gtk? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://github.com/markusfisch/PieDock/archive/1.6.9.tar.gz -> piedock-1.6.9.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8bef90d8930a3ec6276cadcffc1a06c2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=b7fa809bbeb0d6298ecc393d75864734
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-20140219 b/metadata/md5-cache/x11-misc/simpleswitcher-20140219
deleted file mode 100644
index a335c78c95af..000000000000
--- a/metadata/md5-cache/x11-misc/simpleswitcher-20140219
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
-DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
-EAPI=7
-HOMEPAGE=https://github.com/seanpringle/simpleswitcher
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
-SLOT=0
-SRC_URI=https://github.com/seanpringle/simpleswitcher/archive/cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz -> simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ac54368e4c1c90d2809720f73d22a90
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-20191008 b/metadata/md5-cache/x11-misc/simpleswitcher-20191008
index b7448cc63569..720bdbf73ddf 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-20191008
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-20191008
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/simpleswitcher
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 SLOT=0
 SRC_URI=https://github.com/seanpringle/simpleswitcher/archive/7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz -> simpleswitcher-20191008-7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=400d74ea230837ec1a3e9f78c411757f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=3effe5898d4b89010ee26b189b821b69
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-99999999 b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
index 335770adef6a..695e14c8e5d3 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-99999999
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-99999999
@@ -1,12 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 DESCRIPTION=lightweight EWMH window switcher with features and looks of dmenu
 EAPI=7
 HOMEPAGE=https://github.com/seanpringle/simpleswitcher
+INHERIT=git-r3 toolchain-funcs
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a4e5a439edbde2ee8af780019003cc3
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=871795db87928d021b9c8afc25ab9d28
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2 b/metadata/md5-cache/x11-misc/svkbd-0.2
deleted file mode 100644
index 76bfa83d8480..000000000000
--- a/metadata/md5-cache/x11-misc/svkbd-0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=Simple Virtual Keyboard
-EAPI=7
-HOMEPAGE=https://tools.suckless.org/x/svkbd/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c854108534fc4dad6b53dd09e6f4a95b
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1
deleted file mode 100644
index c9a3c212ef2e..000000000000
--- a/metadata/md5-cache/x11-misc/svkbd-0.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=Simple Virtual Keyboard
-EAPI=7
-HOMEPAGE=https://tools.suckless.org/x/svkbd/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT-with-advertising
-RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a54d4213e45b920c8efa1c4fc668176b
diff --git a/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1 b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
new file mode 100644
index 000000000000..1db11888b4d8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/svkbd-0.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst x11-base/xorg-proto
+DESCRIPTION=Simple Virtual Keyboard
+EAPI=7
+HOMEPAGE=https://tools.suckless.org/x/svkbd/
+INHERIT=savedconfig toolchain-funcs
+IUSE=savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXtst
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/svkbd-0.2.1.tar.gz
+_eclasses_=portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=1c4f9cea487648e96336ef379dc695bf
diff --git a/metadata/md5-cache/x11-misc/xcave-2.4.0 b/metadata/md5-cache/x11-misc/xcave-2.4.0
deleted file mode 100644
index c10662390c59..000000000000
--- a/metadata/md5-cache/x11-misc/xcave-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig >=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=configure install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2
-DESCRIPTION=View and manage contents of your wine cellar
-EAPI=7
-HOMEPAGE=http://xcave.free.fr/index-en.php
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://xcave.free.fr/backbone.php?what=download/xcave-2.4.0.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d5fe82f6c7ff255d7812dd7ba201f03
diff --git a/metadata/md5-cache/x11-misc/xcave-2.5.1 b/metadata/md5-cache/x11-misc/xcave-2.5.1
index 3cbd1cb02c92..754703588c3c 100644
--- a/metadata/md5-cache/x11-misc/xcave-2.5.1
+++ b/metadata/md5-cache/x11-misc/xcave-2.5.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libxml2:2 gnome-base/libglade x11-libs/gtk+:2
 DESCRIPTION=View and manage contents of your wine cellar
 EAPI=7
 HOMEPAGE=http://xcave.free.fr/index-en.php
+INHERIT=flag-o-matic
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 gnome-base/libglade x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/xcave/xcave-2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7155aded3ed330e4b4032a121522770c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=fedcd3b709bf35580abe1e5dcd1e49e0
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 52fbdf925244..e86a39a9fe95 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -894,7 +894,7 @@ app-arch/unzip 6.0_p25-r1: unzipper for pkzip-compressed files
 app-arch/upx 3.96: Ultimate Packer for eXecutables (free version using UCL compression and not NRV)
 app-arch/upx-bin 3.96: Ultimate Packer for eXecutables, binary version with proprietary NRV compression
 app-arch/vimball 0.5.1 9999: a command-line vimball archive extractor
-app-arch/wimlib 1.13.0 1.13.3: The open source Windows Imaging (WIM) library
+app-arch/wimlib 1.13.3: The open source Windows Imaging (WIM) library
 app-arch/xar 1.8-r2 1.8-r3 1.8-r4: An easily extensible archive format
 app-arch/xarchiver 0.5.4.15: A GTK+ archive manager that can be used with Thunar
 app-arch/xdms 1.3.2-r1: xDMS - Amiga DMS disk image decompressor
@@ -1034,7 +1034,7 @@ app-crypt/acme 1.12.0 1.13.0 9999: An implementation of the ACME protocol
 app-crypt/acme-sh 2.8.8-r1 9999: A pure Unix shell script implementing ACME client protocol
 app-crypt/acme-tiny 4.1.0 9999: A tiny, auditable script for Let's Encrypt's ACME Protocol
 app-crypt/acr38u 1.7.11-r3: Non CCID driver for ACR38 AC1038-based Smart Card Reader
-app-crypt/aescrypt 3.0.6b 3.14: Advanced file encryption using AES
+app-crypt/aescrypt 3.14: Advanced file encryption using AES
 app-crypt/aespipe 2.4e 2.4f: Encrypts data from stdin to stdout
 app-crypt/age 1.0.0_beta_p7 1.0.0_rc1: A simple, modern and secure encryption tool (and Go library)
 app-crypt/argon2 20190702: Password hashing software that won the Password Hashing Competition (PHC)
@@ -1112,7 +1112,7 @@ app-crypt/mhash 0.9.9.9-r2: library providing a uniform interface to a large num
 app-crypt/minisign 0.8 0.9 9999: Dead simple tool to sign files and verify signatures
 app-crypt/mit-krb5 1.18.2-r3 1.18.3-r1 1.19.1: MIT Kerberos V
 app-crypt/mit-krb5-appl 1.0.3: Kerberized applications split from the main MIT Kerberos V distribution
-app-crypt/monkeysphere 0.36-r2 0.41 0.44: Leverage the OpenPGP web of trust for OpenSSH and Web authentication
+app-crypt/monkeysphere 0.41 0.44: Leverage the OpenPGP web of trust for OpenSSH and Web authentication
 app-crypt/moolticute 0.43.19 9999: Mooltipass crossplatform daemon/tools
 app-crypt/nasty 0.6-r1: Proof-of-concept GPG passphrase recovery tool
 app-crypt/nitrocli 0.3.1 0.3.2 0.3.3 0.3.4 0.3.5: A command line tool for interacting with Nitrokey devices
@@ -1829,7 +1829,7 @@ app-editors/joe 4.2 4.3-r1 4.4 4.6: A free ASCII-Text Screen Editor for UNIX
 app-editors/jove 4.16.0.73-r1: Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings
 app-editors/juffed 0.10_p20160323-r1: QScintilla-based tabbed text editor with syntax highlighting
 app-editors/jupp 3.1_p38 3.1_p40: Portable version of Joe's Own Editor
-app-editors/kakoune 2020.01.16-r1 2020.01.16_p20200601: Modal editor inspired by vim
+app-editors/kakoune 2020.01.16_p20200601: Modal editor inspired by vim
 app-editors/kile 2.9.93-r1: Latex Editor and TeX shell based on KDE Frameworks
 app-editors/le 1.16.1 1.16.3 1.16.5: Terminal text editor
 app-editors/leafpad 0.8.18.1-r1: Simple GTK2 text editor
@@ -1839,7 +1839,7 @@ app-editors/mg 20200215 20200723: MicroGnuEmacs, a port from the BSDs
 app-editors/moe 1.9 1.10 1.11: A powerful and user-friendly console text editor
 app-editors/mousepad 0.5.2-r1 0.5.3-r1: GTK+-based editor for the Xfce Desktop Environment
 app-editors/nano 5.3-r1 5.5 5.6 5.6.1 9999: GNU GPL'd Pico clone with more functionality
-app-editors/ne 3.1.1 3.3.0: the nice editor, easy to use for the beginner and powerful for the wizard
+app-editors/ne 3.1.1: the nice editor, easy to use for the beginner and powerful for the wizard
 app-editors/nedit 5.6-r1 5.6-r2 5.7: Multi-purpose text editor for the X Window System
 app-editors/neovim 0.4.4-r100 9999: Vim-fork focused on extensibility and agility.
 app-editors/ng 1.5_beta1-r2: Emacs like micro editor Ng -- based on mg2a
@@ -2124,7 +2124,7 @@ app-emulation/genymotion-bin 3.2.0: Complete set of tools that provide a virtual
 app-emulation/glean 1.17.0 1.18.2: Simple program to write static config from config-drive
 app-emulation/go-secbench 0.1.0 0.1.0-r1: run and evaluate the docker security benchmark
 app-emulation/grub-xen-host 1.0: Grub2 built as a PV grub per the Xen PV Boot Protocol
-app-emulation/gxemul 0.6.0-r1 0.6.2: A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
+app-emulation/gxemul 0.6.2: A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
 app-emulation/hercules 3.10 3.12 3.13: Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator
 app-emulation/hyperd 0.7.0-r1: Hypervisor-based Runtime for OCI
 app-emulation/img 0.5.7-r1: Standalone daemon-less unprivileged Dockerfile and OCI container image builder
@@ -2498,7 +2498,7 @@ app-misc/delay 1.6-r2: Sleeplike program that counts down the number of seconds
 app-misc/detachtty 9-r1 11.0.0: Attach/detach from interactive processes across the network
 app-misc/detox 1.2.0-r3 1.4.0: Safely remove spaces and strange characters from filenames
 app-misc/devtodo 0.1.20-r3: A nice command line todo list for developers
-app-misc/dfshow 0.8.2_beta-r1 0.9.1_beta-r1: DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT
+app-misc/dfshow 0.9.1_beta-r1: DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT
 app-misc/digitemp 3.7.1: Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol
 app-misc/dtach 0.9: Emulates the detach feature of screen
 app-misc/dvorak7min 1.6.1-r1: Simple ncurses-based typing tutor for learning the Dvorak keyboard layout
@@ -2612,7 +2612,7 @@ app-misc/neofetch 7.1.0 9999: Simple information system script
 app-misc/nnn 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8.1 2.9 3.0 3.1 3.2 3.3 3.4 3.5: The missing terminal file browser for X
 app-misc/no-more-secrets 0.3.3 9999: Recreate decrypting text from 1992 movie 'Sneakers'
 app-misc/notary 0.6.1-r1: A project that allows anyone to have trust over arbitrary collections of data
-app-misc/note 1.3.3-r2 1.3.26: A note taking perl program
+app-misc/note 1.3.26: A note taking perl program
 app-misc/nullmodem 0.0.6-r1: A Utility to loopback Pseudo-Terminals
 app-misc/nut 20.1: Record what you eat and analyze your nutrient levels
 app-misc/ondir 0.2.4: Automatically execute scripts as you traverse directories
@@ -2656,7 +2656,7 @@ app-misc/rundeck-cli-bin 0.1.11: Command line tool for rundeck
 app-misc/screen 4.8.0-r1 4.8.0-r2 9999: screen manager with VT100/ANSI terminal emulation
 app-misc/screenfetch 3.9.1 9999: Bash Screenshot Information Tool
 app-misc/screenie 20120406: A small and lightweight screen wrapper
-app-misc/scrub 2.5.2 2.6.1: Overwrite files with iterative patterns.
+app-misc/scrub 2.6.1: Overwrite files with iterative patterns.
 app-misc/selecta 0.0.7 9999: A fuzzy text selector for files and anything else you need to select
 app-misc/skim 0.9.3: Command-line fuzzy finder
 app-misc/sl 5.02: sophisticated graphical program which corrects your miss typing
@@ -2713,7 +2713,7 @@ app-misc/vzstats 0.5.1: OpenVZ stats collection daemon
 app-misc/wcd 5.2.7 5.3.4 6.0.1 6.0.2: Wherever Change Directory
 app-misc/when 1.1.37 1.1.40: Minimalistic personal calendar program
 app-misc/wipe 2.3.1: Secure file wiping utility based on Peter Gutman's patterns
-app-misc/worker 3.8.3-r100 4.6.1-r100: Worker Filemanager: Amiga Directory Opus 4 clone
+app-misc/worker 4.6.1-r100: Worker Filemanager: Amiga Directory Opus 4 clone
 app-misc/xmind 3.5.3.201506180105-r2 3.7.6_p201801311814: A brainstorming and mind mapping software tool
 app-misc/yq 2.9.2-r1 2.11.1 2.12.0: Command-line YAML processor - jq wrapper for YAML documents
 app-misc/ytree 2.02 2.03: A curses-based file manager
@@ -2736,7 +2736,7 @@ app-office/abiword 3.0.4: Fully featured yet light and fast cross platform word
 app-office/abiword-docs 3.0.2: Fully featured yet light and fast cross platform word processor documentation
 app-office/auto-multiple-choice 1.3.0-r1: Create and manage multiple choice questionnaries, including automated marking
 app-office/borg 1.7.4-r3: Calendar and task tracker, written in Java
-app-office/calcurse 4.4.0-r1 4.7.0: a text-based calendar and scheduling application
+app-office/calcurse 4.7.0: a text-based calendar and scheduling application
 app-office/calligra 3.2.1-r1: KDE Office Suite
 app-office/calligraplan 3.3.0: Project management application
 app-office/dia 0.97.3-r1: Diagram/flowchart creation program
@@ -2956,7 +2956,7 @@ app-text/dbacl 1.14 1.14.1: Digramic Bayesian text classifier
 app-text/dblatex 0.3.11-r1 0.3.12: Transform DocBook using TeX macros
 app-text/delta 20060803-r1: Heuristically minimizes interesting files
 app-text/dictd 1.13.0-r1: Dictionary Client/Server for the DICT protocol
-app-text/diction 1.13 1.14: Diction and style checkers for english and german texts
+app-text/diction 1.14: Diction and style checkers for english and german texts
 app-text/diff-pdf 0.4.1-r2: A simple tool for visually comparing two PDF files
 app-text/diffpdf 2.1.3-r2: Program that textually or visually compares two PDF files
 app-text/ding 1.8.1 1.9: Tk based dictionary (German-English) (incl. dictionary itself)
@@ -3052,7 +3052,7 @@ app-text/libwpg 0.3.3: C++ library to read and parse graphics in WPG
 app-text/libwps 0.4.12: Microsoft Works file word processor format import filter library
 app-text/libxmlpatch 0.3.3: A set of tools to create and apply patch to XML files using XPath
 app-text/linuxdoc-tools 0.9.73-r1: A toolset for processing LinuxDoc DTD SGML files
-app-text/llpp 30 33: Graphical PDF viewer which aims to superficially resemble less(1)
+app-text/llpp 33: Graphical PDF viewer which aims to superficially resemble less(1)
 app-text/logmerge 0.5.2b: Small and powerful script to merge two or more logfiles
 app-text/lout 3.40: High-level language for document formatting
 app-text/lv 4.51-r4: Powerful Multilingual File Viewer
@@ -3080,7 +3080,7 @@ app-text/pandoc 2.9.2.1 2.11.3.1: Conversion between markup formats
 app-text/paperwork 1.3.1 2.0.1 2.0.2: a personal document manager for scanned documents (and PDFs)
 app-text/paperwork-backend 1.3.1 1.3.1-r1 2.0.1 2.0.2: Backend part of Paperwork (Python API, no UI)
 app-text/paps 0.6.8-r2: Unicode-aware text to PostScript converter
-app-text/par 1.52-r1 1.53.0: a paragraph reformatter, vaguely similar to fmt, but better
+app-text/par 1.53.0: a paragraph reformatter, vaguely similar to fmt, but better
 app-text/pastebinit 1.5.1: A software that lets you send anything you want directly to a pastebin
 app-text/pdf2html 1.4: Converts pdf files to html files
 app-text/pdf2oo 20090715-r1: Converts pdf files to odf
@@ -3120,7 +3120,7 @@ app-text/robodoc 4.99.43 4.99.43-r1: Automating Software Documentation
 app-text/ronn 0.7.3-r3 0.7.3-r4: Converts simple, human readable textfiles to roff for terminal display, and HTML
 app-text/rpl 1.6.7: Intelligent recursive search/replace utility
 app-text/rtf2html 0.2.0-r1: RTF to HTML converter
-app-text/sablotron 1.0.3-r1 1.0.3-r2: An XSLT Parser in C++
+app-text/sablotron 1.0.3-r2: An XSLT Parser in C++
 app-text/scdoc 1.11.0 1.11.1 9999: Standalone tool for generating man pages with a simple syntax
 app-text/scrollkeeper-dtd 1.0-r1: DTD from the Scrollkeeper package
 app-text/sdcv 0.5.2: Console version of Stardict program
@@ -3191,12 +3191,12 @@ app-text/xournal 0.4.8.2016 9999: An application for notetaking, sketching, and
 app-text/xournalpp 1.0.20 9999: Handwriting notetaking software with PDF annotation support
 app-text/xpdf 4.03: The PDF viewer and tools
 app-text/yelp-tools 3.32.2 3.38.0: Collection of tools for building and converting documentation
-app-text/yodl 4.02.01 4.02.02-r1 4.03.00: Your Own Document Language: a pre-document language and tools to process it
+app-text/yodl 4.03.00: Your Own Document Language: a pre-document language and tools to process it
 app-text/zathura 0.4.3 0.4.4 0.4.5 0.4.7 9999: A highly customizable and functional document viewer
 app-text/zathura-cb 0.1.8 9999: Comic book plug-in for zathura with 7zip, rar, tar and zip support
 app-text/zathura-djvu 0.2.9 9999: DjVu plug-in for zathura
 app-text/zathura-meta 0: Meta package for app-text/zathura plugins
-app-text/zathura-pdf-mupdf 0.3.5 0.3.6 9999: PDF plug-in for zathura
+app-text/zathura-pdf-mupdf 0.3.6 9999: PDF plug-in for zathura
 app-text/zathura-pdf-poppler 0.2.9 0.3.0 9999: PDF plug-in for zathura
 app-text/zathura-ps 0.2.6 9999: PostScript plug-in for zathura
 app-vim/ackvim 1.0.9-r1: vim plugin: run ack from vim
@@ -3696,7 +3696,7 @@ dev-db/timescaledb 2.0.1-r1 2.0.2 2.1.0: Open-source time-series SQL database
 dev-db/tinycdb 0.77-r2 0.78: A very fast and simple package for creating and reading constant data bases
 dev-db/tokyocabinet 1.4.48-r1: A library of routines for managing a database
 dev-db/tora 3.2-r1 9999: SQL IDE for Oracle, MySQL and PostgreSQL dbs
-dev-db/unixODBC 2.3.7 2.3.9: A complete ODBC driver manager
+dev-db/unixODBC 2.3.9: A complete ODBC driver manager
 dev-db/vsqlite++ 0.3.13-r1: VSQLite++ - A well designed and portable SQLite3 Wrapper for C++
 dev-db/wxsqlite3 3.2.1-r1: C++ wrapper around the public domain SQLite 3.x database
 dev-dotnet/dbus-sharp 0.7.0-r2 0.8.1: D-Bus for .NET
@@ -3836,7 +3836,7 @@ dev-games/tiled 1.4.3-r1: A general purpose tile map editor
 dev-games/wfmath 1.0.2: Worldforge math library
 dev-go/blackfriday 1.2_p20150720 1.4 9999: a markdown processor implemented in Go
 dev-go/coveraggregator 0_pre20170216-r1: Cover profile aggregator for golang
-dev-go/delve 1.3.0 1.3.2: A source-level debugger for the Go programming language
+dev-go/delve 1.3.2: A source-level debugger for the Go programming language
 dev-go/fuzzy 0.0.3 0.0.5: Go library that provides fuzzy string matching
 dev-go/get-ego-vendor 0.2.0: Utility to generate EGO_SUM data for ebuilds
 dev-go/go-bindata 3.1.3: A small utility which generates Go code from any file
@@ -5225,7 +5225,7 @@ dev-lang/inform 6.33.1_p2: design system for interactive fiction
 dev-lang/interprolog 2.1.2: InterProlog is a Java front-end and enhancement for Prolog
 dev-lang/ispc 1.14.1 9999: Intel SPMD Program Compiler
 dev-lang/janet 1.12.2 1.13.1: A dynamic Lisp dialect and bytecode vm
-dev-lang/jimtcl 0.76 0.78-r2: Small footprint implementation of Tcl programming language
+dev-lang/jimtcl 0.78-r2: Small footprint implementation of Tcl programming language
 dev-lang/jsonnet 0.15.0 0.16.0 0.16.0-r2 0.17.0-r1: A data templating language for app and tool developers
 dev-lang/julia 1.5.2-r1 1.5.3: High-performance programming language for technical computing
 dev-lang/julia-bin 1.5.2 1.5.3: High-performance programming language for technical computing
@@ -5240,7 +5240,7 @@ dev-lang/maude 2.7: High-level specification language for equational and logic p
 dev-lang/mercury 20.06: Mercury is a modern general-purpose logic/functional programming language
 dev-lang/mercury-extras 20.06: Additional libraries and tools that are not part of the Mercury standard library
 dev-lang/micropython 1.11: Python implementation for microcontrollers
-dev-lang/mlton 20130715 20180207: Standard ML optimizing compiler and libraries
+dev-lang/mlton 20180207: Standard ML optimizing compiler and libraries
 dev-lang/mmix 20160804-r1: Donald Knuth's MMIX Assembler and Simulator
 dev-lang/moarvm 2020.05 2020.06 2020.07 2020.08 2020.09 2020.10 2020.11 2020.12 2021.02 9999: A 6model-based VM for NQP and Rakudo Perl 6
 dev-lang/mono 6.6.0.161 6.10.0.104: Mono runtime and class libraries, a C# compiler/interpreter
@@ -5259,7 +5259,7 @@ dev-lang/parrot 8.1.0-r2: Virtual machine designed to compile and execute byteco
 dev-lang/pcc 1.1.0-r1 9999: pcc portable c compiler
 dev-lang/perl 5.30.3 5.30.3-r1 5.30.3-r2 5.32.0-r1 5.32.1: Larry Wall's Practical Extraction and Report Language
 dev-lang/php 7.3.27 7.3.27-r1 7.4.15 7.4.15-r1 7.4.16 8.0.2 8.0.2-r1 8.0.3: The PHP language runtime engine
-dev-lang/polyml 5.6 5.8: Poly/ML is a full implementation of Standard ML
+dev-lang/polyml 5.8: Poly/ML is a full implementation of Standard ML
 dev-lang/python 2.7.18-r6 2.7.18_p7 3.6.12-r2 3.6.12_p3 3.6.13 3.7.9-r2 3.7.9_p3 3.7.10 3.8.7-r1 3.8.7_p2 3.8.8 3.9.1-r1 3.9.1_p2 3.9.2 3.10.0_alpha5 3.10.0_alpha5_p1 3.10.0_alpha6-r1 3.10.0_alpha6-r2: An interpreted, interactive, object-oriented programming language
 dev-lang/python-exec 2.4.6-r4: Python script wrapper
 dev-lang/python-exec-conf 2.4.6: Configuration file for dev-lang/python-exec
@@ -5269,7 +5269,7 @@ dev-lang/regina-rexx 3.9.1-r1: Portable Rexx interpreter
 dev-lang/ruby 2.5.8 2.5.8-r1 2.6.6-r2 2.6.6-r3 2.7.2 2.7.2-r1 3.0.0 3.0.0-r1 3.0.0-r2: An object-oriented scripting language
 dev-lang/rust 1.46.0 1.47.0-r2 1.48.0 1.49.0 1.50.0: Systems programming language from Mozilla
 dev-lang/rust-bin 1.46.0 1.47.0-r1 1.48.0 1.49.0 1.50.0: Systems programming language from Mozilla
-dev-lang/sassc 3.6.0 3.6.1: A libsass command line driver
+dev-lang/sassc 3.6.1: A libsass command line driver
 dev-lang/scala 2.12.4 2.12.10: The Scala Programming Language
 dev-lang/scala-bin 2.13.1: The Scala Programming Language
 dev-lang/smlnj 110.82: Standard ML of New Jersey compiler and libraries
@@ -5299,7 +5299,7 @@ dev-libs/OpenSRF 2.1.1: Framework for the high-level development of the Evergree
 dev-libs/amdgpu-pro-opencl 18.20.684755 19.30.838629 20.40.1147286: Proprietary OpenCL implementation for AMD GPUs
 dev-libs/aml 0.2.0 9999: event timer executor loop
 dev-libs/angelscript 2.34.0 2.35.0: A flexible, cross-platform scripting library
-dev-libs/antlr-c 3.5.2 3.5.2-r1: The ANTLR3 C Runtime
+dev-libs/antlr-c 3.5.2-r1: The ANTLR3 C Runtime
 dev-libs/appstream 0.12.11-r1: Cross-distro effort for providing metadata for software in the Linux ecosystem
 dev-libs/appstream-glib 0.7.16 0.7.17 0.7.18: Provides GObjects and helper methods to read and write AppStream metadata
 dev-libs/apr 1.6.3-r4 1.6.5-r1 1.7.0-r1: Apache Portable Runtime Library
@@ -5477,7 +5477,7 @@ dev-libs/libclthreads 2.4.2: POSIX threads C++ access library
 dev-libs/libconfig 1.7.2: Libconfig is a simple library for manipulating structured configuration files
 dev-libs/libcoyotl 3.1.0-r2: A collection of portable C++ classes
 dev-libs/libcroco 0.6.13: Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
-dev-libs/libcss 0.8.0-r2 0.9.0-r1 0.9.1-r1: CSS parser and selection engine, written in C
+dev-libs/libcss 0.9.1-r1: CSS parser and selection engine, written in C
 dev-libs/libdaemon 0.14-r3: Simple library for creating daemon processes in C
 dev-libs/libdazzle 3.36.0 3.38.0: Experimental new features for GTK+ and GLib
 dev-libs/libdbh 5.0.19 5.0.22: A small library to create and manage 64-bit disk based hash tables
@@ -5486,7 +5486,7 @@ dev-libs/libdbusmenu-qt 0.9.3_pre20160218-r3: Library providing Qt implementatio
 dev-libs/libdispatch 5.3.3-r1: A library for concurrent code execution on multicore hardware
 dev-libs/libdivecomputer 0.6.0-r1 9999: Library for communication with dive computers from various manufacturers.
 dev-libs/libdivsufsort 2.0.1-r1: Suffix-sorting library (for BWT)
-dev-libs/libdnet 1.14-r1 1.14-r2: simplified, portable interface to several low-level networking routines
+dev-libs/libdnet 1.14-r2: simplified, portable interface to several low-level networking routines
 dev-libs/libdnsres 0.1a-r3: A non-blocking DNS resolver library
 dev-libs/libdshconfig 0.20.13: Library for parsing dsh.style configuration files
 dev-libs/libdynd 0.7.2-r1: C++ dynamic multi-dimensionnal array library with Python exposure
@@ -5553,7 +5553,7 @@ dev-libs/liblzw 0.2-r1 0.3: small C library for reading LZW compressed files (.Z
 dev-libs/libmaa 1.3.2: Library with low-level data structures which are helpful for writing compilers
 dev-libs/libmanette 0.2.4 0.2.5: Simple GObject game controller library
 dev-libs/libmateweather 1.24.0-r1 1.24.1: MATE library to access weather information from online services
-dev-libs/libmaxminddb 1.4.3 1.5.0-r1 1.5.2 9999: C library for the MaxMind DB file format
+dev-libs/libmaxminddb 1.5.2 9999: C library for the MaxMind DB file format
 dev-libs/libmba 0.9.1-r3: A library of generic C modules
 dev-libs/libmcrypt 2.5.8-r4: libmcrypt provides uniform interface to access several encryption algorithms
 dev-libs/libmelf 0.4.0-r1: libmelf is a library interface for manipulating ELF object files
@@ -5569,8 +5569,8 @@ dev-libs/libnatspec 0.3.0: library to smooth charset/localization issues
 dev-libs/libnest2d 0.4-r1: Library and framework for the 2D bin packaging problem
 dev-libs/libnfc 1.7.2 1.8.0: Near Field Communications (NFC) library
 dev-libs/libnl 1.1.4-r1 1.1.9999 3.5.0 99999999: Libraries providing APIs to netlink protocol based Linux kernel interfaces
-dev-libs/libnsfb 0.2.0-r2 0.2.1-r1 0.2.2-r1: C library for framebuffer abstraction
-dev-libs/libnsutils 0.0.5-r2 0.1.0-r1: C library for base64 and time
+dev-libs/libnsfb 0.2.2-r1: C library for framebuffer abstraction
+dev-libs/libnsutils 0.1.0-r1: C library for base64 and time
 dev-libs/libofx 0.10.1-r1: Library to support the Open Financial eXchange XML format
 dev-libs/liboil 0.3.17-r3: Library of simple functions that are optimized for various CPUs
 dev-libs/liborcus 0.15.4 0.16.1 9999: Standalone file import filter library for spreadsheet documents
@@ -5701,7 +5701,7 @@ dev-libs/onigmo 6.1.3 6.2.0: Onigmo is a regular expressions library forked from
 dev-libs/oniguruma 6.9.4 6.9.6 6.9.6-r1 9999: Regular expression library for different character encodings
 dev-libs/opencl-clang 10.0.0.1-r1 10.0.0.2-r1 11.0.0 11.1.0_pre20201222: OpenCL-oriented thin wrapper library around clang
 dev-libs/opencl-icd-loader 2020.03.13-r1 2020.06.16: Official Khronos OpenCL ICD Loader
-dev-libs/opencryptoki 3.4.1 3.6.1: PKCS#11 provider cryptographic hardware
+dev-libs/opencryptoki 3.6.1: PKCS#11 provider cryptographic hardware
 dev-libs/openct 0.6.20-r4: library for accessing smart card terminals
 dev-libs/openobex 1.7.2-r1 1.7.2-r2: Implementation of the OBEX protocol used for transferring data to mobile devices
 dev-libs/opensc 0.20.0 0.21.0: Libraries and applications to access smartcards
@@ -5710,7 +5710,7 @@ dev-libs/openssl 1.0.2u 1.1.1i 1.1.1j: full-strength general purpose cryptograph
 dev-libs/openssl-compat 0.9.8z_p8-r1 1.0.2u-r1: full-strength general purpose cryptography library (including SSL and TLS)
 dev-libs/ossp-uuid 1.6.2-r6: An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID
 dev-libs/pakchois 0.4-r2: PaKChoiS - PKCS #11 wrapper library
-dev-libs/papi 5.5.1 6.0.0.1: Performance Application Programming Interface
+dev-libs/papi 6.0.0.1: Performance Application Programming Interface
 dev-libs/pcc-libs 1.1.0 9999: pcc compiler support libs
 dev-libs/pcl 1.12-r1: Portable Coroutine Library
 dev-libs/pegtl 2.8.3-r1 3.2.0: Header-only library for creating parsers according to Parsing Expression Grammar
@@ -5723,7 +5723,7 @@ dev-libs/popt 1.16-r2 1.18: Parse Options - Command line parser
 dev-libs/ppl 1.2-r3: The Parma Polyhedra Library for numerical analysis of complex systems
 dev-libs/processor-trace 1.6.1 1.6.2 2.0: Intel(R) Processor Trace decoder library
 dev-libs/protobuf 3.12.2 3.12.4 3.13.0 3.14.0 9999: Google's Protocol Buffers - Extensible mechanism for serializing structured data
-dev-libs/protobuf-c 1.3.2 1.3.3: Protocol Buffers implementation in C
+dev-libs/protobuf-c 1.3.3: Protocol Buffers implementation in C
 dev-libs/pslib 0.4.5: pslib is a C-library to create PostScript files on the fly
 dev-libs/ptexenc 1.3.8_p20200406: Library for Japanese pTeX providing a better way of handling character encodings
 dev-libs/pthreads4w 3.0.0: POSIX Threads for Windows
@@ -5766,7 +5766,7 @@ dev-libs/sink 0.8.0-r2: Data access layer handling synchronization, caching and
 dev-libs/skalibs 2.3.2.0 2.6.1.0 2.6.3.0 2.6.4.0 2.7.0.0 2.8.1.0 2.9.1.0 2.9.3.0: General-purpose libraries from skarnet.org
 dev-libs/smack 0.5.0: low-level IO storage which packs data into sorted compressed blobs
 dev-libs/snowball-stemmer 0.20140325: All you need to include the snowball stemming algorithms into a C project
-dev-libs/softhsm 2.5.0 2.6.1: A software PKCS#11 implementation
+dev-libs/softhsm 2.6.1: A software PKCS#11 implementation
 dev-libs/sord 0.16.8 9999: Library for storing RDF data in memory
 dev-libs/spdlog 1.5.0-r1 1.7.0 1.8.2 9999: Very fast, header only, C++ logging library
 dev-libs/spsdeclib 5.1-r1: Kryoflux SPS Decoder Library
@@ -5950,7 +5950,7 @@ dev-ml/jst-config 0.14.0: Compile-time configuration for Jane Street libraries
 dev-ml/lablgl 1.05-r1 1.06-r1: Objective CAML interface for OpenGL
 dev-ml/lablgtk 2.18.10 3.1.1: OCaml bindings to GTK-3
 dev-ml/lablgtk-sourceview 3.1.1: OCaml bindings to GTK-3
-dev-ml/labltk 8.06.2 8.06.7 8.06.9: OCaml interface to the Tcl/Tk GUI framework
+dev-ml/labltk 8.06.7 8.06.9: OCaml interface to the Tcl/Tk GUI framework
 dev-ml/llvm-ocaml 10.0.1 11.0.0 11.0.1 11.1.0 12.0.0_rc2 12.0.0_rc3 12.0.0.9999 13.0.0.9999: OCaml bindings for LLVM
 dev-ml/logs 0.7.0: Logging infrastructure for OCaml
 dev-ml/lwt 5.3.0-r1: Cooperative light-weight thread library for OCaml
@@ -7140,7 +7140,7 @@ dev-perl/Net-Z3950-ZOOM 1.280.0-r2: Perl extension for invoking the ZOOM-C API
 dev-perl/NetAddr-IP 4.78.0 4.79.0: Manipulation and operations on IP addresses
 dev-perl/NetPacket 1.6.0: Assemble / disassemble network packets at the protocol level
 dev-perl/News-Newsrc 1.110.0: Manage newsrc files
-dev-perl/Nmap-Parser 1.360.0 1.370.0: Parse nmap scan data with perl
+dev-perl/Nmap-Parser 1.370.0: Parse nmap scan data with perl
 dev-perl/Number-Bytes-Human 0.110.0: Convert byte count to human readable format
 dev-perl/Number-Compare 0.30.0-r1: Numeric comparisons
 dev-perl/Number-Format 1.750.0: Package for formatting numbers for display
@@ -8416,7 +8416,7 @@ dev-python/hpack 3.0.0 4.0.0: Pure-Python HPACK header compression
 dev-python/html2text 2020.1.16-r1: Turn HTML into equivalent Markdown-structured text
 dev-python/html5-parser 0.4.9: Fast C based HTML 5 parsing for python
 dev-python/html5lib 1.1: HTML parser based on the HTML5 specification
-dev-python/httmock 1.2.5 1.4.0: A mocking library for requests
+dev-python/httmock 1.4.0: A mocking library for requests
 dev-python/http-parser 0.9.0: HTTP request/response parser for python in C
 dev-python/httpauth 0.3: A WSGI middleware that secures routes using HTTP Digest Authentication
 dev-python/httpbin 0.7.0-r2: HTTP Request and Response Service
@@ -9055,7 +9055,7 @@ dev-python/python-ldap 3.3.1 9999: Various LDAP-related Python modules
 dev-python/python-levenshtein 0.12.1: Functions for fast computation of Levenshtein distance, and edit operations
 dev-python/python-lhafile 0.2.2 0.3.0: LHA archive support for Python
 dev-python/python-libevdev 0.9: Python wrappers for the libevdev library
-dev-python/python-linux-procfs 0.6.1 0.6.3: Python classes to extract information from the Linux kernel /proc files
+dev-python/python-linux-procfs 0.6.3: Python classes to extract information from the Linux kernel /proc files
 dev-python/python-ly 0.9.6: Tool and library for manipulating LilyPond files
 dev-python/python-lzo 1.12-r1: Python interface to lzo
 dev-python/python-magic 0.4.20 0.4.22: Access the libmagic file type identification library
@@ -10740,7 +10740,7 @@ dev-util/bats 0.4.0 0.4.0_p20170219 1.2.1: Bats-core: Bash Automated Testing Sys
 dev-util/bazel 0.22.0 0.24.1 0.27.2 0.29.1 1.0.1 1.2.0 1.2.0-r1 1.2.1 2.0.0 3.2.0: Fast and correct automated build system
 dev-util/bbe 0.2.2-r1: Sed-like editor for binary files
 dev-util/bcc 0.16.0-r1 0.17.0 0.17.0-r100 0.18.0-r1: Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-dev-util/bcpp 20150811-r1 20210108: Indents C/C++ source code
+dev-util/bcpp 20210108: Indents C/C++ source code
 dev-util/bdelta 0.3.1-r1: Binary Delta - Efficient difference algorithm and format
 dev-util/bear 2.4.3 2.4.4: Build EAR generates a compilation database for clang tooling
 dev-util/biew 6.1.0-r3: A portable viewer of binary files, hexadecimal and disassembler modes
@@ -14337,16 +14337,16 @@ net-analyzer/angst 0.4b-r3: an active sniffer that provides methods for aggressi
 net-analyzer/apinger 0.6.1: Alarm Pinger
 net-analyzer/argus 3.0.8.3-r1: network Audit Record Generation and Utilization System
 net-analyzer/argus-clients 3.0.8.3: Clients for net-analyzer/argus
-net-analyzer/arp-scan 1.9.6 1.9.7 99999: ARP scanning and fingerprinting tool
+net-analyzer/arp-scan 1.9.7 99999: ARP scanning and fingerprinting tool
 net-analyzer/arp-sk 0.0.16-r2: A swiss knife tool for ARP
-net-analyzer/arping 2.17 2.20 2.21 9999: A utility to see if a specific IP address is taken and what MAC address owns it
+net-analyzer/arping 2.17 2.20 2.21 9999: A utility to see if a specific IP is taken and what MAC owns it
 net-analyzer/arpoison 0.7: A utility to poison ARP caches
-net-analyzer/arpon 2.7.2 2.7.2-r1 3.0: ArpON (Arp handler inspectiON) is a portable Arp handler
+net-analyzer/arpon 3.0: ArpON (Arp handler inspectiON) is a portable Arp handler
 net-analyzer/arptools 1.0.2: a collection of libnet and libpcap based ARP utilities
 net-analyzer/arpwatch 2.1.15-r11 3.1-r2: An ethernet monitor program that keeps track of ethernet/IP address pairings
 net-analyzer/authforce 0.9.9-r2 0.9.9-r3: An HTTP authentication brute forcer
 net-analyzer/barnyard 0.2.0-r6: Fast output system for Snort
-net-analyzer/barnyard2 1.9-r2 1.13: Parser for Snort unified/unified2 files
+net-analyzer/barnyard2 1.13: Parser for Snort unified/unified2 files
 net-analyzer/bigeye 0.3-r4: network utility dump and simple honeypot utility
 net-analyzer/bing 1.1.3-r2: A point-to-point bandwidth measurement tool
 net-analyzer/bmon 4.0 999: interface bandwidth monitor
@@ -14354,9 +14354,9 @@ net-analyzer/braa 0.82-r1: Quick and dirty mass SNMP scanner
 net-analyzer/bwbar 1.2.3: The kernel.org "Current bandwidth utilization" bar
 net-analyzer/bwm-ng 0.6.2 0.6.3: Bandwidth Monitor NG is a small and simple console-based bandwidth monitor
 net-analyzer/bwmon 1.3-r2: Simple ncurses bandwidth monitor
-net-analyzer/bwping 2.1 2.2: A tool to measure bandwidth and RTT between two hosts using ICMP
+net-analyzer/bwping 2.2: A tool to measure bandwidth and RTT between two hosts using ICMP
 net-analyzer/cacti 1.2.16-r1: Cacti is a complete frontend to rrdtool
-net-analyzer/cacti-spine 1.2.13 1.2.14 1.2.16 99999: Spine is a fast poller for Cacti (formerly known as Cactid)
+net-analyzer/cacti-spine 1.2.16 99999: Spine is a fast poller for Cacti (formerly known as Cactid)
 net-analyzer/calamaris 2.99.4.5: parses logfiles of a wide variety of web proxy servers and generates reports
 net-analyzer/carl 0.9-r3 0.9-r5: An rsync logfile analyzer
 net-analyzer/cbm 0.2: Color Bandwidth Meter
@@ -14384,7 +14384,7 @@ net-analyzer/firewalk 5.0-r2: A tool for determining a firewall's rule set
 net-analyzer/flent 1.3.2: The FLExible Network Tester
 net-analyzer/flow-tools 0.68.6-r1: library and programs to process reports from NetFlow data
 net-analyzer/flowgrind 0.8.0-r1: Network performance measurement tool
-net-analyzer/fping 4.4 5.0: A utility to ping multiple hosts at once
+net-analyzer/fping 5.0: A utility to ping multiple hosts at once
 net-analyzer/fprobe 1.1-r3: libpcap-based tool to collect network traffic data and emit it as NetFlow flows
 net-analyzer/fragroute 1.2.6-r4: Testing of network intrusion detection systems, firewalls and TCP/IP stacks
 net-analyzer/ftester 1.0: Firewall and Intrusion Detection System testing tool
@@ -14419,10 +14419,10 @@ net-analyzer/ipgen 9999: Generate list of IP addresses from a network specificat
 net-analyzer/ipguard 1.04-r1: Tool designed to protect LAN IP adress space by ARP spoofing
 net-analyzer/iplog 2.2.3-r2: iplog is a TCP/IP traffic logger
 net-analyzer/ippl 1.4.14-r6: A daemon which logs TCP/UDP/ICMP packets
-net-analyzer/ipsumdump 1.85 1.86 1.86-r1: Simple TCP/IP Dump summarizer/analyzer
+net-analyzer/ipsumdump 1.86-r1: Simple TCP/IP Dump summarizer/analyzer
 net-analyzer/iptraf-ng 1.2.1 9999: A console-based network monitoring utility
 net-analyzer/iptstate 2.2.6: IP Tables State displays states being kept by iptables in a top-like format
-net-analyzer/ipv6toolkit 2.1_p20190919 2.1_p20200412 99999999: Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets
+net-analyzer/ipv6toolkit 2.1_p20200412 99999999: Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets
 net-analyzer/isic 0.07-r1: IP Stack Integrity Checker
 net-analyzer/jmx2munin 1.0_p20120811-r1: JMX Monitoring plugin for Munin
 net-analyzer/jnettop 0.13.0-r1: A top like console network traffic visualiser
@@ -14433,7 +14433,7 @@ net-analyzer/lft 3.91-r1: Layer Four Traceroute (LFT) and WhoB
 net-analyzer/lilac 1.0.3-r1: Web-based configuration tool written to configure Nagios
 net-analyzer/linkchecker 10.0.0_pre20200729 10.0.1 9999: Check websites for broken links
 net-analyzer/macchanger 1.7.0_p5_p4: Utility for viewing/manipulating the MAC address of network interfaces
-net-analyzer/masscan 1.0.5 1.3.2: Mass IP port scanner
+net-analyzer/masscan 1.3.2: Mass IP port scanner
 net-analyzer/mbrowse 0.4.3-r1: MBrowse is a graphical MIB browser
 net-analyzer/mdns-scan 0.5: a tool for scanning for mDNS/DNS-SD published services
 net-analyzer/monitoring-plugins 2.2-r4 2.3: 50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
@@ -14477,9 +14477,9 @@ net-analyzer/net-snmp 5.9-r2 5.9-r3 99999999: Software for generating and retrie
 net-analyzer/netcat 110-r9 110.20180111-r1: the network swiss army knife
 net-analyzer/netdata 1.29.0 1.29.1 1.29.2 1.29.3 9999: Linux real time system monitoring, done right!
 net-analyzer/netdiscover 0.7: An active/passive address reconnaissance tool
-net-analyzer/nethogs 0.8.5-r1 0.8.6-r1: A small 'net top' tool, grouping bandwidth by process
+net-analyzer/nethogs 0.8.6-r1: A small 'net top' tool, grouping bandwidth by process
 net-analyzer/neti 2.0-r1: NETI@Home research project from GATech
-net-analyzer/netio 1.32-r1 1.33: Network benchmark using TCP and UDP protocols
+net-analyzer/netio 1.33: Network benchmark using TCP and UDP protocols
 net-analyzer/netperf 2.7.0-r2: Network performance benchmark
 net-analyzer/netpipe 3.7.2: network protocol independent performance evaluator
 net-analyzer/netselect 0.4-r1 0.4-r2 9999: Ultrafast implementation of ping
@@ -14526,7 +14526,7 @@ net-analyzer/prelude-correlator 5.1.0 5.2.0: Real time correlator of events rece
 net-analyzer/prelude-lml 5.1.0 5.2.0: The prelude log analyzer
 net-analyzer/prelude-lml-rules 5.1.0 5.2.0: Prelude LML community ruleset
 net-analyzer/prettyping 1.0.1: Ping wrapper that produces coloured, easily readable output.
-net-analyzer/pypacker 4.8 4.9: Fast and simple packet creation and parsing library for Python
+net-analyzer/pypacker 4.9: Fast and simple packet creation and parsing library for Python
 net-analyzer/python-gvm 1.1.0 1.2.0 1.5.0 1.6.0: Greenbone Vulnerability Management Python Library
 net-analyzer/quidscor 1.2.48-r1: Qualys IDS Correlation Daemon
 net-analyzer/raddump 0.3.1: RADIUS packet interpreter
@@ -14550,7 +14550,7 @@ net-analyzer/siphon 666-r2: A portable passive network mapping suite
 net-analyzer/slurm 0.4.3: Realtime network interface monitor based on FreeBSD's pppstatus
 net-analyzer/smokeping 2.7.3: A powerful latency measurement tool
 net-analyzer/snallygaster 0.0.6 0.0.8 0.0.9: Finds file leaks and other security problems on HTTP servers
-net-analyzer/sngrep 1.4.6-r3 1.4.7: Ncurses SIP Messages flow viewer
+net-analyzer/sngrep 1.4.7: Ncurses SIP Messages flow viewer
 net-analyzer/sniffit 0.5: Interactive Packet Sniffer
 net-analyzer/snmpclitools 0.6.4: Pure-Python SNMP management tools, formerly pysnmp-apps
 net-analyzer/snmptt 1.4.2: SNMP Trap Translator
@@ -14573,7 +14573,7 @@ net-analyzer/synscan 5.02: A fast asynchronous half-open TCP portscanner
 net-analyzer/syweb 0.65: Web frontend to symon
 net-analyzer/tcpdump 4.9.3-r4 4.99.0 9999: A Tool for network monitoring and data acquisition
 net-analyzer/tcpflow 1.6.1: A tool for monitoring, capturing and storing TCP connections flows
-net-analyzer/tcping 1.3.5-r1 1.3.6: Check if a desired port is reachable via TCP
+net-analyzer/tcping 1.3.6: Check if a desired port is reachable via TCP
 net-analyzer/tcpreen 1.4.4: TCP network re-engineering tool
 net-analyzer/tcpreplay 4.3.3 999999: utilities for editing and replaying previously captured network traffic
 net-analyzer/tcpslice 1.2a_p3_p4: Extract and concatenate portions of pcap files
@@ -14588,7 +14588,7 @@ net-analyzer/thcrut 1.2.5-r2: Network discovery and fingerprinting tool
 net-analyzer/thrulay 0.9-r1: Measure the capacity of a network by sending a bulk TCP stream over it
 net-analyzer/tleds 1.05_beta11-r2: Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface
 net-analyzer/tptest 3.1.7-r2: Internet bandwidth tester
-net-analyzer/tracebox 0.4.4 0.4.4-r100: A Middlebox Detection Tool
+net-analyzer/tracebox 0.4.4-r100: A Middlebox Detection Tool
 net-analyzer/traceproto 1.1.2_beta1: A traceroute-like utility that sends packets based on protocol
 net-analyzer/traceroute 2.1.0: Utility to trace the route of IP packets
 net-analyzer/traceroute-nanog 6.4.2_p1: Traceroute with AS lookup, TOS support, MTU discovery and other features
@@ -14877,7 +14877,7 @@ net-libs/courier-unicode 2.1 2.1-r1 2.1.2: Unicode library used by the courier m
 net-libs/cppzmq 4.6.0: High-level CPP Binding for ZeroMQ
 net-libs/cvm 0.96-r1 0.97: Credential Validation Modules by Bruce Guenter
 net-libs/czmq 4.2.0: High-level C Binding for ZeroMQ
-net-libs/daq 2.0.6-r1 2.0.7: Data Acquisition library, for packet I/O
+net-libs/daq 2.0.7: Data Acquisition library, for packet I/O
 net-libs/davix 0.7.6: High-performance file management over WebDAV/HTTP
 net-libs/dleyna-connector-dbus 0.3.0: utility library for higher level dLeyna libraries
 net-libs/dleyna-core 0.6.0: utility library for higher level dLeyna libraries
@@ -14948,7 +14948,7 @@ net-libs/libmediawiki 5.37.0-r1: C++ interface for MediaWiki based web service a
 net-libs/libmicrodns 0.1.2 9999: Minimal mDNS resolver (and announcer) library
 net-libs/libmicrohttpd 0.9.65-r1 0.9.68-r1 0.9.69 0.9.70-r1 0.9.71 0.9.72: Small C library to run an HTTP server as part of another application
 net-libs/libmirisdr 9999: Software for the Mirics MSi2500 + MSi001 SDR platform
-net-libs/libmnl 1.0.3-r1 1.0.4: Minimalistic netlink library
+net-libs/libmnl 1.0.4: Minimalistic netlink library
 net-libs/libmrss 0.19.2-r1: A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
 net-libs/libnatpmp 20150609: An alternative protocol to UPnP IGD specification
 net-libs/libndp 1.7: Library for Neighbor Discovery Protocol
@@ -15000,7 +15000,7 @@ net-libs/libtelnet 0.23 9999: Simple RFC-complient TELNET implementation as a C
 net-libs/libtirpc 1.2.6 1.3.1: Transport Independent RPC library (SunRPC replacement)
 net-libs/libtorrent 0.13.7 0.13.7-r1 0.13.8-r1: BitTorrent library written in C++ for *nix
 net-libs/libtorrent-rasterbar 1.2.6 1.2.9 1.2.10 1.2.11 1.2.12: C++ BitTorrent implementation focusing on efficiency and scalability
-net-libs/libtrace 4.0.14_p1 4.0.15_p1 9999: A library and tools for trace processing
+net-libs/libtrace 4.0.15_p1 9999: A library and tools for trace processing
 net-libs/libupnp 1.14.0: An Portable Open Source UPnP Development Kit
 net-libs/libupnpp 0.20.1: The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
 net-libs/libvncserver 0.9.13: library for creating vnc servers
@@ -15243,7 +15243,7 @@ net-misc/freerdp 2.2.0 2.9999 9999: Free implementation of the Remote Desktop Pr
 net-misc/frr 7.5: The FRRouting Protocol Suite
 net-misc/gallery-dl 1.16.0 1.16.3 1.16.5 9999: Download image galleries and collections from several image hosting sites
 net-misc/gcap 0.1.1-r1: Command line tool for downloading Youtube closed captions
-net-misc/geoipupdate 2.3.1 3.1.0 3.1.1 4.0.3-r1 4.0.4 4.3.0: performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
+net-misc/geoipupdate 2.3.1 3.1.1 4.3.0: performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
 net-misc/geomyidae 0.34: A daemon to serve the gopher protocol
 net-misc/gerbera 1.7.0 9999: UPnP Media Server
 net-misc/getdate 1.2-r2: Network Date/Time Query and Set Local Date/Time Utility
@@ -17073,7 +17073,7 @@ sys-apps/mlocate 0.26-r2 0.26-r3: Merging locate is an utility to index and quic
 sys-apps/mlxup-bin 4.13.0: Mellanox Update and Query Utility
 sys-apps/moreutils 0.65: A collection of tools that nobody thought to write when Unix was young
 sys-apps/most 5.0.0a-r1 5.1.0: Paging program that displays, one windowful at a time, the contents of a file
-sys-apps/mount-gtk 1.4.2 1.4.4 1.4.5.1: GTK+ based UDisks2 frontend
+sys-apps/mount-gtk 1.4.5.1: GTK+ based UDisks2 frontend
 sys-apps/mouseemu 0.15: Emulates scrollwheel, right- & left-click for one-button mice/touchpads
 sys-apps/msr-tools 1.3: Utilities allowing the read and write of CPU model-specific registers (MSR)
 sys-apps/mtree 1.0.4: Directory hierarchy mapping tool from FreeBSD
@@ -18535,7 +18535,7 @@ x11-misc/grub2-theme-preview 2.3.0: Preview a GRUB 2.x theme using KVM/QEMU
 x11-misc/grun 0.9.3-r1: A GTK based Run dialog resembling the Windows Run dialog, just like xexec
 x11-misc/gtk2fontsel 0.1-r1: A font selection tool similar to xfontsel
 x11-misc/gtkdialog 0.8.3_p20200202 99999: Small utility for fast and easy GUI building
-x11-misc/gxmessage 2.20.4 3.4.3: A GTK+ based xmessage clone
+x11-misc/gxmessage 3.4.3: A GTK+ based xmessage clone
 x11-misc/habak 0.2.5-r3: A simple but powerful tool to set desktop wallpaper
 x11-misc/hsetroot 1.0.5: Tool which allows you to compose wallpapers ('root pixmaps') for X
 x11-misc/i3blocks 1.5-r1: highly flexible status line for the i3 window manager
@@ -18550,7 +18550,7 @@ x11-misc/idesk-extras 1.37-r2: Graphical configuration for iDesk plus icons
 x11-misc/imake 1.0.8: C preprocessor interface to the make utility
 x11-misc/imwheel 1.0.0_pre13_p20100827: mouse tool for advanced features such as wheels and 3+ buttons
 x11-misc/j4-dmenu-desktop 2.18: A fast desktop replacement for i3-dmenu-desktop
-x11-misc/kapow 1.5.9 1.5.10: A punch clock program designed to easily keep track of your hours
+x11-misc/kapow 1.5.10: A punch clock program designed to easily keep track of your hours
 x11-misc/kaqaz 1.2.0-r4: Modern note manager
 x11-misc/kbdd 0.7.1: Very simple layout switcher
 x11-misc/kdocker 5.2 5.3: Helper to dock any application into the system tray
@@ -18561,7 +18561,7 @@ x11-misc/light-locker 1.9.0-r2: A simple locker using lightdm
 x11-misc/lightdm 1.30.0-r2: A lightweight display manager
 x11-misc/lightdm-gtk-greeter 2.0.7-r1 2.0.8: LightDM GTK+ Greeter
 x11-misc/lightdm-mini-greeter 0.3.4 0.4.0 0.5.0 0.5.1: A Minimal, Configurable, Single-User GTK3 LightDM Greeter
-x11-misc/lineak-defaultplugin 0.9.0-r1 0.9.0-r2: Mute/unmute and other macros for LINEAK
+x11-misc/lineak-defaultplugin 0.9.0-r2: Mute/unmute and other macros for LINEAK
 x11-misc/lineak-xosdplugin 0.9.0-r2: Xosd plugin for LINEAK
 x11-misc/lineakd 0.9.0-r2 0.9.0-r3: Linux support for Easy Access and Internet Keyboards
 x11-misc/lndir 1.0.3-r2 9999: create a shadow directory of symbolic links to another directory tree
@@ -18592,7 +18592,7 @@ x11-misc/pcmanfm 1.3.1-r1 1.3.2: Fast lightweight tabbed filemanager
 x11-misc/pcmanfm-qt 0.15.1 0.16.0: Qt GUI Tabbed Filemanager
 x11-misc/peksystray 0.4.0: A system tray dockapp for window managers supporting docking
 x11-misc/picom 8-r1 8.2-r1 8.2-r2 9999: A lightweight compositor for X11 (previously a compton fork)
-x11-misc/piedock 1.6.6-r1 1.6.9: A little bit like the famous OS X dock but in shape of a pie menu
+x11-misc/piedock 1.6.9: A little bit like the famous OS X dock but in shape of a pie menu
 x11-misc/polybar 3.4.3 3.5.5: A fast and easy-to-use tool for creating status bars
 x11-misc/prime-run 1.0: Run programs on the discrete nVidia video card
 x11-misc/primus 0.2 0.2-r3: Faster OpenGL offloading for Bumblebee
@@ -18626,7 +18626,7 @@ x11-misc/sent 0.2 1-r1 9999: Simple plaintext presentation tool
 x11-misc/set_opacity 1.0 9999: Tool for set real compositing for windows through window's id, process' pid etc.
 x11-misc/shared-mime-info 1.10-r1 1.15 2.0-r2 2.1: The Shared MIME-info Database specification
 x11-misc/shutter 0.94.3_p20200621 0.95: Feature-rich screenshot program
-x11-misc/simpleswitcher 20140219 20191008 99999999: lightweight EWMH window switcher with features and looks of dmenu
+x11-misc/simpleswitcher 20191008 99999999: lightweight EWMH window switcher with features and looks of dmenu
 x11-misc/sisctrl 0.0.20051202 0.0.20051202-r1: tool that allows you to tune SiS drivers from X
 x11-misc/skippy 0.5.0-r1: A full-screen task-switcher providing Apple Expose-like functionality
 x11-misc/slim 1.3.6-r5 9999: Simple Login Manager
@@ -18642,7 +18642,7 @@ x11-misc/stalonetray 0.8.3 0.8.4: System tray utility including support for KDE
 x11-misc/sunflower 0.4_p20200716-r1: Small and highly customizable twin-panel file manager with plugin-support
 x11-misc/superswitcher 0.6-r1: A more feature-full replacement of the Alt-Tab window switching behavior
 x11-misc/sux 1.0-r4 1.0.1: "su" wrapper which transfers X credentials
-x11-misc/svkbd 0.2 0.2.1: Simple Virtual Keyboard
+x11-misc/svkbd 0.2.1-r1: Simple Virtual Keyboard
 x11-misc/sw-notify-send 1.2.1 9999: A system-wide variant of tinynotify-send
 x11-misc/sxhkd 0.6.1 0.6.2: Simple X hotkey daemon
 x11-misc/synergy 1.9.1-r1 1.12.0 1.13.0 1.13.1.41: Lets you easily share a single mouse and keyboard between multiple computers
@@ -18685,7 +18685,7 @@ x11-misc/xbitmaps 1.1.2-r1: X.Org bitmaps data
 x11-misc/xcalendar 4.0-r2: A simple interactive calendar program with a notebook capability
 x11-misc/xcalib 0.10: Tiny monitor calibration loader for X.org
 x11-misc/xcape 1.1 1.2: Utility to make modifier keys send custom key events when pressed on their own
-x11-misc/xcave 2.4.0 2.5.1: View and manage contents of your wine cellar
+x11-misc/xcave 2.5.1: View and manage contents of your wine cellar
 x11-misc/xcb 2.4-r1: Marc Lehmann's improved X Cut Buffers
 x11-misc/xclip 0.13 9999: Copy data from standard input to X clipboard
 x11-misc/xcompmgr 1.1.8: X Compositing manager
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 49fc7fb527c5..c4734859c814 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 19:21:08 +0000
+Tue, 16 Mar 2021 19:36:15 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-16 19:36:18 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-03-16 19:36:18 +0000
commit	e61cf1bcd4978b7e12530e2a535878121d4cea28 (patch)
tree	e1b9f9d570d5c6a35d81d77a98cda184e8976120
parent	Merge updates from master (diff)
download	gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.tar.gz gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.tar.bz2 gentoo-e61cf1bcd4978b7e12530e2a535878121d4cea28.zip