16 files changed, 54 insertions, 40 deletions
diff --git a/metadata/md5-cache/app-editors/joe-4.6 b/metadata/md5-cache/app-editors/joe-4.6
index 690b83259753..4f8bd23fe461 100644
--- a/metadata/md5-cache/app-editors/joe-4.6
+++ b/metadata/md5-cache/app-editors/joe-4.6
@@ -4,10 +4,10 @@ DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/joe-editor/
 IUSE=xterm
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-1+ CC-BY-3.0
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-4.6.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e97acb4b2cc8474ee906969ad41551d9
+_md5_=5b4849dd443678505de5fc369ecc8515
diff --git a/metadata/md5-cache/app-office/calcurse-4.3.0 b/metadata/md5-cache/app-office/calcurse-4.3.0
index 40491b01d5a9..a2515aa56ca1 100644
--- a/metadata/md5-cache/app-office/calcurse-4.3.0
+++ b/metadata/md5-cache/app-office/calcurse-4.3.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-libs/ncurses:0=
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<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
 DESCRIPTION=a text-based calendar and scheduling application
 EAPI=6
 HOMEPAGE=https://calcurse.org/
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/ncurses:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.3.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cce13624b165d17eb5848f4bad313ab0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2a7015e01181fe8ed404989f0c1f3ebe
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
index 9430b112c7bb..3c9c9dd8cdbf 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20180302.tar.bz2
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bd929fd6827a3f33106b12b008a56755
+_md5_=5891a2b75aedd48d1dc24f33832d0e8c
diff --git a/metadata/md5-cache/app-text/gocr-0.50 b/metadata/md5-cache/app-text/gocr-0.50
index 9fe3f1f7a42d..b00221a18ff8 100644
--- a/metadata/md5-cache/app-text/gocr-0.50
+++ b/metadata/md5-cache/app-text/gocr-0.50
@@ -4,9 +4,9 @@ DESCRIPTION=An OCR (Optical Character Recognition) reader
 EAPI=4
 HOMEPAGE=http://jocr.sourceforge.net
 IUSE=doc scanner tk
-KEYWORDS=~alpha ~amd64 ~arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
 SLOT=0
 SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz
-_md5_=44203db21971642bfbbd0f9ea8d51cdc
+_md5_=a1bf63434a8daea20a04c5ecc2c59964
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r4 b/metadata/md5-cache/app-text/texlive-core-2017-r4
index 318059a9389e..5bceb7de8f2e 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=https://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive-20170524-source-freetype.patch.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97bd99b01241491f878f9950fb45658d
+_md5_=9a254807cc7d9270466af7459e1c1179
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.2 b/metadata/md5-cache/dev-erlang/epam-1.0.2
index 0d0b54fc0b91..d37d8a93bcc3 100644
--- a/metadata/md5-cache/dev-erlang/epam-1.0.2
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-
 DESCRIPTION=epam for ejabberd to help with PAM authentication support
 EAPI=6
 HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=amd64 ~arm ~ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/epam/archive/1.0.2.tar.gz -> epam-1.0.2.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1366ec19aa9009ccc15b446a650f67bf
+_md5_=2e6d422620361e563f4afd8f45f91946
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.8 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.8
index a45d66fc44f4..bb4460053eb4 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.8
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.8
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Erlang utility modules from ProcessOne
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_utils
-KEYWORDS=amd64 ~arm ~ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_utils/archive/1.0.8.tar.gz -> p1_utils-1.0.8.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=f71a449608014f90f565bc19bbd17353
+_md5_=d6d022eafb4569400c0ceed0d5cbb837
diff --git a/metadata/md5-cache/dev-games/clanlib-4.0.0 b/metadata/md5-cache/dev-games/clanlib-4.0.0
index 7e12056d53f4..c791b7867b13 100644
--- a/metadata/md5-cache/dev-games/clanlib-4.0.0
+++ b/metadata/md5-cache/dev-games/clanlib-4.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=opengl? ( X )
 SLOT=4.0
 SRC_URI=https://github.com/sphair/ClanLib/archive/v4.0.0.tar.gz -> clanlib-4.0.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=dd78f30b012720d38925ebbf48c45629
