2021-06-18 21:20:16 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-06-18 21:20:21 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-06-18 21:20:21 +0000
commit: 488529e7ab61a1c49c4449d2c8bbeefcf057533e (patch)
tree: 5c7d15f5aff230aa4fbd3ae8be29324de3be31aa /metadata
parent: Merge updates from master (diff)
download: gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.tar.gz
gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.tar.bz2
gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.zip
103 files changed, 303 insertions, 279 deletions
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3 b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r1
index d62235997fdc..c42b152f8e9e 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-appl-1.0.3-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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 unpack
-DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
+DEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:=
 DESCRIPTION=Kerberized applications split from the main MIT Kerberos V distribution
 EAPI=7
 HOMEPAGE=http://web.mit.edu/kerberos/www/
 INHERIT=autotools flag-o-matic toolchain-funcs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=openafs-krb5-a BSD
-RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses
+RDEPEND=>=app-crypt/mit-krb5-1.8.0 sys-libs/e2fsprogs-libs sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.3-signed.tar
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=a42c1d490315a5473b59a9937336f987
+_md5_=650df2793920baea5704b2e374e56c57
diff --git a/metadata/md5-cache/app-editors/ee-1.5.2 b/metadata/md5-cache/app-editors/ee-1.5.2-r1
index adfbbe934b52..318cad37dfd0 100644
--- a/metadata/md5-cache/app-editors/ee-1.5.2
+++ b/metadata/md5-cache/app-editors/ee-1.5.2-r1
@@ -1,13 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
+DEPEND=!app-editors/ersatz-emacs sys-libs/ncurses:=
 DESCRIPTION=An easy to use text editor. A subset of aee
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
-RDEPEND=!app-editors/ersatz-emacs
+RDEPEND=!app-editors/ersatz-emacs sys-libs/ncurses:=
 SLOT=0
 SRC_URI=mirror://gentoo/ee-1.5.2.src.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=7f915d6514c8f4319d282b421623bc89
+_md5_=9bc54ac058adb6074e5e3a3aab5941f6
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
index b15adae024fc..740aa4736358 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
@@ -11,4 +11,4 @@ RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	cannadic	6d8054590c0aef2c11c567e1a815c052
-_md5_=660a310a729d060b3fb5ea0850ffedd9
+_md5_=b6ddc10f154eaa69630f63e79530dcc6
diff --git a/metadata/md5-cache/app-i18n/skkfep-0.87-r1 b/metadata/md5-cache/app-i18n/skkfep-0.87-r1
index 3d9454e6ffa1..34e0d91a64f9 100644
--- a/metadata/md5-cache/app-i18n/skkfep-0.87-r1
+++ b/metadata/md5-cache/app-i18n/skkfep-0.87-r1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:= app-i18n/skk-jisyo
 SLOT=0
 SRC_URI=http://aitoweb.world.coocan.jp/skkfep/skkfep-0.87.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=e70b282ec1657692cd283b24dce8e905
+_md5_=f7ca6aba5e0494615bc6508c2b4c21ad
diff --git a/metadata/md5-cache/app-misc/abook-0.6.1-r2 b/metadata/md5-cache/app-misc/abook-0.6.1-r3
index ebcc0e4e145e..bae2ba72b6fe 100644
--- a/metadata/md5-cache/app-misc/abook-0.6.1-r2
+++ b/metadata/md5-cache/app-misc/abook-0.6.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=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=sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=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=Abook is a text-based addressbook program designed to use with mutt mail client
 EAPI=6
 HOMEPAGE=http://abook.sourceforge.net/
@@ -7,8 +7,8 @@ INHERIT=autotools
 IUSE=nls
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline dev-libs/libvformat nls? ( virtual/libintl )
+RDEPEND=sys-libs/ncurses:= sys-libs/readline:= dev-libs/libvformat nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://abook.sourceforge.net/devel/abook-0.6.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=455b6640ffb44a895765e2bf2b436e67
+_md5_=797811f02ee4292a1d03f39851852951
diff --git a/metadata/md5-cache/app-misc/cdircmp-0.3-r2 b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
index 065a71b7d531..46eee48aa00d 100644
--- a/metadata/md5-cache/app-misc/cdircmp-0.3-r2
+++ b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/ncurses-5.4:0= virtual/pkgconfig
+DEPEND=>=sys-libs/ncurses-5.4:0=
 DESCRIPTION=Compare directories and select files to copy
 EAPI=7
 HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
@@ -10,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.4:0=
 SLOT=0
 SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=f3d736345cf9946a0385e6a12789c54d
+_md5_=5cb4d6e6be4fc1f23a19dd280c583797
diff --git a/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1 b/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
index f1c638ccaa23..21c1f8d5f84e 100644
--- a/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
+++ b/metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=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
-INHERIT=autotools bash-completion-r1
+INHERIT=autotools bash-completion-r1 flag-o-matic
 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.9.1-beta.tar.gz -> dfshow-0.9.1_beta.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
-_md5_=87080b9df4e6e49d5d988235669ea8a0
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
+_md5_=8a8201c9156c51abb01a17947d5b0b4b
diff --git a/metadata/md5-cache/app-misc/dvorakng-0.6.0 b/metadata/md5-cache/app-misc/dvorakng-0.6.0-r1
index 463f3405f48b..c063fea4ea57 100644
--- a/metadata/md5-cache/app-misc/dvorakng-0.6.0
+++ b/metadata/md5-cache/app-misc/dvorakng-0.6.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:* virtual/pkgconfig
+DEPEND=sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=Dvorak typing tutor
 EAPI=6
 HOMEPAGE=http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:*
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.free.of.pl/n/nopik/dvorakng-0.6.0rc1.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=c2e5f98378a56e2f467b7b701c506f62
+_md5_=deeb7ae05068c8a8a1919c5779743d51
diff --git a/metadata/md5-cache/app-office/sc-7.16-r2 b/metadata/md5-cache/app-office/sc-7.16-r3
index d7567193d288..f7703fe576a8 100644
--- a/metadata/md5-cache/app-office/sc-7.16-r2
+++ b/metadata/md5-cache/app-office/sc-7.16-r3
@@ -6,8 +6,8 @@ HOMEPAGE=http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/ncurses-5.2
+RDEPEND=>=sys-libs/ncurses-5.2:=
 SLOT=0
 SRC_URI=ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.16.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=d7a345794b4d78f6eefdb375c0c44f61
