gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /metadata/md5-cache/dev-lang
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
303 files changed, 482 insertions, 512 deletions
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b14caec311ac..c88726bd5db7 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/R-3.4.1 b/metadata/md5-cache/dev-lang/R-3.4.1
index cb6584468d2a..71aae4941ac5 100644
--- a/metadata/md5-cache/dev-lang/R-3.4.1
+++ b/metadata/md5-cache/dev-lang/R-3.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
 EAPI=6
 HOMEPAGE=http://www.r-project.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.4.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f4600c8f87d636cf66750b894bb0a332
diff --git a/metadata/md5-cache/dev-lang/R-3.5.3 b/metadata/md5-cache/dev-lang/R-3.5.3
index 30f0edadb908..34f41a5b97a3 100644
--- a/metadata/md5-cache/dev-lang/R-3.5.3
+++ b/metadata/md5-cache/dev-lang/R-3.5.3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
@@ -12,5 +12,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.5.3.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=10b2becd9b6ecb64a34e2fcf3c2fd0db
diff --git a/metadata/md5-cache/dev-lang/R-3.6.0 b/metadata/md5-cache/dev-lang/R-3.6.0
index 5452978a653a..c34f8131927f 100644
--- a/metadata/md5-cache/dev-lang/R-3.6.0
+++ b/metadata/md5-cache/dev-lang/R-3.6.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) virtual/fortran
 DESCRIPTION=Language and environment for statistical computing and graphics
@@ -12,5 +12,5 @@ REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo
 RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.6.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=10b2becd9b6ecb64a34e2fcf3c2fd0db
diff --git a/metadata/md5-cache/dev-lang/bas-2.4 b/metadata/md5-cache/dev-lang/bas-2.4
index e6b3909a035f..4d662a80714b 100644
--- a/metadata/md5-cache/dev-lang/bas-2.4
+++ b/metadata/md5-cache/dev-lang/bas-2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses virtual/libintl sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An interpreter for the classic dialect of the programming language BASIC
 EAPI=4
 HOMEPAGE=http://www.moria.de/~michael/bas/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses virtual/libintl
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/bas/bas-2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8aeff16859ad52420182de0f82b25a3
diff --git a/metadata/md5-cache/dev-lang/bff-1.0.5 b/metadata/md5-cache/dev-lang/bff-1.0.5
index 0d2236e6e205..aeb948984f5f 100644
--- a/metadata/md5-cache/dev-lang/bff-1.0.5
+++ b/metadata/md5-cache/dev-lang/bff-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ia64 m68k ppc ppc64 s390 sh x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/apankrat/bff/archive/v1.0.5.tar.gz -> bff-1.0.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=68d4b698e6631d934b70aea5253fec43
diff --git a/metadata/md5-cache/dev-lang/c-intercal-30.0 b/metadata/md5-cache/dev-lang/c-intercal-30.0
index ec26b9364616..264462c1a416 100644
--- a/metadata/md5-cache/dev-lang/c-intercal-30.0
+++ b/metadata/md5-cache/dev-lang/c-intercal-30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=C-INTERCAL - INTERCAL to binary (via C) compiler
 EAPI=6
 HOMEPAGE=http://www.catb.org/~esr/intercal/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/intercal/intercal-0.30.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=07bf1a0dadb5ba8f9b8221631a46e939