+_md5_=c0c618ee0086c1644fd2d7ce66b14af3
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3 b/metadata/md5-cache/dev-lang/erlang-20.3
index d89b57a6a7b2..a9751a4baf0a 100644
--- a/metadata/md5-cache/dev-lang/erlang-20.3
+++ b/metadata/md5-cache/dev-lang/erlang-20.3
@@ -4,11 +4,11 @@ DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=6
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_20.3.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=eaabe197a08fe8cefe0b4e40618f04c6
+_md5_=1d9b558c4cd4996a01333f9fa4427262
diff --git a/metadata/md5-cache/dev-util/imediff2-1.1.2-r3 b/metadata/md5-cache/dev-util/imediff2-1.1.2-r3
deleted file mode 100644
index d18c69c4694d..000000000000
--- a/metadata/md5-cache/dev-util/imediff2-1.1.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=An interactive, user friendly 2-way merge tool in text mode
-EAPI=5
-HOMEPAGE=https://elonen.iki.fi/code/imediff/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://debian/pool/main/i/imediff2/imediff2_1.1.2.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fefd75600a0568c5e4544087bb0e5049
diff --git a/metadata/md5-cache/dev-util/imediff2-1.1.2-r4 b/metadata/md5-cache/dev-util/imediff2-1.1.2-r4
new file mode 100644
index 000000000000..a28ce1720da1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/imediff2-1.1.2-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_single_target_python3_5? ( dev-lang/python:3.5[ncurses] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DESCRIPTION=An interactive, user friendly 2-way merge tool in text mode
+EAPI=6
+HOMEPAGE=https://elonen.iki.fi/code/imediff/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_single_target_python3_5? ( dev-lang/python:3.5[ncurses] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/i/imediff2/imediff2_1.1.2.orig.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c3c300c2495620fbfe5d6e6dadd28861
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.1 b/metadata/md5-cache/dev-util/rebar-2.6.1
index e55d6ffd514a..9544890bc8de 100644
--- a/metadata/md5-cache/dev-util/rebar-2.6.1
+++ b/metadata/md5-cache/dev-util/rebar-2.6.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/erlang
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=5
 HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rebar/rebar/archive/2.6.1.tar.gz -> rebar-2.6.1.tar.gz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=549b1d764cd21fe0ab088eb95f9a4207
+_md5_=b96d7cb2204dd2ded8c2f144e302ebd3
diff --git a/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 b/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
index 651fde077177..185536425545 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=6
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.8.0.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ed9b7667789440492d3c70a10063ceab
+_md5_=46e1af20c300ddb035410946b48c8424
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2 b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
index 63abfbf7e4a6..adfae6c0b295 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
+++ b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/
 IUSE=debug static-libs vanilla
-KEYWORDS=~alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman
 SLOT=0
 SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/V_0_6_0.tar.bz2 -> libfprint-0.6.0.tar.bz2 https://dev.gentoo.org/~xmw/libfprint-0.6.0_vfs0050.patch.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=2927297c0accb92dbd0ba56349fc0632
+_md5_=b8d082c2f9342c618273ab0a188331fc
diff --git a/metadata/md5-cache/sys-block/fio-3.7 b/metadata/md5-cache/sys-block/fio-3.7
new file mode 100644
index 000000000000..9a6ee24a7ca1
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!static? ( aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) static? ( aio? ( dev-libs/libaio[static-libs(+)] ) glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) gtk? ( dev-libs/glib:2[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) rdma? ( sys-fabric/libibverbs[static-libs(+)] sys-fabric/librdmacm[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=6
+HOMEPAGE=http://brick.kernel.dk/snaps/
+IUSE=aio glusterfs gnuplot gtk numa rbd rdma static zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) gnuplot? ( sci-visualization/gnuplot python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=gnuplot? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/fio-3.7.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8c1c44d4288aa5c1dccceb6d543ac258
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e8031e8ddaee..30d1affcdfe8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Jun 2018 13:26:14 +0000
+Mon, 25 Jun 2018 13:46:26 +0000