+_md5_=3768f694fbc319317a773fc4cdbb5361
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
index 27174f588cfc..387d642a8c70 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
@@ -1,6 +1,6 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig boost? ( dev-util/boost-build ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= virtual/pkgconfig boost? ( dev-util/boost-build ) test? ( dev-util/cppunit )
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= test? ( dev-util/cppunit )
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	lua-utils	f89d52950f35686c55327aa60782641c	lua-single	f91b5656f00869c220a6e35ae0521c54
-_md5_=b3255e0a9d8a67c737767567d215a569
+_md5_=9d68907403461d90b30b158a820e95d8
diff --git a/metadata/md5-cache/app-text/reed-5.4 b/metadata/md5-cache/app-text/reed-5.4-r1
index 4025788d131d..070375be848a 100644
--- a/metadata/md5-cache/app-text/reed-5.4
+++ b/metadata/md5-cache/app-text/reed-5.4-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=This is a text pager (text file viewer), used to display etexts
 EAPI=7
 HOMEPAGE=http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.sacredchao.net/software/reed/reed-5.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=4ffaa7726192f672768bd7fb3bf24680
+_md5_=5c2701237e2f50c7285b63a1c0935a00
diff --git a/metadata/md5-cache/dev-db/gqlplus-1.16-r1 b/metadata/md5-cache/dev-db/gqlplus-1.16-r2
index bf9ae211702b..eb0044cc59a9 100644
--- a/metadata/md5-cache/dev-db/gqlplus-1.16-r1
+++ b/metadata/md5-cache/dev-db/gqlplus-1.16-r2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=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=sys-libs/readline:*
+DEPEND=sys-libs/readline:=
 DESCRIPTION=a front-end for Oracle program sqlplus with command-line editing
 EAPI=7
 HOMEPAGE=https://gitlab.com/jessp011/gqlplus
 INHERIT=autotools
 KEYWORDS=~amd64 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
-RDEPEND=sys-libs/readline:*
+RDEPEND=sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://sourceforge/gqlplus/gqlplus-1.16.tar.gz https://dev.gentoo.org/~grobian/distfiles/gqlplus-1.16-sqlplus-handling-fixes.patch
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8e260a88377b3106fc53de9d409e45df
+_md5_=09b96718abfae91973dd1f3ac3e58c29
diff --git a/metadata/md5-cache/dev-db/pspg-3.1.5 b/metadata/md5-cache/dev-db/pspg-3.1.5-r1
index 96dca1d4b18c..5b6441e0ad83 100644
--- a/metadata/md5-cache/dev-db/pspg-3.1.5
+++ b/metadata/md5-cache/dev-db/pspg-3.1.5-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=-
-DEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+DEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 DESCRIPTION=A better pager for psql and mysql
 EAPI=7
 HOMEPAGE=https://github.com/okbob/pspg
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+RDEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/3.1.5.tar.gz -> pspg-3.1.5.tar.gz
-_md5_=cd1b8f861faf199a9164d6e8339d1abc
+_md5_=780c565209f025efee9d8c4c5f148fab
diff --git a/metadata/md5-cache/dev-db/pspg-4.3.0 b/metadata/md5-cache/dev-db/pspg-4.3.0-r1
index d47ff554f1e3..62494b1ad436 100644
--- a/metadata/md5-cache/dev-db/pspg-4.3.0
+++ b/metadata/md5-cache/dev-db/pspg-4.3.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=-
-DEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+DEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 DESCRIPTION=A better pager for psql and mysql
 EAPI=7
 HOMEPAGE=https://github.com/okbob/pspg
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:=
+RDEPEND=sys-libs/ncurses:= dev-db/postgresql:= sys-libs/readline:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/4.3.0.tar.gz -> pspg-4.3.0.tar.gz
-_md5_=1778b5e4eda7bb25f0234a5539bb4016
+_md5_=20b0da16222e6d82760c2735e46288d0
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index a659a6219b4f..b582e9e782ba 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( dev-libs/libffi:= ) ppc64? ( dev-libs/libffi:= ) sparc? ( dev-libs/libffi:= ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 sys-devel/gnuconfig >=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=ppc64? ( virtual/pkgconfig ) sparc? ( virtual/pkgconfig ) libffi? ( virtual/pkgconfig ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0 sys-devel/gnuconfig >=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 extremely small and specification-compliant virtual machine
 EAPI=5
 HOMEPAGE=http://jamvm.sourceforge.net/
@@ -11,4 +11,4 @@ RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=be939036b780d975907600f881e7959c
+_md5_=e73e73e3ab1e1b903dc57c12fd5fd904
diff --git a/metadata/md5-cache/dev-java/jss-4.3.2 b/metadata/md5-cache/dev-java/jss-4.3.2
index 819d23184b81..b50bbea15c44 100644
--- a/metadata/md5-cache/dev-java/jss-4.3.2
+++ b/metadata/md5-cache/dev-java/jss-4.3.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3.4
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/jss-4.3.2.tar.bz2
 _eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888
-_md5_=3ecfdb3992479889e3532fb0c35dc4fc
+_md5_=0694a886dbba18ed2e0d274b1bcc42de
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4 b/metadata/md5-cache/dev-lang/ghc-8.8.4
index 679a07fd397a..ad39c9b5c22b 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.8.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	multiprocessing	cac3169468f893670dac3e7cb940e045	ghc-package	2f31876646b777a7851b22816735765c	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	check-reqs	97b90bd8fb799993925e6b3a683184e5
-_md5_=33ad519b7cbf7e5cabd103e7a3536500
+_md5_=4e4b5393fd1fc537234074c3a70c610f
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-20.06 b/metadata/md5-cache/dev-lang/mercury-extras-20.06
index f8b1623c7b2b..a9ef871924a2 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-extras-20.06
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=~dev-lang/mercury-20.06 cairo? ( >=x11-libs/cairo-1.10.0 ) gmp? ( dev-libs/gmp:0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) tommath? ( dev-libs/libtommath ) ncurses? ( sys-libs/ncurses:= ) opengl? ( virtual/opengl virtual/glu ) tk? ( dev-lang/tcl:0 dev-lang/tk:0 ) X? ( x11-libs/libX11 )
 DESCRIPTION=Additional libraries and tools that are not part of the Mercury standard library
@@ -12,4 +13,4 @@ REQUIRED_USE=?? ( odbc iodbc )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury-extras/mercury-extras-20.06-gentoo-patchset-0.tar.gz
 _eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a9858393b57d1da00f7089dc096ee46
+_md5_=d66c78496126692f6589a94547bb999b
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r5 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
index 2a2ae02df082..c156759ad4ee 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r5
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( s
 SLOT=0/4.05
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=935bedcc7084064c4f8e6686dded785c
+_md5_=bfb1c75ff3a9313b23bc5a407cbba33b
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r6 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
index 6f7caeebb3ab..6868e05106c5 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r6
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( s
 SLOT=0/4.05
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=42cd7339acbdb8fc7ca1f72ceda09a93
+_md5_=61b32d4a6d4cca71beff438ddf1cb013
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.09.0-r1 b/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2
index b9394730f53e..d6d9b4c1256b 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.09.0-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.09
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.09.0.tar.gz -> ocaml-4.09.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=12cb31a3857a024352e8871922a6ef2b
+_md5_=0e911e479ff7bfde2ea6f6ee9ec0b28a
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.10.2-r1 b/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2
index ee2d76b1d671..10ca02d0961a 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.10.2-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.10
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.10.2.tar.gz -> ocaml-4.10.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=0845e5e33790c1fc7b947ad56066230f
+_md5_=adbc09bcd34c746b0ec561eb37456d47
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.11.2-r1 b/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2
index c3ca23e04596..1702ef93a826 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.11.2-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.11
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.11.2.tar.gz -> ocaml-4.11.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=c641d0f5dc65db5e99fe2953d4049fef
+_md5_=37928dedb43d505ae8db55cdc628f344
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.12.0-r1 b/metadata/md5-cache/dev-lang/ocaml-4.12.0-r2
index 269e33b9bd7b..86c1a667f09c 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.12.0-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.12.0-r2
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:=
 SLOT=0/4.12
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.12.0.tar.gz -> ocaml-4.12.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=67055ef27e058203855259219361ee73
+_md5_=8c33ffe6321f669f63e6e403cc941715
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.0 b/metadata/md5-cache/dev-lang/swig-4.0.0
index 3928f753ae3c..f1c71f889a0e 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.0
+++ b/metadata/md5-cache/dev-lang/swig-4.0.0
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=7
 HOMEPAGE=http://www.swig.org/
@@ -12,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-4.0.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=d224942edeb86ee42bbb500267b8ebda
+_md5_=ed7c76dde4f2ab64ea23a9b5a7c989b5
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.2 b/metadata/md5-cache/dev-lang/swig-4.0.2
index d41cbda77c45..5e78f38ceb23 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.2
+++ b/metadata/md5-cache/dev-lang/swig-4.0.2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=7
 HOMEPAGE=http://www.swig.org/ https://github.com/swig/swig
@@ -7,9 +8,9 @@ INHERIT=toolchain-funcs
 IUSE=ccache doc pcre
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ BSD BSD-2
-RDEPEND=virtual/pkgconfig pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-4.0.2.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=6f4a45478f740a779127d1e88a419ad6
+_md5_=fa1dc445fc5d63adc172a1b6a224da27
diff --git a/metadata/md5-cache/dev-libs/foma-0.9.18 b/metadata/md5-cache/dev-libs/foma-0.9.18-r1
index 74cb3bbd181d..ddf9df232abe 100644
--- a/metadata/md5-cache/dev-libs/foma-0.9.18
+++ b/metadata/md5-cache/dev-libs/foma-0.9.18-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:* sys-libs/zlib
+DEPEND=sys-libs/readline:= sys-libs/zlib
 DESCRIPTION=A set of utilities for constructing finite-state automata and transducers
 EAPI=7
 HOMEPAGE=https://github.com/mhulden/foma
 INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/readline:* sys-libs/zlib
+RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://bitbucket.org/mhulden/foma/downloads/foma-0.9.18.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=e60d035580cc2351a2828534d78f98d9
+_md5_=664c1eb82c2a3a46472fc62ca308a81c
diff --git a/metadata/md5-cache/dev-libs/libzia-4.25 b/metadata/md5-cache/dev-libs/libzia-4.25
index 12048869ac2e..1f4a85bd881c 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.25
+++ b/metadata/md5-cache/dev-libs/libzia-4.25
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
 DESCRIPTION=platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ft
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.25.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=910ff98b158cf0eeb19044b431872777
+_md5_=b7b07f8ed60f61339f89c5536f0d6f13
diff --git a/metadata/md5-cache/dev-libs/libzia-4.27 b/metadata/md5-cache/dev-libs/libzia-4.27
index 762d038de6b5..d0d8917cf63e 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.27
+++ b/metadata/md5-cache/dev-libs/libzia-4.27
@@ -1,7 +1,7 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
-DESCRIPTION=platform abstraction code for tucnak package
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+DESCRIPTION=Platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 INHERIT=autotools
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ft
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.27.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2b94808a91c41b795110f5480bbfc4cb
+_md5_=2da53c9a22042bae2f3ad696676d643e
diff --git a/metadata/md5-cache/dev-libs/libzia-4.28 b/metadata/md5-cache/dev-libs/libzia-4.28
index 20bfff1b744c..8a6c99abd611 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.28
+++ b/metadata/md5-cache/dev-libs/libzia-4.28
@@ -1,7 +1,7 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
-DESCRIPTION=platform abstraction code for tucnak package
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+DESCRIPTION=Platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 INHERIT=autotools
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ft
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.28.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=910ff98b158cf0eeb19044b431872777
+_md5_=5327aeab6d6afc7e7a0159c7d673e2f9
diff --git a/metadata/md5-cache/dev-libs/libzia-4.29 b/metadata/md5-cache/dev-libs/libzia-4.29
index 8ca74a10629c..529a865cca21 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.29
+++ b/metadata/md5-cache/dev-libs/libzia-4.29
@@ -1,7 +1,7 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) virtual/pkgconfig
-DESCRIPTION=platform abstraction code for tucnak package
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+DESCRIPTION=Platform abstraction code for tucnak package
 EAPI=7
 HOMEPAGE=http://tucnak.nagano.cz
 INHERIT=autotools
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ft
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.29.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2b94808a91c41b795110f5480bbfc4cb
+_md5_=2da53c9a22042bae2f3ad696676d643e
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9 b/metadata/md5-cache/dev-ml/cudf-0.9-r1
index b958bd1ce363..2032cc6a4781 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.9
+++ b/metadata/md5-cache/dev-ml/cudf-0.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 test? ( dev-ml/ounit2 ) dev-ml/ocamlbuild dev-lang/perl
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 sys-libs/libunwind:= sys-libs/ncurses:= test? ( dev-ml/ounit2 ) dev-ml/ocamlbuild dev-lang/perl
 DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
 EAPI=7
 HOMEPAGE=http://www.mancoosi.org/cudf/
@@ -8,9 +8,9 @@ INHERIT=toolchain-funcs
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 sys-libs/libunwind:= sys-libs/ncurses:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=72b6a8861bccc15c367b27fb75bb4d9a
+_md5_=16db502c54f2df5834e7fdb5e602751a
diff --git a/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r4 b/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r4
index 1dd2d8031336..74a3ca7a9073 100644
--- a/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r4
+++ b/metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r4
@@ -4,7 +4,7 @@ DEPEND=>=net-fs/samba-4.2[client] dev-lang/perl
 DESCRIPTION=Provide Perl API for libsmbclient.so
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Filesys-SmbClient
-INHERIT=perl-module autotools
+INHERIT=perl-module autotools toolchain-funcs
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( Artistic GPL-1+ )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALIAN/Filesys-SmbClient-3.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6bbedc9c7d936acf47a8ec78b1382226
+_md5_=6526917483fcd5eabd0dd7db75a0347a
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
index 11bdc82aafa5..1567f6a86d3f 100644
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/hiredis test? ( dev-ruby/test-unit:2 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=dev-libs/hiredis test? ( dev-ruby/test-unit:2 ) virtual/pkgconfig ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
 DESCRIPTION=Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)
 EAPI=6
 HOMEPAGE=https://github.com/redis/hiredis-rb
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940
-_md5_=31548b3f83512af604a9afbed60c0c3e
+_md5_=46ec51d64432b31055667210d470c17c
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.88 b/metadata/md5-cache/dev-util/cppcheck-1.88
index 57269abcc656..203a5b69ea84 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.88
+++ b/metadata/md5-cache/dev-util/cppcheck-1.88
@@ -1,6 +1,6 @@
-BDEPEND=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_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig 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_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig
+DEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 )
 DESCRIPTION=Static analyzer of C/C++ code
 EAPI=7
 HOMEPAGE=https://github.com/danmar/cppcheck
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.88.tar.gz -> cppcheck-1.88.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47
-_md5_=c0c40ddb9430b65a40c7dbb16f397b34
+_md5_=5fa5d652878fd8311cbae40acd5b00b6
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r4 b/metadata/md5-cache/dev-util/ddd-3.3.12-r5
index ba122fbf845c..bc93fc6f175b 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r4
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:* ) x11-base/xorg-proto sys-devel/gnuconfig >=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=sys-devel/gdb sys-libs/ncurses:= x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:= ) x11-base/xorg-proto sys-devel/gnuconfig >=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=Graphical front-end for command-line debuggers
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/ddd
@@ -7,9 +7,9 @@ INHERIT=autotools desktop optfeature
 IUSE=readline
 KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3 FDL-1.1
-RDEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:* ) x11-apps/xfontsel
+RDEPEND=sys-devel/gdb sys-libs/ncurses:= x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline:= ) x11-apps/xfontsel
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	optfeature	e142388219c7fee6ff016fe1c78a10a5
-_md5_=cefdf2f79a0d733b8a798afc0caf7c70
+_md5_=96b90f569fb301b885b458524655defd
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
index 35d7f8538e72..821bdd557a97 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
 DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
@@ -10,4 +10,4 @@ LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3407-src.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a6a2a9ebccc2bedf4156f8be3db83ba4
+_md5_=00b0d06785cd0f0fa3ec8dd80dddce1b
diff --git a/metadata/md5-cache/dev-util/kbuild-9999 b/metadata/md5-cache/dev-util/kbuild-9999
index 3c69ca37db87..0dcd96476e38 100644
--- a/metadata/md5-cache/dev-util/kbuild-9999
+++ b/metadata/md5-cache/dev-util/kbuild-9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=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/subversion[http(+)] net-misc/rsync
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile install preinst prepare setup unpack
 DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
@@ -9,4 +9,4 @@ LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	subversion	c500a1b7795f44153bd96fc2597e3c05
-_md5_=7107b4e8394ad3e9f286830b0ff8e16a
+_md5_=460dbefcd400f126930f6f01aaf65fec
diff --git a/metadata/md5-cache/dev-util/sel-0.08.4-r2 b/metadata/md5-cache/dev-util/sel-0.08.4-r2
index ab9feb253a39..1402f9efa9c4 100644
--- a/metadata/md5-cache/dev-util/sel-0.08.4-r2
+++ b/metadata/md5-cache/dev-util/sel-0.08.4-r2
@@ -1,5 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=A filemanager for shell scripts
 EAPI=7
 HOMEPAGE=http://www.rninet.de/darkstar/sel.html
@@ -10,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.rninet.de/darkstar/files/sel-0.08.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=116ffdf94aedec759fc932e1f9472d21
+_md5_=7304095bfff2c195450195d54dc3f486
diff --git a/metadata/md5-cache/dev-util/usb-robot-0.2.0 b/metadata/md5-cache/dev-util/usb-robot-0.2.0-r1
index e18da24dbc95..d663a3e83fa8 100644
--- a/metadata/md5-cache/dev-util/usb-robot-0.2.0
+++ b/metadata/md5-cache/dev-util/usb-robot-0.2.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile
-DEPEND=virtual/libusb:0 sys-libs/readline
+DEPEND=virtual/libusb:0 sys-libs/readline:=
 DESCRIPTION=USB Reverse engineering tools
 EAPI=6
 HOMEPAGE=http://usb-robot.sourceforge.net/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 sys-libs/readline
