2018-06-06 12:25:03 UTC

33 files changed, 17 insertions, 288 deletions

diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1 b/metadata/md5-cache/app-arch/rpm-4.14.1
index 24a02697868a..9a3a68329aa3 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
 IUSE=acl caps doc lua nls python selinux 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=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(+)?] ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
 REQUIRED_USE=python? ( ^^ ( 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=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a08cc3cbdadf309200e745b010d26865
+_md5_=1ab233c210d89e213eee1a924c0d8ad8
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.4 b/metadata/md5-cache/dev-libs/libgit2-0.26.4
index a680d80d0ceb..819b611d26a3 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.4
+++ b/metadata/md5-cache/dev-libs/libgit2-0.26.4
@@ -4,10 +4,10 @@ DESCRIPTION=A linkable library for Git
 EAPI=6
 HOMEPAGE=https://libgit2.github.com/
 IUSE=+curl examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/26
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.4.tar.gz -> libgit2-0.26.4.tar.gz
 _eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=547c5c8d2a55591b403b37065de8dd6f
+_md5_=4712f28cfc5db0ca9e287fee60cb7c96
diff --git a/metadata/md5-cache/mail-client/neomutt-20171208 b/metadata/md5-cache/mail-client/neomutt-20171208
deleted file mode 100644
index c2b4a97640c9..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171208
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=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 small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171208.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=784242e02ea228d211f462ea78474609
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215 b/metadata/md5-cache/mail-client/neomutt-20171215
deleted file mode 100644
index 7e734ae79754..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=67e208e5346e40c65e647a2ac5a6f012
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r1 b/metadata/md5-cache/mail-client/neomutt-20171215-r1
deleted file mode 100644
index bd3e65822e5c..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e45c2c5e1b3e18839ea5e45fdc079a7
diff --git a/metadata/md5-cache/mail-client/neomutt-20171215-r2 b/metadata/md5-cache/mail-client/neomutt-20171215-r2
deleted file mode 100644
index 41b6e36da0b3..000000000000
--- a/metadata/md5-cache/mail-client/neomutt-20171215-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
-SLOT=0
-SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171215.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2fc10e2eb1698cf974cac6505bb871c
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index f6d1b56eef58..50ce70a575a6 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=https://neomutt.org/
-IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c297918dbbfcdda8760566dc00d0a45
+_md5_=01dea4741716cd1be4de6949783412c4
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
deleted file mode 100644
index f1f83f43c549..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4
index 51deb13c4f62..44a8fb3c5f1c 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
deleted file mode 100644
index 0703d455b0a1..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7
deleted file mode 100644
index 360465fce9e3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
deleted file mode 100644
index 621eeb8daf37..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.4
index 523b3448dcc6..359f03abb852 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
deleted file mode 100644
index 3c5ea533ea11..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7
deleted file mode 100644
index 41f28af7f92a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
deleted file mode 100644
index e80b20b13b5a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.4
index 618d568748bd..64a82d2e1dd3 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
deleted file mode 100644
index cec92510f0d3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7
deleted file mode 100644
index 515ac85a577a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
deleted file mode 100644
index 09ca1c010d11..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.4
index 4ca6f291a618..edf2c9606cec 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
deleted file mode 100644
index ead1189059a5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7
deleted file mode 100644
index 5878bc0e8434..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.3 b/metadata/md5-cache/sys-cluster/kubectl-1.10.3
deleted file mode 100644
index af82831904e0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.2 b/metadata/md5-cache/sys-cluster/kubectl-1.10.4
index f22e8854e500..2d2f53d0a5b6 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.6 b/metadata/md5-cache/sys-cluster/kubectl-1.9.6
deleted file mode 100644
index fcc6a54ccd9c..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.7 b/metadata/md5-cache/sys-cluster/kubectl-1.9.7
deleted file mode 100644
index b2017dc06113..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.3 b/metadata/md5-cache/sys-cluster/kubelet-1.10.3
deleted file mode 100644
index b598664c0b99..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.2 b/metadata/md5-cache/sys-cluster/kubelet-1.10.4
index a81e9d22bf66..b2602fe98ce2 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.2
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.2.tar.gz -> kubernetes-1.10.2.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.4.tar.gz -> kubernetes-1.10.4.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.6 b/metadata/md5-cache/sys-cluster/kubelet-1.9.6
deleted file mode 100644
index a45f6eee2d77..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.7 b/metadata/md5-cache/sys-cluster/kubelet-1.9.7
deleted file mode 100644
index 64982989483c..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.7.tar.gz -> kubernetes-1.9.7.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 818f53c7476a..c23b4060ac57 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -202,7 +202,7 @@ app-arch/pigz 2.3.4: A parallel implementation of gzip
 app-arch/pixz 1.0.6: Parallel Indexed XZ compressor
 app-arch/pure-sfv 0.3-r1: utility to test and create .sfv files and create .par files
 app-arch/pxz 5.0_pre20151029: Parallel implementation of the XZ compression utility
-app-arch/rpm 4.11.0.1: Red Hat Package Management Utils
+app-arch/rpm 4.11.0.1 4.14.1: Red Hat Package Management Utils
 app-arch/rpm2targz 9.0.0.5g: Convert a .rpm file to a .tar.gz archive
 app-arch/rzip 2.1-r3: Compression program for large files
 app-arch/sharutils 4.14-r1: Tools to deal with shar archives
@@ -3067,7 +3067,7 @@ dev-libs/libgamin 0.1.10-r5: Library providing the FAM File Alteration Monitor A
 dev-libs/libgcrypt 1.8.1: General purpose crypto library based on the code used in GnuPG
 dev-libs/libgdata 0.17.8 0.17.9-r1: GLib-based library for accessing online service APIs using the GData protocol
 dev-libs/libgee 0.6.8 0.20.0 0.20.1: GObject-based interfaces and classes for commonly used data structures
-dev-libs/libgit2 0.26.3: A linkable library for Git
+dev-libs/libgit2 0.26.3 0.26.4: A linkable library for Git
 dev-libs/libgit2-glib 0.26.2: Git library for GLib
 dev-libs/libgnome-games-support 1.2.3: Library for code common to Gnome games
 dev-libs/libgpg-error 1.27-r1: Contains error handling functions used by GnuPG software
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7c05e761278f..5ab86b18fd74 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Jun 2018 12:04:29 +0000
+Wed, 06 Jun 2018 12:25:03 +0000