diff --git a/metadata/md5-cache/dev-lang/c-intercal-31.0 b/metadata/md5-cache/dev-lang/c-intercal-31.0
index 5e73a9664888..f4bf0803528d 100644
--- a/metadata/md5-cache/dev-lang/c-intercal-31.0
+++ b/metadata/md5-cache/dev-lang/c-intercal-31.0
@@ -1,4 +1,4 @@
-BDEPEND=emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=emacs? ( virtual/emacs ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install postinst postrm prepare
 DESCRIPTION=C-INTERCAL - INTERCAL to binary (via C) compiler
 EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/intercal/intercal-0.31.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a86dd1ccdb2c5ef25730c332ebd1624a
diff --git a/metadata/md5-cache/dev-lang/cfortran-4.4-r2 b/metadata/md5-cache/dev-lang/cfortran-4.4-r2
deleted file mode 100644
index bd739bca4bad..000000000000
--- a/metadata/md5-cache/dev-lang/cfortran-4.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Header file allowing to call Fortran routines from C and C++
-EAPI=0
-HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/
-IUSE=examples
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_4.4.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_4.4-14.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9797f5d19e6c155d216867114e943ce3
diff --git a/metadata/md5-cache/dev-lang/cfortran-4.4-r3 b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
index ebf4056f91ba..1f65466cecba 100644
--- a/metadata/md5-cache/dev-lang/cfortran-4.4-r3
+++ b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linu
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_4.4.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_4.4-14.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=94787b44e5aecd5033dd5c7f28b97a42
diff --git a/metadata/md5-cache/dev-lang/cilk-5.4.6-r1 b/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
index 2b71cf9156c6..68aaf0c8bfb1 100644
--- a/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
+++ b/metadata/md5-cache/dev-lang/cilk-5.4.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Language for multithreaded parallel programming based on ANSI C
 EAPI=5
 HOMEPAGE=http://supertech.csail.mit.edu/cilk
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://supertech.csail.mit.edu/cilk/cilk-5.4.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2a47349a295da22f0c61a91c1c9b7c0b
diff --git a/metadata/md5-cache/dev-lang/cilk-5.4.6-r2 b/metadata/md5-cache/dev-lang/cilk-5.4.6-r2
index 1f3c888855e3..ab0982fa9ad5 100644
--- a/metadata/md5-cache/dev-lang/cilk-5.4.6-r2
+++ b/metadata/md5-cache/dev-lang/cilk-5.4.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Language for multithreaded parallel programming based on ANSI C
 EAPI=6
 HOMEPAGE=http://supertech.csail.mit.edu/cilk
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://supertech.csail.mit.edu/cilk/cilk-5.4.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c24024b98de121b598cec39becd7a622
diff --git a/metadata/md5-cache/dev-lang/clojure-1.10.0 b/metadata/md5-cache/dev-lang/clojure-1.10.0
index ceaf1d59847c..2d540c3a8374 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.10.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/maven-bin:3.6 >=virtual/jre-1.8 >=dev-java/
 RESTRICT=test
 SLOT=1.10
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.10.0 -> clojure-1.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=20aeac34a219c2ec65d2ea6f3eaaec2a
diff --git a/metadata/md5-cache/dev-lang/clojure-1.8.0 b/metadata/md5-cache/dev-lang/clojure-1.8.0
index ca0a226a7d5f..3e33b0b8e3ae 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.8.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.8
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.8.0 -> clojure-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=405d7773dae9188c176684c829343b59
diff --git a/metadata/md5-cache/dev-lang/clojure-1.9.0-r1 b/metadata/md5-cache/dev-lang/clojure-1.9.0-r1
index 739d2405f8b7..97634018aae3 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.9.0-r1
+++ b/metadata/md5-cache/dev-lang/clojure-1.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 RESTRICT=test
 SLOT=1.9
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.9.0 -> clojure-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=93efcc351e85773d21d3e4e18c6d6786
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20170218 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20170218
index 7786a5e92acb..003d0e031b15 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20170218
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20170218
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://dl.google.com/closure-compiler/compiler-20170218.tar.gz -> closure-compiler-bin-20170218.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d2a02d9850d5b4814b6f7d327d167e98
diff --git a/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1 b/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
index 39267569607f..844d40c446a7 100644
--- a/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
+++ b/metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-libs/nodejs
 SLOT=0
 SRC_URI=https://github.com/jashkenas/coffeescript/archive/1.9.3.tar.gz -> coffee-script-1.9.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=45c527a45b1070acb0d79bc6a440c925
diff --git a/metadata/md5-cache/dev-lang/crystal-0.30.1 b/metadata/md5-cache/dev-lang/crystal-0.30.1
index ab31ed8210da..26c66bfa3c95 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.30.1
+++ b/metadata/md5-cache/dev-lang/crystal-0.30.1
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:8 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/0.30.1.tar.gz -> crystal-0.30.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.30.1/crystal-0.30.1-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.30.1/crystal-0.30.1-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=484d351129d5fa8ddaccda57708ab8b6
diff --git a/metadata/md5-cache/dev-lang/crystal-0.31.1 b/metadata/md5-cache/dev-lang/crystal-0.31.1
index 7f5172cf73b2..00e91e0e2ee5 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.31.1
+++ b/metadata/md5-cache/dev-lang/crystal-0.31.1
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/llvm:8 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/0.31.1.tar.gz -> crystal-0.31.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.31.1/crystal-0.31.1-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.31.1/crystal-0.31.1-1-linux-i686.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=372dcc396795417de3fb3ed4bc3b1032
diff --git a/metadata/md5-cache/dev-lang/elixir-1.4.5 b/metadata/md5-cache/dev-lang/elixir-1.4.5
index 1837f8f820ab..95a3ec01a488 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.4.5
+++ b/metadata/md5-cache/dev-lang/elixir-1.4.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-18[ssl]
 SLOT=0
 SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.4.5.tar.gz -> elixir-1.4.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=203e0b92a76ec6721be832b9748bf668
diff --git a/metadata/md5-cache/dev-lang/elixir-1.6.6 b/metadata/md5-cache/dev-lang/elixir-1.6.6
index 94e706d1ab7e..4bf1d3090502 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.6.6
+++ b/metadata/md5-cache/dev-lang/elixir-1.6.6
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/erlang-18[ssl] !!sci-biology/phylip
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.6.6.tar.gz -> elixir-1.6.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=17e656fe01e5e50808b90eeeb50d4190
diff --git a/metadata/md5-cache/dev-lang/elixir-1.9.1 b/metadata/md5-cache/dev-lang/elixir-1.9.4
index e15fa71d35bd..5ad3c3d759b0 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.9.1
+++ b/metadata/md5-cache/dev-lang/elixir-1.9.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
 LICENSE=Apache-2.0 ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-18[ssl] !!sci-biology/phylip
 SLOT=0
-SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.9.1.tar.gz -> elixir-1.9.1.tar.gz
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.9.4.tar.gz -> elixir-1.9.4.tar.gz
 _md5_=95bffcfffa808b4f1fcbf7edf5e96c3b
diff --git a/metadata/md5-cache/dev-lang/epic-0.9.3.3-r1 b/metadata/md5-cache/dev-lang/epic-0.9.3.3-r1
index f14b08b7c678..ec397f7b98d7 100644
--- a/metadata/md5-cache/dev-lang/epic-0.9.3.3-r1
+++ b/metadata/md5-cache/dev-lang/epic-0.9.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal:=[profile?] dev-haskell/mtl:=[profile?] >=dev-libs/boehm-gc-7.0:0=[threads] dev-libs/gmp:0= >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.3.3
 SRC_URI=mirror://hackage/packages/archive/epic/0.9.3.3/epic-0.9.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5d9d2564c8c158232c97ccfac541960
diff --git a/metadata/md5-cache/dev-lang/erlang-21.1.1 b/metadata/md5-cache/dev-lang/erlang-21.1.1
index 0bd4ed5eba2a..985c09b483a7 100644
--- a/metadata/md5-cache/dev-lang/erlang-21.1.1
+++ b/metadata/md5-cache/dev-lang/erlang-21.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=6
 HOMEPAGE=https://www.erlang.org/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-21.1.1.tar.gz -> erlang-21.1.1.tar.gz http://erlang.org/download/otp_doc_man_21.1.tar.gz -> erlang_doc_man_21.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.1.tar.gz -> erlang_doc_html_21.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=b3da79d85e808a8b72c09fca87a507a4
diff --git a/metadata/md5-cache/dev-lang/erlang-22.0.2-r2 b/metadata/md5-cache/dev-lang/erlang-22.0.2-r2
index db3b4da8cc16..a33d23d216c4 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.0.2-r2
+++ b/metadata/md5-cache/dev-lang/erlang-22.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.0.2.tar.gz -> erlang-22.0.2.tar.gz http://erlang.org/download/otp_doc_man_22.0.tar.gz -> erlang_doc_man_22.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.0.tar.gz -> erlang_doc_html_22.0.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=52b4b1bd364f1fb159a2c3239eb1d06c
diff --git a/metadata/md5-cache/dev-lang/erlang-22.0.7 b/metadata/md5-cache/dev-lang/erlang-22.0.7
index e410c89ff162..dc312a8d3450 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.0.7
+++ b/metadata/md5-cache/dev-lang/erlang-22.0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.0.7.tar.gz -> erlang-22.0.7.tar.gz http://erlang.org/download/otp_doc_man_22.0.tar.gz -> erlang_doc_man_22.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.0.tar.gz -> erlang_doc_html_22.0.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=3925258215795d70957d1f922cf04185
diff --git a/metadata/md5-cache/dev-lang/erlang-22.1.1 b/metadata/md5-cache/dev-lang/erlang-22.1.1
index 81fd8495334a..4b1f2e1ec75f 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.1.1
+++ b/metadata/md5-cache/dev-lang/erlang-22.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.1.1.tar.gz -> erlang-22.1.1.tar.gz http://erlang.org/download/otp_doc_man_22.1.tar.gz -> erlang_doc_man_22.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.1.tar.gz -> erlang_doc_html_22.1.tar.gz )
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=98ae10b32351ce8297e5d95ac880cc70
diff --git a/metadata/md5-cache/dev-lang/erlang-22.1.3 b/metadata/md5-cache/dev-lang/erlang-22.1.3
index ceb24ba5a286..ccaf96fb6cc2 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.1.3
+++ b/metadata/md5-cache/dev-lang/erlang-22.1.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.1.3.tar.gz -> erlang-22.1.3.tar.gz http://erlang.org/download/otp_doc_man_22.1.tar.gz -> erlang_doc_man_22.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.1.tar.gz -> erlang_doc_html_22.1.tar.gz )
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=739fd5461ccd934577adfe510bd06ea5
diff --git a/metadata/md5-cache/dev-lang/erlang-22.1.4 b/metadata/md5-cache/dev-lang/erlang-22.1.4
index be38bbde8352..495c7ed90afc 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.1.4
+++ b/metadata/md5-cache/dev-lang/erlang-22.1.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.1.4.tar.gz -> erlang-22.1.4.tar.gz http://erlang.org/download/otp_doc_man_22.1.tar.gz -> erlang_doc_man_22.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.1.tar.gz -> erlang_doc_html_22.1.tar.gz )
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=739fd5461ccd934577adfe510bd06ea5
diff --git a/metadata/md5-cache/dev-lang/erlang-22.1.6 b/metadata/md5-cache/dev-lang/erlang-22.1.6
new file mode 100644
index 000000000000..560a9c4b9d1e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-22.1.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=https://github.com/erlang/otp/archive/OTP-22.1.6.tar.gz -> erlang-22.1.6.tar.gz http://erlang.org/download/otp_doc_man_22.1.tar.gz -> erlang_doc_man_22.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.1.tar.gz -> erlang_doc_html_22.1.tar.gz )
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=739fd5461ccd934577adfe510bd06ea5
diff --git a/metadata/md5-cache/dev-lang/execline-2.1.1.0 b/metadata/md5-cache/dev-lang/execline-2.1.1.0
index c164f30fef52..50a24a4a7bcf 100644
--- a/metadata/md5-cache/dev-lang/execline-2.1.1.0
+++ b/metadata/md5-cache/dev-lang/execline-2.1.1.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=!static? ( >=dev-libs/skalibs-2.3.1.0 )
 SLOT=0
 SRC_URI=http://www.skarnet.org/software/execline/execline-2.1.1.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6748d0704e2fbd18da5965899b52ab70
diff --git a/metadata/md5-cache/dev-lang/f2c-20100827-r1 b/metadata/md5-cache/dev-lang/f2c-20100827-r1
index 739b89d79189..68b5b9f35dc1 100644
--- a/metadata/md5-cache/dev-lang/f2c-20100827-r1
+++ b/metadata/md5-cache/dev-lang/f2c-20100827-r1
@@ -7,5 +7,5 @@ LICENSE=HPND
 RDEPEND=>=dev-libs/libf2c-20130927-r1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/f2c/f2c_20100827.orig.tar.gz mirror://debian/pool/main/f/f2c/f2c_20100827-1.debian.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7c96536da0c9461711d23d59a7da558c
diff --git a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1 b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
index 75526de13665..906674c4e20d 100644
--- a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
+++ b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/boehm-gc[threads] >=dev-libs/libpcre-5:3 dev-libs/libxml2:2
 DESCRIPTION=A clean, lightweight, object oriented scripting language
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boehm-gc[threads] >=dev-libs/libpcre-5:3 dev-libs/libxml2:2
 SLOT=1
 SRC_URI=mirror://sourceforge/ferite/ferite-1.1.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d72f26865623c5567107b978b2bd62a8
diff --git a/metadata/md5-cache/dev-lang/fpc-2.6.4 b/metadata/md5-cache/dev-lang/fpc-2.6.4
index 127da45eb262..fe72042699cd 100644
--- a/metadata/md5-cache/dev-lang/fpc-2.6.4
+++ b/metadata/md5-cache/dev-lang/fpc-2.6.4
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-2.6.4.tar.gz mirror://sourceforge/freepascal/fpc-2.6.4.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-2.6.4.x86_64-linux.tar ) arm? ( mirror://sourceforge/freepascal/fpc-2.6.4.arm-linux.tar ) ppc? ( mirror://sourceforge/freepascal/fpc-2.6.4.powerpc-linux.tar ) ppc64? ( mirror://sourceforge/freepascal/fpc-2.6.4.powerpc64-linux.tar ) sparc? ( mirror://sourceforge/freepascal/fpc-2.6.2.sparc-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-2.6.4.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/2.6.4/doc-html.tar.gz -> fpc-2.6.4-doc-html.tar.gz https://dev.gentoo.org/~radhermit/distfiles/fpc-2.6.4-fpctoc.htx.bz2 )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=99d3ef3f6531d01c1ed0492895706478
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.0 b/metadata/md5-cache/dev-lang/fpc-3.0.0
index fc07506d3ca1..5936ac202745 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.0
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.0
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.0.tar.gz mirror://sourceforge/freepascal/fpc-3.0.0.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.0.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.0.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.0/doc-html.tar.gz -> fpc-3.0.0-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bedaa549488ad9785b1100d5016bffc4
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.2 b/metadata/md5-cache/dev-lang/fpc-3.0.2
index 7860e075b5ef..e0e78142e585 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.2
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.2
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.2.tar.gz mirror://sourceforge/freepascal/fpc-3.0.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.2/doc-html.tar.gz -> fpc-3.0.2-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=86dc3782712334a0524e5d3773994696
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1 b/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
index c71e811c0dfe..f987d2e1acad 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.2.tar.gz mirror://sourceforge/freepascal/fpc-3.0.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.2/doc-html.tar.gz -> fpc-3.0.2-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3629ef6c52b6e2ce3b958c62b9cb14f2
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.4 b/metadata/md5-cache/dev-lang/fpc-3.0.4
index f4dd21c06afb..714fa488171f 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.4
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.4
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.4.tar.gz mirror://sourceforge/freepascal/fpc-3.0.4.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.4.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.4.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.4/doc-html.tar.gz -> fpc-3.0.4-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=265389bc51312ef8041b2d3ed71a296d
diff --git a/metadata/md5-cache/dev-lang/gdl-0.9.6-r2 b/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
index b311e8058afa..770355bfe409 100644
--- a/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
+++ b/metadata/md5-cache/dev-lang/gdl-0.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/antlr-cpp:2= sci-libs/gsl:0= sci-libs/plplot:0=[-dynamic] sys-li
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnudatalanguage/gdl-0.9.6v2.tgz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89b321598c8475a35c419d28992cf207
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
index 46ecedaae8ca..32e65b9785f6 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/ffcall emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3f6c96acced52737836cf27a468779ca
diff --git a/metadata/md5-cache/dev-lang/ghc-7.10.3 b/metadata/md5-cache/dev-lang/ghc-7.10.3
index d017d08256df..3699632b2df0 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.10.3
+++ b/metadata/md5-cache/dev-lang/ghc-7.10.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !g
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/7.10.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-x86.tbz2 ) ) mirror://hackage/package/binary/binary-0.7.6.1.tar.gz mirror://hackage/package/hoopl/hoopl-3.10.2.0.tar.gz mirror://hackage/package/transformers/transformers-0.4.3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=08e2d3d957d55e8c551f1398624d8719
diff --git a/metadata/md5-cache/dev-lang/ghc-7.8.4 b/metadata/md5-cache/dev-lang/ghc-7.8.4
index 8e862de6e0fe..a00649b5535f 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-7.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses-compat:5 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !g
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/7.8.4
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/7.8.4/ghc-7.8.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.8.4-x86.tbz2 ) ) https://dev.gentoo.org/~slyfox/distfiles/ghc-7.8.4-ia64-CLOSUREs-regenerated.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7c4f3326ec90cfaae9f7600cc4be365c
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index eed3a1b7b85d..763111f0bdd8 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6cbe1e9c9dbe7ad4d422ff52f8913f3f
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.1 b/metadata/md5-cache/dev-lang/ghc-8.2.1
index 3066949132de..1a7b9a59ce16 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=5
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.1/ghc-8.2.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e70e31eb35104195802dfb783b8457f9
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.2 b/metadata/md5-cache/dev-lang/ghc-8.2.2
index c0b7ea354481..558b00575181 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=af30fc285821b5160788e8be56ad6829
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.1 b/metadata/md5-cache/dev-lang/ghc-8.4.1
index 1ccce4eaec4a..43332b208dc5 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6a73b2c94375d9bb29aad201c59a213a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
index ab7f99977fa1..65b948e71d15 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d01224da03d360b81dccfa6a8eb74148
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.3 b/metadata/md5-cache/dev-lang/ghc-8.4.3
index 3872bb150d0d..a8c760c4d3f5 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.3
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b29c3d5fce15a1cdccbe23dfad78ecaf
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.4 b/metadata/md5-cache/dev-lang/ghc-8.6.4
index 92b76290a5c2..b2d1704cf2d4 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.4
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dce05597ad2ace227bf5f0bec0a00ab1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.5 b/metadata/md5-cache/dev-lang/ghc-8.6.5
index 03478d90af7e..9aa7a076d5e0 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.5
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcmakebinary? ( virtual/libffi:= ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=6
 HOMEPAGE=http://www.haskell.org/ghc/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.5
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1cd6dc5d22ab46dded7a4bf4dab13bd3
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.1 b/metadata/md5-cache/dev-lang/ghc-8.8.1
index 4c59dd35b8c6..8e2187d81dab 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
 DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( virtual/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
 DESCRIPTION=The Glasgow Haskell Compiler
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfut
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.8.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d1ef1bae0745afe4f27c08aaa1e6955b
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
index 3fa80f6b1f0e..6627ebe0e33f 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:4.9.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=!sys-devel/gcc:4.9.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
+IUSE=+bootstrap test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= )
-RESTRICT=strip
+RESTRICT=!test? ( test ) strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c9089857ab4c2aca913344d53f869f0d	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45183572c51e158467a6161304134d93
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	6c2ac960594cb561affc83c013aee83b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b46dd13edd35b64d7ed6035ec7dd0d3e
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index b68e433fe618..6e488cccdf53 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=+bootstrap test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=strip
+RESTRICT=!test? ( test ) strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c9089857ab4c2aca913344d53f869f0d	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	6c2ac960594cb561affc83c013aee83b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46eb2db9f037d2010b3b227fef795fdd
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
index 7b0dd1f8e67a..35339b245e40 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=+bootstrap test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=strip
+RESTRICT=!test? ( test ) strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c9089857ab4c2aca913344d53f869f0d	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	6c2ac960594cb561affc83c013aee83b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58f1045786d345e6bba40cebaff1afb3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019 b/metadata/md5-cache/dev-lang/gnat-gpl-2019
index d9b0af947428..9179f1f88d74 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=8.3.1
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	c9089857ab4c2aca913344d53f869f0d	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	6c2ac960594cb561affc83c013aee83b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05c6541143fb61048da4fb27069f9e4e
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
index cc99726e2807..c9fd91af47ca 100644
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
+++ b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=>=virtual/jdk-1.6:= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b3afe0bf3a2a9394048d8771dacd39fa
diff --git a/metadata/md5-cache/dev-lang/go-1.12.10 b/metadata/md5-cache/dev-lang/go-1.12.10
index cab652b3eeb6..07feea98dfca 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.10
+++ b/metadata/md5-cache/dev-lang/go-1.12.10
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.10
 SRC_URI=https://storage.googleapis.com/golang/go1.12.10.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.12.11 b/metadata/md5-cache/dev-lang/go-1.12.11
index f40c8b4ed1ab..ffb353db1235 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.11
+++ b/metadata/md5-cache/dev-lang/go-1.12.11
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.11
 SRC_URI=https://storage.googleapis.com/golang/go1.12.11.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.12.12 b/metadata/md5-cache/dev-lang/go-1.12.12
index 1cc403993c46..f185c150afa6 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.12
+++ b/metadata/md5-cache/dev-lang/go-1.12.12
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.12
 SRC_URI=https://storage.googleapis.com/golang/go1.12.12.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.12.13 b/metadata/md5-cache/dev-lang/go-1.12.13
index 3b5264d86500..97edf85f258f 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.13
+++ b/metadata/md5-cache/dev-lang/go-1.12.13
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.13
 SRC_URI=https://storage.googleapis.com/golang/go1.12.13.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.12.9 b/metadata/md5-cache/dev-lang/go-1.12.9
index c08e092409d6..6aecf0e978f0 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.9
+++ b/metadata/md5-cache/dev-lang/go-1.12.9
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.9
 SRC_URI=https://storage.googleapis.com/golang/go1.12.9.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=288fb93be5de33ea65b6e5f588b40111
diff --git a/metadata/md5-cache/dev-lang/go-1.13 b/metadata/md5-cache/dev-lang/go-1.13
index 6a21f050b079..c09a2a114a97 100644
--- a/metadata/md5-cache/dev-lang/go-1.13
+++ b/metadata/md5-cache/dev-lang/go-1.13
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13
 SRC_URI=https://storage.googleapis.com/golang/go1.13.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.13.1 b/metadata/md5-cache/dev-lang/go-1.13.1
index bdb901a30b07..c47f645a65ed 100644
--- a/metadata/md5-cache/dev-lang/go-1.13.1
+++ b/metadata/md5-cache/dev-lang/go-1.13.1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13.1
 SRC_URI=https://storage.googleapis.com/golang/go1.13.1.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.13.2 b/metadata/md5-cache/dev-lang/go-1.13.2
index 6920d8231b47..f24b86797d15 100644
--- a/metadata/md5-cache/dev-lang/go-1.13.2
+++ b/metadata/md5-cache/dev-lang/go-1.13.2
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13.2
 SRC_URI=https://storage.googleapis.com/golang/go1.13.2.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.13.3 b/metadata/md5-cache/dev-lang/go-1.13.3
index f119edecab18..ae15baf3aa70 100644
--- a/metadata/md5-cache/dev-lang/go-1.13.3
+++ b/metadata/md5-cache/dev-lang/go-1.13.3
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13.3
 SRC_URI=https://storage.googleapis.com/golang/go1.13.3.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-1.13.4 b/metadata/md5-cache/dev-lang/go-1.13.4
index cb293c640590..f25c00f61c99 100644
--- a/metadata/md5-cache/dev-lang/go-1.13.4
+++ b/metadata/md5-cache/dev-lang/go-1.13.4
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13.4
 SRC_URI=https://storage.googleapis.com/golang/go1.13.4.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index f0511177b4ee..10ad83a13166 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -10,5 +10,5 @@ RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/9999
 SRC_URI=!gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842b08eb28896f771e0e8abb2ba84842
diff --git a/metadata/md5-cache/dev-lang/gprolog-1.4.4 b/metadata/md5-cache/dev-lang/gprolog-1.4.4
index 8e410279eb4a..05930a62a973 100644
--- a/metadata/md5-cache/dev-lang/gprolog-1.4.4
+++ b/metadata/md5-cache/dev-lang/gprolog-1.4.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gprolog/gprolog-1.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf8d1cd6f3703a17f56d5299ccc431f6
diff --git a/metadata/md5-cache/dev-lang/gprolog-1.4.5 b/metadata/md5-cache/dev-lang/gprolog-1.4.5
index 8d15cbd37a09..702649acc7d1 100644
--- a/metadata/md5-cache/dev-lang/gprolog-1.4.5
+++ b/metadata/md5-cache/dev-lang/gprolog-1.4.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 SLOT=0
 SRC_URI=http://www.gprolog.org/gprolog-1.4.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ae44a0ee47eb59f41c07a5dc2d7db46
diff --git a/metadata/md5-cache/dev-lang/helium-1.8.1 b/metadata/md5-cache/dev-lang/helium-1.8.1
index f5087b586e2f..c4867c94ae6e 100644
--- a/metadata/md5-cache/dev-lang/helium-1.8.1
+++ b/metadata/md5-cache/dev-lang/helium-1.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/lvmlib-1.1:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/top-1.7:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/wl-pprint:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.8.1
 SRC_URI=mirror://hackage/packages/archive/helium/1.8.1/helium-1.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b789f1354086d2a5ea7b862387fd4d8e
diff --git a/metadata/md5-cache/dev-lang/hy-0.10.0 b/metadata/md5-cache/dev-lang/hy-0.10.0
index 2e8e90846c5c..a50e7336db46 100644
--- a/metadata/md5-cache/dev-lang/hy-0.10.0
+++ b/metadata/md5-cache/dev-lang/hy-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.10.0.tar.gz -> hy-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0229dd3ea74cabffa9449da655d85b4f
diff --git a/metadata/md5-cache/dev-lang/hy-0.10.1 b/metadata/md5-cache/dev-lang/hy-0.10.1
index a9f5c4d55f96..6abec914e93e 100644
--- a/metadata/md5-cache/dev-lang/hy-0.10.1
+++ b/metadata/md5-cache/dev-lang/hy-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.10.1.tar.gz -> hy-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3045427a00faafaa6149770b7dee55b
diff --git a/metadata/md5-cache/dev-lang/hy-0.11.1 b/metadata/md5-cache/dev-lang/hy-0.11.1
index 29ad3026732e..545b47f591b6 100644
--- a/metadata/md5-cache/dev-lang/hy-0.11.1
+++ b/metadata/md5-cache/dev-lang/hy-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.11.1.tar.gz -> hy-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f751474fc66a0861c54e3ec2a3f5ba6
diff --git a/metadata/md5-cache/dev-lang/hy-0.12.0 b/metadata/md5-cache/dev-lang/hy-0.12.0
index 39841591595a..c1aab9d0146b 100644
--- a/metadata/md5-cache/dev-lang/hy-0.12.0
+++ b/metadata/md5-cache/dev-lang/hy-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.12.0.tar.gz -> hy-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f751474fc66a0861c54e3ec2a3f5ba6
diff --git a/metadata/md5-cache/dev-lang/hy-0.12.1 b/metadata/md5-cache/dev-lang/hy-0.12.1
index f8dc7c5a9c18..eaf1963a24ba 100644
--- a/metadata/md5-cache/dev-lang/hy-0.12.1
+++ b/metadata/md5-cache/dev-lang/hy-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.12.1.tar.gz -> hy-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44bc940c281ebe82325672ac7661e655
diff --git a/metadata/md5-cache/dev-lang/hy-0.13.0 b/metadata/md5-cache/dev-lang/hy-0.13.0
index b99e62aff712..d72a9ca87623 100644
--- a/metadata/md5-cache/dev-lang/hy-0.13.0
+++ b/metadata/md5-cache/dev-lang/hy-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.13.0.tar.gz -> hy-0.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0aae5c46b9a8fee78e71d73024e8f78
diff --git a/metadata/md5-cache/dev-lang/hy-0.13.1 b/metadata/md5-cache/dev-lang/hy-0.13.1
index 5c4f1f370e18..ff280b327654 100644
--- a/metadata/md5-cache/dev-lang/hy-0.13.1
+++ b/metadata/md5-cache/dev-lang/hy-0.13.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.13.1.tar.gz -> hy-0.13.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0aae5c46b9a8fee78e71d73024e8f78
diff --git a/metadata/md5-cache/dev-lang/hy-0.14.0 b/metadata/md5-cache/dev-lang/hy-0.14.0
index 75b7a92deea2..0273561e34e5 100644
--- a/metadata/md5-cache/dev-lang/hy-0.14.0
+++ b/metadata/md5-cache/dev-lang/hy-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.14.0.tar.gz -> hy-0.14.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	5ef20774410ba92b3fef636ca7945d52	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30cad7973fe1fa7d15703ccb561a8a44
diff --git a/metadata/md5-cache/dev-lang/hy-0.15.0 b/metadata/md5-cache/dev-lang/hy-0.15.0
index 10c99331d6e0..b2ca64ba814f 100644
--- a/metadata/md5-cache/dev-lang/hy-0.15.0
+++ b/metadata/md5-cache/dev-lang/hy-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.15.0.tar.gz -> hy-0.15.0.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=16d4fd28c72b845a6fa167d27a3ec37e
diff --git a/metadata/md5-cache/dev-lang/hy-0.16.0 b/metadata/md5-cache/dev-lang/hy-0.16.0
index b395bfbf4cd0..95e1cbc608fe 100644
--- a/metadata/md5-cache/dev-lang/hy-0.16.0
+++ b/metadata/md5-cache/dev-lang/hy-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.16.0.tar.gz -> hy-0.16.0.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e8eefa6c381f501a9df39030013d1679
diff --git a/metadata/md5-cache/dev-lang/hy-0.17.0 b/metadata/md5-cache/dev-lang/hy-0.17.0
index cc0a57dbdebf..2dba8c2ae109 100644
--- a/metadata/md5-cache/dev-lang/hy-0.17.0
+++ b/metadata/md5-cache/dev-lang/hy-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.17.0.tar.gz -> hy-0.17.0.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=902316265e2cae1958f03d574a9923fe
diff --git a/metadata/md5-cache/dev-lang/icon-9.5.1-r1 b/metadata/md5-cache/dev-lang/icon-9.5.1-r1
index 7f26e1b6e4ac..6e0936643029 100644
--- a/metadata/md5-cache/dev-lang/icon-9.5.1-r1
+++ b/metadata/md5-cache/dev-lang/icon-9.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain HPND
 RDEPEND=X? ( x11-libs/libX11:= )
 SLOT=0
 SRC_URI=http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v951src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2339187f19da71d047f07f796c8ed7c4
diff --git a/metadata/md5-cache/dev-lang/icon-9.5.1-r2 b/metadata/md5-cache/dev-lang/icon-9.5.1-r2
index 4c31fa053d6e..3fbb055dead2 100644
--- a/metadata/md5-cache/dev-lang/icon-9.5.1-r2
+++ b/metadata/md5-cache/dev-lang/icon-9.5.1-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain HPND
 RDEPEND=X? ( x11-libs/libX11:= )
 SLOT=0
 SRC_URI=http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v951src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=59e4df39cb5b36829583ee219e9ffcc2
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index 4b6ad4b4365d..0a91f3df5546 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4:= dev-java/junit:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
-_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=83a264be938c64abc8de5b78bef64e89
diff --git a/metadata/md5-cache/dev-lang/ispc-1.9.2 b/metadata/md5-cache/dev-lang/ispc-1.9.2
index c806896b08d0..19768c2fafc3 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.9.2
+++ b/metadata/md5-cache/dev-lang/ispc-1.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.9.2.tar.gz -> ispc-1.9.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1b7acdf976bfec937113ed25dfb40482
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index 6ee53b086d1d..ae539065e7bf 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 PROPERTIES=live
 RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1b7acdf976bfec937113ed25dfb40482
diff --git a/metadata/md5-cache/dev-lang/j-701-r2 b/metadata/md5-cache/dev-lang/j-701-r2
index 657b9e8b82f8..3becd57114d7 100644
--- a/metadata/md5-cache/dev-lang/j-701-r2
+++ b/metadata/md5-cache/dev-lang/j-701-r2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.jsoftware.com/download/j701_b_source.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d1ba74cedcb6c45b692c521ed3ef370
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.76 b/metadata/md5-cache/dev-lang/jimtcl-0.76
index 0ab1c4a71d60..38caf21e3fae 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.76
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.76
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 ~m68k ~mips ~s390 ~sh x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.76 -> jimtcl-0.76.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=9e2512c59a322bbf1efc044d34f0bd39
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.12.1 b/metadata/md5-cache/dev-lang/jsonnet-0.12.1
index 21ae089c4e0c..b03e9edbbdc1 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.12.1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.12.1
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.12.1.tar.gz -> jsonnet-0.12.1.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=358ebc7ef00d7c2eb51bc2e38c52a625
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.13.0 b/metadata/md5-cache/dev-lang/jsonnet-0.13.0
index 54f64efa13ee..a18669c122ec 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.13.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.13.0.tar.gz -> jsonnet-0.13.0.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5e1447ac32c2d9fbd2c1c38adc3e468a
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.14.0 b/metadata/md5-cache/dev-lang/jsonnet-0.14.0
index 699e51b1ac42..f753b47364dc 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.14.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.14.0.tar.gz -> jsonnet-0.14.0.tar.gz
-_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=distutils-r1	5ef20774410ba92b3fef636ca7945d52	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1c13e2e5cb6f634e01a618309b002485
diff --git a/metadata/md5-cache/dev-lang/julia-1.1.0 b/metadata/md5-cache/dev-lang/julia-1.1.0
index d885c548b555..ffbb78ad017a 100644
--- a/metadata/md5-cache/dev-lang/julia-1.1.0
+++ b/metadata/md5-cache/dev-lang/julia-1.1.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.1.0/julia-1.1.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz -> julia-llvm-6.0.1.src.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=06f0bfe266f25a13eb88a0ccdbe65bc6
diff --git a/metadata/md5-cache/dev-lang/julia-1.1.1 b/metadata/md5-cache/dev-lang/julia-1.1.1
index bf731cc96ac1..0516bcfbb0f6 100644
--- a/metadata/md5-cache/dev-lang/julia-1.1.1
+++ b/metadata/md5-cache/dev-lang/julia-1.1.1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.1.1/julia-1.1.1.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz -> julia-llvm-6.0.1.src.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b1a98546053eb2036b0575fd0b386410
diff --git a/metadata/md5-cache/dev-lang/julia-1.2.0 b/metadata/md5-cache/dev-lang/julia-1.2.0
index d35fa24b91da..3bbef5fc724c 100644
--- a/metadata/md5-cache/dev-lang/julia-1.2.0
+++ b/metadata/md5-cache/dev-lang/julia-1.2.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.2.0/julia-1.2.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/454f60150c7f023526d353e1e6b386f93ee0b116 -> julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz -> julia-llvm-6.0.1.src.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b5af17a4a06839877df6e930e9231083
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index 1144942c6068..ca0477ee4c03 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -8,5 +8,5 @@ PROPERTIES=live
 RDEPEND=>=sys-devel/llvm-6.0.0:= >=sys-devel/clang-6.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1b63c428d3aadd314b447ff80cd1d7a
diff --git a/metadata/md5-cache/dev-lang/jwasm-2.11a b/metadata/md5-cache/dev-lang/jwasm-2.11a
deleted file mode 100644
index 80a6ea80157f..000000000000
--- a/metadata/md5-cache/dev-lang/jwasm-2.11a
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=MASM-compatible TASM-similar assembler (fork of Wasm)
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/jwasm/
-KEYWORDS=~amd64 ~x86
-LICENSE=Watcom-1.0
-SLOT=0
-SRC_URI=mirror://sourceforge/jwasm/JWasm%20Source%20Code/JWasm211as.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3ecdb8b5b08fc780f5efa95a5335d293
diff --git a/metadata/md5-cache/dev-lang/jwasm-2.11a-r1 b/metadata/md5-cache/dev-lang/jwasm-2.11a-r1
new file mode 100644
index 000000000000..3246d55d3334
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jwasm-2.11a-r1
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=MASM-compatible TASM-similar assembler (fork of Wasm)
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/jwasm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Watcom-1.0
+SLOT=0
+SRC_URI=mirror://sourceforge/jwasm/JWasm%20Source%20Code/JWasm211as.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=da38ad9cb74647fc0e3e60eb2658ddf4
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.0.12 b/metadata/md5-cache/dev-lang/lazarus-1.0.12
index 60999e16e726..3fe4b03ef0f4 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.0.12
+++ b/metadata/md5-cache/dev-lang/lazarus-1.0.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 !=gnome-base
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%201.0.12/lazarus-1.0.12-0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b666378b50d24b2a6ee64743e44e6c4
diff --git a/metadata/md5-cache/dev-lang/lfe-0.10.1 b/metadata/md5-cache/dev-lang/lfe-0.10.1
index 244bd9bb1381..6ca8310987b0 100644
--- a/metadata/md5-cache/dev-lang/lfe-0.10.1
+++ b/metadata/md5-cache/dev-lang/lfe-0.10.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rvirding/lfe/archive/v0.10.1.zip -> lfe-0.10.1.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=14abc867a7d827346c69e557f7427410
diff --git a/metadata/md5-cache/dev-lang/lfe-0.7 b/metadata/md5-cache/dev-lang/lfe-0.7
index 8e11720841f1..ac8320c2e627 100644
--- a/metadata/md5-cache/dev-lang/lfe-0.7
+++ b/metadata/md5-cache/dev-lang/lfe-0.7
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rvirding/lfe/archive/v0.7a.zip -> lfe-0.7a.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f7516d4befcf1dafa573f9f5a618683
diff --git a/metadata/md5-cache/dev-lang/lfe-1.0 b/metadata/md5-cache/dev-lang/lfe-1.0
index 439371bb53a4..6afd35b257ec 100644
--- a/metadata/md5-cache/dev-lang/lfe-1.0
+++ b/metadata/md5-cache/dev-lang/lfe-1.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rvirding/lfe/archive/v1.0.zip -> lfe-1.0.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=916ec18494330028d4fa26a6abb3094f
diff --git a/metadata/md5-cache/dev-lang/lfe-1.1.1 b/metadata/md5-cache/dev-lang/lfe-1.1.1
index eace2a76dddf..cce5b1cd3476 100644
--- a/metadata/md5-cache/dev-lang/lfe-1.1.1
+++ b/metadata/md5-cache/dev-lang/lfe-1.1.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rvirding/lfe/archive/v1.1.1.zip -> lfe-1.1.1.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=916ec18494330028d4fa26a6abb3094f
diff --git a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2 b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
index 86be05ee2549..480789b289b2 100644
--- a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
+++ b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=vim-syntax? ( app-editors/vim ) emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://isaacproject.u-strasbg.fr/download/lisaac-0.13.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=53e06960f40f0811930dac73e2bd34d3
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.11.2 b/metadata/md5-cache/dev-lang/logtalk-3.11.2
index c66cd29c522d..cb93aab8baa6 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.11.2
+++ b/metadata/md5-cache/dev-lang/logtalk-3.11.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
 SRC_URI=http://logtalk.org/files/logtalk-3.11.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2682d302589e798129455dd734b3cc10
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.18.0 b/metadata/md5-cache/dev-lang/logtalk-3.18.0
index 3f5008f1e059..3f2f282748f5 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.18.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.18.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
 SLOT=0
 SRC_URI=http://logtalk.org/files/logtalk-3.18.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11418652fb812840e801f19e2d3b2bb0
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r100 b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
index d0dacd80651c..77390f3d1db3 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r100
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=64635869370e7a16c05c5a9c5eda7c90
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r101 b/metadata/md5-cache/dev-lang/lua-5.1.5-r101
index c7e990d6266c..8f68ad31c9dc 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r101
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r101
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=53bc1b4dcc27e1e87953c3669846d303
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r102 b/metadata/md5-cache/dev-lang/lua-5.1.5-r102
index 6552a5e2c5e1..61be9da3b803 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r102
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r102
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c04e14fa43b6427622335177b8ed9b26
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r4 b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
index 566f152d765b..b927084b05c4 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r4
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aa2defd2b70667085c3cb347a68d9a72
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3 b/metadata/md5-cache/dev-lang/lua-5.2.3
index 94b27554f872..c17a2f59ddd3 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ecab1fedf4e1bd97b23cf26226baa70e
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r1 b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
index 7403cb5329e9..79eefa846e81 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=75ac9e6d6cd0d1271641751118b5b29f
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r2 b/metadata/md5-cache/dev-lang/lua-5.2.3-r2
index 53c95cb6a68c..dcdd8a6a292a 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r2
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=493fb5e091512943705379e7b258fb70
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r3 b/metadata/md5-cache/dev-lang/lua-5.2.3-r3
index 43dc41b92291..b5033ad64bc9 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r3
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e6ea00f27edbb4caa515e910e3976918
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.4 b/metadata/md5-cache/dev-lang/lua-5.2.4
index dc6caa53d304..118b23506191 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.4
+++ b/metadata/md5-cache/dev-lang/lua-5.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.4.tar.gz test? ( https://www.lua.org/tests/lua-5.2.2-tests.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bc0a64a99a1c24c2531f76b236f6dcbe
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.4-r1 b/metadata/md5-cache/dev-lang/lua-5.2.4-r1
index fb48c064243d..ed8cc47b3bc2 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.4-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.4.tar.gz test? ( https://www.lua.org/tests/lua-5.2.2-tests.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6519330558e9bfd3cd3bfca7abbe30c8
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3 b/metadata/md5-cache/dev-lang/lua-5.3.3
index d211414cf4ba..ca365808c912 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9aebc3f0e1f9e2a77cbda8ecd2845cdf
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3-r1 b/metadata/md5-cache/dev-lang/lua-5.3.3-r1
index 227609fc2a0d..2139babaa82c 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3c57f170f3f3201110e642264f00371c
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.3-r2 b/metadata/md5-cache/dev-lang/lua-5.3.3-r2
index 042b85a0c7a4..196b172b8325 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.3-r2
+++ b/metadata/md5-cache/dev-lang/lua-5.3.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2f29f1e9ee540671be838ec6ae07e05a
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.5 b/metadata/md5-cache/dev-lang/lua-5.3.5
index 24c038390f3d..10b995d4b5d8 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.5
+++ b/metadata/md5-cache/dev-lang/lua-5.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.5.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ca6b739ba345aad9fb5d22905022d644
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.5-r1 b/metadata/md5-cache/dev-lang/lua-5.3.5-r1
index 68baec491eb7..a88996794c43 100644
--- a/metadata/md5-cache/dev-lang/lua-5.3.5-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.3.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0 sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A powerful light-weight programming language designed for extending applications
 EAPI=5
 HOMEPAGE=http://www.lua.org/
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.3
 SRC_URI=http://www.lua.org/ftp/lua-5.3.5.tar.gz test? ( https://www.lua.org/tests/lua-5.3.4-tests.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8a57d660bd3433103e56772e53e67f51
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.2 b/metadata/md5-cache/dev-lang/luajit-2.0.2
index 99a5345d4bd2..1858aa59b8ad 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.2
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5a5acb335997cadfbf28abf7161b613f
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.3 b/metadata/md5-cache/dev-lang/luajit-2.0.3
index e30ae148c029..6f3b6d844677 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.3
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4dab0f515288f1975e47f0f43bfc4dcd
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1 b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
index 6662cde936ae..7ee6a3aed318 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6fb748bcb395620d84bfa3fc7a81a610
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.4 b/metadata/md5-cache/dev-lang/luajit-2.0.4
index 7b3b8d6cefe2..2eb910ddc0ef 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.4
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.4
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4a0cfb66d4030f58049e1617a946b18c
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.5 b/metadata/md5-cache/dev-lang/luajit-2.0.5
index 6a221f3911d4..0f4cd697874b 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.5
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2007731ba7a31cb1aeac8d3e2f70667a
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.5-r1 b/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
index 5503baea5b41..3a63e74a65fa 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.5.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e671593bbc501382f0d5148640c8c21d
diff --git a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3 b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3
index 308b9357cab0..4edb348bb1d2 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3
+++ b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3
@@ -6,5 +6,5 @@ IUSE=lua52compat static-libs
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22ac3cd65a719b98e410a2b2530b286b
diff --git a/metadata/md5-cache/dev-lang/maude-2.7 b/metadata/md5-cache/dev-lang/maude-2.7
index 5424e919e57b..e7937ee3d7ee 100644
--- a/metadata/md5-cache/dev-lang/maude-2.7
+++ b/metadata/md5-cache/dev-lang/maude-2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/gmp:0=[cxx] dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/gmp:0=[cxx] dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=High-level specification language for equational and logic programming
 EAPI=6
 HOMEPAGE=http://maude.cs.uiuc.edu/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=[cxx] dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 SLOT=0
 SRC_URI=http://maude.cs.illinois.edu/w/images/2/2d/Maude-2.7.tar.gz https://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ef474f04cbe929eface5ca547146897a
diff --git a/metadata/md5-cache/dev-lang/mercury-14.01.1-r1 b/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
index 07255331fd16..f86ecee15f68 100644
--- a/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
+++ b/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
 EAPI=5
 HOMEPAGE=http://www.mercurylang.org/index.html
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-14.01.1-gentoo-patchset-4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d40f12fe15defe1671800c03b3a371d
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-14.01.1 b/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
index b17e7d88243e..259983022d17 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
+++ b/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=~dev-lang/mercury-14.01.1 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses:= ) opengl? ( virtual/opengl virtual/glu ) tcl? ( tk? ( dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXmu ) )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-extras-14.01.1-gentoo-patchset-2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=112b959d48d7afea0338e66f7b73208b
diff --git a/metadata/md5-cache/dev-lang/micropython-1.9.3 b/metadata/md5-cache/dev-lang/micropython-1.9.3
index f5629f1ba51f..4cc89f393a72 100644
--- a/metadata/md5-cache/dev-lang/micropython-1.9.3
+++ b/metadata/md5-cache/dev-lang/micropython-1.9.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/micropython/micropython/releases/download/v1.9.3/micropython-1.9.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91bf5e810b7e3d390472a293c80408eb
diff --git a/metadata/md5-cache/dev-lang/micropython-1.9.4 b/metadata/md5-cache/dev-lang/micropython-1.9.4
index 8fe27c013b21..e65299977a0e 100644
--- a/metadata/md5-cache/dev-lang/micropython-1.9.4
+++ b/metadata/md5-cache/dev-lang/micropython-1.9.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/micropython/micropython/releases/download/v1.9.4/micropython-1.9.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dfab625b491d34d5f2385825f2e37c4b
diff --git a/metadata/md5-cache/dev-lang/mlton-20130715 b/metadata/md5-cache/dev-lang/mlton-20130715
index 1f5c57eb548c..c3c1bb6b245e 100644
--- a/metadata/md5-cache/dev-lang/mlton-20130715
+++ b/metadata/md5-cache/dev-lang/mlton-20130715
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20130715
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20130715.src.tgz ) binary? ( amd64? ( mirror://sourceforge/mlton/mlton-20130715-1.amd64-linux.tgz ) x86? ( mirror://sourceforge/mlton/mlton-20130715-1.x86-linux.tgz ) )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a976f4b6d4499101a152057b106cb9fd
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index ed3ce622989d..72fe24559410 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=730f246811de2c2f669af658cffd0fcc
diff --git a/metadata/md5-cache/dev-lang/mmix-20160804 b/metadata/md5-cache/dev-lang/mmix-20160804
index c17dc7be5d78..49879013ccf4 100644
--- a/metadata/md5-cache/dev-lang/mmix-20160804
+++ b/metadata/md5-cache/dev-lang/mmix-20160804
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=mmix
 SLOT=0
 SRC_URI=http://mmix.cs.hm.edu/src/mmix-20160804.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e6b47b694683d2d59dbe71740a31c9e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2ae5ac5a8fc39c6307050a5adc667286
diff --git a/metadata/md5-cache/dev-lang/mmix-20160804-r1 b/metadata/md5-cache/dev-lang/mmix-20160804-r1
index 7306af087b76..8250740e11d9 100644
--- a/metadata/md5-cache/dev-lang/mmix-20160804-r1
+++ b/metadata/md5-cache/dev-lang/mmix-20160804-r1
@@ -9,5 +9,5 @@ LICENSE=mmix
 RDEPEND=!!media-sound/mmix
 SLOT=0
 SRC_URI=http://mmix.cs.hm.edu/src/mmix-20160804.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=70364878b7d79b0170748a43c1361a01
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c9cca9a4420473d8a2a1e12bd1219e47
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.06-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
index be07a52ae25d..0428c3d6c19b 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.06-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2018.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49dd3041a77a556676662fe764b91552
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.08-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
index 5a906a422f7c..ba6b8993e00d 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.08-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2018.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49dd3041a77a556676662fe764b91552
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.09-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
index f59a8a7ece6e..dda7f6c9fcb9 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.09-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2018.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49dd3041a77a556676662fe764b91552
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.12-r1 b/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
index 02ea42b7292d..77a6fc3c4219 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.12-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2018.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49dd3041a77a556676662fe764b91552
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
index 2ee37fccdc33..2b4d72dd087e 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49dd3041a77a556676662fe764b91552
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
index 436832538547..0a63a9404dd7 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d830605ff087b369fb099890260a8ec
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
index 60d7d8b8353a..9c5d0120e0b7 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.07.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libf
 RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.07.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a3347b860ed21607d364a35e2927dedb
diff --git a/metadata/md5-cache/dev-lang/moarvm-9999 b/metadata/md5-cache/dev-lang/moarvm-9999
index 4d9f6f59c5d4..d9ac2ed61701 100644
--- a/metadata/md5-cache/dev-lang/moarvm-9999
+++ b/metadata/md5-cache/dev-lang/moarvm-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libatomic_ops >=dev-libs/libuv-1.26 dev-lang/lua:= virtual/libffi
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a3347b860ed21607d364a35e2927dedb
diff --git a/metadata/md5-cache/dev-lang/mono-4.4.1.0 b/metadata/md5-cache/dev-lang/mono-4.4.1.0
index 0db20ef4a1b2..e862e58d77d3 100644
--- a/metadata/md5-cache/dev-lang/mono-4.4.1.0
+++ b/metadata/md5-cache/dev-lang/mono-4.4.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.4.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=75c2da6b8d18118e42c004ad59a2eb52
diff --git a/metadata/md5-cache/dev-lang/mono-4.8.0.524 b/metadata/md5-cache/dev-lang/mono-4.8.0.524
index 21efbb8096f8..3ccefe200a62 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.524
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.524
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=https://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.524.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7109a28658e71ba92f8f253c3f0af61d
diff --git a/metadata/md5-cache/dev-lang/mono-5.14.0.177 b/metadata/md5-cache/dev-lang/mono-5.14.0.177
index 92635ffcd364..8107522d315a 100644
--- a/metadata/md5-cache/dev-lang/mono-5.14.0.177
+++ b/metadata/md5-cache/dev-lang/mono-5.14.0.177
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.14.0.177.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6154b0b83d7db5632ae495ed40668470
diff --git a/metadata/md5-cache/dev-lang/mono-5.16.0.220 b/metadata/md5-cache/dev-lang/mono-5.16.0.220
index a3171ec07519..7cd5f0f157f1 100644
--- a/metadata/md5-cache/dev-lang/mono-5.16.0.220
+++ b/metadata/md5-cache/dev-lang/mono-5.16.0.220
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.16.0.220.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d753f237e30f52b0863b3db961eb159
diff --git a/metadata/md5-cache/dev-lang/mono-5.18.1.0 b/metadata/md5-cache/dev-lang/mono-5.18.1.0
index 97b42d632c7c..daf9dabcd0fa 100644
--- a/metadata/md5-cache/dev-lang/mono-5.18.1.0
+++ b/metadata/md5-cache/dev-lang/mono-5.18.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.18.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8b1e9c56bcdd22e14248d9d5baa5713
diff --git a/metadata/md5-cache/dev-lang/mono-5.20.1.19-r1 b/metadata/md5-cache/dev-lang/mono-5.20.1.19-r1
index d5cb8367d8db..b39e150babcb 100644
--- a/metadata/md5-cache/dev-lang/mono-5.20.1.19-r1
+++ b/metadata/md5-cache/dev-lang/mono-5.20.1.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-5.20.1.19.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3edf11cf1c88d4a3aa5c494f48967906
diff --git a/metadata/md5-cache/dev-lang/mono-6.0.0.334 b/metadata/md5-cache/dev-lang/mono-6.0.0.334
index cda5925060bd..56cfaad7ba0b 100644
--- a/metadata/md5-cache/dev-lang/mono-6.0.0.334
+++ b/metadata/md5-cache/dev-lang/mono-6.0.0.334
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-5.6.1 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-6.0.0.334.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a4379f88671f7771a5e4b7f455419a48
diff --git a/metadata/md5-cache/dev-lang/mono-6.4.0.198 b/metadata/md5-cache/dev-lang/mono-6.4.0.198
index 1691fe5b7a2a..c8876743eebf 100644
--- a/metadata/md5-cache/dev-lang/mono-6.4.0.198
+++ b/metadata/md5-cache/dev-lang/mono-6.4.0.198
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
 EAPI=6
 HOMEPAGE=http://www.mono-project.com/Main_Page
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://download.mono-project.com/sources/mono/mono-6.4.0.198.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d790686d0de09997867dbe6cec70137
diff --git a/metadata/md5-cache/dev-lang/mozart-1.4.0-r3 b/metadata/md5-cache/dev-lang/mozart-1.4.0-r3
index 8ef1f0c5cdfd..d8ce42207d14 100644
--- a/metadata/md5-cache/dev-lang/mozart-1.4.0-r3
+++ b/metadata/md5-cache/dev-lang/mozart-1.4.0-r3
@@ -9,5 +9,5 @@ LICENSE=Mozart
 RDEPEND=dev-lang/perl dev-libs/gmp:0= sys-libs/zlib emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) tcl? ( tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-src.tar.gz mirror://gentoo/mozart-1.4.0-gentoo-patchset-5.tar.gz doc? ( mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/mozart-1.4.0.20080704-doc.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c19a69561a145307eb77a804ec6b7bda
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.5 b/metadata/md5-cache/dev-lang/mujs-1.0.5
index d8e07c1c551a..dc69819556f0 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.5
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.5
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.5.tar.gz -> mujs-1.0.5.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=53afcef8d000cf44d6e7210e795a9e95
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.6 b/metadata/md5-cache/dev-lang/mujs-1.0.6
index 5004c76ec90b..b604fdebc970 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.6
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.6
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=sys-libs/readline:0=
 SLOT=0/1.0.6
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.6.tar.gz -> mujs-1.0.6.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e86db9136e23aa5c7715394c07bf9436
diff --git a/metadata/md5-cache/dev-lang/nasm-2.14.02 b/metadata/md5-cache/dev-lang/nasm-2.14.02
index 1e554bcc3a2e..ebc6c54cfb32 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.14.02
+++ b/metadata/md5-cache/dev-lang/nasm-2.14.02
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ia64 ~ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=313acd8b72308b1f54ee0fc250066be5
diff --git a/metadata/md5-cache/dev-lang/nim-0.20.2 b/metadata/md5-cache/dev-lang/nim-0.20.2
deleted file mode 100644
index d11ad63d9bd6..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.20.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( net-libs/nodejs )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=7
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.20.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=ec6a7614f50d3e7c2709b103259843f8
diff --git a/metadata/md5-cache/dev-lang/nim-1.0.0 b/metadata/md5-cache/dev-lang/nim-1.0.0
deleted file mode 100644
index dfb29aad7a6c..000000000000
--- a/metadata/md5-cache/dev-lang/nim-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( net-libs/nodejs )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=7
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.0.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=ec6a7614f50d3e7c2709b103259843f8
diff --git a/metadata/md5-cache/dev-lang/nim-1.0.2 b/metadata/md5-cache/dev-lang/nim-1.0.2
index 1440e6edd1b2..cc540dff8e71 100644
--- a/metadata/md5-cache/dev-lang/nim-1.0.2
+++ b/metadata/md5-cache/dev-lang/nim-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=readline? ( sys-libs/readline:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nim-lang.org/download/nim-1.0.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=ec6a7614f50d3e7c2709b103259843f8
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=90052f8a2db799a6aeac1c86c71a9c6c
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.06-r1 b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
index 6097826b74fc..b6c43b1a49f7 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.06-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.06-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-la
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.06/nqp-2018.06.tar.gz -> nqp-2018.06.official.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.08-r1 b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
index e006bfed88d4..150dbe539cae 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.08-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.08-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-la
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.08/nqp-2018.08.tar.gz -> nqp-2018.08.official.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.09-r1 b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
index 0db28b08f672..bff2e69681fe 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.09-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.09-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-la
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.09/nqp-2018.09.tar.gz -> nqp-2018.09.official.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.12-r1 b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
index 7db8c123e9ba..e6f8822d0f4d 100644
--- a/metadata/md5-cache/dev-lang/nqp-2018.12-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2018.12-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-la
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2018.12/nqp-2018.12.tar.gz -> nqp-2018.12.official.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.03-r1 b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
index fab14d81da19..ba84a229cdbc 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-la
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.03/nqp-2019.03.tar.gz -> nqp-2019.03.official.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=44f0749ca199f5b84ec620f993ec8e56
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1 b/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
index e159ce5fe1a9..7c3d69696d08 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 )
 SLOT=0/4.04.2
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.04.2.tar.gz -> ocaml-4.04.2.tar.gz mirror://gentoo/ocaml-patches-8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=80c7b05a96bb04f8a34d87f02e2c4555
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
index 578e0b97db92..1560ce43917a 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( sys-libs/libunwind:= ) X? ( x11-libs/libX11 )
 SLOT=0/4.05.0
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=be7986b67bea6ac58e1adc8095367af1
diff --git a/metadata/md5-cache/dev-lang/open-cobol-1.1 b/metadata/md5-cache/dev-lang/open-cobol-1.1
index 89477a153ac0..367ae1121e19 100644
--- a/metadata/md5-cache/dev-lang/open-cobol-1.1
+++ b/metadata/md5-cache/dev-lang/open-cobol-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/gmp berkdb? ( =sys-libs/db-4* ) sys-libs/ncurses readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-cobol/open-cobol-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b0bb397f97e26488974f7559e1b1060
diff --git a/metadata/md5-cache/dev-lang/opendylan-2013.1-r1 b/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
index d3db4bd4fc1b..1c8c5c46ad47 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
+++ b/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -9,5 +9,5 @@ RDEPEND=app-arch/unzip dev-libs/boehm-gc dev-lang/perl dev-perl/XML-Parser || (
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2013.1/opendylan-2013.1-sources.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0bde578f6538c01ef8f34b45e51a3ac0
diff --git a/metadata/md5-cache/dev-lang/opendylan-2013.2 b/metadata/md5-cache/dev-lang/opendylan-2013.2
index 4cde27492d35..6d7d13dc1c3e 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2013.2
+++ b/metadata/md5-cache/dev-lang/opendylan-2013.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -9,5 +9,5 @@ RDEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Par
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-sources.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d7dfb69362b61130d44c6dd7491b6d4a
diff --git a/metadata/md5-cache/dev-lang/opendylan-2014.1 b/metadata/md5-cache/dev-lang/opendylan-2014.1
index 030bab000fc2..2c1d2348cbe0 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2014.1
+++ b/metadata/md5-cache/dev-lang/opendylan-2014.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) x86? ( <dev-libs/mps-1.108 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -9,5 +9,5 @@ RDEPEND=app-arch/unzip dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Par
 RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2014.1/opendylan-2014.1-sources.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=681e60b7b41a9690437a657b7505d02d
diff --git a/metadata/md5-cache/dev-lang/opendylan-9999 b/metadata/md5-cache/dev-lang/opendylan-9999
index db43825317d0..aa18cb9c7089 100644
--- a/metadata/md5-cache/dev-lang/opendylan-9999
+++ b/metadata/md5-cache/dev-lang/opendylan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -8,5 +8,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=042fa5d018b2180e0e820ca0ae52659d
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.28-r1 b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
index 7a121e089117..c1498f049811 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.28-r1
+++ b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.28.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6de03058719fb53335a31b7af0c37a8
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.29 b/metadata/md5-cache/dev-lang/orc-0.4.29
index 4315fd20914d..1655c537ae07 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.29
+++ b/metadata/md5-cache/dev-lang/orc-0.4.29
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.29.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec32930dfe178351719cc6301d9643de
diff --git a/metadata/md5-cache/dev-lang/parrot-7.1.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
index e19bf6db1858..79b9dba08559 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
+++ b/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls
 RESTRICT=test
 SLOT=0/7.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.1.0/parrot-7.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=222fd863fa422e8e663a2d5c0f54f56d
diff --git a/metadata/md5-cache/dev-lang/parrot-7.11.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
index 142a3fa70358..6ca04929856d 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
+++ b/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls
 RESTRICT=test
 SLOT=0/7.11.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.11.0/parrot-7.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f83857265d0d7cfceac5b04a7418a5b
diff --git a/metadata/md5-cache/dev-lang/parrot-7.5.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
index f801b0aec777..0a16cfbbc169 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
+++ b/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls
 RESTRICT=test
 SLOT=0/7.5.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.5.0/parrot-7.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f83857265d0d7cfceac5b04a7418a5b
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r1 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
index 555996c11ed3..ca274a309f4a 100644
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-
 RESTRICT=test
 SLOT=0/8.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13a0f09b58894acb25679c5d29c4adc6
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r2 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
index 6305272ab302..bb738e8bf33f 100644
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-
 RESTRICT=test
 SLOT=0/8.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e3f49d84d0d9d738d4655375516957bb
diff --git a/metadata/md5-cache/dev-lang/pcc-1.1.0-r1 b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
index 104f7f1f96cc..9e7ba03cf042 100644
--- a/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
+++ b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/pcc-libs-1.1.0 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/pcc-libs-1.1.0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=pcc portable c compiler
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/pcc-libs-1.1.0
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-1.1.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3f1390d17500112e31db8baa8d6a7d8
diff --git a/metadata/md5-cache/dev-lang/pcc-9999 b/metadata/md5-cache/dev-lang/pcc-9999
index 0fd14fc1408e..e8dae0d806b7 100644
--- a/metadata/md5-cache/dev-lang/pcc-9999
+++ b/metadata/md5-cache/dev-lang/pcc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/pcc-libs-9999 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
+DEPEND=>=dev-libs/pcc-libs-9999 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
 DESCRIPTION=pcc portable c compiler
 EAPI=5
 HOMEPAGE=http://pcc.ludd.ltu.se
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-libs/pcc-libs-9999
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cvs	6625b4ea3655a11531b433946cebd6b3	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cvs	6625b4ea3655a11531b433946cebd6b3	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=85b2f4057e8697cc5c91980093da47d2
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.3-r1 b/metadata/md5-cache/dev-lang/perl-5.24.3-r1
index 76176cf63f39..aca0d10b715c 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.3-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.24.3-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-2/perl-5.24.3-patches-2.tar.xz mirror://gentoo/perl-5.24.3-patches-2.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-2.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d99a41f723d974ad6e2467da19f34bc
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.4 b/metadata/md5-cache/dev-lang/perl-5.24.4
index ec7f2b8cb5f9..7872f845839c 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.4
+++ b/metadata/md5-cache/dev-lang/perl-5.24.4
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.4.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.4.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.4-patches-1/perl-5.24.4-patches-1.tar.xz mirror://gentoo/perl-5.24.4-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.4-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=36642dc444d36af96e42455c907a276c
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.2 b/metadata/md5-cache/dev-lang/perl-5.26.2
index 079420b0506f..50a437aacd82 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.2
+++ b/metadata/md5-cache/dev-lang/perl-5.26.2
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=vir
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.2-patches-1/perl-5.26.2-patches-1.tar.xz mirror://gentoo/perl-5.26.2-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.2-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc2bfa48842b194a4e6399def4ab8599
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.2-r1 b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
index 978e7c121557..53ffe30a43b6 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.2-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=vir
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.28.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.2-patches-4/perl-5.28.2-patches-4.tar.xz mirror://gentoo/perl-5.28.2-patches-4.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.28.2-patches-4.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1704ec70ff85f46c4b74afc545b06b6b
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.0 b/metadata/md5-cache/dev-lang/perl-5.30.0
index 01e78db3a48d..455c9fc0fcd9 100644
--- a/metadata/md5-cache/dev-lang/perl-5.30.0
+++ b/metadata/md5-cache/dev-lang/perl-5.30.0
@@ -10,5 +10,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=vir
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.30
 SRC_URI=mirror://cpan/src/5.0/perl-5.30.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5dd457355385cfc126b1d5c88d9f38e
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.1_rc1 b/metadata/md5-cache/dev-lang/perl-5.30.1_rc1
index 462ac7fd738f..9064cfaf82bd 100644
--- a/metadata/md5-cache/dev-lang/perl-5.30.1_rc1
+++ b/metadata/md5-cache/dev-lang/perl-5.30.1_rc1
@@ -9,5 +9,5 @@ PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=vir
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.30
 SRC_URI=mirror://cpan/src/5.0/perl-5.30.1-RC1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.30.1-RC1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82a0f561d4c67133df616d3726f48a95
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40-r6 b/metadata/md5-cache/dev-lang/php-5.6.40-r6
index b8d1bcd120f9..c4ec591b700c 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.40-r6
+++ b/metadata/md5-cache/dev-lang/php-5.6.40-r6
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( <dev-db/mysql-connector-c-8.0:0= ) mysqli? ( <dev-db/mysql-connector-c-8.0:0= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
 DESCRIPTION=The PHP language runtime engine
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[u
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-7.1.31bp.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f609cc7ae94def67212d8bf17d0777d9
diff --git a/metadata/md5-cache/dev-lang/php-7.1.32 b/metadata/md5-cache/dev-lang/php-7.1.32
index 7581d4097c88..0c89f3cbc8d9 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.32
+++ b/metadata/md5-cache/dev-lang/php-7.1.32
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[u
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
 SLOT=7.1
 SRC_URI=https://php.net/distributions/php-7.1.32.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=11bb45bfafc61c5a55bb7c3aa0b6c554
diff --git a/metadata/md5-cache/dev-lang/php-7.1.33 b/metadata/md5-cache/dev-lang/php-7.1.33
index 302477f63507..c91ed4616c17 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.33
+++ b/metadata/md5-cache/dev-lang/php-7.1.33
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
 SLOT=7.1
 SRC_URI=https://php.net/distributions/php-7.1.33.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=c37e4a2225be6e6cf011104972ea9210
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b2be0826ecb0f5152619c5fddd615b66
diff --git a/metadata/md5-cache/dev-lang/php-7.2.22 b/metadata/md5-cache/dev-lang/php-7.2.22
index b8a64eaebe0e..35839a6f6442 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.22
+++ b/metadata/md5-cache/dev-lang/php-7.2.22
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedi
 RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://php.net/distributions/php-7.2.22.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6fe6668df8ba51d0337aba26bc854d79
diff --git a/metadata/md5-cache/dev-lang/php-7.2.24 b/metadata/md5-cache/dev-lang/php-7.2.24
index b45cee75255f..53f300c49449 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.24
+++ b/metadata/md5-cache/dev-lang/php-7.2.24
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
 RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://php.net/distributions/php-7.2.24.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=4f14c2bb31649121570a2382e3f4da83
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9efde051132e428c31b7c773f3d5fe2d
diff --git a/metadata/md5-cache/dev-lang/php-7.3.11 b/metadata/md5-cache/dev-lang/php-7.3.11
index 1c9cdaa2bb9b..1a6bd037c349 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.11
+++ b/metadata/md5-cache/dev-lang/php-7.3.11
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://php.net/distributions/php-7.3.11.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=1bfb3a6e8f04c0b9892c19c8e97e3859
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e00c3421d537f48044ad609716abbb86
diff --git a/metadata/md5-cache/dev-lang/php-7.3.9 b/metadata/md5-cache/dev-lang/php-7.3.9
index 26795f21b97d..0e8ee2b4c2cf 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.9
+++ b/metadata/md5-cache/dev-lang/php-7.3.9
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://php.net/distributions/php-7.3.9.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e0954683ebb779cb12d10bd8eb24e402
diff --git a/metadata/md5-cache/dev-lang/php-7.4.0_rc5 b/metadata/md5-cache/dev-lang/php-7.4.0_rc5
index 7c76b500298d..943ae078cb49 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.0_rc5
+++ b/metadata/md5-cache/dev-lang/php-7.4.0_rc5
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=virtual/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
 SLOT=7.4
 SRC_URI=https://downloads.php.net/~derick/php-7.4.0RC5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34793766546fab1c316564957ab1c9b5
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
index 042c77123e84..a67dec2d6512 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
 SLOT=0/5.4.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ab4f7e0cba6c8af9ad79a1599d41d4c
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
index 6aaf0b4cd81e..c24b16d6c40a 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.0
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7ff3d0ab45e01850fc71f6c7ccd2eeb7
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
index fadfd47c8518..c082fdb0c84f 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f2b67b5d597885fcdf7a2b0d89ae982
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
index ed13fb0b10d0..69a752559599 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.2
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.2
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db6bd08d7c7c63533e2992b347ccd85c
diff --git a/metadata/md5-cache/dev-lang/polyml-5.6 b/metadata/md5-cache/dev-lang/polyml-5.6
index 18b8d81008a0..6ff9810cce89 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.6
+++ b/metadata/md5-cache/dev-lang/polyml-5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare test
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=6
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.6
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.6 -> polyml-5.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7780a1fb42044e656c4386941860f0b4
diff --git a/metadata/md5-cache/dev-lang/polyml-5.8 b/metadata/md5-cache/dev-lang/polyml-5.8
index 956309a9cd24..22dec52c7bc8 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.8
+++ b/metadata/md5-cache/dev-lang/polyml-5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare test
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=6
 HOMEPAGE=https://www.polyml.org
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.8
 SRC_URI=https://codeload.github.com/polyml/polyml/tar.gz/v5.8 -> polyml-5.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0e03dbfdb8b2fcb3942dc55639968d0c
diff --git a/metadata/md5-cache/dev-lang/python-2.7.15 b/metadata/md5-cache/dev-lang/python-2.7.15
index 16a503bcaf72..f5ecf3f5eac4 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.15
+++ b/metadata/md5-cache/dev-lang/python-2.7.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fb3e2535162fb74bb64dc61c2131efe
diff --git a/metadata/md5-cache/dev-lang/python-2.7.16 b/metadata/md5-cache/dev-lang/python-2.7.16
index 66cd7fa822a8..af53d6b586f2 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.16
+++ b/metadata/md5-cache/dev-lang/python-2.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -10,5 +10,5 @@ PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.16.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50be206e86a850de0e14da34c7bf4c23
diff --git a/metadata/md5-cache/dev-lang/python-3.5.5 b/metadata/md5-cache/dev-lang/python-3.5.5
index e591a9ed8d54..8867210fa752 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.5
+++ b/metadata/md5-cache/dev-lang/python-3.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d97e92dea91de1968c72d405870abba
diff --git a/metadata/md5-cache/dev-lang/python-3.5.7 b/metadata/md5-cache/dev-lang/python-3.5.7
index cc6ff3591b44..3ceaea0d4aa4 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.7
+++ b/metadata/md5-cache/dev-lang/python-3.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.7/Python-3.5.7.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8baf7102aab66853044984adf3436d9d
diff --git a/metadata/md5-cache/dev-lang/python-3.6.5 b/metadata/md5-cache/dev-lang/python-3.6.5
index bddae5a98c0a..94d87ebbfc59 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.5
+++ b/metadata/md5-cache/dev-lang/python-3.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f6fcf8ea3f26b1badef6905faca297c
diff --git a/metadata/md5-cache/dev-lang/python-3.6.8 b/metadata/md5-cache/dev-lang/python-3.6.8
index 357f25cca64e..be2b3e19366d 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.8
+++ b/metadata/md5-cache/dev-lang/python-3.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1d642cd05b1165ab8de4bde921de33a4
diff --git a/metadata/md5-cache/dev-lang/python-3.6.9 b/metadata/md5-cache/dev-lang/python-3.6.9
index a829c29017fd..f84a85a860aa 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.9
+++ b/metadata/md5-cache/dev-lang/python-3.6.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7fc9bd653d78eb54eef30d770b27c52
diff --git a/metadata/md5-cache/dev-lang/python-3.7.2 b/metadata/md5-cache/dev-lang/python-3.7.2
index ab8a2dcde5b6..5951b6d25bf5 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.2
+++ b/metadata/md5-cache/dev-lang/python-3.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=6
 HOMEPAGE=https://www.python.org/
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.2/Python-3.7.2.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0bd25bd73b45466d37cf1ac597050758
diff --git a/metadata/md5-cache/dev-lang/python-3.7.3 b/metadata/md5-cache/dev-lang/python-3.7.3
index d5559e15b877..1b3dad39f729 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.3
+++ b/metadata/md5-cache/dev-lang/python-3.7.3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-3.7.3-0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63d7e83b58f1c52f663a10f3979cf1ac
diff --git a/metadata/md5-cache/dev-lang/python-3.7.4-r1 b/metadata/md5-cache/dev-lang/python-3.7.4-r1
index 953c9c319432..1524a787fbbe 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.7.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.4-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=90c4f4bfa3d9df5cf3a775b5f9573bff
diff --git a/metadata/md5-cache/dev-lang/python-3.7.5 b/metadata/md5-cache/dev-lang/python-3.7.5
index 15cbd5b83543..7998993b9568 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.5
+++ b/metadata/md5-cache/dev-lang/python-3.7.5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.5/Python-3.7.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.4-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=90c4f4bfa3d9df5cf3a775b5f9573bff
diff --git a/metadata/md5-cache/dev-lang/python-3.7.5-r1 b/metadata/md5-cache/dev-lang/python-3.7.5-r1
index 351de4627ff7..dfb609e856e8 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.7.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -12,5 +12,5 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.5/Python-3.7.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.4-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=827e82b5765432d35b3418813185bd3a
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1 b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
index 3f7e0675ac12..e60ce1d84623 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9080ce8182464b8639e0db0b53e5c6bf
diff --git a/metadata/md5-cache/dev-lang/python-exec-9999 b/metadata/md5-cache/dev-lang/python-exec-9999
index 8601ef6cf8e6..feec27d0ed8a 100644
--- a/metadata/md5-cache/dev-lang/python-exec-9999
+++ b/metadata/md5-cache/dev-lang/python-exec-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install preinst prepare unpack
 DESCRIPTION=Python script wrapper
 EAPI=7
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
 SLOT=2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=50495c094a555a5ffc46d214ff620f08
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-10.1 b/metadata/md5-cache/dev-lang/qu-prolog-10.1
index aeaa771f1e4e..9d993ee86d8b 100644
--- a/metadata/md5-cache/dev-lang/qu-prolog-10.1
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 GPL-2+
 RDEPEND=!dev-util/mpatch !dev-util/rej !games-rpg/kqlives qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
 SLOT=0
 SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92ef454bd88796c1dd42be38d1e2642c
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.06 b/metadata/md5-cache/dev-lang/rakudo-2018.06
index 8f35b08b43bb..0cd57af1feb7 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.06
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.06
@@ -10,5 +10,5 @@ RDEPEND=~dev-lang/nqp-2018.06:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=34ab2cd429be00b5f90033afb65eb2e7
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.08 b/metadata/md5-cache/dev-lang/rakudo-2018.08
index aa67a1c7275c..4bff1f5f8453 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.08
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.08
@@ -10,5 +10,5 @@ RDEPEND=~dev-lang/nqp-2018.08:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=34ab2cd429be00b5f90033afb65eb2e7
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.09 b/metadata/md5-cache/dev-lang/rakudo-2018.09
index 1f3410e28dfb..6be6def4aa64 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.09
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.09
@@ -10,5 +10,5 @@ RDEPEND=~dev-lang/nqp-2018.09:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5d844e254540041c86498a1c015d5579
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.12 b/metadata/md5-cache/dev-lang/rakudo-2018.12
index 29a068c4a0e7..95ccbf8d3eb5 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2018.12
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.12
@@ -10,5 +10,5 @@ RDEPEND=~dev-lang/nqp-2018.12:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=81e57345f56f7c37b853d3df44622b01
diff --git a/metadata/md5-cache/dev-lang/rakudo-2019.03 b/metadata/md5-cache/dev-lang/rakudo-2019.03
index bb1996eb3efa..ddc720053ae7 100644
--- a/metadata/md5-cache/dev-lang/rakudo-2019.03
+++ b/metadata/md5-cache/dev-lang/rakudo-2019.03
@@ -10,5 +10,5 @@ RDEPEND=~dev-lang/nqp-2019.03:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
 SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2019.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=81e57345f56f7c37b853d3df44622b01
diff --git a/metadata/md5-cache/dev-lang/rakudo-9999 b/metadata/md5-cache/dev-lang/rakudo-9999
index 9de5b8ceabf4..b685c0989878 100644
--- a/metadata/md5-cache/dev-lang/rakudo-9999
+++ b/metadata/md5-cache/dev-lang/rakudo-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=~dev-lang/nqp-9999:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=|| ( java moar )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5039e5125d89d32a0fea33e1e85938ac
diff --git a/metadata/md5-cache/dev-lang/rebol-9999 b/metadata/md5-cache/dev-lang/rebol-9999
index 47766c44f4d9..5abd1fdadb46 100644
--- a/metadata/md5-cache/dev-lang/rebol-9999
+++ b/metadata/md5-cache/dev-lang/rebol-9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=|| ( dev-lang/rebol dev-lang/rebol-bin )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b248e0c3297fc347f32d039eb6971273
diff --git a/metadata/md5-cache/dev-lang/rebol-bin-3_pre111 b/metadata/md5-cache/dev-lang/rebol-bin-3_pre111
deleted file mode 100644
index 7448b11b48fe..000000000000
--- a/metadata/md5-cache/dev-lang/rebol-bin-3_pre111
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Relative Expression-Based Object Language
-EAPI=4
-HOMEPAGE=http://rebol.com
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://www.rebol.com/r3/downloads/r3-a111-4-4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2054d97bbda779e4fb002658f7e620d2
diff --git a/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1 b/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1
index 3cfe2adaf49f..bf0f08476ecd 100644
--- a/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1
+++ b/metadata/md5-cache/dev-lang/regina-rexx-3.9.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Portable Rexx interpreter
 EAPI=4
 HOMEPAGE=https://regina-rexx.sourceforge.io/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1 MPL-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/regina-rexx/Regina-REXX-3.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6411c1c79d03ce769cab86c375450538
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.9 b/metadata/md5-cache/dev-lang/ruby-2.4.9
index d8359be131de..bb8c008c70b4 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.9
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.9
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 DESCRIPTION=An object-oriented scripting language
@@ -11,5 +11,5 @@ PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minite
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.9.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=40f4096d2c2c892e2595f45fb1859a36
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.7 b/metadata/md5-cache/dev-lang/ruby-2.5.7
index ac1e5675d097..fe4c8bf500a2 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.7
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.7
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 DESCRIPTION=An object-oriented scripting language
@@ -11,5 +11,5 @@ PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minite
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.5
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.7.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5fd1b2007b15168945eaa18f67940e46
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.5 b/metadata/md5-cache/dev-lang/ruby-2.6.5
index 9baa518e5919..94f060f09667 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.6.5
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 DESCRIPTION=An object-oriented scripting language
@@ -11,5 +11,5 @@ PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.6
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9b4d5d49dc0c4c928e941dab5fa43e59
diff --git a/metadata/md5-cache/dev-lang/rust-1.34.2 b/metadata/md5-cache/dev-lang/rust-1.34.2
index 17a8a7a240ca..00ef99febefa 100644
--- a/metadata/md5-cache/dev-lang/rust-1.34.2
+++ b/metadata/md5-cache/dev-lang/rust-1.34.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.34
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.xz -> rustc-1.34.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d32fe326156fe3f637530261c3611972
diff --git a/metadata/md5-cache/dev-lang/rust-1.35.0 b/metadata/md5-cache/dev-lang/rust-1.35.0
index 1db82582815c..c1a782c0c0ee 100644
--- a/metadata/md5-cache/dev-lang/rust-1.35.0
+++ b/metadata/md5-cache/dev-lang/rust-1.35.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.35
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.xz -> rustc-1.35.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.34.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.34.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25019437cfde4e859d6d899bfba8ee6f
diff --git a/metadata/md5-cache/dev-lang/rust-1.36.0 b/metadata/md5-cache/dev-lang/rust-1.36.0
index 32dc4863caf0..948449c1aa83 100644
--- a/metadata/md5-cache/dev-lang/rust-1.36.0
+++ b/metadata/md5-cache/dev-lang/rust-1.36.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.36
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.36.0-src.tar.xz -> rustc-1.36.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.35.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.35.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f9b7c3b615ae0b07b5efc3d41d3470f9
diff --git a/metadata/md5-cache/dev-lang/rust-1.37.0 b/metadata/md5-cache/dev-lang/rust-1.37.0
index 24a61322b54a..f1930042ee75 100644
--- a/metadata/md5-cache/dev-lang/rust-1.37.0
+++ b/metadata/md5-cache/dev-lang/rust-1.37.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.37
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.xz -> rustc-1.37.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.36.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.36.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19688822dddf8036569436d18d168674
diff --git a/metadata/md5-cache/dev-lang/rust-1.38.0 b/metadata/md5-cache/dev-lang/rust-1.38.0
index cd3063afe409..16bba7e43608 100644
--- a/metadata/md5-cache/dev-lang/rust-1.38.0
+++ b/metadata/md5-cache/dev-lang/rust-1.38.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.38
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.xz -> rustc-1.38.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.37.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.37.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.37.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f70845e11d52d28275ec7f11dc4e298b
diff --git a/metadata/md5-cache/dev-lang/rust-1.39.0 b/metadata/md5-cache/dev-lang/rust-1.39.0
new file mode 100644
index 000000000000..769c8d192be2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+SLOT=stable/1.39
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.xz -> rustc-1.39.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.38.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.38.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.38.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bae53838fbf50edc85bf26986f931336
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.34.2 b/metadata/md5-cache/dev-lang/rust-bin-1.34.2
index d5fc40292b32..5b60b49cf6c0 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.34.2
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.34.2
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.34.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.34.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=022ec9e849b60b6bacc535f3703a4c78
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.35.0 b/metadata/md5-cache/dev-lang/rust-bin-1.35.0
index 988d03859ae4..858b4097c1b1 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.35.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.35.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.35.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.35.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3267961494bdda03621689506f9301c8
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.36.0 b/metadata/md5-cache/dev-lang/rust-bin-1.36.0
index 3809713abf66..8d35984958b2 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.36.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.36.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.36.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.36.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=064a502d40ff9d2e2d62fd4288f4a4c7
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.37.0 b/metadata/md5-cache/dev-lang/rust-bin-1.37.0
index dc26543a5e83..b3b44ef0943d 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.37.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.37.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.37.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.37.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.37.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4eb3bb963401d024441f509dfd5e65da
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.38.0 b/metadata/md5-cache/dev-lang/rust-bin-1.38.0
index ac640f726b04..45d4bde0a7f4 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.38.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.38.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.38.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.38.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.38.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=064a502d40ff9d2e2d62fd4288f4a4c7
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.39.0 b/metadata/md5-cache/dev-lang/rust-bin-1.39.0
new file mode 100644
index 000000000000..d017d0b1bba9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm pretend unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc libressl rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-misc/curl[ssl] !dev-lang/rust:0 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.39.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.39.0-i686-unknown-linux-gnu.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=064a502d40ff9d2e2d62fd4288f4a4c7
diff --git a/metadata/md5-cache/dev-lang/sassc-3.5.0 b/metadata/md5-cache/dev-lang/sassc-3.5.0
index 9450134bc349..0e2c3e151b91 100644
--- a/metadata/md5-cache/dev-lang/sassc-3.5.0
+++ b/metadata/md5-cache/dev-lang/sassc-3.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/libsass-3.5:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libsass-3.5:= >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A libsass command line driver
 EAPI=6
 HOMEPAGE=https://github.com/sass/sassc
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libsass-3.5:=
 SLOT=0
 SRC_URI=https://github.com/sass/sassc/archive/3.5.0.tar.gz -> sassc-3.5.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eb8ceab84a02d760b51db53ff3deeb58
diff --git a/metadata/md5-cache/dev-lang/sassc-3.6.0 b/metadata/md5-cache/dev-lang/sassc-3.6.0
index bc8adb8ddbf9..9a11e156aebe 100644
--- a/metadata/md5-cache/dev-lang/sassc-3.6.0
+++ b/metadata/md5-cache/dev-lang/sassc-3.6.0
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/libsass:=
 DESCRIPTION=A libsass command line driver
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libsass:=
 SLOT=0
 SRC_URI=https://github.com/sass/sassc/archive/3.6.0.tar.gz -> sassc-3.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec6a72d44aad6000dda648b4ae38c73c
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index 57edb90d1429..4cdb8a5c6dbd 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-2.12.4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.4.tar.gz -> scala-2.12.4.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.12.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.12.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.12.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.12.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.12.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.12.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.12.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.12.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.12.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.12.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.12.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.12.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.12.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.12.4-instrumented.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.4-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=447c81773bd0dd28ad1bd786c5cee2f2
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.12.4 b/metadata/md5-cache/dev-lang/scala-bin-2.12.4
index 1dd4201afcf0..69088f31b12c 100644
--- a/metadata/md5-cache/dev-lang/scala-bin-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-bin-2.12.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://downloads.lightbend.com/scala/2.12.4/scala-2.12.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c750fb953a193e580ca745c03376c03c
diff --git a/metadata/md5-cache/dev-lang/smlnj-110.75 b/metadata/md5-cache/dev-lang/smlnj-110.75
index a6c1fe9139e1..514b55f6785f 100644
--- a/metadata/md5-cache/dev-lang/smlnj-110.75
+++ b/metadata/md5-cache/dev-lang/smlnj-110.75
@@ -6,5 +6,5 @@ KEYWORDS=-* ~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=amd64? ( http://smlnj.cs.uchicago.edu/dist/working/110.75/boot.x86-unix.tgz -> smlnj-110.75-boot.x86-unix.tgz ) ppc? ( http://smlnj.cs.uchicago.edu/dist/working/110.75/boot.ppc-unix.tgz -> smlnj-110.75-boot.ppc-unix.tgz ) sparc? ( http://smlnj.cs.uchicago.edu/dist/working/110.75/boot.sparc-unix.tgz -> smlnj-110.75-boot.sparc-unix.tgz ) x86? ( http://smlnj.cs.uchicago.edu/dist/working/110.75/boot.x86-unix.tgz -> smlnj-110.75-boot.x86-unix.tgz ) http://smlnj.cs.uchicago.edu/dist/working/110.75/config.tgz -> smlnj-110.75-config.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/cm.tgz -> smlnj-110.75-cm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/compiler.tgz -> smlnj-110.75-compiler.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/runtime.tgz -> smlnj-110.75-runtime.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/system.tgz -> smlnj-110.75-system.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/MLRISC.tgz -> smlnj-110.75-MLRISC.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/smlnj-lib.tgz -> smlnj-110.75-smlnj-lib.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/ckit.tgz -> smlnj-110.75-ckit.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/nlffi.tgz -> smlnj-110.75-nlffi.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/cml.tgz -> smlnj-110.75-cml.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/eXene.tgz -> smlnj-110.75-eXene.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/ml-lex.tgz -> smlnj-110.75-ml-lex.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/ml-yacc.tgz -> smlnj-110.75-ml-yacc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/ml-burg.tgz -> smlnj-110.75-ml-burg.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/ml-lpt.tgz -> smlnj-110.75-ml-lpt.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/pgraph.tgz -> smlnj-110.75-pgraph.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/trace-debug-profile.tgz -> smlnj-110.75-trace-debug-profile.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/heap2asm.tgz -> smlnj-110.75-heap2asm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.75/smlnj-c.tgz -> smlnj-110.75-smlnj-c.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1647467bcfccc78ad29492a11b9beca7
diff --git a/metadata/md5-cache/dev-lang/smlnj-110.82 b/metadata/md5-cache/dev-lang/smlnj-110.82
index e58d4c31383b..27255ef62bc4 100644
--- a/metadata/md5-cache/dev-lang/smlnj-110.82
+++ b/metadata/md5-cache/dev-lang/smlnj-110.82
@@ -8,5 +8,5 @@ KEYWORDS=-* ~amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=amd64? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) ppc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.ppc-unix.tgz -> smlnj-110.82-boot.ppc-unix.tgz ) sparc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.sparc-unix.tgz -> smlnj-110.82-boot.sparc-unix.tgz ) x86? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) http://smlnj.cs.uchicago.edu/dist/working/110.82/doc.tgz -> smlnj-110.82-doc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/config.tgz -> smlnj-110.82-config.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cm.tgz -> smlnj-110.82-cm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/compiler.tgz -> smlnj-110.82-compiler.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/runtime.tgz -> smlnj-110.82-runtime.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/system.tgz -> smlnj-110.82-system.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/MLRISC.tgz -> smlnj-110.82-MLRISC.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-lib.tgz -> smlnj-110.82-smlnj-lib.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/old-basis.tgz -> smlnj-110.82-old-basis.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ckit.tgz -> smlnj-110.82-ckit.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/nlffi.tgz -> smlnj-110.82-nlffi.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cml.tgz -> smlnj-110.82-cml.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/eXene.tgz -> smlnj-110.82-eXene.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lpt.tgz -> smlnj-110.82-ml-lpt.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lex.tgz -> smlnj-110.82-ml-lex.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-yacc.tgz -> smlnj-110.82-ml-yacc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-burg.tgz -> smlnj-110.82-ml-burg.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/pgraph.tgz -> smlnj-110.82-pgraph.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/trace-debug-profile.tgz -> smlnj-110.82-trace-debug-profile.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/heap2asm.tgz -> smlnj-110.82-heap2asm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-c.tgz -> smlnj-110.82-smlnj-c.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f0534af066f5095e7a89fd93d495cf54
diff --git a/metadata/md5-cache/dev-lang/spark-2017 b/metadata/md5-cache/dev-lang/spark-2017
deleted file mode 100644
index f29aeb8be37b..000000000000
--- a/metadata/md5-cache/dev-lang/spark-2017
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/gnat-gpl:6.3.0 >=dev-ada/gnatcoll-2017[gnat_2017,projects,shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark dev-ada/gprbuild[gnat_2017]
-DESCRIPTION=Software development for high-reliability applications.
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=dev-lang/gnat-gpl:6.3.0 >=dev-ada/gnatcoll-2017[gnat_2017,projects,shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/591c4777c7a447af2deed05e -> spark-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=4b77e08f59c8aea67140a4c942610504
diff --git a/metadata/md5-cache/dev-lang/spark-2018 b/metadata/md5-cache/dev-lang/spark-2018
deleted file mode 100644
index 13b7631116e7..000000000000
--- a/metadata/md5-cache/dev-lang/spark-2018
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/gnat-gpl:7.3.1 dev-ada/gnatcoll-core[gnat_2018,shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark dev-ada/gprbuild[gnat_2018]
-DESCRIPTION=Software development for high-reliability applications.
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=dev-lang/gnat-gpl:7.3.1 dev-ada/gnatcoll-core[gnat_2018,shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a47 -> spark-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=451d72ffa6e3174f8cbb25f0677be9cb
diff --git a/metadata/md5-cache/dev-lang/spark-2018-r1 b/metadata/md5-cache/dev-lang/spark-2018-r1
new file mode 100644
index 000000000000..e39d7457f2a9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spark-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark dev-ada/gprbuild[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)]
+DESCRIPTION=Software development for high-reliability applications.
+EAPI=7
+HOMEPAGE=http://libre.adacore.com
+IUSE=ada_target_gnat_2018 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2019
+KEYWORDS=amd64
+LICENSE=GPL-3
+RDEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),shared] sci-mathematics/alt-ergo sci-mathematics/why3-for-spark
+REQUIRED_USE=ada_target_gnat_2018
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a47 -> spark-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=33a692dbc2cafb34cef39eaea7717990
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
index 94ed1f6ce435..c00096cca6a5 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=threadsafe? ( dev-libs/nspr )
 SLOT=0/js
 SRC_URI=http://archive.mozilla.org/pub/js/js-1.7.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74fe6da1ada44803d204ff4d496ba2b3
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
index 9f11e747cea0..084fbab33b10 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=33b74e83cf30c83c094f99c31c7045c9
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
index f45b4ed217f9..b43e69f111e9 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0438f2e1831d0dc56e5181fdafa6de43
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
index a701b3bd2eaf..161ffae88bcc 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.5-r9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) app-arch/zip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -9,5 +9,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.7.0 sys-libs/readline:0= x64-macos? ( dev-libs/jemalloc )
 SLOT=0/mozjs185
 SRC_URI=https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot0-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bb2a9aa32dc77171c4d5adcf6b1fe184
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
index 4d9e2099f953..f5e26ae93b94 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=debug? ( jit )
 RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b214bb89465e746f58fc37202c859cf2
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0 b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
index 2d8c57b48295..59171355eaa3 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=ia64? ( test )
 SLOT=38
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/38.3.0/mozjs-38.3.0sfink2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7b833dfcdd5bc239faf6a3d73155af8c
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2 b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
index 3df22a866e96..1048fc8200a6 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/z
 RESTRICT=ia64? ( test )
 SLOT=45
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot45-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2b47a7d3a28cccc45aa171b74cfe3985
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
index c239284e7254..f5f8ea8599b3 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e25afa4ebe68ebc6afbb0e69f062b7af
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r1 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r1
index f8922dc02074..847a65c53f72 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=545c5aea3b949bd403e122298cc72ccb
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
index 0feca3380370..4a5c80b0c955 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3:= system-icu? ( >=dev-libs/icu-59.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3:= system-icu? ( >=dev-libs/icu-59.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccb89d00d60334f95444253a243d0585
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
index cfe8fd2c8ecf..956c1db4b411 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3:= system-icu? ( >=dev-libs/icu-59.1:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
+DEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3:= system-icu? ( >=dev-libs/icu-59.1:= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] )
 DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5fd43252f0ac05eaa9657a5ed88f6f52
diff --git a/metadata/md5-cache/dev-lang/squirrel-3.1 b/metadata/md5-cache/dev-lang/squirrel-3.1
index d80640062f40..dbd061e80d85 100644
--- a/metadata/md5-cache/dev-lang/squirrel-3.1
+++ b/metadata/md5-cache/dev-lang/squirrel-3.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/albertodemichelis/squirrel/archive/v3.1.tar.gz -> squirrel-3.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0439aa9a0acdb22bce3667cf7daa238
diff --git a/metadata/md5-cache/dev-lang/srf-1.0-r2 b/metadata/md5-cache/dev-lang/srf-1.0-r2
index 4506094769e5..afa316995d78 100644
--- a/metadata/md5-cache/dev-lang/srf-1.0-r2
+++ b/metadata/md5-cache/dev-lang/srf-1.0-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.stratigery.com/srf.html/srf-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a5dc74669fcfe3eacf09796a6e05c107
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.0.3 b/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
index 3ac97a142172..6f62ef33eaa3 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.0.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23ad3dccfaf6a57a86b9137af492f138
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.14 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
index cf34d93893be..f3840fc91b07 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.14
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.14.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.15 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
index 0b311fca8333..8c6af553a96c 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.15
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.15.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3e24a9cce27f69b65799e5154e852a5
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.26-r3 b/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
index a7746ee6fbaa..7e269140ccc5 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
+++ b/metadata/md5-cache/dev-lang/tcc-0.9.26-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!dev-lang/tendra
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.26.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fd59c2cce97abc81b715e9e93b69f082
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.27 b/metadata/md5-cache/dev-lang/tcc-0.9.27
index e26737472a72..7aad0bfa6164 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.27
+++ b/metadata/md5-cache/dev-lang/tcc-0.9.27
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!dev-lang/tendra
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=90c136ff6b051f28187d9181e9f6c28c
diff --git a/metadata/md5-cache/dev-lang/tcc-9999 b/metadata/md5-cache/dev-lang/tcc-9999
index dc4781e66df4..62fc5b64d9b9 100644
--- a/metadata/md5-cache/dev-lang/tcc-9999
+++ b/metadata/md5-cache/dev-lang/tcc-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=!dev-lang/tendra
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=06399073dc62e9b71c975fe5bf663d8d
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
index e606bbdaaaff..a767d1cfd85d 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d1b17047367ce27ce1751644938cb9b0
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.8 b/metadata/md5-cache/dev-lang/tcl-8.6.8
index 2fe47f3f3f61..4244ccd65545 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.8
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Tool Command Language
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.8-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8112f57960bf3953f74e1fdd02961519
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.9 b/metadata/md5-cache/dev-lang/tcl-8.6.9
index eea1a17982bf..4f92e58ada8c 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.9
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.9
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Tool Command Language
@@ -10,5 +10,5 @@ LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.9-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=00d88dfeb7ee5b1892882b6dec0dceaa
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1 b/metadata/md5-cache/dev-lang/teyjus-2.1
index ea782dcab35f..2bf5c4dc39f1 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6f12787335080ad8f7ad23063fe6b705
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
index c8ba500edc5f..b92dd4a2643c 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1-r1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0ae09af8f2d2f8419c3f91bd6ea29b5c
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r1 b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
index 9514e84f8519..f669322740d2 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.17-r1
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0= !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0= !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Tk Widget Set
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0=
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=831033aa86735393ae7d02bcc008aa2e
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.8 b/metadata/md5-cache/dev-lang/tk-8.6.8
index 49b6e1e36a61..5428c2efc582 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.8
+++ b/metadata/md5-cache/dev-lang/tk-8.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.8:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.8:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Tk Widget Set
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.8:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.8-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=2fe7f076fc73fc4edb9cd9e65c460fbc
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9 b/metadata/md5-cache/dev-lang/tk-8.6.9
index 071b421de02f..8836e544afe4 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -10,5 +10,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=e589a3becf2b2be5f65365d77acbe065
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9.1 b/metadata/md5-cache/dev-lang/tk-8.6.9.1
index 97e9754a0eb6..4b8df8b2b073 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9.1
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9.1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto )
 DESCRIPTION=Tk Widget Set
@@ -10,5 +10,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9.1-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=610d6943106e72dc9862e890e1487b1e
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
index 359214d08e09..046eb7d4cb8a 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2af38c2a472e5d95cb944879af55fc3a
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.0.1 b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
index 20c33737d2ef..00880e64e0bf 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.0.1
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c8eb46faca18a091ac0a9659f33ef606
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.1.0 b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
index 188d9d2486d4..6e35b747a2b0 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-3.1.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 BSD
 RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2f66fcc0056bb9e2a90a449dff594b92
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.18 b/metadata/md5-cache/dev-lang/vala-0.36.18
index 3602c3e3381e..3b164276c6c6 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.18
+++ b/metadata/md5-cache/dev-lang/vala-0.36.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.18
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.18.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82c321592bd3e47aaac5d9f248c2e589
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.19 b/metadata/md5-cache/dev-lang/vala-0.36.19
index 92a47dec9c29..faef6456fc79 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.19
+++ b/metadata/md5-cache/dev-lang/vala-0.36.19
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.19
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.19.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52cfdc8f908edbc36c66fa6245733c62
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.20 b/metadata/md5-cache/dev-lang/vala-0.36.20
index e5eafca65456..503a31383079 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.20
+++ b/metadata/md5-cache/dev-lang/vala-0.36.20
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.20
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.20.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8decdf4dc83e2fe64989d425720675d4
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.14 b/metadata/md5-cache/dev-lang/vala-0.40.14
index 50c524e0bbb7..038f8d1b10a8 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.14
+++ b/metadata/md5-cache/dev-lang/vala-0.40.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd8d120d493f3cf5d8fe5f3b6629a1a7
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.15 b/metadata/md5-cache/dev-lang/vala-0.40.15
index 7bb0332ebb74..f3405f9e9432 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.15
+++ b/metadata/md5-cache/dev-lang/vala-0.40.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.15 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.15 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.15 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.15.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9bc48bb2b5bbca6da802c9365ca5a4d
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.16 b/metadata/md5-cache/dev-lang/vala-0.40.16
index 62675f709503..987af8b1753e 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.16
+++ b/metadata/md5-cache/dev-lang/vala-0.40.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.16.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0668947f93e23951af4143a687ccc540
diff --git a/metadata/md5-cache/dev-lang/vala-0.42.7 b/metadata/md5-cache/dev-lang/vala-0.42.7
index d77b10c30744..034488457f5a 100644
--- a/metadata/md5-cache/dev-lang/vala-0.42.7
+++ b/metadata/md5-cache/dev-lang/vala-0.42.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.42.7 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.42.7 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.42.7 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.42
 SRC_URI=mirror://gnome/sources/vala/0.42/vala-0.42.7.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e57b4abaa0e413efd2d9ae83b5da66ef
diff --git a/metadata/md5-cache/dev-lang/vala-0.44.7 b/metadata/md5-cache/dev-lang/vala-0.44.7
index e9c38539166e..9e35759cf567 100644
--- a/metadata/md5-cache/dev-lang/vala-0.44.7
+++ b/metadata/md5-cache/dev-lang/vala-0.44.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.7 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.7 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.7 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.44
 SRC_URI=mirror://gnome/sources/vala/0.44/vala-0.44.7.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70f4465bb692d150924709a0d4ffcb58
diff --git a/metadata/md5-cache/dev-lang/vala-0.44.8 b/metadata/md5-cache/dev-lang/vala-0.44.8
index b517b3b8f353..964e18ef59e2 100644
--- a/metadata/md5-cache/dev-lang/vala-0.44.8
+++ b/metadata/md5-cache/dev-lang/vala-0.44.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.8 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.8 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.8 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.44
 SRC_URI=mirror://gnome/sources/vala/0.44/vala-0.44.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70f4465bb692d150924709a0d4ffcb58
diff --git a/metadata/md5-cache/dev-lang/vala-0.44.9 b/metadata/md5-cache/dev-lang/vala-0.44.9
index c7ff97afe11e..32d5c190327c 100644
--- a/metadata/md5-cache/dev-lang/vala-0.44.9
+++ b/metadata/md5-cache/dev-lang/vala-0.44.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.9 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.9 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.44.9 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.44
 SRC_URI=mirror://gnome/sources/vala/0.44/vala-0.44.9.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70f4465bb692d150924709a0d4ffcb58
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.3 b/metadata/md5-cache/dev-lang/vala-0.46.3
index 888e511f26ac..79f9aa2d6446 100644
--- a/metadata/md5-cache/dev-lang/vala-0.46.3
+++ b/metadata/md5-cache/dev-lang/vala-0.46.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.3 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 SLOT=0.46
 SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad18c7cbe06bd52b22554bc5c348efbf
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.3 b/metadata/md5-cache/dev-lang/whitespace-0.3
index 17b6eb656b11..068c57ab2f9b 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.3
+++ b/metadata/md5-cache/dev-lang/whitespace-0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://compsoc.dur.ac.uk/whitespace/downloads/wspace-0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50fb5678cc0251e760bbe007525e92fb
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.4 b/metadata/md5-cache/dev-lang/whitespace-0.4
index 065c6846374d..5e1e85c0324a 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.4
+++ b/metadata/md5-cache/dev-lang/whitespace-0.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/whitespace/0.4/whitespace-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f8fecb2c9bd16aa9ccb4be768976827
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0 b/metadata/md5-cache/dev-lang/xsb-3.6.0
index eec5644d946f..20c499bbfe5d 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=XSB is a logic programming and deductive database system
 EAPI=5
 HOMEPAGE=http://xsb.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ab846767bb89613672428f03f3c4fd7
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0-r1 b/metadata/md5-cache/dev-lang/xsb-3.6.0-r1
index 62ba02c762d8..833997543791 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0-r1
+++ b/metadata/md5-cache/dev-lang/xsb-3.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=XSB is a logic programming and deductive database system
 EAPI=6
 HOMEPAGE=http://xsb.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=363832b7aabe195482bef63ea9fff95e
diff --git a/metadata/md5-cache/dev-lang/xsb-3.7.0-r1 b/metadata/md5-cache/dev-lang/xsb-3.7.0-r1
index 6d2817e1b265..c53c8a9cf484 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.7.0-r1
+++ b/metadata/md5-cache/dev-lang/xsb-3.7.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=XSB is a logic programming and deductive database system
 EAPI=6
 HOMEPAGE=http://xsb.sourceforge.net
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB370.tar.gz mirror://gentoo/xsb-3.7.0-gentoo-patchset-3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f10d222d7b69e72f992c19e3b2e79aae
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.3 b/metadata/md5-cache/dev-lang/yap-6.3.3
deleted file mode 100644
index 9eb1cdc7b1d7..000000000000
--- a/metadata/md5-cache/dev-lang/yap-6.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virtual/jdk-1.4:= ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) R? ( dev-lang/R ) doc? ( app-text/texi2html ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=YAP is a high-performance Prolog compiler
-EAPI=5
-HOMEPAGE=http://www.dcc.fc.up.pt/~vsc/Yap/
-IUSE=R debug doc examples gmp java mpi mysql odbc readline static threads elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=Artistic LGPL-2
-RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virtual/jdk-1.4:= ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.3.tar.gz mirror://gentoo/yap-6.3.3-gentoo-patchset-11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3ffdc0b966a7668963a5331b50e18b84
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.3-r1 b/metadata/md5-cache/dev-lang/yap-6.3.3-r1
index d343e7a8014f..c6ba68c4d36e 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.3-r1
+++ b/metadata/md5-cache/dev-lang/yap-6.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virtual/jdk-1.4:= ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.3.tar.gz mirror://gentoo/yap-6.3.3-gentoo-patchset-12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	82402a1c36ab4bf38f3313a543f9e827	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=38c25f60b48ca385fe3af363c1850b96
diff --git a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
index dc30a73dd54a..90bf401257fa 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
+++ b/metadata/md5-cache/dev-lang/yasm-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare test
-DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=5
 HOMEPAGE=http://yasm.tortall.net/
@@ -10,5 +10,5 @@ RDEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz mirror://gentoo/yasm-1.2.0-x32.patch.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72984d45026265320d581bb34e767c91
diff --git a/metadata/md5-cache/dev-lang/yasm-1.3.0 b/metadata/md5-cache/dev-lang/yasm-1.3.0
index 745d3cc1a946..82422cda0316 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.3.0
+++ b/metadata/md5-cache/dev-lang/yasm-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lan
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73501bb3055ffbf0763a3b8889f45e71
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index 012d9dd98c32..d1255fd96a01 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare test unpack
-DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-text/xmlto app-text/docbook-xml-dtd:4.1.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-text/xmlto app-text/docbook-xml-dtd:4.1.2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=5
 HOMEPAGE=http://yasm.tortall.net/
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d946805ab62a230e3a753456910bc147
diff --git a/metadata/md5-cache/dev-lang/zig-0.4.0-r1 b/metadata/md5-cache/dev-lang/zig-0.4.0-r1
index aa793439e94c..266f8ac87e72 100644
--- a/metadata/md5-cache/dev-lang/zig-0.4.0-r1
+++ b/metadata/md5-cache/dev-lang/zig-0.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] )
 SLOT=0
 SRC_URI=https://github.com/ziglang/zig/archive/0.4.0.tar.gz -> zig-0.4.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6567da54022c43dd3f05eb28f2968883
diff --git a/metadata/md5-cache/dev-lang/zig-0.5.0 b/metadata/md5-cache/dev-lang/zig-0.5.0
index a7f56fe9f785..c3086bd6a245 100644
--- a/metadata/md5-cache/dev-lang/zig-0.5.0
+++ b/metadata/md5-cache/dev-lang/zig-0.5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/llvm:9 !experimental? ( sys-devel/llvm:9[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/clang:9
 SLOT=0
 SRC_URI=https://github.com/ziglang/zig/archive/0.5.0.tar.gz -> zig-0.5.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9136fcbf951098e4dc5f6d86f4fd129
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index 6fef2a7ccb6e..e724622395a7 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-devel/llvm:9 !experimental? ( sys-devel/llvm:9[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/clang:9
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9136fcbf951098e4dc5f6d86f4fd129
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /metadata/md5-cache/dev-lang
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)