+RDEPEND=virtual/libusb:0 sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://sourceforge/usb-robot/usb-robot-0.2.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=6e36676381414a902a78a3b6b77dc1d6
+_md5_=a47c365d6822c3c9914ed4567d2c896d
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615 b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
index 0578f440a02f..ea8d1f70fde2 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbi
 SLOT=0
 SRC_URI=https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/0c2fcf691ffb2a586991350d67f3efd1cca2a1f3 -> dxx-rebirth-0.61.0_pre20200615.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	fc8e53815030125602cc608cd1bff857	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=77bdbeb22d3d6213e74abc311c74f9de
+_md5_=d7f535b4b89c25d3c6927a958409d0de
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-9999 b/metadata/md5-cache/games-action/dxx-rebirth-9999
index 61dc80dae180..3a6a58e619ad 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-9999
+++ b/metadata/md5-cache/games-action/dxx-rebirth-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
 DEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
@@ -12,4 +12,4 @@ RDEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png
 REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbis? ( music ) opl3-musicpack? ( vorbis ) sc55-musicpack? ( vorbis ) sdl2? ( opengl )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	fc8e53815030125602cc608cd1bff857	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1dc6ff17eda7ce9a7c4622efa547857f
+_md5_=c0728003968ff6e02a042e221871cf72
diff --git a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1 b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r2
index 67782b68ae95..15f2321b8c0b 100644
--- a/metadata/md5-cache/games-action/moon-buggy-1.0.51-r1
+++ b/metadata/md5-cache/games-action/moon-buggy-1.0.51-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=acct-group/gamestat sys-libs/ncurses:0 virtual/pkgconfig sys-devel/gnuconfig >=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=acct-group/gamestat sys-libs/ncurses:0= virtual/pkgconfig sys-devel/gnuconfig >=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 simple console game, where you drive a car across the moon's surface
 EAPI=6
 HOMEPAGE=https://www.seehuhn.de/pages/moon-buggy.html
 INHERIT=autotools
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=acct-group/gamestat sys-libs/ncurses:0
+RDEPEND=acct-group/gamestat sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://m.seehuhn.de/programs/moon-buggy-1.0.51.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=bb341257173930f1dbfd4223b43128aa
+_md5_=668a44eb57576d7526a02195826676d2
diff --git a/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1 b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r2
index b88737781e49..22f0d2fa6a29 100644
--- a/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
+++ b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r2
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=An ncurses-based Xenon clone
 EAPI=7
 HOMEPAGE=http://www.alessandropira.org/alienwave/aw.html
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.alessandropira.org/alienwave/alienwave-0.4.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=df8234991e86238ac78bd5540c3fc050
+_md5_=fc0b935ed2b661a452947ec849bef926
diff --git a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1 b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r2
index 40c0b6fbe708..061d1a60a6c3 100644
--- a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
+++ b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=Space invaders clone, using ncurses library
 EAPI=6
 HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/invaders0.1b.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=8624c7b41ee46fa904a9c197a21bd81d
+_md5_=3bd4c9d091de3522119edeb47a15b27e
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1 b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
index c2839f0d6300..fc7eb8164970 100644
--- a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
+++ b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=b6a724a5b60940fb0462fd051e8a8545
+_md5_=6c596b3fe88ab341dfdfd2e35df128ed
diff --git a/metadata/md5-cache/games-arcade/gnake-0.94b-r1 b/metadata/md5-cache/games-arcade/gnake-0.94b-r2
index df0c64aab6ba..b04168e2c1bc 100644
--- a/metadata/md5-cache/games-arcade/gnake-0.94b-r1
+++ b/metadata/md5-cache/games-arcade/gnake-0.94b-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=An ncurses-based Nibbles clone
 EAPI=6
 HOMEPAGE=http://lightless.org/gnake
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/Gnake.0.94b.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=aa1011fbf566d720b22ca4f29f1efef8
+_md5_=22ab647f61c3b9edf3ca034c166aa5c1
diff --git a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1 b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r2
index c36e482d6a2d..d511214afd05 100644
--- a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
+++ b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r2
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0=
 DESCRIPTION=client for the french tarot game maitretarot
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/maitretarot/
 INHERIT=autotools toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_ncurses_client.pkg/0.1.98/mt_ncurses_client-0.1.98.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f9e1a53713392ad247fe17feb66b411b
+_md5_=1b702b9d9d7ecae535c2d8841ff8c85b
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
index 829b11438103..8ed0f4d8d37c 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:= ) speex? ( media-libs/speex:= media-libs/speexdsp:= ) virtual/pkgconfig
+DEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:= ) speex? ( media-libs/speex:= media-libs/speexdsp:= )
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
@@ -10,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:= ) speex? ( media-libs/speex:= media-libs/speexdsp:= )
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-audio-sdl/releases/download/2.5.9/mupen64plus-audio-sdl-src-2.5.9.tar.gz
-_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6166c6bfa9b4c28aa6e8e8cd979acf45
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
+_md5_=38778bb95f9af52da522158ed5b59bcb
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
index 5e2444aad816..6df8bbd73eba 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystick] virtual/pkgconfig
+DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystick]
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL input plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
@@ -10,4 +11,4 @@ RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joysti
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-input-sdl/releases/download/2.5.9/mupen64plus-input-sdl-src-2.5.9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=f60e23fc19c6d3599d4c16d7a2793ec4
+_md5_=d96f935a251d0fc17de0ea9420dad0b8
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
index 56330840aca1..0e792abfc997 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] sys-libs/zlib:0= virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] ) hires? ( dev-libs/boost:0= ) virtual/pkgconfig
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] sys-libs/zlib:0= virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] ) hires? ( dev-libs/boost:0= )
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
@@ -11,4 +12,4 @@ RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-video-glide64mk2/releases/download/2.5.9/mupen64plus-video-glide64mk2-src-2.5.9.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=85bc27a1130c0612e497cb75fd665657
+_md5_=fb67eda5db049f37ddc75ac4a23648b3
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
index 49b8c7ae7274..5ac1205e061e 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] ) virtual/pkgconfig
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] )
 DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, rice video plugin
 EAPI=7
 HOMEPAGE=https://www.mupen64plus.org/
@@ -10,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] )
 SLOT=0
 SRC_URI=https://github.com/mupen64plus/mupen64plus-video-rice/releases/download/2.5.9/mupen64plus-video-rice-src-2.5.9.tar.gz
-_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5651b4d8b76964c729840f4078e90451
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
+_md5_=65c335bf381c6b88de4c2a3741d3982a
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r9 b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
index 8409ad205a71..569255888ae2 100644
--- a/metadata/md5-cache/games-emulation/zsnes-1.51-r9
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r9
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/nasm debug? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-lang/nasm virtual/pkgconfig sys-devel/gnuconfig >=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=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
 DESCRIPTION=SNES (Super Nintendo) emulator that uses x86 assembly
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[ab
 SLOT=0
 SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2 -> zsnes-1.51-20071031.tar.bz2
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	pax-utils	d3fc79d3d50544347e324864f95206e2
-_md5_=088061c3020343ef5a4d83132ae9c8e9
+_md5_=25e4590923ab579bbefc246314b968b6
diff --git a/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r1 b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
index 202899b33e2b..325bf9e29116 100644
--- a/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r1
+++ b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile install prepare test
-DEPEND=sys-apps/miscfiles sys-libs/ncurses:0 !app-misc/banner !games-misc/wtf !games-puzzle/hangman
+DEPEND=sys-apps/miscfiles sys-libs/ncurses:0= !app-misc/banner !games-misc/wtf !games-puzzle/hangman
 DESCRIPTION=Collection of games from NetBSD
 EAPI=7
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
 INHERIT=toolchain-funcs
 KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=BSD
-RDEPEND=sys-apps/miscfiles sys-libs/ncurses:0 !app-misc/banner !games-misc/wtf !games-puzzle/hangman acct-group/gamestat
+RDEPEND=sys-apps/miscfiles sys-libs/ncurses:0= !app-misc/banner !games-misc/wtf !games-puzzle/hangman acct-group/gamestat
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz mirror://debian/pool/main/b/bsdgames/bsdgames_2.17-28.debian.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=56ccb85adaf878135849d4e0e721e37d
+_md5_=5d5c00cb1b7d32f45559bef0d08ca781
diff --git a/metadata/md5-cache/games-misc/sdljoytest-11102003 b/metadata/md5-cache/games-misc/sdljoytest-11102003
index 2a77b2ac3706..6083f590a86e 100644
--- a/metadata/md5-cache/games-misc/sdljoytest-11102003
+++ b/metadata/md5-cache/games-misc/sdljoytest-11102003
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-i
 SLOT=0
 SRC_URI=mirror://sourceforge/sdljoytest/SDLJoytest-GL-11102003.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=6330859dcd84e2c48d9ce2cf18f5e720
+_md5_=a47bb9f714b5bff60c5d92d3384c0102
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1 b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
index fad4e42cd92f..d295cf462656 100644
--- a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
+++ b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst
 DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
 DESCRIPTION=Portable redcode simulator's sdl port for core war
-EAPI=6
+EAPI=7
 HOMEPAGE=https://corewar.co.uk/pihlaja/pmars-sdl/
-INHERIT=readme.gentoo-r1 toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs readme.gentoo-r1
 IUSE=sdl X
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
 SLOT=0
 SRC_URI=https://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=61dcdf3abd8d346c3eac95af40b36147
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=ee0125b50c8bbd3fa657d0e4778be885
diff --git a/metadata/md5-cache/games-strategy/dopewars-1.6.1 b/metadata/md5-cache/games-strategy/dopewars-1.6.1
index 49878ee90178..37731d04bb4e 100644
--- a/metadata/md5-cache/games-strategy/dopewars-1.6.1
+++ b/metadata/md5-cache/games-strategy/dopewars-1.6.1
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) nls? ( sys-devel/gettext )
 DESCRIPTION=Re-Write of the game Drug Wars
 EAPI=7
 HOMEPAGE=http://dopewars.sourceforge.net/
@@ -12,4 +12,4 @@ RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs
 SLOT=0
 SRC_URI=https://github.com/benmwebb/dopewars/archive/v1.6.1.tar.gz -> dopewars-1.6.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=947fe4e7616bc88afb5c56df05e6da63
+_md5_=2039f803b150a3254b69ec1b9faef6d9
diff --git a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2 b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
index d2fe57c6e30f..b1f57bfab8cd 100644
--- a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
+++ b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) virtual/pkgconfig
+DEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= )
 DESCRIPTION=A portable, high performance parallel ray tracing system
 EAPI=7
 HOMEPAGE=http://jedi.ks.uiuc.edu/~johns/raytracer/
@@ -11,4 +12,4 @@ RDEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu vir
 SLOT=0
 SRC_URI=http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/tachyon-0.99b6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=869519d6f64085c68106b2726992ba6c
+_md5_=9c5e369336a0dd681635a25254be1751
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
index 9085800768dd..f7220ea502b8 100644
--- a/metadata/md5-cache/media-plugins/hexter-1.1.0
+++ b/metadata/md5-cache/media-plugins/hexter-1.1.0
@@ -4,10 +4,12 @@ DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? (
 DESCRIPTION=Yamaha DX7 modeling DSSI plugin
 EAPI=7
 HOMEPAGE=http://smbolton.com/hexter.html
+INHERIT=toolchain-funcs
 IUSE=gtk2 readline
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
-_md5_=088e471e43977b3670a852fab5979194
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
+_md5_=30fcf4c979af504b19742f3e54c78c8e
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index 24372efb0654..99de315c25cc 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=media-libs/freetype virtual/udev media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: shows information about the current state of VDR on iMON LCD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-imonlcd/wiki
-INHERIT=linux-info udev vdr-plugin-2
+INHERIT=linux-info toolchain-funcs udev vdr-plugin-2
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -12,4 +12,4 @@ RDEPEND=media-libs/freetype virtual/udev >=media-tv/gentoo-vdr-scripts-0.4.2 >=a
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2086/vdr-imonlcd-1.0.2.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	linux-info	dcc3dd587b38fefad1be6ff5e2fc9cb7	udev	452708c3f55cf6e918b045adb949a9e6	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=2725ceeb6195cefeae4330256796d9f0
+_md5_=d0eeb9945a351e83ba54588853c10281
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index c9e1c81a88f3..1d6afcf73a2e 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards
 EAPI=7
 HOMEPAGE=https://github.com/CvH/vdr-plugin-wirbelscan
-INHERIT=vdr-plugin-2
+INHERIT=toolchain-funcs vdr-plugin-2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=0f1728497d2689b70cb66651897b64c2
+_md5_=1e0bd1779b5f2329abb34d0890dd281b
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
index f9d488a194a5..4a017833bc39 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r4
@@ -1,9 +1,10 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender bluray? ( media-libs/libbluray ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) jpeg? ( virtual/jpeg:* ) opengl? ( virtual/opengl ) vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] ) xinerama? ( x11-libs/libXinerama ) ) ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
-INHERIT=vdr-plugin-2
+INHERIT=toolchain-funcs vdr-plugin-2
 IUSE=bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -12,4 +13,4 @@ REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz http://vdr.websitec.de/download/vdr-xineliboutput/vdr-xineliboutput-2.2.0_clang.patch.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=1cd3b61b35faeef1bf1b159e254f4976
+_md5_=3aaae7f988928da034c01ed185fcf655
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index 8eacb524af99..52ceccc34a42 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) virtual/pkgconfig sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers )
+DEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) sys-kernel/linux-headers nls? ( sys-devel/gettext ) xine? ( X? ( x11-base/xorg-proto x11-libs/libXxf86vm ) ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers )
 DESCRIPTION=VDR Plugin: Xinelib PlugIn
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xineliboutput/
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2 )
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	unpacker	517f16af48ee3ab88180dd58b5143213	vdr-plugin-2	97da93828a6d0a7bb63d8a301042b0f3
-_md5_=a61962f6e46dfaa84a7189ce339d0ce3
+_md5_=d094f34b1485356d0867be1baea97f34
diff --git a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0 b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
index a741735536f3..2209c00571cc 100644
--- a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
+++ b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
 DEPEND=media-sound/pulseaudio:=
 DESCRIPTION=Linux Fleetsync / MDC1200 decoder
@@ -10,4 +11,4 @@ RDEPEND=media-sound/pulseaudio:=
 SLOT=0
 SRC_URI=https://github.com/russinnes/fsync-mdc1200-decode/archive/1.0.tar.gz -> fsync-mdc1200-decode-1.0.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=f715211ba1eedf80c5e5129edf787734
+_md5_=cd01aa455cf0f7030db61c4923ad96bf
diff --git a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999 b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
index a68040139b09..18ce0eba3fee 100644
--- a/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
+++ b/metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
 DEPEND=media-sound/pulseaudio:=
 DESCRIPTION=Linux Fleetsync / MDC1200 decoder
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-sound/pulseaudio:=
 SLOT=0
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=f715211ba1eedf80c5e5129edf787734
+_md5_=cd01aa455cf0f7030db61c4923ad96bf
diff --git a/metadata/md5-cache/media-radio/ibp-0.21-r1 b/metadata/md5-cache/media-radio/ibp-0.21-r2
index d35dcc80a200..0e39be88ac21 100644
--- a/metadata/md5-cache/media-radio/ibp-0.21-r1
+++ b/metadata/md5-cache/media-radio/ibp-0.21-r2
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 ) X? ( >=x11-misc/imake-1.0.8-r1 )
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) X? ( >=x11-misc/imake-1.0.8-r1 )
 DESCRIPTION=Shows currently transmitting beacons of the International Beacon Project (IBP)
-EAPI=6
+EAPI=7
 HOMEPAGE=http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp.html
 INHERIT=toolchain-funcs
 IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 )
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp-0.21.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=16ed4586500cbb523ac5df784c7621fb
+_md5_=cd115dd6115506fb01eca10473122274
diff --git a/metadata/md5-cache/media-sound/snd-17.4-r1 b/metadata/md5-cache/media-sound/snd-17.4-r2
index 6348cfe76429..e97c0625e9af 100644
--- a/metadata/md5-cache/media-sound/snd-17.4-r1
+++ b/metadata/md5-cache/media-sound/snd-17.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp:0= dev-libs/mpc dev-libs/mpfr:0= ) gsl? ( sci-libs/gsl:= ) gtk? ( x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango ) jack? ( virtual/jack ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/motif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline:* ) ruby? ( dev-lang/ruby:* ) sys-devel/gnuconfig >=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/audiofile alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp:0= dev-libs/mpc dev-libs/mpfr:0= ) gsl? ( sci-libs/gsl:= ) gtk? ( x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango ) jack? ( virtual/jack ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/motif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline:= ) ruby? ( dev-lang/ruby:* ) sys-devel/gnuconfig >=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=Snd is a sound editor
 EAPI=6
 HOMEPAGE=https://ccrma.stanford.edu/software/snd/
@@ -7,9 +7,9 @@ INHERIT=autotools flag-o-matic
 IUSE=alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )
-RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp:0= dev-libs/mpc dev-libs/mpfr:0= ) gsl? ( sci-libs/gsl:= ) gtk? ( x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango ) jack? ( virtual/jack ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/motif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline:* ) ruby? ( dev-lang/ruby:* )
+RDEPEND=media-libs/audiofile alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp:0= dev-libs/mpc dev-libs/mpfr:0= ) gsl? ( sci-libs/gsl:= ) gtk? ( x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango ) jack? ( virtual/jack ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/motif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline:= ) ruby? ( dev-lang/ruby:* )
 REQUIRED_USE=?? ( portaudio pulseaudio ) ?? ( ruby s7 )
 SLOT=0
 SRC_URI=ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-17.4.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=9f7a088cd42a2cd191c7ec45b9c3f2bf
+_md5_=09cff63932c2174ff2479ae19ee547b6
diff --git a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1 b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
index 06f5c4d952cc..69e007cdfd98 100644
--- a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
+++ b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
@@ -1,5 +1,6 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
 DEFINED_PHASES=compile install prepare setup
-DEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/alsa-lib-0.9:0 ) media-libs/libsndfile:0 media-libs/freeglut:0 virtual/opengl:0 virtual/glu:0 x11-libs/gtk+:2 sys-devel/bison:0 sys-devel/flex:0
+DEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/alsa-lib-0.9:0 ) media-libs/libsndfile:0 media-libs/freeglut:0 virtual/opengl:0 virtual/glu:0 x11-libs/gtk+:2
 DESCRIPTION=Expressive Synthesis, Transformation, Rendering of Environmental Audio
 EAPI=7
 HOMEPAGE=http://taps.cs.princeton.edu/
@@ -11,4 +12,4 @@ RDEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/a
 SLOT=0
 SRC_URI=http://taps.cs.princeton.edu/release/files/tapestrea-0.1.0.5.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=4c6e54303b0ebaca9f0f8dfa633f5c42
+_md5_=68a82d9daec770444003c5979e550f62
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
index 6fb306265c30..46c4e450f1e2 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	linux-info	dcc3dd587b38fefad1be6ff5e2fc9cb7	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=441ed4639d96e83bff58b1810ce06d25
+_md5_=3490f8fdb853cbdbb0055544738b9e24
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index f1db8c2fe248..30133484ddab 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -12,4 +12,4 @@ RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( m
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	linux-info	dcc3dd587b38fefad1be6ff5e2fc9cb7	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=c9007a44b9338de082fb6de2ac02565f
+_md5_=b79dd833226986919ad3eb388d8f16e4
diff --git a/metadata/md5-cache/media-video/matroxset-0.4 b/metadata/md5-cache/media-video/matroxset-0.4-r1
index a146290d80d2..6bd6ffda55fc 100644
--- a/metadata/md5-cache/media-video/matroxset-0.4
+++ b/metadata/md5-cache/media-video/matroxset-0.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses virtual/pkgconfig
+DEPEND=sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=Matrox utility to switch output modes (activate tvout)
 EAPI=6
 HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/matroxset-0.4.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=804d01fd4225eea15658560dab4215e2
+_md5_=b61a5d77edadd29b207bc8964db3d562
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r3
index d74e1ac6d204..f95f27f296cd 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst setup
-DEPEND=net-libs/libpcap sys-libs/ncurses:*
+DEPEND=net-libs/libpcap sys-libs/ncurses:=
 DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
 EAPI=7
 HOMEPAGE=https://ee.lbl.gov/
@@ -8,8 +8,8 @@ INHERIT=systemd user
 IUSE=selinux
 KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=BSD GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
+RDEPEND=net-libs/libpcap sys-libs/ncurses:= selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
 SLOT=0
 SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
-_md5_=b545b074a9a1f028f6a2d30435e44ae5
+_md5_=1262faba4c5adadb8d2a91b2bbd2b141
diff --git a/metadata/md5-cache/net-analyzer/zniper-1.0-r1 b/metadata/md5-cache/net-analyzer/zniper-1.0-r2
index eae930b29e91..ed25bd285958 100644
--- a/metadata/md5-cache/net-analyzer/zniper-1.0-r1
+++ b/metadata/md5-cache/net-analyzer/zniper-1.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses
+DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=Displays and kill active TCP connections seen by the selected interface
 EAPI=5
 HOMEPAGE=http://www.signedness.org/tools/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
+RDEPEND=net-libs/libpcap sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/zniper-1.0.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=dc8ad9964da14a4aaf58ec8e758232c6
+_md5_=8e5b49a8bdbce863faf74b4b564bc3cc
diff --git a/metadata/md5-cache/net-dialup/xc-4.3.2-r4 b/metadata/md5-cache/net-dialup/xc-4.3.2-r5
index 5fe3b581e386..2f0cb591970a 100644
--- a/metadata/md5-cache/net-dialup/xc-4.3.2-r4
+++ b/metadata/md5-cache/net-dialup/xc-4.3.2-r5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
+DEPEND=sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=Modem dialout & serial terminal program
 EAPI=5
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/
 INHERIT=epatch flag-o-matic multilib toolchain-funcs
 KEYWORDS=amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=xc-radley
-RDEPEND=sys-libs/ncurses
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/xc-4.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=43904005c27d88abb7001402582cd4ff
+_md5_=7af81761766f7eaea64a6728b8097ed8
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
index bb40845ec274..205fbb45e845 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.15
@@ -12,4 +12,4 @@ RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/t
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.15.tar.gz -> xl2tpd-1.3.15.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=057d1f1383adc737ff0a7d59de4a9e35
+_md5_=06a629c386d5c802b9029dd63b488dd2
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.16 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
index e4f505fb7ba3..4016225b9188 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
@@ -12,4 +12,4 @@ RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/t
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.16.tar.gz -> xl2tpd-1.3.16.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=057d1f1383adc737ff0a7d59de4a9e35
+_md5_=06a629c386d5c802b9029dd63b488dd2
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r3
index 467a2bba439a..8b40bdaf3a7b 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=sys-libs/ncurses:*
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=An extremely configurable ftp client
 EAPI=7
 HOMEPAGE=https://www.ncftp.com/
@@ -8,8 +8,8 @@ INHERIT=autotools toolchain-funcs
 IUSE=pch
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=Clarified-Artistic
-RDEPEND=sys-libs/ncurses:*
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ecc65c8796e7947afeafa30bec1696b8
+_md5_=e33346fe952b68b4296e9768f47ebfc9
diff --git a/metadata/md5-cache/net-ftp/yafc-1.3.7 b/metadata/md5-cache/net-ftp/yafc-1.3.7-r1
index dc6b05e89cb9..4a8858ac576e 100644
--- a/metadata/md5-cache/net-ftp/yafc-1.3.7
+++ b/metadata/md5-cache/net-ftp/yafc-1.3.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:* dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
+DEPEND=sys-libs/ncurses:= dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
 DESCRIPTION=Console ftp client with a lot of nifty features
 EAPI=7
 HOMEPAGE=http://www.yafc-ftp.com/
@@ -7,8 +7,8 @@ INHERIT=bash-completion-r1
 IUSE=ipv6 kerberos readline socks5 ssh
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:* dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
+RDEPEND=sys-libs/ncurses:= dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
 SLOT=0
 SRC_URI=http://www.yafc-ftp.com/downloads/yafc-1.3.7.tar.xz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908
-_md5_=95f5c485ab5873fac5b0454ec6c3caac
+_md5_=34333c6465a2de682c71472582272415
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r3
index 02bd175496a3..f05b26d21ded 100644
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r2
+++ b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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=sys-libs/ncurses app-arch/sharutils net-mail/mailbase
+DEPEND=sys-libs/ncurses:= app-arch/sharutils net-mail/mailbase
 DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
 EAPI=7
 HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
@@ -8,8 +8,8 @@ INHERIT=autotools toolchain-funcs
 IUSE=static-libs
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
+RDEPEND=sys-libs/ncurses:= app-arch/sharutils net-mail/mailbase app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
 SLOT=0
 SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=1c90bc0ba42c4a2c3696a334a417d5c1
+_md5_=6c38b5f60e5dabd9c8573f6a9de0f07b
diff --git a/metadata/md5-cache/net-mail/nmzmail-1.1 b/metadata/md5-cache/net-mail/nmzmail-1.1-r1
index 03e00f4759b3..dcc35e9b3b58 100644
--- a/metadata/md5-cache/net-mail/nmzmail-1.1
+++ b/metadata/md5-cache/net-mail/nmzmail-1.1-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
-DEPEND=sys-libs/readline
+DEPEND=sys-libs/readline:=
 DESCRIPTION=Fast mail searching for mutt using namazu
 EAPI=6
 HOMEPAGE=https://www.ecademix.com/JohannesHofmann/nmzmail.html
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/readline >=app-text/namazu-2
+RDEPEND=sys-libs/readline:= >=app-text/namazu-2
 SLOT=0
 SRC_URI=https://www.ecademix.com/JohannesHofmann/nmzmail-1.1.tar.gz
-_md5_=bfaf366f9d0414db66e5f33b67b16eaa
+_md5_=33d30bf3d34f8ce005ae6aadd9eeb024
diff --git a/metadata/md5-cache/net-misc/netkit-talk-0.17-r5 b/metadata/md5-cache/net-misc/netkit-talk-0.17-r6
index 7b5c6633c648..3e35d511d126 100644
--- a/metadata/md5-cache/net-misc/netkit-talk-0.17-r5
+++ b/metadata/md5-cache/net-misc/netkit-talk-0.17-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2 virtual/pkgconfig
+DEPEND=>=sys-libs/ncurses-5.2:= virtual/pkgconfig
 DESCRIPTION=Netkit - talkd
 EAPI=5
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
@@ -7,8 +7,8 @@ INHERIT=epatch toolchain-funcs
 IUSE=ipv6
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2 virtual/inetd
+RDEPEND=>=sys-libs/ncurses-5.2:= virtual/inetd
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ntalk-0.17.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=a5bcecebd1ce4abf51296f9c93054ada
+_md5_=bd57ec1a61c9d88f7906be6dfb3a095b
diff --git a/metadata/md5-cache/net-news/snownews-1.6.10 b/metadata/md5-cache/net-news/snownews-1.6.10
index 6a6e2b93d6cf..c92b51bb594d 100644
--- a/metadata/md5-cache/net-news/snownews-1.6.10
+++ b/metadata/md5-cache/net-news/snownews-1.6.10
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode] dev-perl/XML
 SLOT=0
 SRC_URI=https://github.com/kouya/snownews/archive/1.6.10.tar.gz -> snownews-1.6.10.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=01a6f78c6f3c7985bf82b2768d901a21
+_md5_=cf343a97fd6b9d393f37ae7006edc553
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r4 b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
index 97728c6b08e4..2bb7be27c0fc 100644
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r4
+++ b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
+DEPEND=net-libs/libpcap sys-libs/ncurses:=
 DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
 EAPI=7
 HOMEPAGE=http://www.elixar.com/
@@ -10,4 +11,4 @@ RDEPEND=net-libs/libpcap sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=b56dab45bf633a935e9fb318d7d29c78
+_md5_=3ebec7cc8dd297c7376f49585d2b30b4
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2 b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r3
index bb97aa2df1a7..c6948694449e 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt ) virtual/pkgconfig
+DEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= virtual/glu virtual/opengl X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt ) virtual/pkgconfig
 DESCRIPTION=Development toolkit and applications for computational biology, including BLAST
 EAPI=5
 HOMEPAGE=https://www.ncbi.nlm.nih.gov/
@@ -7,8 +7,8 @@ INHERIT=epatch flag-o-matic prefix toolchain-funcs
 IUSE=doc static-libs X
 KEYWORDS=~alpha amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
-RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt )
+RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= virtual/glu virtual/opengl X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/blast/executables/release/2.2.26/ncbi.tar.gz -> ncbi-tools-2.2.26.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=f4fd3d16b0f57ddd5ddff7eb3342f37e
+_md5_=4a060d3447bfe5e557c4831b3fc8fad9
diff --git a/metadata/md5-cache/sci-biology/plink-1.90_pre140514 b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
index 09405a7a2db8..edd9bb389731 100644
--- a/metadata/md5-cache/sci-biology/plink-1.90_pre140514
+++ b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip virtual/pkgconfig
+DEPEND=sys-libs/zlib virtual/cblas virtual/lapack app-arch/unzip virtual/pkgconfig
 DESCRIPTION=Whole genome association analysis toolset
 EAPI=5
 HOMEPAGE=http://pngu.mgh.harvard.edu/~purcell/plink/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib virtual/cblas virtual/lapack
 SLOT=0
 SRC_URI=http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.zip -> plink-1.90_pre140514.zip
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=84c4fdcaa7feed7785c42d566070ab94
+_md5_=e1f50da3f99cd26238e4ef37a7de379a
diff --git a/metadata/md5-cache/sci-chemistry/tinker-8.2.1 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
index 340eb7ed4879..820b9f68fb95 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-8.2.1
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 virtual/pkgconfig virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !sys-apps/bar !dev-util/diffuse >=virtual/jre-1.6 >=virtual/jdk-1.6 virtual/pkgconfig virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Molecular modeling package that includes force fields, such as AMBER and CHARMM
 EAPI=6
 HOMEPAGE=http://dasher.wustl.edu/tinker/
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-8.2.1.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f
-_md5_=61457eb4ec14437ac6d628ef46e9e805
+_md5_=fb598b8d929f5e0c789410edc0a98c00
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2 b/metadata/md5-cache/sci-electronics/spice-3.5.5-r3
index c857116e72ae..5664d4da5448 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3 x11-base/xorg-proto
+DEPEND=sys-libs/ncurses:0= x11-libs/libXaw >=app-misc/editor-wrapper-3 virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=general-purpose circuit simulation program
 EAPI=6
 HOMEPAGE=http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3
+RDEPEND=sys-libs/ncurses:0= x11-libs/libXaw >=app-misc/editor-wrapper-3
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=ba456b21b01a2cf9a767f0b26baf9c5d
+_md5_=9806ca17916a92662e119aeed55e660b
diff --git a/metadata/md5-cache/sci-libs/levmar-2.6-r1 b/metadata/md5-cache/sci-libs/levmar-2.6-r1
index 79be8fb0e166..0767442f0d00 100644
--- a/metadata/md5-cache/sci-libs/levmar-2.6-r1
+++ b/metadata/md5-cache/sci-libs/levmar-2.6-r1
@@ -1,5 +1,6 @@
-BDEPEND=virtual/blas virtual/lapack virtual/pkgconfig dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/blas virtual/lapack
 DESCRIPTION=Levenberg-Marquardt nonlinear least squares C library
 EAPI=7
 HOMEPAGE=https://www.ics.forth.gr/~lourakis/levmar/
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=c02af178c1dc5b2e5966144741abf4bf
+_md5_=9e9ffe13384292cef3124bdafe9bdecd
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
index a71f7052fcf8..a2570b846187 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config =dev-util/bazel-3* cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=dev-util/bazel-0.20
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config =dev-util/bazel-3* virtual/pkgconfig cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=dev-util/bazel-0.20
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
 DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( || ( ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* ) ) ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/dill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flatbuffers[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/tblib[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/typing-extensions[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.4.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python? ( dev-python/mock dev-python/setuptools )
 DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
@@ -14,4 +14,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0.tar.gz -> tensorflow-2.4.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	cuda	c2f1b334711bbbf2130f339636dc7515	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	prefix	de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=0e231528d0fae135f1a5444a1654015b
+_md5_=1aa15d78be0e7204f601b79c1918fd8b
diff --git a/metadata/md5-cache/sys-apps/ethq-9999 b/metadata/md5-cache/sys-apps/ethq-9999
index 3ab85aa27a7d..31573cb72743 100644
--- a/metadata/md5-cache/sys-apps/ethq-9999
+++ b/metadata/md5-cache/sys-apps/ethq-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=sys-libs/ncurses:0
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Ethernet NIC Queue stats viewer
 EAPI=7
 HOMEPAGE=https://github.com/isc-projects/ethq
@@ -8,8 +8,8 @@ INHERIT=git-r3 toolchain-funcs
 IUSE=test
 LICENSE=MPL-2.0
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=11f90f0bee02dbaa79ec52f7b311009f
+_md5_=1955523de4b062d8e7ab7d863d74395f
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1
index 3ee5ad27aaba..9a247ea7bbb7 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.6-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
-DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
 DESCRIPTION=GPT partition table manipulator for Linux
 EAPI=7
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
@@ -11,4 +12,4 @@ RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.6.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=c5a62afa22c4b64d21defdd3ddf09f48
+_md5_=fcea1e7f0daa229a00f04c9a5726444b
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7
index 50b48fc06a63..9cd045293f47 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.7
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.7
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
-DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) )
 DESCRIPTION=GPT partition table manipulator for Linux
 EAPI=7
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
@@ -11,4 +12,4 @@ RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.7.tar.gz
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=4c947665dab5fce33735b7d5764854e1
+_md5_=c99b16e0ff41e55a872deee7d18a084f
diff --git a/metadata/md5-cache/sys-apps/heirloom-tools-070715-r3 b/metadata/md5-cache/sys-apps/heirloom-tools-070715-r4
index 7d061af2aff7..3721d654c2d5 100644
--- a/metadata/md5-cache/sys-apps/heirloom-tools-070715-r3
+++ b/metadata/md5-cache/sys-apps/heirloom-tools-070715-r4
@@ -1,15 +1,15 @@
 BDEPEND=sys-apps/ed sys-devel/bc virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/zlib
+DEPEND=sys-libs/ncurses:= sys-libs/zlib
 DESCRIPTION=Heirloom toolchest - original Unix tools
 EAPI=7
 HOMEPAGE=http://heirloom.sourceforge.net/tools.html
 INHERIT=flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=CDDL GPL-2 LGPL-2.1 9base ZLIB
-RDEPEND=sys-libs/zlib
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/heirloom/heirloom/070715/heirloom-070715.tar.bz2
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc
-_md5_=113875ba7681b616e830a91b32c492a5
+_md5_=b08382913b6baf8db7f39dd85d6eb94c
diff --git a/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214 b/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214-r1
index b6726fbc5985..9e69e8bfc463 100644
--- a/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214
+++ b/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=config install postinst prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
+DEPEND=sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=TOMOYO Linux tools
 EAPI=5
 HOMEPAGE=http://tomoyo.sourceforge.jp/
 INHERIT=epatch multilib toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses !sys-apps/ccs-tools
+RDEPEND=sys-libs/ncurses:= !sys-apps/ccs-tools
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/tomoyo/53357/tomoyo-tools-2.5.0-20130214.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e9e65074acdab9672d56b78abbd960cc
+_md5_=41cc08a23d949f68bb633b92eaf81e63
diff --git a/metadata/md5-cache/www-client/netrik-1.16.1-r1 b/metadata/md5-cache/www-client/netrik-1.16.1-r2
index d2021be3329d..579264144e3c 100644
--- a/metadata/md5-cache/www-client/netrik-1.16.1-r1
+++ b/metadata/md5-cache/www-client/netrik-1.16.1-r2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=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=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline
+DEPEND=>=sys-libs/ncurses-5.1:=[unicode] sys-libs/readline:=
 DESCRIPTION=A text based web browser with no ssl support
 EAPI=7
 HOMEPAGE=http://netrik.sourceforge.net/
 INHERIT=autotools
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline
+RDEPEND=>=sys-libs/ncurses-5.1:=[unicode] sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://sourceforge/netrik/netrik-1.16.1.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9b823ea92d0082a4c5d601b2a2cc7468
+_md5_=5e0abf5e1a5425c01447928941415fe2
diff --git a/metadata/md5-cache/www-client/opera-77.0.4054.80 b/metadata/md5-cache/www-client/opera-77.0.4054.90
index b48bdb324991..f8def2bd7d00 100644
--- a/metadata/md5-cache/www-client/opera-77.0.4054.80
+++ b/metadata/md5-cache/www-client/opera-77.0.4054.90
@@ -10,6 +10,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/77.0.4054.80/linux/opera-stable_77.0.4054.80_amd64.deb https://download2.operacdn.com/pub/opera/desktop/77.0.4054.80/linux/opera-stable_77.0.4054.80_amd64.deb https://download3.operacdn.com/pub/opera/desktop/77.0.4054.80/linux/opera-stable_77.0.4054.80_amd64.deb https://download4.operacdn.com/pub/opera/desktop/77.0.4054.80/linux/opera-stable_77.0.4054.80_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/77.0.4054.90/linux/opera-stable_77.0.4054.90_amd64.deb https://download2.operacdn.com/pub/opera/desktop/77.0.4054.90/linux/opera-stable_77.0.4054.90_amd64.deb https://download3.operacdn.com/pub/opera/desktop/77.0.4054.90/linux/opera-stable_77.0.4054.90_amd64.deb https://download4.operacdn.com/pub/opera/desktop/77.0.4054.90/linux/opera-stable_77.0.4054.90_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	linux-info	dcc3dd587b38fefad1be6ff5e2fc9cb7	chromium-2	199d6bc7f8b84ac7c00aca900739e570	pax-utils	d3fc79d3d50544347e324864f95206e2	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=d17979a5c4b36fa9bc46c4217dfcc983
diff --git a/metadata/md5-cache/www-client/opera-beta-77.0.4054.14 b/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
index e46ac4c23506..5fc127d350c8 100644
--- a/metadata/md5-cache/www-client/opera-beta-77.0.4054.14
+++ b/metadata/md5-cache/www-client/opera-beta-77.0.4054.91
@@ -10,6 +10,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/77.0.4054.14/linux/opera-beta_77.0.4054.14_amd64.deb https://download2.operacdn.com/pub/opera-beta/77.0.4054.14/linux/opera-beta_77.0.4054.14_amd64.deb https://download3.operacdn.com/pub/opera-beta/77.0.4054.14/linux/opera-beta_77.0.4054.14_amd64.deb https://download4.operacdn.com/pub/opera-beta/77.0.4054.14/linux/opera-beta_77.0.4054.14_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download2.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download3.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb https://download4.operacdn.com/pub/opera-beta/77.0.4054.91/linux/opera-beta_77.0.4054.91_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-91.0.4472.19.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	linux-info	dcc3dd587b38fefad1be6ff5e2fc9cb7	chromium-2	199d6bc7f8b84ac7c00aca900739e570	pax-utils	d3fc79d3d50544347e324864f95206e2	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	xdg	c7ba313ea1eaf266f95cc6235f7d6a07
 _md5_=1bf7fd06da390c6e0914466401d0d1c1
diff --git a/metadata/md5-cache/x11-misc/dmenu-5.0 b/metadata/md5-cache/x11-misc/dmenu-5.0
index 333ba3fff4d7..9f3a3d53ce45 100644
--- a/metadata/md5-cache/x11-misc/dmenu-5.0
+++ b/metadata/md5-cache/x11-misc/dmenu-5.0
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
 DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/dmenu/
@@ -11,4 +12,4 @@ RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-li
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/dmenu-5.0.tar.gz
 _eclasses_=portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=4adbd8b71e4cf1cdb0dd83f8beb9bc8c
+_md5_=23d6f0e5ea2b129f04d9586caebb70a5
diff --git a/metadata/md5-cache/x11-misc/dmenu-9999 b/metadata/md5-cache/x11-misc/dmenu-9999
index b389fde00b35..c0c3f696a557 100644
--- a/metadata/md5-cache/x11-misc/dmenu-9999
+++ b/metadata/md5-cache/x11-misc/dmenu-9999
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
 DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/dmenu/
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
-_md5_=74f318a3b01087437cb9299f45775262
+_md5_=b0e88cac89011c20cacc0ce695d7ce64
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r1
index 090dad9148dc..2fd7648bc5ee 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.9
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=window manager without mouse dependency
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/ratpoison/
@@ -7,8 +7,8 @@ INHERIT=elisp-common eutils toolchain-funcs
 IUSE=debug emacs +history sloppy +xft +xrandr
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=2f63b3d194918b34b46e2bf9433dfef6
+_md5_=00806760887f0cc695c576402fa2b3e9
diff --git a/metadata/md5-cache/x11-wm/ratpoison-9999 b/metadata/md5-cache/x11-wm/ratpoison-9999
index f3d7b421dfc9..fbaea5102b85 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-9999
+++ b/metadata/md5-cache/x11-wm/ratpoison-9999
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/gnuconfig >=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]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=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]
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
+DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=window manager without mouse dependency
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/ratpoison/
@@ -8,7 +8,7 @@ INHERIT=autotools elisp-common git-r3 toolchain-funcs
 IUSE=debug emacs +history sloppy +xft +xrandr
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=cdb861ecefd8b274b54b2d8256be0f20
+_md5_=e44b6705591778453593e0586be72810
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 895924e1c6f2..3c8a495c24d3 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1233,7 +1233,7 @@ app-crypt/md6sum 1.0-r2: A C implementation of MD6
 app-crypt/mhash 0.9.9.9-r2: Library providing a uniform interface to a large number of hash algorithms
 app-crypt/minisign 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/mit-krb5-appl 1.0.3-r1: Kerberized applications split from the main MIT Kerberos V distribution
 app-crypt/monkeysphere 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
@@ -1952,7 +1952,7 @@ app-editors/dav 0.8.5-r2: A minimal console text editor
 app-editors/dhex 0.69: ncurses-based hex-editor with diff mode
 app-editors/diakonos 0.9.4: A Linux editor for the masses
 app-editors/e3 2.8.2: Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings
-app-editors/ee 1.5.2: An easy to use text editor. A subset of aee
+app-editors/ee 1.5.2-r1: An easy to use text editor. A subset of aee
 app-editors/elvis 2.2.0-r8: A vi/ex clone
 app-editors/emacs 18.59-r13 23.4-r20 24.5-r10 25.3-r9 26.3-r4 27.1-r4 27.2-r1 27.2.9999 28.0.9999: The extensible, customizable, self-documenting real-time display editor
 app-editors/emact 2.58.0-r1: EmACT, a fork of Conroy's MicroEmacs
@@ -2592,7 +2592,7 @@ app-metrics/uwsgi_exporter 0.7.0 0.8.0: uWSGI metrics exporter for prometheus.io
 app-metrics/vault_exporter 0.1.2-r1: Vault exporter for Prometheus
 app-misc/OpenRGB 0.5 0.6 9999: Open source RGB lighting control that doesn't depend on manufacturer software
 app-misc/abduco 0.6: lightweight session manager with {de,at}tach support
-app-misc/abook 0.6.1-r2: Abook is a text-based addressbook program designed to use with mutt mail client
+app-misc/abook 0.6.1-r3: Abook is a text-based addressbook program designed to use with mutt mail client
 app-misc/acdctl 1.1-r1: Apple Cinema Display Control
 app-misc/actkbd 0.2.8-r2: A keyboard shortcut daemon
 app-misc/aldo 0.7.7: A morse tutor
@@ -2662,7 +2662,7 @@ app-misc/dfshow 0.9.1_beta-r1: DF-SHOW is a Unix-like rewrite of some of the app
 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
-app-misc/dvorakng 0.6.0: Dvorak typing tutor
+app-misc/dvorakng 0.6.0-r1: Dvorak typing tutor
 app-misc/dvtm 0.15-r2 0.15-r3 9999: Dynamic virtual terminal manager
 app-misc/editor-wrapper 4-r1: Wrapper scripts that will execute EDITOR or PAGER
 app-misc/egads 0.9.5-r1: Entropy Gathering And Distribution System
@@ -2924,7 +2924,7 @@ app-office/pinpoint 0.1.8-r1: A tool for making hackers do excellent presentatio
 app-office/plan 1.10: Motif based schedule planner
 app-office/planner 0.14.6_p20130520-r2: Project manager for Gnome
 app-office/projectlibre-bin 1.6.2: An open source desktop alternative to Microsoft Project
-app-office/sc 7.16-r2: Spreadsheet Calculator
+app-office/sc 7.16-r3: Spreadsheet Calculator
 app-office/scribus 1.5.7 9999: Desktop publishing (DTP) and layout program
 app-office/skrooge 2.24.6: Personal finances manager, aiming at being simple and intuitive
 app-office/texmacs 1.99.11: Wysiwyg text processor with high-quality maths
@@ -3261,7 +3261,7 @@ app-text/qpdf 10.0.4 10.1.0 10.3.1 10.3.2: Command-line tool for structural, con
 app-text/qpdfview 0.4.18 0.4.18_p1: A tabbed document viewer
 app-text/rarian 0.8.1-r3: A documentation metadata library
 app-text/recode 3.7.6-r1 3.7.8 3.7.9: Convert files between various character sets
-app-text/reed 5.4: This is a text pager (text file viewer), used to display etexts
+app-text/reed 5.4-r1: This is a text pager (text file viewer), used to display etexts
 app-text/refbase 0.9.6_p20180223: Web-based solution for managing scientific literature, references and citations
 app-text/restview 2.9.2: reStructuredText viewer
 app-text/rman 3.2-r1: PolyGlotMan man page translator AKA RosettaMan
@@ -3766,7 +3766,7 @@ dev-db/firebird 3.0.4.33054.0: Relational database offering many ANSI SQL:2003 a
 dev-db/freetds 1.2.18: Tabular Datastream Library
 dev-db/gigabase 3.83-r2: OO-DBMS with interfaces for C/C++/Java/PHP/Perl
 dev-db/go-etcd 2.0.0-r1: Go client library for etcd
-dev-db/gqlplus 1.16-r1: a front-end for Oracle program sqlplus with command-line editing
+dev-db/gqlplus 1.16-r2: a front-end for Oracle program sqlplus with command-line editing
 dev-db/henplus 0.9.8-r1: Java-based multisession SQL shell for databases with JDBC support
 dev-db/hsqldb 1.8.1.3-r2 1.8.1.3-r3: The leading SQL relational database engine written in Java
 dev-db/influxdb 1.5.1 1.6.3 1.6.4 1.8.0 1.8.0-r1 1.8.1 1.8.2 1.8.3: Scalable datastore for metrics, events, and real-time analytics
@@ -3829,7 +3829,7 @@ dev-db/phppgadmin 7.12.1 7.13.0: Web-based administration for Postgres database
 dev-db/plr 8.3.0.17 8.4.1: R language extension for postgresql database
 dev-db/postgis 3.0.3-r2 3.1.0 3.1.1 3.1.2 9999: Geographic Objects for PostgreSQL
 dev-db/postgresql 9.5.25 9.6.21 9.6.22 10.16 10.17 11.11 11.12 12.6 12.7 13.2 13.3 14_beta1 9999: PostgreSQL RDBMS
-dev-db/pspg 3.1.5 4.3.0: A better pager for psql and mysql
+dev-db/pspg 3.1.5-r1 4.3.0-r1: A better pager for psql and mysql
 dev-db/psqlodbc 11.01.0000 13.00.0000: Official ODBC driver for PostgreSQL
 dev-db/qdbm 1.8.78-r2: Quick Database Manager
 dev-db/qt5-sqlcipher 1.0.11: Qt SQL driver plugin for SQLCipher
@@ -5339,7 +5339,7 @@ dev-lang/nasm 2.15.05: groovy little assembler
 dev-lang/nim 1.4.8: compiled, garbage-collected systems programming language
 dev-lang/nqp 2020.11 2020.12 2021.02 9999: Not Quite Perl, a Perl 6 bootstrapping compiler
 dev-lang/nwcc 0.8.3: Nils Weller's C Compiler
-dev-lang/ocaml 4.05.0-r5 4.05.0-r6 4.09.0-r1 4.10.2-r1 4.11.2-r1 4.12.0-r1: Programming language supporting functional, imperative & object-oriented styles
+dev-lang/ocaml 4.05.0-r7 4.05.0-r8 4.09.0-r2 4.10.2-r2 4.11.2-r2 4.12.0-r2: Programming language supporting functional, imperative & object-oriented styles
 dev-lang/open-cobol 1.1: an open-source COBOL compiler
 dev-lang/orc 0.4.31: The Oil Runtime Compiler, a just-in-time compiler for array operations
 dev-lang/parrot 8.1.0-r2: Virtual machine designed to compile and execute bytecode for dynamic languages
@@ -5472,7 +5472,7 @@ dev-libs/ferrisloki 3.0.13-r2: Loki C++ library from Modern C++ Design
 dev-libs/ffcall 2.1: Build foreign function call interfaces in embedded interpreter
 dev-libs/flatbuffers 1.12.0: Memory efficient serialization library
 dev-libs/folks 0.15.2: Library for aggregating people from multiple sources
-dev-libs/foma 0.9.18: A set of utilities for constructing finite-state automata and transducers
+dev-libs/foma 0.9.18-r1: A set of utilities for constructing finite-state automata and transducers
 dev-libs/freexl 1.0.5 1.0.6: Simple XLS data extraction library
 dev-libs/fribidi 1.0.10: A free implementation of the unicode bidirectional algorithm
 dev-libs/fstrm 0.6.0 0.6.1: Frame Streams implementation in C
@@ -5749,7 +5749,7 @@ dev-libs/libxml2 2.9.10-r5 2.9.12 2.9.12-r2 2.9.12-r3: XML C parser and toolkit
 dev-libs/libxmlb 0.1.15 0.3.1 0.3.2: Library to help create and query binary XML blobs
 dev-libs/libxslt 1.1.34-r1: XSLT libraries and tools
 dev-libs/libyaml 0.2.2 0.2.5: YAML 1.1 parser and emitter written in C
-dev-libs/libzia 4.25 4.27 4.28 4.29: platform abstraction code for tucnak package
+dev-libs/libzia 4.25 4.27 4.28 4.29: Platform abstraction code for tucnak package
 dev-libs/libzip 1.7.3-r1: Library for manipulating zip archives
 dev-libs/light 1.2.2 1.2.2-r1: A program to control backlights (and other hardware lights)
 dev-libs/link-grammar 5.8.0 5.8.1: A Syntactic English parser
@@ -6004,7 +6004,7 @@ dev-ml/cppo 1.6.7: An equivalent of the C preprocessor for OCaml programs
 dev-ml/cryptokit 1.16.1-r1: Cryptographic primitives library for Objective Caml
 dev-ml/csexp 1.3.2-r1: Parsing and printing of S-expressions in Canonical form
 dev-ml/cstruct 5.2.0: Map OCaml arrays onto C-like structs
-dev-ml/cudf 0.9: Library to parse, pretty print, and evaluate CUDF documents
+dev-ml/cudf 0.9-r1: Library to parse, pretty print, and evaluate CUDF documents
 dev-ml/dose3 5.0.1_p16-r3 6.0.1_p2: Library to perform analysis on package repositories
 dev-ml/dune 1.11.4 2.1.0 2.7.1 2.8.2 2.8.4: A composable build system for OCaml
 dev-ml/dune-configurator 2.8.2-r1 2.8.4: A composable build system for OCaml
@@ -10928,7 +10928,7 @@ dev-util/cvise 2.3.0: Super-parallel Python port of the C-Reduce
 dev-util/cwdiff 0.4.0 9999: A script that wraps wdiff to support directories and colorize the output
 dev-util/d-feet 0.3.16: D-Feet is a powerful D-Bus debugger
 dev-util/dbus-test-runner 19.04.0-r1: Run executables under a new DBus session for testing
-dev-util/ddd 3.3.12-r4: Graphical front-end for command-line debuggers
+dev-util/ddd 3.3.12-r5: Graphical front-end for command-line debuggers
 dev-util/debhelper 13.2.1: Collection of programs that can be used to automate common tasks in debian/rules
 dev-util/debootstrap 1.0.123 1.0.124: Debian/Ubuntu bootstrap scripts
 dev-util/debugedit 4.16.1.3: Stand-alone debugedit from RPM
@@ -11171,7 +11171,7 @@ dev-util/uftrace 0.10: Function (graph) tracer for user-space
 dev-util/umockdev 0.12.1: Mock hardware devices for creating unit tests
 dev-util/uncrustify 0.71.0 0.72.0 9999: C/C++/C#/D/Java/Pawn code indenter and beautifier
 dev-util/unifdef 2.12: remove #ifdef'ed lines from a file while otherwise leaving the file alone
-dev-util/usb-robot 0.2.0: USB Reverse engineering tools
+dev-util/usb-robot 0.2.0-r1: USB Reverse engineering tools
 dev-util/valgrind 3.16.1 3.17.0 9999: An open-source memory debugger for GNU/Linux
 dev-util/vbindiff 3.0_beta5: Visual binary diff utility
 dev-util/vint 0.3.21: Lint tool for Vim script language
@@ -11311,7 +11311,7 @@ games-action/luola 1.3.2-r1: A 2D multiplayer arcade game resembling V-Wing
 games-action/maelstrom 3.0.6-r3: An asteroids battle game
 games-action/minecraft-launcher 1.6.93 928: An open-world game whose gameplay revolves around breaking and placing blocks
 games-action/minetest 5.4.1-r1: A free open-source voxel game engine with easy modding and game creation
-games-action/moon-buggy 1.0.51-r1: A simple console game, where you drive a car across the moon's surface
+games-action/moon-buggy 1.0.51-r2: A simple console game, where you drive a car across the moon's surface
 games-action/multimc 0.6.12: An advanced Qt5-based open-source launcher for Minecraft
 games-action/nighthawk 2.2-r1: A tribute to Paradroid by Andrew Braybrook
 games-action/noiz2sa 0.51a-r1: Abstract Shooting Game
@@ -11345,12 +11345,12 @@ games-action/xbomber 101-r1: Bomberman clone w/multiplayer support
 games-action/xpilot 4.5.5-r1: A multi-player 2D client/server space game
 games-arcade/abe 1.1-r1: Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game
 games-arcade/afternoonstalker 1.1.6: Clone of the 1981 Night Stalker video game by Mattel Electronics
-games-arcade/alienwave 0.4.0-r1: An ncurses-based Xenon clone
+games-arcade/alienwave 0.4.0-r2: An ncurses-based Xenon clone
 games-arcade/amphetamine 0.8.10-r1: A cool Jump'n Run game offering some unique visual effects
 games-arcade/aop 0.6-r2: Ambassador of Pain is a curses based game with only 64 lines of code
 games-arcade/apricots 0.2.6-r2: Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga
 games-arcade/aquaria 1.1.3-r2: A 2D scroller set in a massive ocean world
-games-arcade/ascii-invaders 0.1b-r1: Space invaders clone, using ncurses library
+games-arcade/ascii-invaders 0.1b-r2: Space invaders clone, using ncurses library
 games-arcade/asteroid 1.2.1: Modern version of the arcade classic that uses OpenGL
 games-arcade/balloonchase 0.9.6-r1: Fly a hot air balloon and try to blow the other player out of the screen
 games-arcade/barbarian-bin 1.01-r2: Save Princess Mariana through one-on-one battles with demonic barbarians
@@ -11385,7 +11385,7 @@ games-arcade/frozen-bubble 2.2.1_beta1-r1: A Puzzle Bubble clone written in perl
 games-arcade/funnyboat 1.5_p11-r1: A side scrolling shooter game starring a steamboat on the sea
 games-arcade/gav 0.9.0-r1: GPL Arcade Volleyball
 games-arcade/gish-demo 1.6-r1: Play as an amorphous ball of tar that rolls and squishes around
-games-arcade/gnake 0.94b-r1: An ncurses-based Nibbles clone
+games-arcade/gnake 0.94b-r2: An ncurses-based Nibbles clone
 games-arcade/gnome-nibbles 3.38.2: Nibbles clone for GNOME
 games-arcade/gnome-robots 40.0: Avoid the robots and make them crash into each other
 games-arcade/gnujump 1.0.8-r1: Xjump clone with added features
@@ -11503,7 +11503,7 @@ games-board/mah-jong 1.16: A networked Mah Jong program, together with a compute
 games-board/maitretarot 0.1.98-r2: Server for the french tarot game maitretarot
 games-board/megamek 0.34.10-r2: Unofficial online version of the Classic BattleTech board game
 games-board/mt_dolphin_ia 0.1.98-r2: client for the french tarot game maitretarot
-games-board/mt_ncurses_client 0.1.98-r1: client for the french tarot game maitretarot
+games-board/mt_ncurses_client 0.1.98-r2: client for the french tarot game maitretarot
 games-board/natch 2.4-r1: A program to solve chess proof games
 games-board/openyahtzee 1.9.3-r1: A full-featured wxWidgets version of the classic dice game Yahtzee
 games-board/pasang-emas 3.1.0-r1: Traditional game of Brunei
@@ -11677,7 +11677,7 @@ games-kids/tuxmath 2.0.3-r2: Educational arcade game where you have to solve mat
 games-kids/tuxtype 1.8.3-r2: Typing tutorial with lots of eye-candy
 games-misc/asr-manpages 1.3_rc6: Set of humorous manual pages developed on alt.sysadmin.recovery
 games-misc/ballerburg 1.2.0-r1: Linux port of the classical Atari ST game Ballerburg
-games-misc/bsd-games 2.17_p28-r1 3.1-r1: collection of games from NetBSD
+games-misc/bsd-games 2.17_p28-r2 3.1-r1: collection of games from NetBSD
 games-misc/bsod 0.1-r1: This program will let you experience the authentic Microsoft Windows experience
 games-misc/c++robots 0-r1: ongoing 'King of the Hill' (KotH) tournament
 games-misc/cowsay 3.04-r1: Configurable talking ASCII cow (and other characters)
@@ -13902,7 +13902,7 @@ media-radio/flrig 1.3.54 1.4.0: Transceiver control program for Amateur Radio us
 media-radio/fsync-mdc1200-decode 1.0 9999: Linux Fleetsync / MDC1200 decoder
 media-radio/gpredict 2.2.1 2.3: Real-time satellite tracking and orbit prediction application
 media-radio/grig 0.8.1-r1: A tool for controlling amateur radios
-media-radio/ibp 0.21-r1: Shows currently transmitting beacons of the International Beacon Project (IBP)
+media-radio/ibp 0.21-r2: Shows currently transmitting beacons of the International Beacon Project (IBP)
 media-radio/js8call 2.2.0-r1: Weak signal ham radio communication
 media-radio/qrq 0.3.3: Yet another CW trainer for Linux/Unix
 media-radio/qsstv 9.4.4-r1 9.5.3: Amateur radio SSTV software
@@ -14195,7 +14195,7 @@ media-sound/sidplay 2.0.9-r1: C64 SID player
 media-sound/sidplayfp 1.4.4: Sidplay2 fork with resid-fp
 media-sound/smixer 1.0.4: command-line tool for setting and viewing mixer settings
 media-sound/snapcast 0.20.0 9999: Synchronous multi-room audio player
-media-sound/snd 17.4-r1: Snd is a sound editor
+media-sound/snd 17.4-r2: Snd is a sound editor
 media-sound/sndfile-tools 1.5 9999: Small collection of programs that use libsndfile
 media-sound/sndio 1.7.0-r1 9999: small audio and MIDI framework part of the OpenBSD project
 media-sound/sndpeek 1.41-r1: real-time audio visualization
@@ -14358,7 +14358,7 @@ media-video/luvcview 0.2.6-r1: USB Video Class grabber
 media-video/lxdvdrip 1.77: Command line tool to automate the process of ripping and burning DVDs
 media-video/m2vrequantizer 0.0.2_pre20060306-r1: Tool to requantize mpeg2 videos
 media-video/makemkv 1.16.3: Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
-media-video/matroxset 0.4: Matrox utility to switch output modes (activate tvout)
+media-video/matroxset 0.4-r1: Matrox utility to switch output modes (activate tvout)
 media-video/mediainfo 20.09 20.09-r1: MediaInfo supplies technical and tag information about media files
 media-video/mjpegtools 2.1.0-r4 2.2.0: Tools for MJPEG video
 media-video/mjpg-streamer 0_pre20120621-r2: MJPG-streamer takes JPGs from Linux-UVC compatible webcams
@@ -14458,7 +14458,7 @@ net-analyzer/arping 2.21 9999: A utility to see if a specific IP is taken and wh
 net-analyzer/arpoison 0.7: A utility to poison ARP caches
 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 3.1-r2: An ethernet monitor program that keeps track of ethernet/IP address pairings
+net-analyzer/arpwatch 3.1-r3: 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-r7: Fast output system for Snort
 net-analyzer/barnyard2 1.13: Parser for Snort unified/unified2 files
@@ -14720,7 +14720,7 @@ net-analyzer/xprobe 0.3-r1: Active OS fingerprinting tool - this is Xprobe2
 net-analyzer/yersinia 0.8.2 9999: A framework for layer 2 attacks
 net-analyzer/zabbix 4.0.30-r1 4.0.31-r1 5.0.8-r1 5.0.10-r1 5.0.11-r1 5.0.12-r1 5.2.4-r1 5.2.6-r1 5.4.0-r1 5.4.1-r1: ZABBIX is software for monitoring of your applications, network and servers
 net-analyzer/zmap 2.1.1-r2 9999: Fast network scanner designed for Internet-wide network surveys
-net-analyzer/zniper 1.0-r1: Displays and kill active TCP connections seen by the selected interface
+net-analyzer/zniper 1.0-r2: Displays and kill active TCP connections seen by the selected interface
 net-dialup/accel-ppp 1.12.0_p20210430 9999: High performance PPTP, PPPoE and L2TP server
 net-dialup/cistronradius 1.6.8-r2: Authentication and accounting server for terminal servers using RADIUS
 net-dialup/cutecom 0.51.0-r1: A serial terminal, like minicom, written in Qt
@@ -14752,7 +14752,7 @@ net-dialup/sendpage 1.1.0-r4: Dialup alphapaging software
 net-dialup/sercd 3.0.0-r2: RFC2217-compliant serial port redirector
 net-dialup/speedtouch-usb 3.0.1.2-r3: Firmware and configuration instructions for Alcatel SpeedTouch USB modems
 net-dialup/wvdial 1.61: Excellent program to automatically configure PPP sessions
-net-dialup/xc 4.3.2-r4: Modem dialout & serial terminal program
+net-dialup/xc 4.3.2-r5: Modem dialout & serial terminal program
 net-dialup/xl2tpd 1.3.15 1.3.16: A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
 net-dns/avahi 0.8-r4: System which facilitates service discovery on a local network
 net-dns/bind 9.16.15-r1: Berkeley Internet Name Domain - Name Server
@@ -14862,7 +14862,7 @@ net-ftp/gftp 2.0.19-r3: Gnome based FTP Client
 net-ftp/gproftpd 8.3.2-r2: GTK frontend to proftpd
 net-ftp/lftp 4.9.2 9999: A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 net-ftp/linksys-tftp 1.2.1-r3: TFTP client suitable for uploading to the Linksys WRT54G Wireless Router
-net-ftp/ncftp 3.2.6-r2: An extremely configurable ftp client
+net-ftp/ncftp 3.2.6-r3: An extremely configurable ftp client
 net-ftp/proftpd 1.3.7a-r1 1.3.7b 1.3.8_rc1: An advanced and very configurable FTP server
 net-ftp/profxp 3_pre2-r2: FXP (server-to-server FTP) commandline client written in Perl
 net-ftp/pure-ftpd 1.0.49-r3 9999: Fast, production-quality, standard-conformant FTP server
@@ -14871,7 +14871,7 @@ net-ftp/tftp-hpa 5.2-r2: Port of the OpenBSD TFTP server
 net-ftp/tnftp 20141104 20151004: NetBSD FTP client with several advanced features
 net-ftp/uftpd 2.13: The no nonsense TFTP/FTP server
 net-ftp/vsftpd 3.0.3-r3 3.0.4: Very Secure FTP Daemon written with speed, size and security in mind
-net-ftp/yafc 1.3.7: Console ftp client with a lot of nifty features
+net-ftp/yafc 1.3.7-r1: Console ftp client with a lot of nifty features
 net-im/bitlbee 3.6-r1 9999: irc to IM gateway that support multiple IM protocols
 net-im/bitlbee-facebook 1.2.2 9999: Facebook protocol plugin for BitlBee
 net-im/bitlbee-steam 1.4.2 9999: Steam protocol plugin for BitlBee
@@ -15224,7 +15224,7 @@ net-mail/mailutils 3.12-r1: A useful collection of mail servers, clients, and fi
 net-mail/mairix 0.24: Indexes and searches Maildir/MH folders
 net-mail/mboxgrep 0.7.9-r2: Grep for mbox files
 net-mail/mess822 0.58-r2: Collection of utilities for parsing Internet mail messages
-net-mail/metamail 2.7.53.3-r2: Metamail (with Debian patches) - Generic MIME package
+net-mail/metamail 2.7.53.3-r3: Metamail (with Debian patches) - Generic MIME package
 net-mail/mhonarc 2.6.19: Perl Mail-to-HTML Converter
 net-mail/mhonarc-gentoo 2.6.18-r2: Perl Mail-to-HTML Converter, Gentoo fork
 net-mail/mlmmj 1.3.0-r1: Mailing list managing made joyful
@@ -15233,7 +15233,7 @@ net-mail/mpop 1.4.7: A small, fast, and portable POP3 client
 net-mail/mswatch 1.2.0-r1: A utility to watch mailstores for changes and initiate mailbox syncs
 net-mail/mu 1.4.15 1.4.15-r1: Set of tools to deal with Maildirs, in particular, searching and indexing
 net-mail/muchsync 6: Synchronizes mail messages and notmuch tags across machines
-net-mail/nmzmail 1.1: Fast mail searching for mutt using namazu
+net-mail/nmzmail 1.1-r1: Fast mail searching for mutt using namazu
 net-mail/notmuch 0.31.3 0.32.1: Thread-based e-mail indexer, supporting quick search and tagging
 net-mail/onionrouter 0.6.1 9999: .onion discovery via SRV DNS lookups for use with postfix
 net-mail/pflogsumm 1.1.5-r1 1.1.5-r2: Pflogsumm is a log analyzer for Postfix logs
@@ -15452,7 +15452,7 @@ net-misc/netkit-bootpd 2.4-r1: Netkit - bootp
 net-misc/netkit-fingerd 0.17-r3: Netkit - fingerd and finger client
 net-misc/netkit-routed 0.17-r5: Netkit - routed
 net-misc/netkit-rsh 0.17-r11: Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
-net-misc/netkit-talk 0.17-r5: Netkit - talkd
+net-misc/netkit-talk 0.17-r6: Netkit - talkd
 net-misc/netkit-telnetd 0.17-r12: Standard Linux telnet client and server
 net-misc/netkit-timed 0.17-r10: Netkit - timed
 net-misc/netopeer2 1.1.70-r1 1.1.76 2.0.0: Server for implementing NETCONF configuration management
@@ -16111,7 +16111,7 @@ sci-biology/mothur 1.27.0-r1: A suite of algorithms for ecological bioinformatic
 sci-biology/mrbayes 3.1.2-r2: Bayesian Inference of Phylogeny
 sci-biology/mummer 3.23: A rapid whole genome aligner
 sci-biology/muscle 3.8.31: Multiple sequence comparison by log-expectation
-sci-biology/ncbi-tools 2.2.26-r2: Development toolkit and applications for computational biology, including BLAST
+sci-biology/ncbi-tools 2.2.26-r3: Development toolkit and applications for computational biology, including BLAST
 sci-biology/newick-utils 1.6-r1: Tools for processing phylogenetic trees
 sci-biology/njplot 2.3-r2: A phylogenetic tree drawing program which supports tree rooting
 sci-biology/pals 1.0-r1: Pairwise Aligner for Long Sequences
@@ -16290,7 +16290,7 @@ sci-electronics/pulseview 0.4.2 9999: Qt based logic analyzer GUI for sigrok
 sci-electronics/qelectrotech 0.80 9999: Qt5 application to design electric diagrams
 sci-electronics/quartus-prime-lite 15.1.0.185-r2 15.1.0.185-r3: Full-featured EDA product for altera devices
 sci-electronics/sigrok-cli 0.7.1-r1 0.7.2 9999: Command-line client for the sigrok logic analyzer software
-sci-electronics/spice 3.5.5-r2: general-purpose circuit simulation program
+sci-electronics/spice 3.5.5-r3: general-purpose circuit simulation program
 sci-electronics/splat 1.4.2: RF Signal Propagation, Loss, And Terrain analysis tool
 sci-electronics/systemc 2.3.4-r1: A C++ based modeling platform for VLSI and system-level co-design
 sci-electronics/vbs 1.4.0: vbs - the Verilog Behavioral Simulator
@@ -17130,7 +17130,7 @@ sys-apps/habitat 0.54.0: Application automation framework
 sys-apps/haveged 1.9.8c-r1 1.9.14-r1: A simple entropy daemon using the HAVEGE algorithm
 sys-apps/hd-idle 1.05-r1: Utility for spinning down hard disks after a period of idle time
 sys-apps/hdparm 9.62: Utility to change hard drive performance parameters
-sys-apps/heirloom-tools 070715-r3: Heirloom toolchest - original Unix tools
+sys-apps/heirloom-tools 070715-r4: Heirloom toolchest - original Unix tools
 sys-apps/help2man 1.48.3: GNU utility to convert program --help output to a man page
 sys-apps/hexdump-esr 1.8: Eric Raymond's hex dumper
 sys-apps/highway 1.1.0: High performance source code search tool
@@ -17294,7 +17294,7 @@ sys-apps/tcp-wrappers 7.6.28-r1: TCP Wrappers
 sys-apps/texinfo 6.7: The GNU info program and utilities
 sys-apps/the_silver_searcher 2.2.0 2.2.0_p20201217: A code-searching tool similar to ack, but faster
 sys-apps/thunderbolt-software-user-space 0.9.3-r1: Thunderbolt(TM) user-space components
-sys-apps/tomoyo-tools 2.5.0_p20130214: TOMOYO Linux tools
+sys-apps/tomoyo-tools 2.5.0_p20130214-r1: TOMOYO Linux tools
 sys-apps/toybox 0.8.4 0.8.5 9999: Common linux commands in a multicall binary
 sys-apps/tuned 2.15.0-r1: Daemon for monitoring and adaptive tuning of system devices
 sys-apps/uam 0.3.2-r1 9999: Simple udev-based automounter for removable USB media
@@ -18285,10 +18285,10 @@ www-client/lynx 2.9.0_pre6-r1: An excellent console-based web browser with ssl s
 www-client/microsoft-edge-beta 91.0.864.41 92.0.902.9 92.0.902.15: The web browser from Microsoft
 www-client/microsoft-edge-dev 92.0.902.8 93.0.910.5 93.0.916.1: The web browser from Microsoft
 www-client/midori 9.0: A lightweight web browser based on WebKitGTK+
-www-client/netrik 1.16.1-r1: A text based web browser with no ssl support
+www-client/netrik 1.16.1-r2: A text based web browser with no ssl support
 www-client/netsurf 3.10-r4: a free, open source web browser
-www-client/opera 77.0.4054.80: A fast and secure web browser
-www-client/opera-beta 77.0.4054.14 77.0.4054.19 77.0.4054.38: A fast and secure web browser
+www-client/opera 77.0.4054.90: A fast and secure web browser
+www-client/opera-beta 77.0.4054.19 77.0.4054.38 77.0.4054.91: A fast and secure web browser
 www-client/opera-developer 78.0.4072.0 78.0.4079.0 78.0.4086.0: A fast and secure web browser
 www-client/otter 1.0.02 9999: Project aiming to recreate classic Opera (12.x) UI using Qt5
 www-client/pybugz 0.13 9999: Command line interface to (Gentoo) Bugzilla
@@ -19247,7 +19247,7 @@ x11-wm/oroborus 2.0.20-r1: Small and fast window manager
 x11-wm/page 1.9.8 1.9.9-r3: A mouse friendly tiling window manager
 x11-wm/pekwm 0.1.17-r3: A lightweight window manager initially based on aewm++
 x11-wm/qtile 0.16.1 0.17.0: A full-featured, hackable tiling window manager written in Python
-x11-wm/ratpoison 1.4.9 9999: window manager without mouse dependency
+x11-wm/ratpoison 1.4.9-r1 9999: window manager without mouse dependency
 x11-wm/sawfish 1.12.90-r2: Extensible window manager using a Lisp-based scripting language
 x11-wm/selectwm 0.4.1-r1: window manager selector tool
 x11-wm/sithwm 1.2.3: Minimalist Window Manager for X
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6b0985f17180..90c8945c04c9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Jun 2021 20:50:21 +0000
+Fri, 18 Jun 2021 21:20:16 +0000
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-06-18 21:20:21 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-06-18 21:20:21 +0000
commit	488529e7ab61a1c49c4449d2c8bbeefcf057533e (patch)
tree	5c7d15f5aff230aa4fbd3ae8be29324de3be31aa /metadata
parent	Merge updates from master (diff)
download	gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.tar.gz gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.tar.bz2 gentoo-488529e7ab61a1c49c4449d2c8bbeefcf057533e.zip