diff --git a/Manifest b/Manifest
index 9be57d0f6b57..61a2e80b8747 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28810 BLAKE2B bcb36155be66f3416364387d084cdd0e6ed27256b791cc2608d03ce3033a14d7f421960b1703c17a753a12068451ada7ec15de999eeaf076d0a37af1cfd37772 SHA512 12e094d7aa0e7343268d2403abb5b2baa75d5f0f0385363b7a0af60301141c115cfda6c5ca0f5af1a8a4584116c67abc8423062eae84f37bc70021418b1ec2b6
-TIMESTAMP 2018-12-18T13:08:35Z
+MANIFEST Manifest.files.gz 28823 BLAKE2B 0bcdfb11479f04e67ed5379e1a35f567bb9a8e2a044d861e0fa5a0ea701ddd1b389d37eb1e91ae0c706e8221a79917b0fdb605ddb97be93f0e2b486ac09c7b63 SHA512 1d7011288632115f968476f8a48dbd2fc7e1cd714f4675608ba1f1947753f853fcef409d720c52e2ce58b7a43427f4d5f3dc8fc724169930958fd409e7689e83
+TIMESTAMP 2018-12-19T05:38:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwY8VNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwZ2VxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC2shAAiEhQpjMU9c1gZuSOepYpDChO8JfTvIDcloZymyhQRGoKKJhqeOeUnzRn
-TffQvu9/onBVg5jKC1YIroRn/y4lJHUAnimIT+IStJL3/fTrJ5XJcWjYK7bkStrs
-vXPpb4qB2yCjc1QVm3FjwjnauPGzaGKmUOmd999GsL28hjqe/Wht/RdMCLkTPNVb
-e/TOCzZoByAXJzWfp2qUlH76u8vKGbWhhvyn6/xunM37+TkdGQL0zigPk0A0rT76
-Zm+7lfz9vvcxrrIV+SQGUzzbvVfaNMM9ggCYUaP072irRD3NeR/iaXhXRQ8tpI/8
-8GcbypTyYnKMkbLgkLYj8hCx03jCQsZuTtJJofw5oUlOG+bnXMqB8ES+FtGRg6eb
-fatweiSCK34oIM+s9hy4CSsoTe8YZ6W0wXlPDCD5rr330+cjrdWv+ug1oH+gZlOj
-RWdhhPNvL6UaavEqZpKZzXCp6hMNevbx/Tji9zwfRll4PKfIPQ0Xo1UEbYSd4SQD
-TUu1WtJ9TwtleKFN5wu+0EALfplZ7WBm2lb355VCjmszcRPTnV/MHbm2DR9ge5cS
-sOKZFzL/VVqL/WxhwiVGPjE3w5n0EBrQ7v8MSUa1ro9t2eimRAHWfUfqSMpuQ/x6
-MxOJc8PlgSpSPG9lCObE1qqnDyokXSTbN2L1kq9onLKh9SeHdsE=
-=w2jW
+klB89g/+PbrLHkADcU41Q/NKAuzfljuZ02tuxLQSJ/k7+BLaWAUFW1+abTtUFrik
+sig++nKqLUQRQnt7JcO0Blmuxs/8YOcmWqIvd8Bw+m4b8geXWjoKr3LlbCvMDBLV
+Nzy3zvlKQ9v0g17QI9Om/USUXe2suBp0OeUvqsT5+6K5n2CKA6tXIQwrYYKy0uBn
+4DNZnRPT0fJWYwSxwvbNvjtdYy9SCvLY6bmh694lVGqHXTtXgMSC1qU1Xw4+nbkJ
+K+0YzQCiNQUY7906yb9FmB+e5ZF6S+5GNjvKFKF1/IUMFZHVn6uNrV+lX0gI0FbV
+gyA4OP+wnv4DpqPkQKu7e5NlHIFlXaPgD8/V/QUCzeCtxouPk0Kqq24+C720iXib
+J5j9S4eqbH64R1xD7EsuieofQE7Yjrust2XiHHWpEmL30QcT4RVUr1w6i3zwxvPp
+mVKf9gkAZrtYvcFWDYKsSF6CSVL1ojjRqHridegvIU0LxxJzLmq7SwEBdxl1lihO
+SbJrcuECzhaIgmDENJuhbyj5OSqRTAI7RBv2AYXUjpyLSPh6FDnoM9mL6NbVLocP
+wptYD1IBmFBBXl6EcvO0yQVmr9UgQAW2HTnjdNdxJIFajnMDobFh71AfFZ7IjKu/
+s1Y9exbZG9dzC8zUvYvcpeZkYHeq5kP3ZR8poLStMP7ro3U1UsU=
+=iqww
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b20fafdc20c8..d2aa7edfafb0 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c922f3471dd0..9eab755350cf 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/stuffit/Manifest b/app-arch/stuffit/Manifest
index 14f52665da9b..500a70a94ed4 100644
--- a/app-arch/stuffit/Manifest
+++ b/app-arch/stuffit/Manifest
@@ -1,3 +1,3 @@
 DIST stuffit520.611linux-i386.tar.gz 1955619 BLAKE2B fb80abef29d266c93747b3359c62840afa15a32786a82ee01cab22cf0eddad750817c87b767632df5bb2ef681c1c9dd6dfe136dae388f8390bcab0b137a2c0bc SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a
-EBUILD stuffit-5.2.0.611.ebuild 1471 BLAKE2B 33b12391d0b2ee3a638b85f5010ad500032570d52a875ed72f36403f43fd238a6e47b9316f30be82966a78e6f602ff45b9db764d898f6894490e1eada29cacce SHA512 816b2b903025599753824cff5eed538c327b49ab146c26967e5246fdc0e2b2168f1531266970c1670d2cf2bcf1f45ab7eb3332b41294734c2214ad7e69b42cea
+EBUILD stuffit-5.2.0.611.ebuild 1483 BLAKE2B 78acbc361330b828415fe6334a62b0bd1048ad927fbf7927df23a01423d78256027e8982869216874517b6faeb93396c1028ff65b87aea527342316c6de19c7e SHA512 013048fca9cbf5ae86fb680c6bfa1de0afcbd1cc45f6143c35be7fb64d1dedc298ed1fa5f564ffcd6502dc8b803a50d6899f1592a49a3a117542a96ffc9f29d5
 MISC metadata.xml 302 BLAKE2B f1870466f061240593b130854dc1baaffbc351f573e2f8e7bd4e5d8dcb986a794d151bc6a41bb7929b34a5bea104f0f95efbedd3bd068af39896fd444997cf45 SHA512 cb8ca2c4b1b49221c5e2ef4d37a9f8faa4a03ec8e116dfe31185f0a09aeaadf1034f45f655d984658e8318f057ca9028edb4cd373abb0d5bfe05ff6dd83d00b3
diff --git a/app-arch/stuffit/stuffit-5.2.0.611.ebuild b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
index 2e6528ed2126..f951829d1fe4 100644
--- a/app-arch/stuffit/stuffit-5.2.0.611.ebuild
+++ b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://my.smithmicro.com/downloads/files/${MY_P}.tar.gz"
 
 LICENSE="Stuffit"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="fetch strip"
 
@@ -22,7 +22,7 @@ INSTALLDIR=/opt/stuffit
 pkg_nofetch() {
 	einfo "Please download stuffit from"
 	einfo "${SRC_URI}"
-	einfo "and put the file in ${DISTDIR}"
+	einfo "and place the file in your DISTDIR directory."
 	einfo
 	einfo "Note that StuffIt requires registration within 30 days,"
 	einfo "but StuffIt Expander is freeware."
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ab399d8de577..fe4884ffd121 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
new file mode 100644
index 000000000000..fcd84c3b8626
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -0,0 +1,5 @@
+AUX 1.8.0-gcc5.patch 1793 BLAKE2B b25b356e68c5e210557373a3cf8e5543e8851f2d375fb72af82189bfb7c491826bc4fe092484e28031683d30a37863c20b6c36b19ca73ed133e77988dc4df188 SHA512 941a8fbe435d24287be158648d3083062806de639ce822645d949a171b2e662249bb13d9f5903017792cc979c7ff89615681adaed2afbf0d9c6ca5fe825e135a
+DIST JohnTheRipper-1.8.0-jumbo-1.tar.gz 32533148 BLAKE2B 15929fa25314438619899582b209bee6902b1e53dc2df39ed6a686820665fd4d8e56d26b3f0082d05dc6be2f54add3526570d936c0a929641e33e6dcfb7a13b5 SHA512 8b7fad7a6330b5ff1afc306218ba698aaa27776b566f82c2e76102d5ceb10aeafa69d71fa6fff67c81996ea2c6a04384bab4696ed192306c6d074873562e7089
+EBUILD johntheripper-jumbo-1.8.0.ebuild 2940 BLAKE2B 1c6b481c78f848f2a6c8dbe0721e63d61cb7c4a433e4e15d892539fd0e440f37e3e8f13541e391475f57978b88b8ef7106cc93de0b7a0d1ef9a55ffe27807581 SHA512 353eca3400ac5d20b19cc10f0f9af8e0631beb1d7d063bb52408c8511ca815d208f03fced4f9d4010a8352ff887ec5531008bd84fc1ed3eb6067db17cee100e6
+EBUILD johntheripper-jumbo-9999.ebuild 2865 BLAKE2B 11b00b85e23031676a54c7ac32b40d4c19a79b28583df585291b1a2d3531b52db97a12785f9a346fddd848518526b3f00d09f7e5f451bc0a98b84959e4e623a8 SHA512 9dad160ba5e0e045b02c98806b5d995669935297775d91fe373ea168055256af16252548acfc30590a85bbc37da53c7f2e201bca380c4689f96cce54099580f6
+MISC metadata.xml 573 BLAKE2B bfe4625ed3871bcc6c083ce63f30b433c6904411db832f5833b753c02dda92d60086264b4167fc59c7b3130de2db73e4d8814c606f02372669c866c185d6477f SHA512 590ef9c3538bbda4e19f88acf78988510343771e4e764d68d0872add996bc041c28aa8f16efcb4b21232870ff7c3e768b3512f39f0da900fedeb99210c200fd6
diff --git a/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch b/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch
new file mode 100644
index 000000000000..f2a7984955ab
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/1.8.0-gcc5.patch
@@ -0,0 +1,63 @@
+From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001
+From: magnum <john.magnum@hushmail.com>
+Date: Wed, 13 May 2015 12:05:00 +0200
+Subject: [PATCH] Add another solution to #1093. This make it possible to build
+ using gcc 5 without --std=gnu89 (although I kept the latter for now). See
+ also #1250.
+
+---
+ src/DES_bs_b.c |  3 +++
+ src/MD5_std.c  | 12 ++++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c
+index 306b4e4..18c9235 100644
+--- a/src/DES_bs_b.c
++++ b/src/DES_bs_b.c
+@@ -1272,6 +1272,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void)
+ #endif
+ 
+ #if DES_bs_mt
++#if __GNUC__ >= 5
++extern
++#endif
+ MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt)
+ #else
+ void DES_bs_set_salt(ARCH_WORD salt)
+diff --git a/src/MD5_std.c b/src/MD5_std.c
+index 6bdcd35..1eec9b4 100644
+--- a/src/MD5_std.c
++++ b/src/MD5_std.c
+@@ -496,9 +496,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]);
+ #if MD5_std_mt
+ #define MD5_body(x, out) \
+ 	MD5_body_for_thread(t, x, out)
++#if __GNUC__ >= 5
++extern
++#endif
+ MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
+ 	MD5_word x[15], MD5_word out[4])
+ #else
++#if __GNUC__ >= 5
++extern
++#endif
+ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
+ #endif
+ {
+@@ -595,10 +601,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
+ #if MD5_std_mt
+ #define MD5_body(x0, x1, out0, out1) \
+ 	MD5_body_for_thread(t, x0, x1, out0, out1)
++#if __GNUC__ >= 5
++extern
++#endif
+ MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
+ 	MD5_word x0[15], MD5_word x1[15],
+ 	MD5_word out0[4], MD5_word out1[4])
+ #else
++#if __GNUC__ >= 5
++extern
++#endif
+ MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15],
+ 	MD5_word out0[4], MD5_word out1[4])
+ #endif
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
new file mode 100644
index 000000000000..6e8d04dc6d4f
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	JUMBO="jumbo-1"
+	MY_PV="${PV}-${JUMBO}"
+	MY_P="${MY_PN}-${MY_PV}"
+	SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+#removed rexgen and commoncrypto
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:0
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:*
+	sys-libs/zlib
+	app-arch/bzip2"
+
+RDEPEND="${DEPEND}
+		!app-crypt/johntheripper"
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}-gcc5.patch"
+	sed -i 's#/usr/share/john#/etc/john#' src/params.h || die
+	default
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	# John ignores CPPFLAGS, use CFLAGS instead
+	append-cflags -DJOHN_SYSTEMWIDE=1
+
+	econf \
+		--disable-native-macro \
+		--disable-native-tests \
+		--without-commoncrypto \
+		--disable-rexgen \
+		--with-openssl \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	pax-mark -mr run/john
+	#if use opencl; then
+		#gpu tests fail in portage, so run cpu only tests
+	#	./run/john --device=cpu --test=0 --verbosity=2 || die
+	#else
+		#weak tests
+	#	./run/john --test=0 --verbosity=2 || die
+		#strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	#fi
+	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/$s
+	done
+
+	insinto /usr/share/john
+	doins run/*.py
+
+	if use opencl; then
+		insinto /usr/share/john/kernels
+		doins run/kernels/*
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/kernels
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
new file mode 100644
index 000000000000..1e72fa5104cb
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	JUMBO="jumbo-1"
+	MY_PV="${PV}-${JUMBO}"
+	MY_P="${MY_PN}-${MY_PV}"
+	SRC_URI="https://github.com/magnumripper/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+#removed rexgen and commoncrypto
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:0
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:*
+	sys-libs/zlib
+	app-arch/bzip2"
+
+RDEPEND="${DEPEND}
+		!app-crypt/johntheripper"
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	sed -i 's#$prefix/share/john#/etc/john#' src/configure || die
+	default
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	econf \
+		--disable-native-march \
+		--disable-native-tests \
+		--without-commoncrypto \
+		--disable-rexgen \
+		--with-openssl \
+		--with-systemwide \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	pax-mark -mr run/john
+	#if use opencl; then
+		#gpu tests fail in portage, so run cpu only tests
+	#	./run/john --device=cpu --test=0 --verbosity=2 || die
+	#else
+		#weak tests
+	#	./run/john --test=0 --verbosity=2 || die
+		#strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	#fi
+	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/$s
+	done
+
+	insinto /usr/share/john
+	doins run/*.py
+
+	if use opencl; then
+		insinto /usr/share/john/kernels
+		doins run/kernels/*
+	fi
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/rules run/kernels run/ztex
+
+	# documentation
+	dodoc doc/*
+}
diff --git a/app-crypt/johntheripper-jumbo/metadata.xml b/app-crypt/johntheripper-jumbo/metadata.xml
new file mode 100644
index 000000000000..6eefb4340ea5
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">magnumripper/JohnTheRipper</remote-id>
+	</upstream>
+	<use>
+		<flag name="opencl">Build with opencl/GPU cracking support</flag>
+		<flag name="pcap">Build with pcap support</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 3a270716e368..ae08fb6eaf73 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -4,7 +4,8 @@ AUX johntheripper-1.7.9-clang.patch 454 BLAKE2B 96a7ffadcb23ba7979e05a796fafb8f2
 AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 BLAKE2B 0bbbe937851272ba3a06c7c521c4cf24d092d66816f65eabd9800bb0c968e0a191fa7ccd2ccb2a87c0b540e8910a5f4c8978d7692cfba775b1f64471078ec013 SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513
 DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
 DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
-EBUILD johntheripper-1.7.9-r10.ebuild 6458 BLAKE2B 8896245230bec6d2bf2add2ba42175fc7980c5c7cea201a5f587dd78089f06af8d2eb92cec63a617f7f9538c6ad332a34abbeffc0af70e4b686e4fcd6a457e8b SHA512 6eecf3ad51c49b0dca5f71a226ae56a552373fa9b730a2c8f9bc3ab1d1eb7a1cd2a53e57b0d6938b1832f008d8f329480fe643a10eb8acf90e66defb962f18c9
-EBUILD johntheripper-1.7.9-r11.ebuild 6502 BLAKE2B dee55100a0e3a20e3542327c4ce5952cc3bb0ee2779d01570dad18a56870935877d773fcb7930a19151f9d93d545f0be33a0d93d56870c1e43ce8e92f7af172c SHA512 926edae818cf9712ebca25f3b8ad85c8531aa8676a482d9525fe97668f93180424b6f3e0d90c2bf2e10985de8464fbdfd5fee582dd839b10c5be944205dbf40a
-EBUILD johntheripper-1.7.9-r6.ebuild 6006 BLAKE2B aaa7d9a64623ff5f9749b9920c04dffff5ac1f9f39e14966ef124c81deb038023709cc3681d9108ec4bfb926a2c770d4e0a89bbafb5ac6721f0f6e636bba6a92 SHA512 2dba19dfe3cb407cc123d70b3e45fd48013eb47a336186392e1276d5aa0936956958d632b2b41c5e9218b86477d6a135ade507c35d81e3b3558fac279fd8ddf5
+DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
+EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7
+EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb
+EBUILD johntheripper-1.8.0.ebuild 3223 BLAKE2B d3b8685091a2635645e674abfd3d56013d250622ca89b6e96d56d23c0bf07d45cb37a57dc59c544553fcc65d4ac0b6e313c6c0245d94db72fe15139bd751c951 SHA512 dfe72d8d3513eeed262d5dd755f36000ea50140633e8e1d0d3789bc326498715b7759b475007b1a20c7f371ad014561a9a803f6986a0db0117feecdbc1a5d5e6
 MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
deleted file mode 100644
index 09066589c34b..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )
-	mozilla? ( !minimal )"
-
-DEPEND="sys-libs/zlib
-	!minimal? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )
-	mozilla? ( dev-libs/nss dev-libs/nspr )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-
-	if use cuda; then
-		cuda_src_prepare
-		sed \
-			-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
-			-i Makefile || die
-	fi
-
-	if use mozilla; then
-		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		use mozilla && dosym john /usr/sbin/mozilla2john
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
index 8cc549fa4bff..49d18cec6232 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
@@ -27,7 +27,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	opencl? ( !minimal )
 	mozilla? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
index e3e30d7db420..48f23d519a62 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
@@ -26,7 +26,8 @@ REQUIRED_USE="openmp? ( !minimal )
 	cuda? ( !minimal )
 	opencl? ( !minimal )"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="!app-crypt/johntheripper-jumbo
+	sys-libs/zlib
 	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
new file mode 100644
index 000000000000..8cd2dafa1828
--- /dev/null
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cuda eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN="john"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="fast password cracker"
+HOMEPAGE="https://www.openwall.com/john/"
+
+SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
+IUSE="custom-cflags openmp ${CPU_FLAGS}"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	!app-crypt/johntheripper-jumbo"
+
+S="${WORKDIR}/${MY_P}"
+
+get_target() {
+	if use alpha; then
+		echo "linux-alpha"
+	elif use amd64; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-64-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-64-avx"
+		else
+			echo "linux-x86-64"
+		fi
+	elif use ppc; then
+		echo "linux-ppc32"
+	elif use ppc64; then
+		echo "linux-ppc64"
+	elif use sparc; then
+		echo "linux-sparc"
+	elif use x86; then
+		if use cpu_flags_x86_xop; then
+			echo "linux-x86-xop"
+		elif use cpu_flags_x86_avx; then
+			echo "linux-x86-avx"
+		elif use cpu_flags_x86_sse2; then
+			echo "linux-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "linux-x86-mmx"
+		else
+			echo "linux-x86-any"
+		fi
+	elif use ppc-macos; then
+		echo "macosx-ppc32-altivec"
+	elif use x86-macos; then
+		if use cpu_flags_x86_sse2; then
+			echo "macosx-x86-sse2"
+		else
+			echo "macosx-x86"
+		fi
+	elif use x86-solaris; then
+		echo "solaris-x86-any"
+	elif use x86-fbsd; then
+		if use cpu_flags_x86_sse2; then
+			echo "freebsd-x86-sse2"
+		elif use cpu_flags_x86_mmx; then
+			echo "freebsd-x86-mmx"
+		else
+			echo "freebsd-x86-any"
+		fi
+	elif use amd64-fbsd; then
+		echo "freebsd-x86-64"
+	else
+		echo "generic"
+	fi
+}
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local OMP
+
+	use custom-cflags || strip-flags
+	cat <<- EOF >> config.gentoo || die
+	#define JOHN_SYSTEMWIDE 1
+	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
+	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
+EOF
+
+	append-flags -fPIC -fPIE
+	#gcc-specs-pie && append-ldflags -nopie
+	use openmp && OMP="-fopenmp"
+
+	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
+
+	emake -C src/ \
+		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
+		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP}" \
+		LDFLAGS="${LDFLAGS} ${OMP}" \
+		OPT_NORMAL="" \
+		OMPFLAGS="${OMP}" \
+		$(get_target)
+}
+
+src_test() {
+	make -C src/ check
+}
+
+src_install() {
+	# executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	dosym john /usr/sbin/unafs
+	dosym john /usr/sbin/unique
+	dosym john /usr/sbin/unshadow
+
+	# config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+
+	# documentation
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ] && [ "${REPLACING_VERSIONS}" != "1.8.0" ]; then
+		ewarn "This package no longer includes jumbo.  If you want jumbo please install app-crypt/johntheripper-jumbo instead."
+	fi
+}
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index fb35e260a67e..d01a3e90a4ff 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,7 +1,9 @@
 DIST kbfs-2.10.1.tar.gz 4471525 BLAKE2B 79a1046a6d225ab790081e2ec0aa057c8aab9c3c1fd0fe9832769b01f2e92137aa3b6424c303b736dbc6142917aecbb32c54d98111b42be80e66ee459524c7f2 SHA512 66b07a07c4b4734465d8ea8eccf3b1d05c0c3ba8792161ed3fd8ed9eaccb43d51cf5ef44c8c44fca4a22ab2b360093f1801d9eb77904d2aa917d0a76026fffa9
+DIST kbfs-2.11.0.tar.gz 4520872 BLAKE2B 4472360205f42f59bc18f64634b4e10f38f532db262de38260a459faf0d76b9f805fb3d5e12d21afecbd51a980e63c68cc2be47b4e5ab597b7b0bfdd491dd54d SHA512 f735f7fc1c958eabcb38933f19edeba0cd3854e3d5a2030c6e4301c9cea714c432993e099b2199060e1275982755f60728545e71151c5796eb9be4978790e2f5
 DIST kbfs-2.6.0.tar.gz 5836566 BLAKE2B 14ca1fa35d01330ad51c5ca735bea059dc4f5be10298f36d2a7bd10ab5cfe2a399104dbade2da58ea3e0e77ef1e24f0644b751e7f06b91e9f4360514aaa7f6df SHA512 f636f6d01fa12e63930be7fa2d0cd919c37e68820bd602af6a54703a64759e475c5e19e29bf60b94d02dd9db188709c9ecd4da7abd05af7880fdf5e94a8d3590
 DIST kbfs-2.8.0.tar.gz 4459997 BLAKE2B b361ae343ab5fada7f9edac8c5083173dca103362b6e0688df069fbc0bf7dbb0eab6779259bd5c1038c542d7f51b68259404aa24c797da5c3aee6fab9fc4dab1 SHA512 892b7c51f52ca129145f10932e23c22f0f7003ea8662d26939d4f9e72cd8296fc5a66516dc7a3135fdc1cb96b1d02160c0f1dd32a4a6fe13ddcd4750eac9b8fc
 EBUILD kbfs-2.10.1.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
+EBUILD kbfs-2.11.0.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
 EBUILD kbfs-2.6.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.8.0.ebuild 1256 BLAKE2B 87285240aaf1f9685a6ea12ebe8db704d294cc923f23b760873fba48ab22795a915bebca9913c6a369fc10c67f6aee4fa6354902889dd8c0fb414212eb61d1be SHA512 5759fea9cacb3a60a1e9eb4934cd35beba52c08f7d6889bb8cacd4075bb977c7d8694292158a9a58493c88173aae498d8579188ed72020a7d3f64f7e61b8a226
 EBUILD kbfs-9999.ebuild 1228 BLAKE2B 940cab18094f74e24dbfe63c77f2a21456b02d0f83ff8922b8c9120a0baf873cfa31686827406bdd8ea53183378fe19e5d8725350b8722fe6ad4c90b94e4f5c4 SHA512 47ccfab006114011ff461d0b305f9a1fe88bd4720cc3f26a4a80c8462b519fab96f7e271637c0fa2aeb3f37ff268cdeb458435e041947998191bc4665218480d
diff --git a/app-crypt/kbfs/kbfs-2.11.0.ebuild b/app-crypt/kbfs/kbfs-2.11.0.ebuild
new file mode 100644
index 000000000000..f6dfded5dc62
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+		golang-build_src_compile
+	EGO_PN="github.com/keybase/kbfs/redirector" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index d110cf860a1c..5564155f8c58 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,9 +1,11 @@
 DIST keybase-2.10.1.tar.gz 38275486 BLAKE2B 0c99c3bc9aad0610473f43bfefb467d2be5aca8af95207a2ecbb60c99bf8a5d87004c54e8af9e5c2f6068a03fc3c980c7d910f20a2ee0bc5f39937ff63c86a47 SHA512 f4acf70b0fceaeb6a2a7da89661c7c2a59fc8ccf10a6aafbbc75d43af04295250237845b4de06170287b5edcc2366d1390b5b7038ecfcbaa501753b41fd22911
+DIST keybase-2.11.0.tar.gz 38490645 BLAKE2B 58771d880a412e2cd0bc585ff2d2922092d49a132d4526de91796fccca95351a2422a45e63296b1fb8d502087c17147727e8c406b8d13884da538ab308b88d5e SHA512 b150184e692c81243a8f83b828ec8ef4f6b324a6cbd0b1cb9cf5e89eebbec7a6183a2af3b8d26c663ab677aa38753c328e190b46035c3815af8373d8ff4b26fa
 DIST keybase-2.6.0.tar.gz 34597277 BLAKE2B 3380cf081ed4e0c211ca47164a5d813e0ca647b004d8e54aae4ec51d24f0cd26437008dbdb2e81cf5372c943c2181e424918425cf11687b0629dae8df5020ada SHA512 25515e69e86c870b45852e93957ec37c7af9bbe3a4a8f8f2cb1ab9f4d02236b9de57fc6294b93aa4f6378ee8d33e03a2773aa445db5d8a34c3fbfe34eed256fe
 DIST keybase-2.7.3.tar.gz 34648144 BLAKE2B 6da664847640c35b1028868651e31b99fd154520942cb9fc3922565906b288c9b808c7368199ec3a37216e1b2c6930f2951b58cee543a72fb69d96006bbb33fa SHA512 0b3fc5f7830862ffdddd70606bbe2fd2b5dd2e5e4fb24349dc57ed0e8f2bd0cc9a9aba0f00b8080f910d877db5f092757d209f01de83f7113ed9d99aed68342d
 DIST keybase-2.8.0.tar.gz 34545469 BLAKE2B 53b348d4956542e51f19b5d4209cdcdc2b1873421153cf62f376f733207131c4d82c5cccf162b8a98909406e49bee3972e1deac478e006571ebcd5a94d20ede5 SHA512 01319ee36d50d928e195d854a3c332d7f327cabd8cdf930f643f3d373a6bd644634a56137f5f02477c15fc261cee3c01cb87efbb80333b7c7299a2048d9f1be1
 DIST keybase-2.9.0.tar.gz 34703406 BLAKE2B ec8bd076d07eeb40ecd978c049f57f0df0ae858fa966d90a521685838fb3c1a01b38a7cc584ecfde174ea51b3cca06440ae7c53074fd58151af1621144f431b8 SHA512 01938d83806260e6c7a1065b73ae4d8f82f776d3a81d70d9c8b2e8df9fd4f05dcbf45e23a78ca34573cca8a11b0592dae6c4aa1b20e4777c9ba69af0af5f3e41
 EBUILD keybase-2.10.1.ebuild 1306 BLAKE2B 298b5302aa97f4216d73eabab9585bd9352de3a18bf844a53fb522dfd6f95030dfdc8ae2776a71bb9c5250b341202f6042c4e31ae3b17d6a1471e884bcf623fb SHA512 e310ac6ed6d1601b7a8e5a8720075f66705b64302aadc4c8487fcad5532462146ae720d11d858fdf70486ef578f101ec2b5627a000197205b8c78e7ebf8aea67
+EBUILD keybase-2.11.0.ebuild 1305 BLAKE2B 29acf15d150fc08ccb39337e771a51e475d38ce546c7c5212dee2b488f7021db8ab585295f9c4844452ee6953be263f5095cae91056da9720ab2372b413788e0 SHA512 478d0e83bc45797d444ca387880d811a14b0c24139f2ac0ae9a57ee8c28a6fc6feb8d369ef40b63d176c9dff73aaa76b679a67adf660220bdfc2998cdcc14ad5
 EBUILD keybase-2.6.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.7.3.ebuild 1305 BLAKE2B fe25947ce4516417eaaf427eacc71513b6839e53e31e440298e75f4427108a7c6f6d0fcbc0e9e5b388a305a2f7149a7ff58ef1ee7b32a7eaf17d16e0bb6fcf86 SHA512 36496057ccfe5cb5aa103122c3681136d1950bbe6de331496298730e116f021d7552cdb2030d3cbfd124d6d77f20478bd7beb30c432ff3ec7f64a4ae05ae2bd3
 EBUILD keybase-2.8.0.ebuild 1305 BLAKE2B a7fdda95b324d7d65ca9d66c67d872059fa5734965bd24a0d4b40d86590a6d17a4809491490055141948040be0e199aac499e9af6fa6916e2aae48d7c94dcb12 SHA512 b3fd771e61c9ce8fb141253fce08762c2056916e4d7281e4bf27274c5c889632a34e9d69e1ced5439dd7ef97953d97c2a186c8652cb2ff57cdb1c4190713be16
diff --git a/app-crypt/keybase/keybase-2.11.0.ebuild b/app-crypt/keybase/keybase-2.11.0.ebuild
new file mode 100644
index 000000000000..8da82c171a0c
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.11.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 7a67f81142a2..09e02679f927 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -8,6 +8,6 @@ DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1
 EBUILD pinentry-1.0.0-r2.ebuild 2874 BLAKE2B 8d2d5d2804270af7e717dd8bab0a025251da59ff4e82f3044420f437f0d89c7bb3efa88a7d725deb54635b5006d83b8496c4b29ee0a440bd70e08d8d80390b83 SHA512 944d73b638e782c52faf3596f38d3ebff7e7f4caa3d459cc41d6c4b37a31738782fe3414742d25f61c8749983030c26acd905f0b930db3fec42027ea3be114f4
 EBUILD pinentry-1.0.0-r3.ebuild 2947 BLAKE2B e60fcc295f85e56b52e3c06de406084aaee202398e03a596bcb68918c388074c02687c8bb28b1829ac118df5e98973eebee810a531d55eeae7f0241bb07dcbd7 SHA512 4e4c5c407d4acdcce021564852d24b5c9b7343f9059747a0b5efe4a700315ab2470dd2f15f9242189489338e5a9af47a33c55858d6145b3832a262e638a61580
 EBUILD pinentry-1.1.0-r1.ebuild 2798 BLAKE2B ddbaa44c716dfd7e3289c116f0205df9e5ae522884b37b822e0218d377f9d4b236a4a40969619a491989510a08e4e29405d2df8f1ffe7d040a389c274e6fe03d SHA512 6bff540b8ebac1269a5f79c68fdf7de8cb3f79ca00ada5746ddf7daed5b27f05e7f54caf768fb43b9c7e9ec6ecf43edb1471848170af59f62d38329934f98d08
-EBUILD pinentry-1.1.0-r2.ebuild 2852 BLAKE2B c6e188a783529b6353fa3578332e34d8d8f7ddf9e155677048da0e992cff6903b92c565399940d26b26c6d4eb7f9c382beaa4847375714edc13b90616fc1734b SHA512 62e944968dbf26d4d9be4d000c2b81b3173660e9e5b6006a094fe4f93627f58f2fd8c1325d559b3cfb24ac5a65ac130f6c4eb8acd38b79e3c26b41b824aaba61
+EBUILD pinentry-1.1.0-r2.ebuild 2851 BLAKE2B 68c8fd00ffa3176677370c4325e86d165fe43b6659dd96416a757694071f5bf137d4f1bf1e4795d7d536ffa055133d4fb5b5ff8a76f84f92ca91237546225a1c SHA512 135422b9b4f83de6ff37d1cd1849bbd0ffbdfc49444e2beee965e3163af550b45fa73b3c9e412b4342afd357bb94f41cff7f262451ffc33edc7f1098a8507f8c
 EBUILD pinentry-1.1.0-r3.ebuild 3111 BLAKE2B c8ec6d56faf778c043e7653e3fedc1e0a2e910eb545d87017dce1d1bc929d945480e8334ddd5c081729b2d2e31f626c30f2ac6a1ec58f4ff59a977f77c479f6a SHA512 d85bf7f8581a95b5483f677c4504a5716bcf09456b3302290de30f149f5f1e04548be28f99a14059e3f6e6ca35e4cc0b3023fbdeaeb7973daa9dbab1be917e62
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index baad0def36cd..06af197fd4ca 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0b3a1d05b340..2877a1e24187 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 409bbb64ccdc..36c3e6d3be67 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,13 +1,16 @@
 AUX 18.4-add-support-for-package_upgrade.patch 1734 BLAKE2B 1eb4fd07bec989b1584ec0ad272243d33f0c6b6fd17994b6bda69c38a0360acedfdeb7ca81f8c9bee2c35a40b07b5f831a10315129c1b0fd030a00881831fc76 SHA512 ebe2eadb13190d29e1933a81d1e8a0301842f2a9fbf1848ec2618c479a731d98d8807827abb1b43aebb05110bc566048841f8d1b63118b691f8a0c3e4c32aefb
 AUX 18.4-fix-filename-for-storing-locale.patch 1045 BLAKE2B 0167101d78f821fefc3d05447d3fe35d7328cdebcb3a0eebdaaf2f14b8e2f46efe7c0fb4031baa3a8600546a47f98641719112992c8e50cc1ab0181851937f81 SHA512 8a3b1bf35a445cbc7c3d4849c4c9ebd716209bc3b38bc060cd3b27b1b09749da8dcf35c8e0963300f7cc21f43fda96e5928f9f3c86c22a784cc60b840a1cc419
 AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c177de8e65369203e4d3b94de98126b85fca22ee4a89f9568c6081078b03dd4bb6cdcd07c51bc55b093e94092a06fd7eeec610ce22780f67 SHA512 8b82d0e565a9f8b4f6464382e01b79c95ad0ced600bf2ba1c6377eea704f86108cf68bc20c99f65e68c6b2d7a7ccc02624bfef400dd76990ef18f00f1e220f6c
+AUX 18.5-fix-invalid-string-format.patch 1680 BLAKE2B 55e0fe95b7ab61bfa8a9106f92e28da8df39d47e3fc35adbbff0a1c977cbbc0d996de400693cfcbf1011f8f9e0ed61fd444f225f6b0f9dd2cd4e0c48484cea31 SHA512 b9a6646419dd3c0fa34a1ba97cec29870369af97ea72791973348443d6ceeee80fd5e27ed4d7f2beb1fc7c27c699f2e22a787ad062bada5284bc55981cb08f29
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-18.4-gentoo-support-upstream-templates.patch 3366 BLAKE2B 88add00b9754fb9b9301545ec35bbcf3c747fa6a3a5b10e79879c022a59cbb8d3b1102615b48ad19e5d2c9e477c31159bea4d9435bd4371fe6b4ab864225cf59 SHA512 c840338d19ef74caec4d1d867a3e674b80b34fd995d2961efa41650de36653f1c027e3e7c841a2231db6ad1b3dfe478fb3e7511bf2ba8a9cba9e43e160a0412b
 AUX cloud.cfg 1815 BLAKE2B df997117fc3e15303171942c2127eb1ae8c333a04c3d8ba7aa6e55b6f0641872e90bc643cb4ac576876c50af09136777507b739b4cc50b5b4094272b5e8bcdb0 SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3
 AUX hosts.gentoo.tmpl 920 BLAKE2B 9195167754ff1f09c37c0220a2dbf7c0c098daf8e71edabe944a96cbf66d2b029fbb36fef9efe6ffa7410bb8ee33f71f04a4dc1f7c62811fdd87e5216eb6589a SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4 SHA512 730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
+DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979 SHA512 f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
 EBUILD cloud-init-17.2.ebuild 1962 BLAKE2B 253368bf942bbda581e586ba346b56ee9e80b92069c5eb4b6f114d62a5756aa68bd61a87ddf8b46d27ac27e90b8e3f201802d1ed9137846e0c6063bea248ed77 SHA512 aa04144b55af445074987e4c3bdb9a8caefa5c34f6c07f10dbfa980e97036c34379e3c062acf97d29d82c309e0e5257c56ec89cac3e05eb67b5dc0e091eb8ece
 EBUILD cloud-init-18.4-r1.ebuild 2504 BLAKE2B 7e5af1c61d1c68e99d19900fc865c179c094ea52316f88d192791d16f903968d40f5d6614604c30172e77480fd57a204f26f25a8c344514e4da37e8cb0305939 SHA512 d57b356391edbc8fb216fffed8634791d144e8871197d95d65bba2f9abf9a581636bd47cc5eecba4b16532d7de06e9a181d899d0669ccdce41008ac40940d973
+EBUILD cloud-init-18.5.ebuild 2581 BLAKE2B 749437a7e57fc17a9821fc4904788e6015ae740d1da9518addd536d321c5c89b85945cfabaec14163f23bed4b59eded7997618d2012972a8a4c332551f345589 SHA512 e954b470853182f55eb8a6670fa29f3c80355e328da7a30cdf79994b38228691307057810941a625776f36d1eb61df3e694be02874d117a9a7e21d50ff3b3c3d
 EBUILD cloud-init-9999.ebuild 2571 BLAKE2B 867e5ac678791a7892e3bcea1d0c0c38fc80f95484ecdd900fe5936161682d72e4a3d4e02c8bad35ef3f3c3a5fca8fb771ba60bc253ee5f0929ef092662383a9 SHA512 083237921392e83b227bfde148e6f461999a854c681569488dc2fb82ecfefb32fadbd9bf12e62ca26029d0bc5ec81d83b0c5a87471fa9d16331b75311f52be04
 MISC metadata.xml 583 BLAKE2B 24a5563ff0106a6992b0adb539bc12f34f4ceee97213a71c6b8c15701ff627dc914917dc32510b728a59e8014571ec9d86313b0016710308e317da4b28adbf1e SHA512 1424ff88b0a75fe1037471c4187f3a557f1d180acf7879b52696730b9e789e6bcb2e2d870b68ae0b6d4eab05fa0d11388f2fd9b6a64eb0bfbd54403a88b1f68b
diff --git a/app-emulation/cloud-init/cloud-init-18.5.ebuild b/app-emulation/cloud-init/cloud-init-18.5.ebuild
new file mode 100644
index 000000000000..c4ff15cbfd9b
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-18.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(
+	# Fix Gentoo support
+	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+	"${FILESDIR}"/${PN}-18.4-fix-packages-module.patch
+	"${FILESDIR}"/${PN}-18.4-gentoo-support-upstream-templates.patch
+	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
+	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
+	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
+	# From master
+	"${FILESDIR}"/${PV}-fix-invalid-string-format.patch
+)
+
+src_prepare() {
+	# Fix location of documentation installation
+	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Do not use Makefile target as it does not setup environment correclty
+	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch b/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch
new file mode 100644
index 000000000000..42030f57dc45
--- /dev/null
+++ b/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch
@@ -0,0 +1,46 @@
+From 5b065316113b97aadb43e63cc31bb8639f6a6376 Mon Sep 17 00:00:00 2001
+From: Scott Moser <smoser@ubuntu.com>
+Date: Fri, 14 Dec 2018 03:24:26 +0000
+Subject: [PATCH] Update to pylint 2.2.2.
+
+The tip-pylint tox target correctly reported the invalid use of
+string formatting.  The change here is to:
+
+a.) Fix the error that was caught.
+b.) move to pylint 2.2.2 for the default 'pylint' target.
+---
+ cloudinit/sources/DataSourceAzure.py | 4 ++--
+ tox.ini                              | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
+index e076d5dc..46efca4a 100644
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -980,8 +980,8 @@ def read_azure_ovf(contents):
+         raise NonAzureDataSource("No LinuxProvisioningConfigurationSet")
+     if len(lpcs_nodes) > 1:
+         raise BrokenAzureDataSource("found '%d' %ss" %
+-                                    ("LinuxProvisioningConfigurationSet",
+-                                     len(lpcs_nodes)))
++                                    (len(lpcs_nodes),
++                                     "LinuxProvisioningConfigurationSet"))
+     lpcs = lpcs_nodes[0]
+ 
+     if not lpcs.hasChildNodes():
+diff --git a/tox.ini b/tox.ini
+index 2fb3209d..d983348b 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -21,7 +21,7 @@ setenv =
+ basepython = python3
+ deps =
+     # requirements
+-    pylint==1.8.1
++    pylint==2.2.2
+     # test-requirements because unit tests are now present in cloudinit tree
+     -r{toxinidir}/test-requirements.txt
+ commands = {envpython} -m pylint {posargs:cloudinit tests tools}
+-- 
+2.20.0
+
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index c97be7c7c4a7..34a0867e0dcc 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -16,5 +16,5 @@ DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
 EBUILD libvirt-4.9.0.ebuild 9598 BLAKE2B bdebac5787d42beacf8ef9fdf2820d521258dc5cbfe3abc2d315b93d607d2fa65b83fb2d7bc96ac0eccb90bdc51f0dcb6e5d07e7cb6504d69ca0d35090e74d8f SHA512 0822f2601cc3dc4fc2d6172799d7219b046a331c296e8d0754e49b5e0c6e5afaf165c96bacb987eb7cc351f6faea0f6cea9256cad47ffc04e0d0976efcfe7d57
-EBUILD libvirt-9999.ebuild 9598 BLAKE2B bdebac5787d42beacf8ef9fdf2820d521258dc5cbfe3abc2d315b93d607d2fa65b83fb2d7bc96ac0eccb90bdc51f0dcb6e5d07e7cb6504d69ca0d35090e74d8f SHA512 0822f2601cc3dc4fc2d6172799d7219b046a331c296e8d0754e49b5e0c6e5afaf165c96bacb987eb7cc351f6faea0f6cea9256cad47ffc04e0d0976efcfe7d57
+EBUILD libvirt-9999.ebuild 9553 BLAKE2B 55124688e59d3ef79f15e68c8acad6e44044e8500e4cbd29c8511307245e42ae071c421f058511f09f4e7b4ee3de94fa78d073f4c9467331bc4390642b1a334f SHA512 ac815c90d698438878bebb091343e2cca19756e4dc2b6de8a79f37f2cbccf5136fe4c153192ceb9633228b3c8264d24ee60ad0dc1a732a5ae0153a3a384eb2aa
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7d7a7e166fc5..6ecf1140a71f 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -30,18 +30,17 @@ LICENSE="LGPL-2.1"
 IUSE="
 	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
 	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	+qemu rbd sasl selinux +udev +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "
 
 REQUIRED_USE="
 	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
 	policykit? ( dbus )
 	qemu? ( libvirtd )
-	uml? ( libvirtd )
 	vepa? ( macvtap )
 	virt-network? ( libvirtd )
 	virtualbox? ( libvirtd )
@@ -272,7 +271,6 @@ src_configure() {
 		$(use_with sasl)
 		$(use_with selinux)
 		$(use_with udev)
-		$(use_with uml)
 		$(use_with vepa virtualport)
 		$(use_with virt-network network)
 		$(use_with wireshark-plugins wireshark-dissector)
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index ec9817c85fda..53cbbb80f50d 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -11,7 +11,9 @@ AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668c
 DIST open-vm-tools-10.1.10-6082533.tar.gz 5111726 BLAKE2B 22e2e901c542ae14b7537bc26ff848359f30bde6824a16968b70070dd6e57c92fbf76dca0d02e35ef45bda257725e207632b0602a4336bd2d9c97d10fb094967 SHA512 60c52a24509cb0630f2ad649fe6717fefff624fc2a5c736ced35cbdb8f639264d482e063e8140eedb39216adfb1231d58232bfef0233ebc477ba4f9a732c5965
 DIST open-vm-tools-10.1.15-6677369.tar.gz 5153995 BLAKE2B 03c6b359df8f42f1ba65331dcac67e8ce86b0fce9a572c1665d3f385cae14f1757611d3948d30bb5b2e40bb2b4673bb244c45f56098faf09d6de515bb937ea3f SHA512 fe3699a7f704bdadc4c274c963d177f4700067e7436074554b7cf113ffa341ad0e4753016214f947418fd5a7cb4a6f2c0342acf074b6b414b3fd18fd2ea2bc58
 DIST open-vm-tools-10.2.5-8068406.tar.gz 4818035 BLAKE2B 87e3edc42afceaf9efe69ae8cbd1abfbbf959fe09a721dbe4737ca30c6b57dcf1d8bff23bb3ed3d2236c31e7f3e6fd4d10a689b40b3b725eb580609a68bb7090 SHA512 da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68
+DIST open-vm-tools-10.3.5-10430147.tar.gz 4623854 BLAKE2B a2bc0ed099cd713820aea17f01131fb4ffcdefedc04b2edb217b4a96c6c9a4007f8ecc80c40445580abffaf3fb0f67be3ca9f3df7a55d368109a53da91e0db77 SHA512 2f2b3d9a8d39b01904cf845936b51a468ba61a29ca64635f842451ca9fd90bf5a770967e4c332319327c6f920ac4fb06d304e185c18ab8898aeb4fcd491a4a1f
 EBUILD open-vm-tools-10.1.10.ebuild 3412 BLAKE2B 230f0c96a19168f8097772f2b962829b430732c025c091f0c5a2b5deb22a8dd038036b3482d7347aadab490c2335cd56a6279e2380bab925b456a5af0278281d SHA512 20d56ddb09464c77792febabe57db66a33d1c6f81e22a8b6f7b6e4c4d0ca6f58b1646bc155d1fb77a96774e023f321a74af0bb5b2f8aa08d3f50459f2f041ce5
 EBUILD open-vm-tools-10.1.15.ebuild 3597 BLAKE2B 93ceaf85d62b4049e7b1ba68ff52b0d6ffc47dbb4d4e143368f64c3be3ef1d3154801e4451da74949c50df0f3bd489c6cdfc3d7e3ec51633ce72397375aacabd SHA512 ff5467262b1bffd67a8806bd922ffa955688b9ad642707de8920e74bddf94d013e170a82d92d2f9eb95550db9f2dd4d7ba19442f2cfd2ba85d87f67345d7ee00
 EBUILD open-vm-tools-10.2.5.ebuild 3952 BLAKE2B 23c4c618eceba910f901da93e647a744b4c3025f4914782185731e96540e7a2b134b2828fada90cfc08e5b031f37b983b8de2b6c5727ded68c7826809702dc41 SHA512 2ffd16170f6ec537185b1cb31254e459b671252baa811c7488e863e842c0925d147da58836b25989687beabc589dba07a69914bec93f00ce0fd4ea150da77f1e
+EBUILD open-vm-tools-10.3.5.ebuild 3333 BLAKE2B 8d22fa3fbc5e059d6e9ad11ec8ce2df51a00e69ff30415a2282655cfb9fcbd1da2918431b9eef6553d50e359482b54d6367b6a39737a2ff9df654b2beef89018 SHA512 148f1277d0aba2c2d26b9a8af8d165566b237425866ab884c453ad76f984e30a9b8b22889a128f82f68da03ddd0c7f2c70eec50949e87fe158471b82014dffe7
 MISC metadata.xml 1572 BLAKE2B 3242a50ca7fb3fbf9bf166070d8c6d2734c52edd1983bc2992c4a329031f0fc21bdb522c46c1dce5e6e3a7682fe8706c0da5784ba168f1e4bf5a110cbf5a208e SHA512 e75e73b412df8f3a04ba5805888d09d6455ee7a5244ce0fc4ff794ddfaadf96deadc935312c66a7b1ec7e1e2b89246c4319e0a353b2413efdf29a8794d6ff153
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.3.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.3.5.ebuild
new file mode 100644
index 000000000000..2b036c75b63d
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.3.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd toolchain-funcs user
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools"
+MY_P="${P}-10430147"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
+REQUIRED_USE="
+	multimon? ( X )
+	vgauth? ( ssl )
+	grabbitmqproxy? ( ssl )
+"
+
+RDEPEND="
+	dev-libs/glib
+	net-libs/libtirpc
+	deploypkg? ( dev-libs/libmspack )
+	fuse? ( sys-fs/fuse:0 )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl:0 )
+	vgauth? (
+		dev-libs/libxml2
+		dev-libs/xmlsec
+	)
+	X? (
+		x11-libs/libXext
+		multimon? ( x11-libs/libXinerama )
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+		x11-libs/libSM
+		x11-libs/libXcomposite
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		gtkmm? (
+			dev-cpp/gtkmm:3.0
+			dev-libs/libsigc++:2
+		)
+	)
+	dnet? ( dev-libs/libdnet )
+	icu? ( dev-libs/icu:= )
+	resolutionkms? (
+		x11-libs/libdrm[video_cards_vmware]
+		virtual/libudev
+	)
+"
+
+DEPEND="${RDEPEND}
+	net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
+	"${FILESDIR}/10.1.0-Werror.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply -p2 "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-root-privileges
+		$(use_enable multimon)
+		$(use_with X x)
+		$(use_with X gtk3)
+		$(use_with gtkmm gtkmm3)
+		$(use_enable doc docs)
+		--disable-tests
+		$(use_enable resolutionkms)
+		$(use_enable static-libs static)
+		$(use_enable deploypkg)
+		$(use_enable grabbitmqproxy)
+		$(use_with pam)
+		$(use_enable vgauth)
+		--disable-caf
+		$(use_with dnet)
+		$(use_with icu)
+	)
+	# Avoid a bug in configure.ac
+	use ssl || myeconfargs+=( --without-ssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use pam; then
+		rm "${ED}"/etc/pam.d/vmtoolsd || die
+		pamd_mimic_system vmtoolsd auth account
+	fi
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	if use vgauth; then
+		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
+		systemd_dounit "${FILESDIR}"/vgauthd.service
+	else
+		systemd_dounit "${FILESDIR}"/vmtoolsd.service
+	fi
+
+	# Replace mount.vmhgfs with a wrapper
+	mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
+	dosbin "${FILESDIR}/mount.vmhgfs"
+
+	# Make fstype = vmhgfs-fuse work in fstab
+	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+
+	if use X; then
+		fperms 4711 /usr/bin/vmware-user-suid-wrapper
+		dobin scripts/common/vmware-xdg-detect-de
+
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, please add the users to the 'vmware' group."
+	fi
+}
+
+pkg_postinst() {
+	enewgroup vmware
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7d722b7632c5..e460040afdde 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 83d0b8cc8e9f..b456c901c225 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397
+DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47
 EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e
-MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
+EBUILD skrooge-2.17.0.ebuild 2498 BLAKE2B 52f7a523a29ad49b2568fa0bfca83e1c4636a9bc42faf658fc4f71a49f3ad85a98d806af7c47d2616c73402ccb34c904a71cf33a980137c355c50e313080f47a SHA512 84e36e0ed95ef81cfff139bb352434cc4e12b89c58ec586552a86c3ec677cc3458e4fcc7ba066f0088400e398d6cdf3de3319856e01373783c92b783aea7a922
+MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 6afd808cbbb7..5156b3be98f4 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
new file mode 100644
index 000000000000..adde622d056a
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities designer kde ofx webkit"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	activities? ( $(add_frameworks_dep kactivities) )
+	kde? ( $(add_frameworks_dep krunner) )
+	ofx? ( dev-libs/libofx )
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwindowsystem)
+	dev-libs/libxslt
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	designer? (
+		$(add_frameworks_dep kdesignerplugin)
+		$(add_qt_dep designer)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/skrooge:4
+	$(add_qt_dep qtquickcontrols)
+"
+
+REQUIRED_USE="test? ( designer )"
+
+# hangs + installs files
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=$(usex test)
+		-DSKG_DESIGNER=$(usex designer)
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package kde KF5Runner)
+		$(cmake-utils_use_find_package ofx LibOfx)
+		-DSKG_WEBENGINE=$(usex !webkit)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde5_src_test
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 601312776cce..6244681f536f 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7657fe158497..11b19c8e6fa4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,7 +7,6 @@ AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1f
 DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e07113969bf5cf6f78cd37435d95b15c03eaf188ed09768033b182de125c9f018a5fe902094f17ab891f94cab9de6dd SHA512 978384915c145ec8f0d85deb764154d8d4a9764f2d342928bda6ad43a00bc110aa888895416d2ba5684a4432e433037990dd3fe8c5caf024faa487bc2e153f49
 DIST mysql-5.5.62.tar.gz 21111902 BLAKE2B f1cbb1c6b4dfac11c2c517a57a5c6216ce43766cc247b3c9b387326a7f6446cbc21ddb42bd95afa658c3b0ed2568a29563ceea248c6ec63364ce210119d39cc2 SHA512 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce
 DIST mysql-5.6.40.tar.gz 32083035 BLAKE2B efcc078341bae239df28ac0504111aa34926885ae47edb5011352b56552a5a3abd1f824f8cbdc23d8d667592b8f5510946ef18c3efa61865dbbc7f4bb8a2d4a0 SHA512 c8e458b4cd34cae87f1b088ed2188bd00de8cdc42709d5964e82fa2e4aaecfc12a75ae006c54ffa0d3d286fbdef9704d0cbb83436437d5705fb8921d960e758c
-DIST mysql-5.6.41.tar.gz 32111985 BLAKE2B 5ccad59333525b354db4fa892857e237cddf8fe1a4d289c6e410c31d6142a71d3ce4dab8d954fa9932ec1f83b50e8eccd5845e082deaaa56f1c0c5e21b2ce6c0 SHA512 a62d7a68c6bb49de33f8c9e634bce53cb453a87238e92967115e8e928fa9ed291727b8bd5a5271a0b5b634d957eb310c745edfb14b6be1deb9099bb757aa2cff
 DIST mysql-5.6.42.tar.gz 32201731 BLAKE2B c573328b37225dac090c32178f90e1419fc1848612e304bddc11eafdd48228981a846857be680978b72ef76edbd5d2422a98b5d20b4d082fabcc2b072e2b8fde SHA512 3104e6a3145a119f2b012de6af2a92fc37134aa402b889a562f5fc2391705d0bc2f718166c5fa8387d973fff5ecd9544c8b389b6d0c81d98bdcaf2acfb9b55e8
 DIST mysql-boost-5.7.23.tar.gz 49025014 BLAKE2B 669f10779bc2cda866d6bd876b4efe55fb4b0c796f596f66513a3ca85f322e2a03e9879eecd72a69729a0cb71d408c46cdd9086ae456712b4adff6ae7c584c97 SHA512 e4317f89d108a68652cd95e41ffd670c37b6663aabd6af3985d18052fb7e8d8879b5822399caf9091cecc0a949ec588c121c87cfd60d69941f68d0ecbedd0953
 DIST mysql-boost-5.7.24.tar.gz 49110448 BLAKE2B 1cf64712d84cbb2dfd31f2a530470b6f7cbf5ae9107106d86705575ea9739fa582e1f079447d9a58c4762fffc636d69e448ebdec9172ee15dc09245bc39c3525 SHA512 bbd411e15cd9e6053a353146808b74881d2d950f09e94794a699e7604dadf767b58b661a8321fbe1424f2c2e6cfc3adaa388242183e759082eae47b64cbfbcde
@@ -17,7 +16,6 @@ DIST mysql-extras-20181111-2314Z.tar.bz2 329013 BLAKE2B fa928b699ef0e6f092e028fc
 EBUILD mysql-5.5.61.ebuild 25515 BLAKE2B 2e8a5ff36ec6003ff7e4d746157afe8af9d462537d2808ab6cfe4d469cee1a594df38aafddcb010d0157335b42253f12474614f4eec85729f79d2e05a28cb8b3 SHA512 9ea05d2509c6693d71c5ce048e11393a77cf50570fa19f40500900284b9e5e5d1097de5c82fa518058ea773ac8fd30131a9c153b4effb371f4ce04f454e8867e
 EBUILD mysql-5.5.62.ebuild 25693 BLAKE2B abb1400994767e1a29259fda70531e27e9160b849a6228802baa440f8a5c8244393cb155ac9985f04353c8b35516e653a563c2eb84b72a714c5ee81d016e5d27 SHA512 759b82802fdeb7840b0da3e4ef1d6e7b1f32d7bd815ba780b11e57143b52bcb7eb483c008d25670f4626968028a46f7080abff247e5d2047f6b500ac67888ad4
 EBUILD mysql-5.6.40-r2.ebuild 25714 BLAKE2B c78b1d8b2a77d095302f7e203c3ee6c0c2014770944072b87bd77f97972fcb6db52b05088adacbc821ce2e8f3dbb780bd40d850e381b866458b0d530fd11ea5d SHA512 b6301834c7813714f18f9763922d10e6faa33675705ba479c6d76e3c5673d903b0683f64a8281836bd6be396f398ed1bee14f9e6c8ddfe30b84ad1ac66a8be48
-EBUILD mysql-5.6.41.ebuild 25721 BLAKE2B babbbcf2b0004de259843b201af56ed5513d3c61e484164aff8ff8dc8266bad491628b5f4805a2deda373af6a39e0b086e23dec53799546e35dbb4f51a3c645e SHA512 5933bf59434bf7fdc2ff8d119d2c1cf58284bfda94ec2adbd4340e2958a6ac325bcbdd2106f538e26bcddf8c93ac3d9d0646757ba3e4c32f7dbc5336320a6df1
 EBUILD mysql-5.6.42.ebuild 25955 BLAKE2B de075ce30850d5f2fe17a5aaf02e5888d62634028a042105ac4bff9a90dbec7803c6b1d348e35267be6b4b12afa8f12f4a02f969c536890bf7970cb4e466907c SHA512 56aa82fe363e091a6db7b307318f14ff93ded6eba2a61142eb3e026205740b02dca8587e23accf2ff757e941b0d4b2a0e7ab386b879d7cee35976facbb7aec94
 EBUILD mysql-5.7.23-r2.ebuild 30078 BLAKE2B 57bf58e862639e651335a10a8c4dfc5f7f0f76bfb0545414d697875906d917131fedd3e9d0e58f57b886d8cae55adbd2a104ee3632d49b4ba0669b93a1a68bff SHA512 dfbb88e79b717ceb615246a806123ee2d30c1632cfb40d0bb9e04a9204565a92afbb2b37245794c15985e99a60d2adc46723b97e455fb85e137079d6192b148c
 EBUILD mysql-5.7.24.ebuild 30386 BLAKE2B ecf0c03821af6a21467b53a02e6e0a0ae2f7e5d267ff4669266d34cdb9fddb7defbd8a4013dd3a1f8a103c84da4c6eddafae06fc1ebc4bf94c9769e64dbbfc1b SHA512 f8b372573d82b513ea1d82a1e00d728501c483ef949a2411c05ac93a8d2d90162d6992b58d3a101fefcbac541f9f37dcfa2263ac49231839d338af158557153f
diff --git a/dev-db/mysql/mysql-5.6.41.ebuild b/dev-db/mysql/mysql-5.6.41.ebuild
deleted file mode 100644
index d4052c130f80..000000000000
--- a/dev-db/mysql/mysql-5.6.41.ebuild
+++ /dev/null
@@ -1,789 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20181111-2314Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs \
-	user cmake-utils multilib-build
-
-SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
-	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
-	http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.mysql.com/"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="0/18"
-IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
-	+server static static-libs systemtap tcmalloc test yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
-	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
-	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
-	"${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	net-misc/curl
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	server? (
-		numa? ( sys-process/numactl )
-	)
-	!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-}
-
-pkg_preinst() {
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT%/}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libmysqlclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${P}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-	_disable_engine ndb
-	_disable_plugin innodb_memcached
-
-	cmake-utils_src_prepare
-}
-
-src_configure(){
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		### TODO: make this system but issues with UTF-8 prevent it
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITH_LIBEVENT=NO
-		-DWITHOUT_CLIENTLIBS=YES
-		-DENABLE_DTRACE=$(usex systemtap)
-		-DWITH_SSL=$(usex yassl bundled system)
-		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
-		-DWITHOUT_VALIDATE_PASSWORD=1
-	)
-
-	if use server ; then
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Kill old libmysqclient_r symlinks if they exist.  Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.6"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S}"/support-files/magic
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='perl server static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.7 for now and are believed to be
-	# false positives:
-	#
-	local t
-
-	for t in auth_sec.keyring_udf federated.federated_plugin ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	local help_tables="${EROOT%/}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-	[[ -r "${help_tables}" ]] \
-	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-	|| touch "${TMPDIR}/fill_help_tables.sql"
-	help_tables="${TMPDIR}/fill_help_tables.sql"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR%/}/mysqld-help"
-	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT%/}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
-	chown mysql "${sqltmp}" || die
-
-	local cmd=( "${EROOT%/}/usr/share/mysql/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT%/}/usr/bin/mysql_install_db" )
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
-	fi
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT%/}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT%/}/usr \
-		--datadir=${ROOT%/}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile} \
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');"
-	"${EROOT%/}/usr/bin/mysql" \
-		--no-defaults \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT%/}/usr/bin/mysql" \
-			--socket="${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 578dabe9fbc4..c1dee32ae4c4 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index b45a1f7614c7..b5e46bfbcaca 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,8 @@
 DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
 DIST simgear-2018.2.1.tar.bz2 1314943 BLAKE2B 60e44896d466085014020874a1be6ab3f6f87e472f985237404dffb5dfbd5c25f0d330701276e0b8d075830695872eb7521bb4eb5b0107edac5977c3aab85bf7 SHA512 6756994e0688a1f3699c33548ea90b19e99a439ea2f2002cf524629370cd1161a1556ee966fc3a781141fc7a08e7574adc0ecbe6dec67e72d631c6c4d744e4dd
+DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
 EBUILD simgear-2018.1.1.ebuild 1289 BLAKE2B 6b645fd5621acc09b4a0a9862e5e5238334c8d5b6cc1a9f6b8c7d1c08154e84b04a9be2e827cf12383a805027858d7ef9bc2ca9841251b01ab28da4ad39ede61 SHA512 4deaa97b485983475f5c9a72dbe7e3b1ac4c5a0166d3c5a541ac38cc0504211289dbfa8721139fbc8da01cd6171ed99414aec13d924a5ff0c37f379c6a1cf7ed
 EBUILD simgear-2018.2.1.ebuild 1289 BLAKE2B 7765dabb2e05d3c4f948ddb60b877c3bfee627c7c72f59df5c5020a5eb4b3022b53cf098d4a57b197b4e1a5384954fc734859c2b9998ed2c81d47dc1f45be57c SHA512 d6ba94beeea257a0e19435c1d9fdc0aaa31ee4e1d7dd14c0f40e61ce07fd16ff7b37d9e957478afb1b5c88df176b437cd407a272ed69626add981924d0b85432
+EBUILD simgear-2018.3.1.ebuild 1286 BLAKE2B 5b2d53e3bc343c85432a3d630483f46ff73ff44ec453e08e7f9c26ca9bad34830e723e70a7776b068d6d185286ae8b4f4c1d7e6a87763dfe2ef5995725f6038d SHA512 acffeba8cb2e16581656ab6dcdc951bc8bf84672d602c2ce3570b0c5ba264677430915d79853bfa081f9cd38a23b1a7e60bcd1f078cb8dc6601ec138e64daa1a
 EBUILD simgear-9999.ebuild 1351 BLAKE2B 69fd6d6034053e9d026e9f91376bbb716be4c687007a031ca580f844a7ae0c3d035abbfb01d3e39eb3ed5fbc9502d0f3ef123e7c7f4566a52eb88eb23077bce4 SHA512 3735c556acf625e06391dd2c51b329cc8367449ed67d72dd0e4345a102b98b334595634ac1de1e61c05094075616a48887785f3b3f368d06181413add49a2f91
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/simgear-2018.3.1.ebuild b/dev-games/simgear/simgear-2018.3.1.ebuild
new file mode 100644
index 000000000000..6c5c009057ec
--- /dev/null
+++ b/dev-games/simgear/simgear-2018.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="http://www.simgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dns debug gdal openmp subversion test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-games/openscenegraph-3.2.0
+	media-libs/openal
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	dns? ( net-libs/udns )
+	gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+	subversion? ( dev-vcs/subversion )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DNS=$(usex dns)
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PKGUTIL=ON
+		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=ON
+		-DENABLE_SOUND=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSIMGEAR_HEADLESS=OFF
+		-DSIMGEAR_SHARED=ON
+		-DSYSTEM_EXPAT=ON
+		-DSYSTEM_UDNS=ON
+		-DUSE_AEONWAVE=OFF
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e8bf16da5c09..52c9d91e2bbc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 2162a54f95a3..2c149f94fafe 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -10,6 +10,6 @@ EBUILD libcdio-0.93.ebuild 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e
 EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
 EBUILD libcdio-1.0.0-r1.ebuild 1867 BLAKE2B 6c5c7e85d381822cb8ab25d4e0c69b59160588d98e68e038e09816b686c7d57766d9bc9ed4697400f1fd8c06ddfcd3a2515e8896d4d5f09d251b354a34b87dea SHA512 af06569b609761255605ddc89fae69fe1e9a4e831023f8e5219de2ee19c6247d53e468e79d530f7935661fccf51cea1fac2f70d7b814abfaa396327248a15f0b
 EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
-EBUILD libcdio-2.0.0-r1.ebuild 1839 BLAKE2B c484efe11b5b5499daec347745b2dcfa08bed11449107a281f5ed70a7c7f5dd60bc8366af8dbae1d62f7c838310f02c57771da0c50ee3ea086dc2dcc75aa66be SHA512 40ffd9e62a4fdd321d6b610a4ef259f7152c7f888d75eb902a33d43f70c56ba6eb91cac90c5d5a8bfd341b64420817891e710b8029e5bcf82fa0824ab7856c6b
+EBUILD libcdio-2.0.0-r1.ebuild 1838 BLAKE2B 7c0f3100156395d729a2e0f045c1c5d2d49509257c94c640b9ab2db3f887445548229d83552bf814f1a94eed4828dca959670e0a2e5125dcce859277dd5eecc0 SHA512 c4a412398d1c8c604e8b1a74a2baf6caf3146f9279d7d361338a4b342793afcd4a999a6b1840663db76f6591f4928178a2f51821f31435c6b8ecb288d762bbca
 EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index b6e1b4dffe1a..3e15b8530167 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8e198cbc4454..a7aef457d00b 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index d4e635a31932..fa42c4dadd0a 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -2,8 +2,10 @@ DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac599
 DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
 DIST event-2.4.0.tgz 139646 BLAKE2B fe672b5d1f4eabd06456ffb14f11ed978a23a15eba06bc01b22d1784d71d5859e71e3914ab64856dd33a1cccb6618b5926bab446a112d8bf106081c2ab41bc74 SHA512 d238b72764461cf338d20618e4dee80ed8e8519350d17a6c789a68d749d2f4adae991ee43928ab09321caaff321fa21aaa4b5fac6f827974b2f8e9295e948293
 DIST event-2.4.1.tgz 139675 BLAKE2B 47b78868bad327778c917e026456dbbb8955f4910d1b6092132101618e348b064ee33766e7e8a2aec6c6c8bdb5e79a09fbbc7ef841dca0b16826fcc1737dd028 SHA512 d115fa12dfefe164532b39b6a79f01c2c00e2718967c3d675584a0dd193b155cdc74a632f6327239e201720fbabd440b9434bde5de4a9e30373595636dafad94
+DIST event-2.4.3.tgz 139788 BLAKE2B 428e8df15d4d8e9ff731ae4cd3f8dd0a5dc7d0bc7c5dbbe3575cfaeb596fec1c97c89d6aca19b2385ad09cf9bc36492f193e6264a238b71c4595d9e9a145877c SHA512 6f0ed8803e013ef96a14d7e89d037c31d78ddb3a386d0c7527d378b9ef9dc877c1c5642de7551363e5264b4e9f73975bd9ecd60936ac54dc2ccb5abf9f918ffd
 EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e
 EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 EBUILD pecl-event-2.4.0.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 EBUILD pecl-event-2.4.1.ebuild 1300 BLAKE2B f79690078d2f841c465d20d576941eca88f85ab38001463d6319e0b7470483724cecf24e409008053d754593f8f3697b7700ac3f5ba402980b195822b78ba582 SHA512 f7112bace3fc41db52dcb153bf71cad1ef54785ec8589fd6c16336351bdf094c3b2e61f7f6fa5d330d6ad34f0efa1cd409a63656ddd0ab0573cb999094b31014
+EBUILD pecl-event-2.4.3.ebuild 1297 BLAKE2B 6076f916ebae71364f02aed42036916f007625595f7761ab5a626a485a5bc38d99b40a803044502b2c13503a41868e588ee00f97d0249c95be0bdb97f505711f SHA512 42718934533a23a5ea942ab9efd8794050abcbec8d9d02b9fc875c6e721bb12f54f5fcaa5df34a64806e0c9f245ee0c5861bac992522a5c48396bde00b9a5787
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.4.3.ebuild b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
new file mode 100644
index 000000000000..c990f965da3f
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+LICENSE="PHP-3"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/libevent-2.0.2
+	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+	php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
+	php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
+	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )"
+
+RDEPEND="${DEPEND} !dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--with-event-core
+		$(use_enable debug event-debug)
+		$(use_with extra event-extra)
+		$(use_with ssl event-openssl)
+		$(use_with threads event-pthreads)
+		$(use_enable sockets event-sockets)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index bc846b721898..1b4575db3b75 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,9 +1,5 @@
-DIST yaml-1.3.0.tgz 37075 BLAKE2B 90fc101dc5b1d040efbbda481d28a862dd4021d09cf1853644db8769b04ca7c986a38758247b6e61dd38bdae31f995fef04f7b381d303b3914b8126806e99ce8 SHA512 60f54db7cd22ef1dc31cb5b31950a138e0bd2cc436f9e667aaa69ddceb4dcd7aeea9ecca9d424cb6822c2300b382de8f10c07403f80df749192820b27881d96a
-DIST yaml-1.3.1.tgz 37263 BLAKE2B 4be9dad710a4b7b2ea3ed8222500bbf2c94807b1bed627c1460beb31b5745c1dd5484fed11d23bb7deec454fcbb5d88a93034c82f7fe978e6cbb26944c9f7c4f SHA512 67359e6b8d5b19ad594acd741dfb53006079fbdbdb7c3402be57c006f45c992158c505ad2bf0c52a1b997c9b9fac48724b1a44fc5744689b0f02b308324a4a4f
-DIST yaml-2.0.0.tgz 37960 BLAKE2B df325cb73c4788a3022661e841c9ab479a103bcee76d4f911d2ba673d7fa7344006d8ba9a22aed3a701accee49593d524ee506052ac30231f02463c34d7b51e9 SHA512 760c9f9f5738594e3ad55c030fa619bc891e1d5a8feb85bec2389e2fd4d6d4933fd13abf68c85eb1bb4cc3b6f4a66079ea75a2046c47fe4095b01a50c8e65eab
-DIST yaml-2.0.2.tgz 38495 BLAKE2B c992c72b7ba84ca3d953109a9d274c7c3b203f3ce75630860f40a43a565e9ffd92f1d831e386624351879598ee305a64cb3b4228eccfa58b4bf1db76f994cab9 SHA512 b3dd2098826cd7cdcfd1e5d97b9015de66812dc90e506e74a4a50a56afed5f9de0449465bb807a36a13170f479897cc62a9b108653aa7eb81895abd5966bde1a
-EBUILD pecl-yaml-1.3.0.ebuild 843 BLAKE2B 481ca5f3e246f42f6b3beb3bdac479c86ebc13309f82914eb374d50fd51f5b45327efd71cbd053a7e0f79d6714537fc31bca39231d9e5f223e964ac17a6b61de SHA512 90520c8e294d98b0f5081b5b13b12d16e96920f5726d39a0da703b5c50d725be1a8cca7e138f998aaaf58950f5c53dc32fd79b5c80f95773716021cad2a26700
-EBUILD pecl-yaml-1.3.1.ebuild 1010 BLAKE2B 7a0510d95b887c6fb53f0d7c8e48775671c15380bdb8835e36f6dba68fed82e1fc1e1e4a5d2bc10968f89bdbc72678f0d8113c9ded4313b02ae211c99eae48ff SHA512 ddd9a554be36a50ad40197b15b3851505311a5d7946936dda2dc427f79d2e7dcc5dfbbc15e55301676c00c5fb21ab2d71ee56bed63d03a8e57695e7b3ece5ee7
-EBUILD pecl-yaml-2.0.0.ebuild 851 BLAKE2B 7985abf810e41d6724e694c079410bea56f60dd68a655d76e9aa31fb7ca8ff07380984a2ce928b3e24d68304560bf7721a759d03bd0ee4ad0d3242be53eb75e3 SHA512 094aace10ba13de4dfdb15872ae454797fe582a32074f4f2612a3cbf5d8e7b3129b615560c5a0eb4d9970a9012003a19fd2f6b8bcf989cb85659744b2af634ee
-EBUILD pecl-yaml-2.0.2.ebuild 983 BLAKE2B e9ec310ecf527f7e962c8773fc1e759aea2f65f53c4eed0ec147e6b92d8a58b3761bfeb8800cb0602487ae40e2d42c61fc10eac8655dcaa6a0fed93fc41309a1 SHA512 16d5d58753e7a6ff02fc561ee45f90deeaed89c88f2d3b6ad2971e96c0c1066f3bed30c8fa0bab6c5de2ea4b590234f2fc54427addb0555f41edeb25778753f7
+DIST yaml-1.3.2.tgz 37354 BLAKE2B a8124b0b24ba0686e028b27d9659f7c273435861cba23da321a650813aca28394659fe3083ae08f992f9813912352d0f198d3348dded58a465275b7de4c227d6 SHA512 d1761ebda34b48894a50b831969c928d8a1d3a8577c5213bea92a3de97ec4cf908ffabcc269b2cafae29e49143b8403c3b370c3bfc6d20548c4093a3cb132263
+DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
+EBUILD pecl-yaml-1.3.2.ebuild 1079 BLAKE2B bfa33f6a71df2226587f23f74d43fd0ad2e2c79acc027642638ef317fc692ad890d1cd3524b60010f45b0d754652d7f7a4481dc877d249d689905193faf45866 SHA512 0893605cbe310d653076b0139daafeff061324e0cffbd5c2761bdf0456254b4a3f45dab90a3a04bc7ac8ff29724ab57f50e52fc9d811354f7cbcd29cd5589223
+EBUILD pecl-yaml-2.0.4.ebuild 1046 BLAKE2B fef163f4d8f00a5eac23cdc2ff4221f6160d5cf090a96fbba66d6c8c9a5b752c8d2c12d1bc30949aa5ef8154920ee66dc6af1341f4fa5b86ed6b2c8619f89aff SHA512 078605cbf1f3f602c18b498a9a09e9f4b915a83ab2c0f2c9c1bd0acffe76a2d6c0b4c5cd209ce42e8570886d760085ab2d020edefc42fa3ba091e0472eec4e95
 MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
deleted file mode 100644
index a09636e5e61d..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_beta/b}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-0 php5-6"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-yaml:7 )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php5-6 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php5-6 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
similarity index 86%
rename from dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
rename to dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
index b8e538af44ba..5d179e7121f2 100644
--- a/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS README )
 
-USE_PHP="php7-0 php7-1 php7-2 php5-6"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php5-6"
 
 inherit php-ext-pecl-r3
 
@@ -32,6 +32,7 @@ PDEPEND="
 	php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] )
 	php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] )
 	php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
+	php_targets_php7-3? ( dev-php/pecl-yaml:7[php_targets_php7-3] )
 "
 PHP_EXT_ECONF_ARGS=""
 
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
deleted file mode 100644
index cb318ec1f047..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-0 php5-6"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="7"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
similarity index 79%
rename from dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
rename to dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
index bcd73c631481..804cd88748e5 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,13 +10,13 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS README )
 
-USE_PHP="php7-0 php7-1 php7-2 php5-6"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php5-6"
 
 inherit php-ext-pecl-r3
 
 S="${WORKDIR}/yaml-${MY_PV}"
 PHP_EXT_S="${S}"
-USE_PHP="php7-0 php7-1 php7-2"
+USE_PHP="php7-0 php7-1 php7-2 php7-3"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6]
 PHP_EXT_ECONF_ARGS=""
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index 7485c83de290..13ac811f09f4 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -2,8 +2,10 @@ DIST swoole-4.0.1.tgz 899395 BLAKE2B 7e7320905cb83794115280977031cc5254a4947781f
 DIST swoole-4.0.4.tgz 907216 BLAKE2B f078f712c61c7ec9c1a98d94370c892fedd7d1efee7de34438a19d96fea9d41a0553d53fdd34c3d32138c6685045bf45be5fad533b0430b07cb7e60d183433d5 SHA512 b448abeec1fdfe94e0fd5d05b9c2abc7cfc2bb9477d6847adc35cba051d38acfb9ff3bdfaeb10591a50f5a6238f21cef4e0b614e1ff53c71f62b0bcd846d785f
 DIST swoole-4.1.1.tgz 930623 BLAKE2B fb4fa99b7b687aeaf4473983659cc2ceb7d8ba9ba6e198b49bea175b28918ebf8316c51f3ab7b4f75a9b7566941ddbba698c0d57f6ee752767c416e68fa68ca1 SHA512 4afc986f6ce362e28085d4ce07c534867311d65be487a66edfb0c01df7cf6e6d2df92abb2aba22b72f2840daade82b5bc3a12883d9cb54fd8ed9e6b0cdf0870f
 DIST swoole-4.2.3.tgz 1127669 BLAKE2B c99b540bf2f5c8757ae8e1b88de5db60bd2fcef0a14faebee3032419645f61c3c54c81f0ced7a4d67701bd1932d962592ea695fd4460d4d5bbb6849a2bb13674 SHA512 37758ff2c8e2638bdd9c5c7ac26ec86e71d71a75c4af0a8ac2c68c81eb74fdbb31e70489b94c50488d25ceeed1731e5f8f74316d5cce3f6e6db41623200416f1
+DIST swoole-4.2.9.tgz 1220045 BLAKE2B 752d00ae6a61c0592f308fceff205be68f55eb9918288fcfa3f2ed29edaf8e3e8682a28e2c783f1eb6df097e5567690cfa88a056b1078ecbbb809e4bd81c5bb6 SHA512 5fbc7c2d5a797074ceaef89d4b5f81440bc7c911e2feda9ded4183069cc9e98bac1ab2acdc6e7788a8c7e379dc0d7b07aaa3c5374c8b20b1ea7c327bc13c87d9
 EBUILD swoole-4.0.1.ebuild 1695 BLAKE2B 7720c6946b04a5c35c012187873a351919f02a4c9b8cf041b20f4777b57db65e8f2376a1cd121af0203d802227bedae046fd1aa3b3ea3c0fecc6c677f9f029ce SHA512 fa2a870086d261175ff9ed262bd3051a62bd12ba979a384d8fbfca121ba9cba74ffe55cf8f84c687eec4b449d57904d73232c637d87fb6cd5d42e7d1bff19ee5
 EBUILD swoole-4.0.4.ebuild 1818 BLAKE2B 94bfc9d9802443718edef78fdfa3b86375e822b6ee5983b97c3a001e04fd15ae42b94c7dfd12b8439f976a6c035ccf0f7055a21a44107c0cf1e50b7dede89aef SHA512 cd256d3486b92e544db3ecf8a55c994b0305c1be747c7cb1497977a6b9ae6c1a242ceb6978c5f7a57cdef2fe57c0f04af596df5a74049a56eb788a996b6c6bf9
 EBUILD swoole-4.1.1.ebuild 1947 BLAKE2B 1b1d9303354b30520a39e48713548324bfac21fb0393452a056ab69fd02e886d487cec5bd7fff7029426e7783aa4e23310b2f5ec526b0fa5898d0485fa4e98db SHA512 db7f7032d2ef33a1610c5fea8ba314616715f0ba8d2e0ba8cf7fbdc2a8139a96b89e1352dcc66abbbe1211ac9c6f154a9c108715c4fa3b5c839ff86407e08972
 EBUILD swoole-4.2.3.ebuild 2025 BLAKE2B 0d9d150ca64a572d4e6a401dfa5196125bfb5a3026a7f5468fd0919d642b808612d7d96d3e21e928825b24f3e06861b0138a5a963defcac234473a6d82dfdae0 SHA512 e29ab7df2116ad30abcccdb45a7b225d35a97f6107b2aec6aa2a28837dbd0c4326842666ad5fa806ce8f63bb26cef22f1621cfe1b357659da3928e5fca2b8a9d
+EBUILD swoole-4.2.9.ebuild 1914 BLAKE2B a342c2377dfcaace8ad212c92b62a4cf69b4b7c126120a85ea9f511382debd3dbb567502421323012ee50e91f7f6eb9ff31c61605728a6d0295121a017be6408 SHA512 d6b82a342a95e29148e32fe8443507072ef4d55f3793e0c7ca0932d4d16e8a407582cc61f3a2ae1f25a18e924c3d8198d4642c8d258c236f0a1bae5df427d4f0
 MISC metadata.xml 424 BLAKE2B abaaecb73dd8caf77e25775dc2b3307efa430399d197b24f3ade567b93989108c70216949327677f5c9540e6aaafaf2f77d9af17b01f99de2ac6f04a95abb03b SHA512 52dc7ac48b61458b810ba467bbe5cfaeaef808ae7db72f58ba4ad4dd8723c7149995e43e94c8b4552e7dfc38cd1c3e627dd5c9854652ee656f421f345dd72471
diff --git a/dev-php/swoole/swoole-4.2.9.ebuild b/dev-php/swoole/swoole-4.2.9.ebuild
new file mode 100644
index 000000000000..253ee6973880
--- /dev/null
+++ b/dev-php/swoole/swoole-4.2.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="swoole"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests can hang.  Disable until this no longer happens
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/boost:0=
+	dev-libs/libpcre
+	http2? ( net-libs/nghttp2:0= )
+	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+	php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
+	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
+	mysql? (
+		php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
+		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
+		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 libressl mysql sockets ssl"
+
+src_configure() {
+	# PostgreSQL disabled due to Gentoo's slot system
+	# JEMalloc not included as it refuses to find a ${EROOT}usr/includes/jemalloc subdirectory
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole
+		--disable-coroutine-postgresql
+		$(use_enable debug)
+		$(use_enable http2)
+		$(use_enable mysql mysqlnd)
+		$(use_enable ssl openssl)
+		$(use_with ssl openssl-dir "${EROOT%/}/usr")
+		$(use_enable sockets)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 661ed60fb04c..4c0e6e158f70 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 8d926daef984..87b87ad13a6a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -26,7 +26,7 @@ DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4094 BLAKE2B a20c04c9445b3b13d30706b2fa26633541722175c4f2797777cd90c5c5d1a7af5079009bbdee026b0b437e6e82ece7efa60f16d59a09e7c39b2139162c76bd86 SHA512 f0817e879689c05b76cfb921db376828227f947fec740126e59969bf75933d5b0bd969f5dd836c7060a4bcf079ab7174db33e0388629d8f323585d7e31ce9d18
 EBUILD numpy-1.13.3.ebuild 4646 BLAKE2B 717d5acd1683ef3f5d7ea07475b7d3a5555991aa2240c5cade1170f01092e12e315ba99d408f2f04e8e998d5c0820bbc2034ef177375d729d19280e6940c6f66 SHA512 2eccdcda9e51aeda860a1cc02538708709687a202a8d0ed9cba6ab6fa45ce80153b118bda265944235040027d7b15f36c281d130e2e6a59a66d9ecec046240b8
-EBUILD numpy-1.14.5.ebuild 4066 BLAKE2B ad72c70643e237c382371d35753e4df760400fc4b20d8e13d11549628d6bda40d20543a0a605785825aa159d1e21e0507b6a99c33b346a3e600431be32f274c9 SHA512 82b21579dce4d833a7df9df9e9cc769ab5a164560d0a6ff8e87769644d4cf8d6d5280a68457af35a0b7186746be87c64bd5121c8b714301aa7d2bbc4675d701c
+EBUILD numpy-1.14.5.ebuild 4065 BLAKE2B 42f9c13392d122e0aa3fa01d2a55d370b4d37a1f932cb860b1f9d81c551632f3778a4ab94fa911f7a9db6a9686d1541d54f450cd9e78fc9168b2cb00bf9c15a2 SHA512 915326a6ccbf196e98e3061a4abc8817246cd6b46cdeaafb7d93dc577358da626334563398def155de38fd090a75c3c9e4b45753c231851ffe6774755e5e74d5
 EBUILD numpy-1.8.2.ebuild 3945 BLAKE2B dd27488a9771219b8df7c8546067ec710168d39a7675c963846197aac6959907d402269efdee44d9e2a42edcfe6a3f27e9e360604df77d620f8f39f96427201e SHA512 3086b989bd9ac6f8b07839afaabcd8f683888ac5f0b2e1fdeb951ac49c79af4585be7984775af8d3a03b89957792ffeb065b54c624d00050bb389aac67f0fed6
 EBUILD numpy-1.9.2.ebuild 3958 BLAKE2B e05e749e5f0c4b3f0346cf0dc78531421ab081bcea12ecef30219d0504a77c0f99ccacfaf355bbf008c2af07434d7989e4b2c4417e91ad48e70407535a23a1be SHA512 04f442c6a363caad3313418f681e264a7e680c19d235aa132b27f2d0caac8495bcda7c75ea9904ad0096e844beda1ccb15dd2f4562e632a1576918279569cfe4
 EBUILD numpy-9999.ebuild 3355 BLAKE2B 09f61bae65c20b5736f5375c2ce6c04670f43f953b820ce30c329c8053f1b151490c53d00209fb84b2167ff11d3b2901dcbf5780ea1d057787f0218f8a9a322e SHA512 9ec2ffc43301df0664b7448ea3d094c8fa6fd587c087c95e0ad91f9cda780ff605653ff6e003234d8e4091ed30973ba13265dab882d1f4e854090958c2ff35ba
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index b5bef492705f..17335bd9732c 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-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"
 IUSE="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2eeaed0df683..621a0c44dac3 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
index cab20e346391..a9f5dc9b065b 100644
--- a/dev-util/shc/Manifest
+++ b/dev-util/shc/Manifest
@@ -1,5 +1,3 @@
-DIST shc-3.8.9.tgz 20536 BLAKE2B 68f2c18f79e28bcbf5116428ec16a4b6eceffba686aaf3e9075f14a77793831bbb9c80c7f44a849f152eb164000956a383343d4dc8b49fc8cf68758aa9a4d27e SHA512 e8a4f9b0ef6e90fc99ebeeb0af36b89d1020209429c9651a036ab1f51a293d9faa3b775b7f040e91997b6ff5a487cb45943fc3548fa6fa3e7282e0d6f74d2cd4
 DIST shc-3.9.6.tar.gz 122644 BLAKE2B bef9993f49ffc7a1119862c8bd4b520a6122505493a59269218c6d46a0780e0788d3c9acc3975e642f9ea0bfd5a3907f0c1ff54bbc20c01fc630b2da096fc479 SHA512 dbda4af6740a8a719976d7260133ab3d92552ea08416e2b1ec4815e83349507ed68eb1e52a78b34e2c129dd40eafcce84ef7bf0d97d28073ee3af4598f804ed2
-EBUILD shc-3.8.9.ebuild 825 BLAKE2B 035a2082aed05a8a71d901f914b6aa84ec4d0cfa93659a51c0b85f6e52e60ae6323a469b2b53ebb73ec322dffc041fccd5e00f80e9de772d99fdb481f0ca7f68 SHA512 048acb29321004230fb3da0713b4879d1c672633fe45212cef21ab72e3a9d9b55e2444449e1a25a333134f185b05641ea2393a475cef3b403666b7086c83168f
-EBUILD shc-3.9.6.ebuild 450 BLAKE2B b58546d213ce700e392edcb408e6763040be965224db85db66ac5cb06a63176120383ce7271efa17163bc41f7dc1ec31efa0033a0caf2b48d980e5ffbfa92d6c SHA512 96a715b5623ec9fb7236ec6c473d6bb72abbd5d42b253ed421037ea34194e30112cc0ad68ff9f47c47bd59419099fea68456d3e8eea54646a250cc597d9f3623
+EBUILD shc-3.9.6.ebuild 447 BLAKE2B 88a8ae951eef23d2fb06af65f11cd910e8d5f8dd568229406685a92a26efeb29ee702088fdde80857fb26dcf6ef0033e195b5fb45da4cbe935277b9e52f76b60 SHA512 ee96f953217b9511da6932c964ff72e2f1a3282ec5d2453dd427fbd849f03cd2191be68d5049ba66cfe91ec0b1888b3c91a7bbcc40551a9f66d11f6474c33fab
 MISC metadata.xml 341 BLAKE2B 9e21bf4fde239181d0dca080e08667fcf098398ea5f89b5e3b2fb27d3797eea6ef792f81b159a25c891c831dda165858172b11f1932469262117c12c155731eb SHA512 f5b2c355996851ad7c34e40f762e636295581148806b5a6129e79d39c564dcd16a8281b289598204048ca53c30b3f5efdea7f393e6ac47008d9a8af9bb54fe2b
diff --git a/dev-util/shc/shc-3.8.9.ebuild b/dev-util/shc/shc-3.8.9.ebuild
deleted file mode 100644
index 78178e4f1ae1..000000000000
--- a/dev-util/shc/shc-3.8.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A (shell-) script compiler/scrambler"
-HOMEPAGE="http://www.datsi.fi.upm.es/~frosal"
-SRC_URI="http://www.datsi.fi.upm.es/~frosal/sources/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i makefile -e 's:$(CC) $(CFLAGS):& $(LDFLAGS):' || die
-	# fix source file name wrt bug #433970
-	mv {${P},${PN}}.c || die
-}
-
-src_compile() {
-	## the "test"-target leads to an access-violation -> so we skip it
-	## as it's only for demonstration purposes anyway.
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" shc
-}
-
-src_install() {
-	dobin shc
-	doman shc.1
-	newdoc shc.README README
-	dodoc CHANGES
-}
diff --git a/dev-util/shc/shc-3.9.6.ebuild b/dev-util/shc/shc-3.9.6.ebuild
index 60de37b13329..a72c0f210b1e 100644
--- a/dev-util/shc/shc-3.9.6.ebuild
+++ b/dev-util/shc/shc-3.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/neurobin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 src_install() {
 	dobin src/shc
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 7ba9176bb2f8..d143e1a6c185 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/golang-base.eclass b/eclass/golang-base.eclass
index c8308d286658..f0941ef822c0 100644
--- a/eclass/golang-base.eclass
+++ b/eclass/golang-base.eclass
@@ -30,6 +30,9 @@ QA_FLAGS_IGNORED='.*'
 
 STRIP_MASK="*.a"
 
+# Do not use the go build cache for go 1.11.
+export GOCACHE=off
+
 # @ECLASS-VARIABLE: EGO_PN
 # @REQUIRED
 # @DESCRIPTION:
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 15e65ca49d2f..bc56cc689ea1 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 114cc3e21bb6..6cfbee8579b7 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,6 +1,8 @@
 DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f
 DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05
+DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
 EBUILD flightgear-data-2018.1.1.ebuild 518 BLAKE2B afd977b91675529215c7c72fb939a8a2c1be99b5af682a86cfd06175b9a9386c6fe665b31fe8e2e5102fba0f33f0d28bed2c150e614758f6b758738b9c53c86d SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f
 EBUILD flightgear-data-2018.2.1.ebuild 518 BLAKE2B b28ff44f4d60306ee8edd3d1cc1af8659891ec4d358aa677112d3489584f3d79abc4d093b84795750894ce8f6bbffefaaa219df6b6467189aa445dfe7d05fde0 SHA512 6c2c9171b3d91fd9eeb5c3b2f6cfbdd5cc5a6fe6ab3ec5cb8fbc9bbf6b311f69e43d269fdff725a4eb1e081e72aab191ab544f890954fdec4fd99088be881ddc
+EBUILD flightgear-data-2018.3.1.ebuild 515 BLAKE2B a360626ccf5d47b379f96d0eb69813697eb6428a4933c8243298855ec90094252aa0ac2047467245be2edf0242238f65a0f6f004adccbfef353a5d1e4f040a76 SHA512 adea1e43c16a43b4c16ddaa43af7c55c6390f82c78dbdd42fe6ce77a317a324cbe5fd22137e251b50dd2fdea317680d69cb802192386e26e05b840c2699addcd
 EBUILD flightgear-data-9999.ebuild 546 BLAKE2B ea1647fcbee2eee6a213ad67e6fa6ca22ee66d8a7ed4cc6928a75a9e2852b9befbba63aa5032921da37aa83cbb22d3d6433d459faa5787d80cdd33678215125c SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508
 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
new file mode 100644
index 000000000000..5e2859ac4b45
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+	!<games-simulation/flightgear-2.10.0
+"
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+	insinto /usr/share/flightgear
+	rm -fr .git
+	doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 6d5c731446e3..710685431c9c 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -3,7 +3,9 @@ AUX flightgear-2018.2.1-cmake.patch 364 BLAKE2B fd191b13792a4a9846dfc1a1f3875e13
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
 DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03
+DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
 EBUILD flightgear-2018.1.1.ebuild 3675 BLAKE2B 3b5f1278f9d30def22ce34477f0a014de7aded6c8065758f518040211ddb5df5d834d4eeec3eb70c34705117cc8cd4541e80b37781d6e5fcc27932aec4c476a4 SHA512 b6854ea8183ff5674935a33c223c881e181fc71999e0af93d3af5a9104bc03630b25cb50d7dc019360efb70056fd53f5a2debfb507bff59d2ca08d094eee7c3b
 EBUILD flightgear-2018.2.1.ebuild 3864 BLAKE2B 2cf1d7735e1b5395f00580b83d32518eabc3468cc9992836bc7ab084a5b157e7ff94504f61282a25dd8dbd86ea7dc2d9b3faee58fad80e4b2377146e835ca37c SHA512 67f6547445806bab8e6c57ae727784a7f7c82a3784d3cfd532ecf26b9e19accda55fd0bd265ef18fdb01ee49e5559a2f13bdd73f23a2f855157eebeb14fb2c13
-EBUILD flightgear-9999.ebuild 3725 BLAKE2B 433c07af5de569f1add5ed24527745d40b2f65bdf1e9e9fc611f1bd22159559c778b7b6b4181acd2055ebf4b3c6d6c27298f55979b03f42466ad4ea1435d4c90 SHA512 88412936aa8b2a16fb9501952345185f66d8952c8727422250f17868a3b70639e23da2cb82d2640d80d6183bcc30c1d9cf6baf782cf6da0a8cc1a048c97e3066
+EBUILD flightgear-2018.3.1.ebuild 4085 BLAKE2B 68fe0646b063af453a55cedaa7ec88953288b188cb2194a49bb2b1528a0fa5c330ff1631f4f24c3a9bd11555e18903812d8d8b69fd9411f05f46f674651a4436 SHA512 87bdfdc3b1d54c176405944404a79e050f1b6e8bbf46583e1f5df6a731fdebd4f8680cdc691ea2194cc48b89eb35ea78d28e01b4bcc4577a170d22d5fd96f695
+EBUILD flightgear-9999.ebuild 4135 BLAKE2B d15027b761de090ef7d9353b4c2f785d682c465d1b12c153afe2146fbe31329cbcf385c3087e41fdeabb8b3487f74de1df51e28f8897156c79c1fa5d0c4d4441 SHA512 cdc6368c6f5539525d4793538255294bc456b07b23da113ccdb2adc7bf040675f640b5fb8cb0e0aa5e11b29308577976da90e17bf14d1b0167535164341f410a
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
new file mode 100644
index 000000000000..6ae489b664d7
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="http://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.0[jpeg,png]
+	~dev-games/simgear-${PV}[gdal=]
+	media-libs/openal
+	>=media-libs/speex-1.2.0:0
+	media-libs/speexdsp:0
+	media-sound/gsm
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	gdal? ( >=sci-libs/gdal-2.0.0:0 )
+	qt5? (
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
+	)
+	udev? ( virtual/udev )
+	utils? (
+		media-libs/freeglut
+		media-libs/freetype:2
+		media-libs/glew:0
+		media-libs/libpng:0
+		virtual/opengl
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+	)
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.44
+	>=media-libs/plib-1.8.5
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AUTOTESTING=OFF
+		-DENABLE_FGCOM=$(usex utils)
+		-DENABLE_FGELEV=$(usex utils)
+		-DENABLE_FGJS=$(usex utils)
+		-DENABLE_FGVIEWER=$(usex utils)
+		-DENABLE_FLITE=OFF
+		-DENABLE_GDAL=$(usex gdal)
+		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
+		-DENABLE_JS_DEMO=$(usex utils)
+		-DENABLE_JSBSIM=ON
+		-DENABLE_LARCSIM=ON
+		-DENABLE_METAR=$(usex utils)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
+		-DENABLE_PROFILE=OFF
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_RTI=OFF
+		-DENABLE_STGMERGE=ON
+		-DENABLE_TERRASYNC=$(usex utils)
+		-DENABLE_TRAFFIC=$(usex utils)
+		-DENABLE_UIUC_MODEL=ON
+		-DENABLE_YASIM=ON
+		-DEVENT_INPUT=$(usex udev)
+		-DFG_BUILD_TYPE=Release
+		-DFG_DATA_DIR=/usr/share/${PN}
+		-DJSBSIM_TERRAIN=ON
+		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+		-DSP_FDMS=ON
+		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
+		-DSYSTEM_FLITE=ON
+		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_SPEEX=ON
+		-DSYSTEM_GSM=ON
+		-DSYSTEM_SQLITE=ON
+		-DUSE_AEONWAVE=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_FGPANEL=$(usex utils)
+	)
+	if use gdal && use utils; then
+		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+	else
+		mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+	fi
+	if use qt5 && use utils; then
+		mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+	else
+		mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Install bash completion (TODO zsh)
+	# Uncomment below when scripts stops writing files...
+#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+#	newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+	# Install examples and other misc files
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r scripts/java scripts/perl scripts/python
+		insinto /usr/share/doc/"${PF}"/examples/c++
+		doins -r scripts/example/*
+		insinto /usr/share/doc/"${PF}"/tools
+		doins -r scripts/atis scripts/tools/*
+	fi
+
+	# Install nasal script syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/syntax/{ac3d,nasal}.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/{ac3d,nasal}.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please note that data files location changed to /usr/share/flightgear"
+	if use qt5; then
+		einfo "To use launcher, run fgfs with '--launcher' parameter"
+	fi
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 10e2e7113b34..c3a046d8574c 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,11 @@ EGIT_BRANCH="next"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
+IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
 
 # zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
@@ -68,11 +72,10 @@ pkg_pretend() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
+		-DENABLE_AUTOTESTING=OFF
 		-DENABLE_FGCOM=$(usex utils)
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
-		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
 		-DENABLE_FGVIEWER=$(usex utils)
 		-DENABLE_FLITE=OFF
 		-DENABLE_GDAL=$(usex gdal)
@@ -83,11 +86,12 @@ src_configure() {
 		-DENABLE_LARCSIM=ON
 		-DENABLE_METAR=$(usex utils)
 		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_STGMERGE=ON
 		-DENABLE_TERRASYNC=$(usex utils)
-		-DENABLE_TESTS=$(usex test)
 		-DENABLE_TRAFFIC=$(usex utils)
 		-DENABLE_UIUC_MODEL=ON
 		-DENABLE_YASIM=ON
@@ -97,6 +101,7 @@ src_configure() {
 		-DJSBSIM_TERRAIN=ON
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
 		-DSP_FDMS=ON
+		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
 		-DSYSTEM_FLITE=ON
 		-DSYSTEM_HTS_ENGINE=ON
 		-DSYSTEM_SPEEX=ON
@@ -106,6 +111,16 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
+	if use gdal && use utils; then
+		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+	else
+		mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+	fi
+	if use qt5 && use utils; then
+		mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+	else
+		mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+	fi
 
 	cmake-utils_src_configure
 }
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index c4fc1f4237c8..c1de7b5e448f 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 4bb54e84f238..33df6344950d 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-18.08.3.tar.xz 362192 BLAKE2B 8fa45fe7ab30b164c773752ccaa375d1f082b272a13eaa10183d2ccdf228bfe53a913b8b375bdaaa5a0023f2636c5000f33845f8dc087c2da2b3fdd13a4783e3 SHA512 55c58bebd13f73e9b9a4f6ffb06c43700493f268eef9ad7357ef7a7e6857ffa134fe396ef3ab1fa3bd4544f01ac35bbb1d2b729acf93c271f9dbfc694b18b144
 DIST kcalc-18.12.0.tar.xz 362668 BLAKE2B fb60ac093fef13661832a551446967ccdca7d262d97d40c4fa7b95f80af653d6375c661da30fbb447fb3e6a05178379c7fab57a500859949cc8e04eef2119816 SHA512 3bc8075210f62e69434e721a5be93d0c091377ad7b72ca256fffbe0f4658c4d47646930760557f66f290d03bc851fe3fcb7d8b24a966efe4ba415d490cab618e
 EBUILD kcalc-18.08.3.ebuild 768 BLAKE2B 1038f425ed9ac45b0e8241b4727b3f53e4d6e24615165d4d45c7b5272557d273684bee827d5b27fac7d80135b4979b22d521ee06fc4a7cf84a1da924e88e57b6 SHA512 cf2162eda7b62f7827a90875f221830ab740250f725f009c404b562bfa5075f39c6fb2981070259d9033dda6404fc55813d2cac45e604db56ba80f00e73add8a
-EBUILD kcalc-18.12.0.ebuild 770 BLAKE2B 2845f7f41c61e2f6e18f2d59d70eeb3a2dc28a03204bb2d0f1a34805f6c85a87916ac47dd42e2a3890402516ba78e2806c2f879b4397a0a5ccd7509d02d4bbfd SHA512 0d34ab65b533999a21f39dbf690bfed4ddfce5d891e340fcf6b9c7a6c4f158cdb93bb0a762083b9a785b737264dbef406ebc14c50184d60be3192c4aa2e4d234
+EBUILD kcalc-18.12.0.ebuild 803 BLAKE2B 93988210c1d253c29c3df4d032ede4a850abe91eb486e8cb7c18c659f4e95ed278ab27405f13db03c0593ab0f6338f08a11fcaee724dbf2df2d00865e4cb06c7 SHA512 376798fe35eb391b92e513f8758b0487e8bfce6bdd66a6e52282002e5adbd843fe2b216d1b83d50c77d5ab95d6372605943dd28e87dae342b62bc71483724f41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.12.0.ebuild b/kde-apps/kcalc/kcalc-18.12.0.ebuild
index 150699d9a9a4..d826dfff8f09 100644
--- a/kde-apps/kcalc/kcalc-18.12.0.ebuild
+++ b/kde-apps/kcalc/kcalc-18.12.0.ebuild
@@ -31,3 +31,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
+
+RESTRICT+=" test" # bug #673136
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index fbdd2ff4fdcd..7d3b7c4a61cc 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index f7dff763ad08..1bb7109d282c 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-screenshot-3.22.0.tar.xz 258888 BLAKE2B 48f997832a8e0f937283a2cfba8880dc9032ea7a3254b0f45dd1ffd3951d096f03899199497ca78fc9be22f83ae8c60bb4f72662a323dad3afc05d2229fd914c SHA512 a532e9cc8615ce22db5805c1857a3bad5bf69a3436a45574384c6c8f848ae67d6991dbfc5556e7cf08f630915c0666bba0c4bee9e4190340bbad57faa9af2ff9
 DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
 EBUILD gnome-screenshot-3.22.0.ebuild 1203 BLAKE2B 9f74f14b77d22c51394d9d131a5e03779594f405e2f95c3398b50df057fb7c854979e17ab02aaba1f73ef76dd61262a9d9e57795cac15f2c0946312316be6a6c SHA512 fed2aaf00f661cf23e83f0c86b610e94ed3100d62e8d18bb1fded4b8e72fd98e030e048a8c3aff442eaf990f6a9050431a8448ade68de2c54ce0f8af53b2bce4
-EBUILD gnome-screenshot-3.30.0.ebuild 1213 BLAKE2B e2f3932f92ceab6b0d04a346faee0da53b2952b1e32d1ddbbe8b58f10f97b680bae993b7340f4092034b8aba9adf61d931643c1f8a42156082286275270c5c31 SHA512 6407adf3a3b168ac7cb6a4f7312a51086bc943b59fe0b4d663652bd79a990a5a929b6085dd4423db5d310f92d25448c192cda9ad868822d854ed5d0e872b0ddc
+EBUILD gnome-screenshot-3.30.0.ebuild 1238 BLAKE2B 18dcfe3b8f6ef9c4ab2b2277acd8a6feb51eb722385258488dea827f86e1c02a63872bf8e76250ed6a03790cc293be78824c4f4895fe81a0f56f4fabd14acd98 SHA512 8ef1d69d80aa01cf9e5edcb1011af8bca83a5624e2f400dea162d06b366e26b1cd0d2582bfda9a9dd19e2687459710d59fd1421245ba222420845ee9a56bf35a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
index 9244d3de109e..356eb6e133b5 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 "
 DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
 	dev-libs/libxml2:2
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a44de77f7856..b3dd6705167f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index bd2480ff632d..b3bfa4102471 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,5 +1,8 @@
 AUX shaderc-2017.2-fix-glslang-link-order.patch 1803 BLAKE2B b5c880d6869a3a6d70405e12290bbb7f22d83c9903fdec62d0672f4e475bbb92ff377ed71121f7d8f935c1043d9c15949158aef616d45452dc3024ca24d8e4d5 SHA512 f8204ed66381864ee2f682f4e948d3e426fa4031b702e31ee5be7e1d963d7d64aea72b5e9234d621e0708c35f4009d788235b6d8c4bd45b91fa1957c1f641c0d
+AUX shaderc-2018.0-fix-glslang-link-order.patch 1059 BLAKE2B e8985d1de7f6e425eabbd05201aeff854304fe227f2a83878ed41e5494e71742d46c49b86aa97c3a9b364909f5d6adcc2a3aed21128935febbc7765b90b2f2b3 SHA512 09a61e04dd68674d159c69a497ce412b924967d595526a54693e1999345fd45c88999b5e793b5bfd21a0a555b535d89d1611c44a76f81e1ce308bff821c86f87
+DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18
-EBUILD shaderc-2017.2.ebuild 2104 BLAKE2B fbf8550151920a89a8522e131d9a499425de667c0168af5968965e5a715d12bd7cc81cf1e4e92484d77c2bc5ebc277e4d1502040049a0c63f198a613d0d0d3a1 SHA512 b01c956fb8e727222ee4badbbcf4de68d9993c3d09a6211156405a2f15ddfe991a6acc5ab80262b6573ffdff4b00d774950ecb46e32b41eb29fab5f985715fa0
+EBUILD shaderc-2017.2-r1.ebuild 2107 BLAKE2B efc8b90f83e81191da600e9904d96f2107486b82e9b79dcd889bdd24f4408b3eed407bc7a7396cede96e169610ec91e710700113296a339eedf7992e64bc2cc2 SHA512 4667b524cc19b3a06d0549e0ca122dd2dacb921ce00a1a9bbcfd5c68bba9dfd21c987ce64cfef0c664d6482b3f093378facb6c87c5161aecbc5699a6dda973e6
+EBUILD shaderc-2018.0.ebuild 1988 BLAKE2B 610b98c1d6687e865909c5cc810b41cf12868872e9e379ec9b1a2bbb5551a2fbfe46823e4a91b417250aef8813d96ccb97d6d3535b3f829bd9e099753c70c6d4 SHA512 b268a3685a3bebf20091cc5fbd48b3fe2a3da24a100d5ff8d05b11a349c211dabe432dad8d54915e4724751a2335897973909e712a220c6381cb54afc5db84dc
 EBUILD shaderc-9999.ebuild 1981 BLAKE2B ce4353c33b52a4f95f6ea65882afd5a3114e7ba6d5bb2b9dea6e2103778a809fd418fad27d4bf927e7cba7c3ee8e2b253327f3398c8ea40e414bcb0b92e3add4 SHA512 9ac2e97a909e8a00fcf540bf1695bd4937a095b758ebc116a5dfe35fc7076f223f6f1fd24a211ea31ac4cd5da3ed65ecea2c4c497cf54fda5b6870d1e05967e7
 MISC metadata.xml 445 BLAKE2B 6e35c47106d6253c5895ee5e641d1481d20df16f2f2d54f0404a84b9a4a8c5d0b55b51dbe465630bfc7983e9c82b7610000cb44fe30a9d8a4b42539f19e2cea6 SHA512 adabb9a986ad200680297819c3933d22a921bf77d6c2991f360c19d8fe4131d7e78422570c4928055b6aaab69242698b8edf757c5b4d7c2876a2ef6f3a110bd5
diff --git a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
new file mode 100644
index 000000000000..837303d84e17
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
@@ -0,0 +1,26 @@
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index acf6fb0..0f5d888 100644
+--- a/glslc/CMakeLists.txt
++++ b/glslc/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_library(glslc STATIC
+ shaderc_default_compile_options(glslc)
+ target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
+ target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
+-  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
++  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(glslc PRIVATE shaderc_util shaderc)
+ 
+ add_executable(glslc_exe src/main.cc)
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index 873540a..b189430 100644
+--- a/libshaderc_util/CMakeLists.txt
++++ b/libshaderc_util/CMakeLists.txt
+@@ -35,7 +35,7 @@ endif(SHADERC_ENABLE_INSTALL)
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+   glslang OSDependent OGLCompiler HLSL glslang SPIRV
+-  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
++  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
+ 
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_util
diff --git a/media-libs/shaderc/shaderc-2017.2.ebuild b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
similarity index 96%
rename from media-libs/shaderc/shaderc-2017.2.ebuild
rename to media-libs/shaderc/shaderc-2017.2-r1.ebuild
index 3657eab08ee2..e664c51b776d 100644
--- a/media-libs/shaderc/shaderc-2017.2.ebuild
+++ b/media-libs/shaderc/shaderc-2017.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	dev-util/glslang[${MULTILIB_USEDEP}]
+	<dev-util/glslang-7.10[${MULTILIB_USEDEP}]
 	dev-util/spirv-tools[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
new file mode 100644
index 000000000000..e0b0e435fad8
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-7.10[${MULTILIB_USEDEP}]
+	dev-util/spirv-tools[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/spirv-headers
+	doc? ( dev-ruby/asciidoctor )
+	test? (
+		dev-cpp/gtest
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
+
+python_check_deps() {
+	if use test; then
+		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="$(usex !test)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_make glslc_doc_README
+	fi
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake-utils_src_install
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0f21952c7c82..611805ce4676 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index a4babc06c9d1..0da6906d1586 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -3,5 +3,5 @@ AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601b
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 EBUILD vcdimager-0.7.24.ebuild 1494 BLAKE2B d6d71aa03fef4ee2af9c7f160a8218448b4b2eb2f84b64726e5d38ac1a4a0a5f36ca5c69d896354ced7f2cf11b73324c9157ce917413d519b9dd96599c2bb781 SHA512 5800c746da2facc0537f54b40d3a66ed1b9065ae4e2e05cd6713712f366d435c3fe7c5b180642948d97eabd3950b4045ce1652891f69e26fe5a5f8223e72b072
-EBUILD vcdimager-2.0.1.ebuild 1401 BLAKE2B 0d94f3f8c3cd71a3643e3de24024e4a316ddface445f449adce06da43f65783a6659079b61117952c470ed7deaaff60910344962f80e7a6a815cb7fbdd8c84e5 SHA512 1b2a6923630ced170bcb4736db80b240b47e266ec103ffedd7918dd4dcea3d26eea439a6e9ea5eccc60f5e8baf22c3d8d5a7056d63df144072868e9a946e8ac5
+EBUILD vcdimager-2.0.1.ebuild 1400 BLAKE2B b9d1d864856f025c57536f6ebc3135bb8ca01fd61c072a18647166187772289354a243ac9876c5a52d85e7e2e0f9bc31f60bea9d0486350b0d3f415ee7544cd6 SHA512 d898fa4c3ad5ad1ad10cf6d66f98786c5f3ebd7ae5a83e04e7c13754f5a561450a8a62b266687bfef533e11613dea8855a424fd3cde59a1709d9400b81d56ba4
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index 6d2e79028c21..ce43e32b0d6a 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs +xml"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 033e0440dddf..4a3608adace1 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 620b6762a090..3f2728cf75f7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Dec 2018 13:08:30 +0000
+Wed, 19 Dec 2018 05:38:31 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d84164037400..6b9142dc49cb 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 434726 BLAKE2B aeddb2a727986b48ce90895a7461314460765152720e3bc39609378de78a1990d9f375f2cb45237ba599a49f988add32c84ecaa991df8fe81c3f20301277ebc9 SHA512 90345170805c7921b44a7f7c5be0ce14fa23ec9a7edb531e596d3bd61777d863eb3d0c6d7968b2b547c793d39bc3411e1a09aad840260e6b123c80bee9f13fce
-TIMESTAMP 2018-12-18T13:08:34Z
+TIMESTAMP 2018-12-19T05:38:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwY8VJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwZ2VtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBAWw//Zu1JXIryH9qBmYb7PkKU7gFAUR6P6cCTMxgfXhEJr7HTGPmMbYzIJqco
-wNOtarH2Z4Hi3L5uCErn4mOjVkXcNKG0BivAqR9O0BxBJ8M7Ng+9O8kMsXWYlIky
-Fjy/EUbRc6XCUhplY3Dv0wZAv009gH69mLF+cBLtUNrbqWuSvdrHCapOefJJolYF
-6u0aLTpiN00B4al9TBVHBTLvusetX1XhYCBgyIyyIm98GBx0ftVVFWd+lSnlcXx3
-0k+PolD23Zhz9klrPNMUI4Q7VTO1BRQRDgUYoZ5RE+NZZedTyGdfnQ0P2Zg+dkLY
-lSImgOLZWBwM7HqkLi9U2StimO4lcdbSWQr++QjpxaufkGTv4ivF3czmaCeRdhRE
-NioN4GmpBszeNFjLKh8PMeHDeJ9hn5DoXiwiR2KsLSvLK3UAqYOC7c+A4b/TpTRQ
-aZlg6v/5RSyWgm/mQwtHf0P7AruhtvkR+mKJWz865C/ugzaPlr1BsfDjo1eIXN/M
-dNJn32pPt4O1SHXjqEHLP7IsMPS82sdI9NN3+EgeOPt2A+S1pMS7cF0o9I+q1d8Y
-MhcaP+NBzponximnLa4oceGUQDrSXehFxY3WE+P1wwNB124OXVUNW+JcJXIiUwFU
-WRWiMIb0I+ZZy1YW/hbvDy37BA8oj2XialywbiRiFn8oXTkP7z8=
-=1Fq8
+klAbohAAj7w5d1UhtltXsFis46ZQpsGGJwkpF3o6ZV4kjMuE+0r13/p/FbavfH9o
+qLVU3dzQ2SxxTXgo+swfXAKSwpS+49X+QdPX+rG6cPk/+ebxfvgyu5cx15GQ7J1h
+OqrpSlWTTWgsHo2ULgfIZTksWQUwQIT7lfYiiUBxGEOvfTzXe9tuC2PO/NfXp+XD
+TQlNc37wnJ609A7W8UVD0s8QsFhgVY6IWvoVzx2zkOanGsDFsy8u/zkkSdt281wB
+WXCbo2HHMw10NUSFz1f+3EpIs6E3zLOqEzZ+QFn9RxdkveeJKHl+r8MztGXGCWHX
+GH5bzxFWKIdAgK8CHaESfJdAH/KcWd02V1bH/ciVYYN1n1JmGWb/bkT2RK3eIAVq
+zd1QPQqWvhelM4SGl/npvOMy1ntryiaL/ZUjyUUVq49UWai14UpxgpwkwQZSxBcF
+I3YnxGqAGGakX+HRadugLNd1nlf+yOOS+IuGUIgq3mT2ncXYzExxQhrseQcgK/WZ
++1j6nELIJIZYKnEjuRi7UTViJq41Ixxmi8ayebGOBkk/Syi7pzcWOZqiZAPZkiDN
+Tr0HZs1fcLSaK5z2FRDPMouupOsWvXAj+7Jbof2JDGnOj8zB74O+bIca2eNk7NA+
+DyX7NFjTJy1sb7uQIdO9UXAk9tuCM7/0bhv8v4qUwvpFL4dQiAY=
+=YA0t
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 620b6762a090..8f4da9ebebff 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Dec 2018 13:08:30 +0000
+Wed, 19 Dec 2018 05:38:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 969991765812..7deeee28cc78 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 713c0eb4fbf7..59d8ac1cbed9 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/certmgr-1.6.0 b/metadata/md5-cache/app-admin/certmgr-1.6.0
index b901c6d57570..0ba4276fbe88 100644
--- a/metadata/md5-cache/app-admin/certmgr-1.6.0
+++ b/metadata/md5-cache/app-admin/certmgr-1.6.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cloudflare/certmgr/archive/v1.6.0.tar.gz -> certmgr-1.6.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=78b15da68325cd1f2f8edbc7fbad766c
diff --git a/metadata/md5-cache/app-admin/cli53-0.8.12 b/metadata/md5-cache/app-admin/cli53-0.8.12
index 8dc19eaeb7fe..e7aba8bed40d 100644
--- a/metadata/md5-cache/app-admin/cli53-0.8.12
+++ b/metadata/md5-cache/app-admin/cli53-0.8.12
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/barnybug/cli53/archive/0.8.12.tar.gz -> cli53-0.8.12.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/metadata/md5-cache/app-admin/cli53-0.8.9 b/metadata/md5-cache/app-admin/cli53-0.8.9
index 412299d37c33..e64370dd5abe 100644
--- a/metadata/md5-cache/app-admin/cli53-0.8.9
+++ b/metadata/md5-cache/app-admin/cli53-0.8.9
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/barnybug/cli53/archive/0.8.9.tar.gz -> cli53-0.8.9.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/metadata/md5-cache/app-admin/cli53-9999 b/metadata/md5-cache/app-admin/cli53-9999
index cdeba9e57dde..679263fda6bc 100644
--- a/metadata/md5-cache/app-admin/cli53-9999
+++ b/metadata/md5-cache/app-admin/cli53-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/barnybug/cli53
 LICENSE=MIT
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b7e3100a7214716730162a9f7d815c9
diff --git a/metadata/md5-cache/app-admin/consul-1.2.2 b/metadata/md5-cache/app-admin/consul-1.2.2
index 105f3c383b4f..c2720bdb52ef 100644
--- a/metadata/md5-cache/app-admin/consul-1.2.2
+++ b/metadata/md5-cache/app-admin/consul-1.2.2
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.2.2.tar.gz -> consul-1.2.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=39814074d7c518ea55495854ab6e3e3c
diff --git a/metadata/md5-cache/app-admin/consul-1.2.3 b/metadata/md5-cache/app-admin/consul-1.2.3
index 85bb82e00c15..81b950aa9d81 100644
--- a/metadata/md5-cache/app-admin/consul-1.2.3
+++ b/metadata/md5-cache/app-admin/consul-1.2.3
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.2.3.tar.gz -> consul-1.2.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e00533a532372ece299df0267498bf08
diff --git a/metadata/md5-cache/app-admin/consul-1.3.0 b/metadata/md5-cache/app-admin/consul-1.3.0
index 13478b7d7f29..39513809971c 100644
--- a/metadata/md5-cache/app-admin/consul-1.3.0
+++ b/metadata/md5-cache/app-admin/consul-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.3.0.tar.gz -> consul-1.3.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=273330732e00488b28e7ebf1cf9858c2
diff --git a/metadata/md5-cache/app-admin/consul-1.4.0 b/metadata/md5-cache/app-admin/consul-1.4.0
index c3c54085e51b..2476a05c4b4a 100644
--- a/metadata/md5-cache/app-admin/consul-1.4.0
+++ b/metadata/md5-cache/app-admin/consul-1.4.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.4.0.tar.gz -> consul-1.4.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9266992c22fcd84208f3a698d0c6787b
diff --git a/metadata/md5-cache/app-admin/consul-replicate-0.2.0 b/metadata/md5-cache/app-admin/consul-replicate-0.2.0
index 04ed8fbbc310..e45a6ca2341d 100644
--- a/metadata/md5-cache/app-admin/consul-replicate-0.2.0
+++ b/metadata/md5-cache/app-admin/consul-replicate-0.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-replicate/archive/v0.2.0.tar.gz -> consul-replicate-0.2.0.tar.gz https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe
 _md5_=863b1e2da42a810e3032fcebfee9a31a
diff --git a/metadata/md5-cache/app-admin/consul-template-0.18.5-r1 b/metadata/md5-cache/app-admin/consul-template-0.18.5-r1
index 472c4c72fe6e..a1a9265aaca9 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.18.5-r1
+++ b/metadata/md5-cache/app-admin/consul-template-0.18.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.18.5.tar.gz -> consul-template-0.18.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=219c0c558bbc4d28461829b365828203
diff --git a/metadata/md5-cache/app-admin/consul-template-0.19.5 b/metadata/md5-cache/app-admin/consul-template-0.19.5
index 1925b3afe778..a0e1d3a3a99d 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.19.5
+++ b/metadata/md5-cache/app-admin/consul-template-0.19.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.19.5.tar.gz -> consul-template-0.19.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=bd5e37848a4ab2e5c5df1553c39455dc
diff --git a/metadata/md5-cache/app-admin/docker-bench-0_p20171206 b/metadata/md5-cache/app-admin/docker-bench-0_p20171206
index 08e2fcf9b175..a146c5da41db 100644
--- a/metadata/md5-cache/app-admin/docker-bench-0_p20171206
+++ b/metadata/md5-cache/app-admin/docker-bench-0_p20171206
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/docker-bench/archive/8abecdea32bc3fe271eed1848b3e77ab46dd1971.tar.gz -> docker-bench-0_p20171206.tar.gz https://github.com/aquasecurity/bench-common/archive/fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz -> github.com-aquasecurity-bench-common-fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz https://github.com/fatih/color/archive/5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz -> github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/spf13/cobra/archive/93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz -> github.com-spf13-cobra-93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz -> github.com-spf13-viper-aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mitchellh/mapstructure/archive/a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz -> github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/spf13/afero/archive/bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz -> github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz https://github.com/golang/text/archive/4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz -> github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz https://github.com/go-yaml/yaml/archive/d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz -> github.com-go-yaml-yaml-d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=af2a007e6403d85d3b131be474b60dcc
diff --git a/metadata/md5-cache/app-admin/gopass-1.8.3 b/metadata/md5-cache/app-admin/gopass-1.8.3
index bbc7e5cfc80d..bdf31aa43f6c 100644
--- a/metadata/md5-cache/app-admin/gopass-1.8.3
+++ b/metadata/md5-cache/app-admin/gopass-1.8.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
 SLOT=0
 SRC_URI=https://github.com/gopasspw/gopass/archive/v1.8.3.tar.gz -> gopass-1.8.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=df00cf1362b16779fc1e4c2560e4ef7e
diff --git a/metadata/md5-cache/app-admin/helm-2.10.0 b/metadata/md5-cache/app-admin/helm-2.10.0
index 0a6e2926e89e..07ac3a3675c6 100644
--- a/metadata/md5-cache/app-admin/helm-2.10.0
+++ b/metadata/md5-cache/app-admin/helm-2.10.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.10.0.tar.gz -> helm-2.10.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/06bda8370f45268db985f7af15732444d94ed51c.tar.gz -> github.com-cyphar-filepath-securejoin-06bda8370f45268db985f7af15732444d94ed51c.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz -> github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz -> github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz -> github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz https://github.com/kubernetes/apiserver/archive/f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz -> github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz -> github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz https://github.com/kubernetes/kubernetes/archive/32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz -> github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7a81d18dce4a8dd40d6a634e4d8ad977
diff --git a/metadata/md5-cache/app-admin/helm-2.11.0 b/metadata/md5-cache/app-admin/helm-2.11.0
index 1f17d2b75402..83fd87b25a59 100644
--- a/metadata/md5-cache/app-admin/helm-2.11.0
+++ b/metadata/md5-cache/app-admin/helm-2.11.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.11.0.tar.gz -> helm-2.11.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/1ff28809256a84bb6966640ff3d0371af82ccba4.tar.gz -> github.com-Azure-go-autorest-1ff28809256a84bb6966640ff3d0371af82ccba4.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz -> github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz -> github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz -> github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz -> github.com-gophercloud-gophercloud-781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz -> github.com-json-iterator-go-f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz -> github.com-Masterminds-sprig-15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz -> github.com-modern-go-reflect2-05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/c439c4fa093711d42e1b01acb1235b52004753c1.tar.gz -> github.com-spf13-cobra-c439c4fa093711d42e1b01acb1235b52004753c1.tar.gz https://github.com/spf13/pflag/archive/583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz -> github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/49796115aa4b964c318aad4f3084fdb41e9aa067.tar.gz -> github.com-golang-crypto-49796115aa4b964c318aad4f3084fdb41e9aa067.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/2d6f90ab1293a1fb871cf149423ebb72aa7423aa.tar.gz -> github.com-kubernetes-api-2d6f90ab1293a1fb871cf149423ebb72aa7423aa.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/103fd098999dc9c0c88536f5c9ad2e5da39373ae.tar.gz -> github.com-kubernetes-apimachinery-103fd098999dc9c0c88536f5c9ad2e5da39373ae.tar.gz https://github.com/kubernetes/apiserver/archive/8b122ec9e3bbab91a262d17a39325e69349dc44d.tar.gz -> github.com-kubernetes-apiserver-8b122ec9e3bbab91a262d17a39325e69349dc44d.tar.gz https://github.com/kubernetes/client-go/archive/59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82.tar.gz -> github.com-kubernetes-client-go-59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82.tar.gz https://github.com/kubernetes/kube-openapi/archive/91cfa479c814065e420cee7ed227db0f63a5854e.tar.gz -> github.com-kubernetes-kube-openapi-91cfa479c814065e420cee7ed227db0f63a5854e.tar.gz https://github.com/kubernetes/kubernetes/archive/2e809eed16445fff9dcbfc56e9936cf76ccbdadc.tar.gz -> github.com-kubernetes-kubernetes-2e809eed16445fff9dcbfc56e9936cf76ccbdadc.tar.gz https://github.com/kubernetes/utils/archive/258e2a2fa64568210fbd6267cf1d8fd87c3cb86e.tar.gz -> github.com-kubernetes-utils-258e2a2fa64568210fbd6267cf1d8fd87c3cb86e.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=213ce8ab215b23ebb95c846523db8215
diff --git a/metadata/md5-cache/app-admin/helm-2.12.0 b/metadata/md5-cache/app-admin/helm-2.12.0
index 846f3b5e7ff4..edc8889389fe 100644
--- a/metadata/md5-cache/app-admin/helm-2.12.0
+++ b/metadata/md5-cache/app-admin/helm-2.12.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.12.0.tar.gz -> helm-2.12.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz -> github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz https://github.com/Azure/go-autorest/archive/bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz -> github.com-Azure-go-autorest-bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz -> github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz https://github.com/chai2010/gettext-go/archive/c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz -> github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz -> github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz -> github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz -> github.com-evanphx-json-patch-36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz -> github.com-gophercloud-gophercloud-781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz -> github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz -> github.com-json-iterator-go-f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz -> github.com-Masterminds-sprig-15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz -> github.com-modern-go-reflect2-05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz -> github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz https://github.com/spf13/pflag/archive/298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz -> github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz -> github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/95c6576299259db960f6c5b9b69ea52422860fce.tar.gz -> github.com-golang-sys-95c6576299259db960f6c5b9b69ea52422860fce.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz -> github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz -> github.com-kubernetes-api-fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz -> github.com-kubernetes-apiextensions-apiserver-05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz https://github.com/kubernetes/apimachinery/archive/6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz -> github.com-kubernetes-apimachinery-6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz https://github.com/kubernetes/apiserver/archive/e85ad7b666fef0476185731329f4cff1536efff8.tar.gz -> github.com-kubernetes-apiserver-e85ad7b666fef0476185731329f4cff1536efff8.tar.gz https://github.com/kubernetes/client-go/archive/1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz -> github.com-kubernetes-client-go-1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz https://github.com/kubernetes/cli-runtime/archive/79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz -> github.com-kubernetes-cli-runtime-79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz https://github.com/kubernetes/kube-openapi/archive/0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz -> github.com-kubernetes-kube-openapi-0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz https://github.com/kubernetes/kubernetes/archive/54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz -> github.com-kubernetes-kubernetes-54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz https://github.com/kubernetes/utils/archive/66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz -> github.com-kubernetes-utils-66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=26c3bf2518d8158bc07e0128ff3a6d27
diff --git a/metadata/md5-cache/app-admin/helm-2.12.0-r1 b/metadata/md5-cache/app-admin/helm-2.12.0-r1
index e4538030b688..3b621c14cdfc 100644
--- a/metadata/md5-cache/app-admin/helm-2.12.0-r1
+++ b/metadata/md5-cache/app-admin/helm-2.12.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.12.0.tar.gz -> helm-2.12.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz -> github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz https://github.com/Azure/go-autorest/archive/bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz -> github.com-Azure-go-autorest-bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz -> github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz https://github.com/chai2010/gettext-go/archive/c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz -> github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/cyphar/filepath-securejoin/archive/a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz -> github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz -> github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz -> github.com-evanphx-json-patch-36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz -> github.com-gophercloud-gophercloud-781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz -> github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz -> github.com-json-iterator-go-f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz -> github.com-Masterminds-sprig-15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz -> github.com-modern-go-reflect2-05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz -> github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz https://github.com/spf13/pflag/archive/298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz -> github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz https://github.com/technosophos/moniker/archive/a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz -> github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz https://github.com/golang/crypto/archive/de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz -> github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/95c6576299259db960f6c5b9b69ea52422860fce.tar.gz -> github.com-golang-sys-95c6576299259db960f6c5b9b69ea52422860fce.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz -> github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz https://github.com/go-yaml/yaml/archive/670d4cfef0544295bc27a114dbac37980d83185a.tar.gz -> github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz https://github.com/kubernetes/api/archive/fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz -> github.com-kubernetes-api-fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz -> github.com-kubernetes-apiextensions-apiserver-05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz https://github.com/kubernetes/apimachinery/archive/6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz -> github.com-kubernetes-apimachinery-6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz https://github.com/kubernetes/apiserver/archive/e85ad7b666fef0476185731329f4cff1536efff8.tar.gz -> github.com-kubernetes-apiserver-e85ad7b666fef0476185731329f4cff1536efff8.tar.gz https://github.com/kubernetes/client-go/archive/1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz -> github.com-kubernetes-client-go-1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz https://github.com/kubernetes/cli-runtime/archive/79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz -> github.com-kubernetes-cli-runtime-79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz https://github.com/kubernetes/kube-openapi/archive/0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz -> github.com-kubernetes-kube-openapi-0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz https://github.com/kubernetes/kubernetes/archive/54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz -> github.com-kubernetes-kubernetes-54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz https://github.com/kubernetes/utils/archive/66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz -> github.com-kubernetes-utils-66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8445f85c9576bbab02cc64aab0b483e8
diff --git a/metadata/md5-cache/app-admin/helm-2.9.1 b/metadata/md5-cache/app-admin/helm-2.9.1
index 1b422212de20..7c00a73fd80c 100644
--- a/metadata/md5-cache/app-admin/helm-2.9.1
+++ b/metadata/md5-cache/app-admin/helm-2.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.9.1.tar.gz -> helm-2.9.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz -> github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz -> github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz https://github.com/kubernetes/apiserver/archive/ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz -> github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz -> github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz https://github.com/kubernetes/kubernetes/archive/a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz -> github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=90eceaa8601bd1754d1b085962e6e9cf
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.10.2 b/metadata/md5-cache/app-admin/ksonnet-0.10.2
index 06b6db7db20d..5878f43b05e3 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.10.2
+++ b/metadata/md5-cache/app-admin/ksonnet-0.10.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.10.2.tar.gz -> ksonnet-0.10.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.11.0 b/metadata/md5-cache/app-admin/ksonnet-0.11.0
index 462d82a8eb9e..c469f7cf7ee3 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.11.0
+++ b/metadata/md5-cache/app-admin/ksonnet-0.11.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.11.0.tar.gz -> ksonnet-0.11.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.8.0 b/metadata/md5-cache/app-admin/ksonnet-0.8.0
index 8cce43718481..b6bdd0f46c21 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.8.0
+++ b/metadata/md5-cache/app-admin/ksonnet-0.8.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.8.0.tar.gz -> ksonnet-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.9.2 b/metadata/md5-cache/app-admin/ksonnet-0.9.2
index 4016cd2c6247..e922b114a2c5 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.9.2
+++ b/metadata/md5-cache/app-admin/ksonnet-0.9.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.9.2.tar.gz -> ksonnet-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.16 b/metadata/md5-cache/app-admin/kube-bench-0.0.16
index b87a44a0a104..beb62eedfa8e 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.16
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.16
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.16.tar.gz -> kube-bench-0.0.16.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.17 b/metadata/md5-cache/app-admin/kube-bench-0.0.17
index 2313fe080c2a..e65758eb4e09 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.17
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.17
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.17.tar.gz -> kube-bench-0.0.17.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.19 b/metadata/md5-cache/app-admin/kube-bench-0.0.19
index b8d1fdcc70d0..135f3e375237 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.19
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.19
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.19.tar.gz -> kube-bench-0.0.19.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.20 b/metadata/md5-cache/app-admin/kube-bench-0.0.20
index c862fa17197b..94b4d7246353 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.20
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.20
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.20.tar.gz -> kube-bench-0.0.20.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.22 b/metadata/md5-cache/app-admin/kube-bench-0.0.22
index 898fb76beaec..4e786acd57f1 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.22
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.22
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.22.tar.gz -> kube-bench-0.0.22.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f858a9dbbc3de3aff5d799c741a00629
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc4 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc4
index 8274ac0d73e1..7ab7fa06b87e 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc4
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc4
@@ -9,5 +9,5 @@ RDEPEND=!app-misc/mtail
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc4.tar.gz -> mtail-3.0.0_rc4.tar.gz https://github.com/golang/tools/archive/f57adc18217d779aa42266ea71a545827755a77b.tar.gz -> github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz -> github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz https://github.com/spf13/afero/archive/e67d870304c4bca21331b02f414f970df13aa694.tar.gz -> github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz -> github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=fc901649c24d7a7e608c1ccf36215191
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc5 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
index 210bbd65b2e4..cbced639f2fe 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
@@ -9,5 +9,5 @@ RDEPEND=!app-misc/mtail
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc5.tar.gz -> mtail-3.0.0_rc5.tar.gz https://github.com/golang/tools/archive/a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz -> github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz -> github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz https://github.com/spf13/afero/archive/bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz -> github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz https://github.com/golang/text/archive/4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz -> github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9a2f9a14f6baa50ec76bb66c18d3dc87
diff --git a/metadata/md5-cache/app-admin/serf-0.8.1-r1 b/metadata/md5-cache/app-admin/serf-0.8.1-r1
index a674441afefd..17c60f92b743 100644
--- a/metadata/md5-cache/app-admin/serf-0.8.1-r1
+++ b/metadata/md5-cache/app-admin/serf-0.8.1-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.1.tar.gz -> serf-0.8.1.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=019100a5cfecb8bdd5b8b5e4e1ff4a34
diff --git a/metadata/md5-cache/app-admin/vault-0.10.3 b/metadata/md5-cache/app-admin/vault-0.10.3
index 8fef3348e85a..d579834b73f0 100644
--- a/metadata/md5-cache/app-admin/vault-0.10.3
+++ b/metadata/md5-cache/app-admin/vault-0.10.3
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.3.tar.gz -> vault-0.10.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.10.4 b/metadata/md5-cache/app-admin/vault-0.10.4
index fc9d2f343949..bed7da9ddf26 100644
--- a/metadata/md5-cache/app-admin/vault-0.10.4
+++ b/metadata/md5-cache/app-admin/vault-0.10.4
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.4.tar.gz -> vault-0.10.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.11.0 b/metadata/md5-cache/app-admin/vault-0.11.0
index fd6661379cf8..a90f0cdc264d 100644
--- a/metadata/md5-cache/app-admin/vault-0.11.0
+++ b/metadata/md5-cache/app-admin/vault-0.11.0
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.11.0.tar.gz -> vault-0.11.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f161ad71c33952fadd9ed852f735838c
diff --git a/metadata/md5-cache/app-admin/vault-0.11.4 b/metadata/md5-cache/app-admin/vault-0.11.4
index 0f92c396c680..b2870049ed52 100644
--- a/metadata/md5-cache/app-admin/vault-0.11.4
+++ b/metadata/md5-cache/app-admin/vault-0.11.4
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.11.4.tar.gz -> vault-0.11.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=00e15866032e8ea2a5b009d63cf84dd8
diff --git a/metadata/md5-cache/app-admin/vault-0.11.5 b/metadata/md5-cache/app-admin/vault-0.11.5
index 27e5c0c98113..6f3a9198b8ef 100644
--- a/metadata/md5-cache/app-admin/vault-0.11.5
+++ b/metadata/md5-cache/app-admin/vault-0.11.5
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.11.5.tar.gz -> vault-0.11.5.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=00e15866032e8ea2a5b009d63cf84dd8
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 1583583e1183..047cd44cb4d0 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/stuffit-5.2.0.611 b/metadata/md5-cache/app-arch/stuffit-5.2.0.611
index 606efab5fb3b..cf3d5a1ff360 100644
--- a/metadata/md5-cache/app-arch/stuffit-5.2.0.611
+++ b/metadata/md5-cache/app-arch/stuffit-5.2.0.611
@@ -2,9 +2,9 @@ DEFINED_PHASES=install nofetch postinst
 DESCRIPTION=Aladdin Software's StuffIt and StuffIt Expander
 EAPI=6
 HOMEPAGE=http://www.stuffit.com/
-KEYWORDS=-* x86 amd64
+KEYWORDS=-* amd64 x86
 LICENSE=Stuffit
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=http://my.smithmicro.com/downloads/files/stuffit520.611linux-i386.tar.gz
-_md5_=48e7448f38101dcda5735bbbd3aea203
+_md5_=931c85e5ed3479886bbcea3a339b858d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 9cf3482ad919..588010a7caf0 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/restic-0.8.3 b/metadata/md5-cache/app-backup/restic-0.8.3
index c1679c440cf1..69642c66c62e 100644
--- a/metadata/md5-cache/app-backup/restic-0.8.3
+++ b/metadata/md5-cache/app-backup/restic-0.8.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.8.3.tar.gz -> restic-0.8.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8f90d3cbe4acf8d6b79af79ebe595e0a
diff --git a/metadata/md5-cache/app-backup/restic-0.9.2 b/metadata/md5-cache/app-backup/restic-0.9.2
index f89634f82e31..f3a23e4bdd2b 100644
--- a/metadata/md5-cache/app-backup/restic-0.9.2
+++ b/metadata/md5-cache/app-backup/restic-0.9.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.9.2.tar.gz -> restic-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/metadata/md5-cache/app-backup/restic-0.9.3 b/metadata/md5-cache/app-backup/restic-0.9.3
index 1b50c48895cb..8fa40ecb7617 100644
--- a/metadata/md5-cache/app-backup/restic-0.9.3
+++ b/metadata/md5-cache/app-backup/restic-0.9.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.9.3.tar.gz -> restic-0.9.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7e2dbdbf792732e212edaf20ad8cc9aa
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 77afe83239d2..1e7768a1e228 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017 b/metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017
index 8be36f64904a..b79e9af73fe9 100644
--- a/metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017
+++ b/metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rakyll/hey/archive/01803349acd49d756dafa2cb6ac5b5bfc141fc3b.tar.gz -> hey-0.1.1_p20181017.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b5fe0bdc4343c7bc0988a409c2eda9a9
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 77e2772d282f..3aaa3933e5a8 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/cfssl-1.3.2 b/metadata/md5-cache/app-crypt/cfssl-1.3.2
index 1928088ead51..05d12ce9a500 100644
--- a/metadata/md5-cache/app-crypt/cfssl-1.3.2
+++ b/metadata/md5-cache/app-crypt/cfssl-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=!!dev-lang/mono
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cloudflare/cfssl/archive/1.3.2.tar.gz -> cfssl-1.3.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=f07aea9d578db832f0deccb9c56ac19b
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
deleted file mode 100644
index c7f642061825..000000000000
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-DESCRIPTION=fast password cracker
-EAPI=5
-HOMEPAGE=https://www.openwall.com/john/
-IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
-REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
-SLOT=0
-SRC_URI=https://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( https://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c56a81db8caf119efcefba16a13c4dfa
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
index 848a955b2273..ee9b58257161 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
+DEPEND=!app-crypt/johntheripper-jumbo sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
 DESCRIPTION=fast password cracker
 EAPI=7
 HOMEPAGE=https://www.openwall.com/john/
 IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
+RDEPEND=!app-crypt/johntheripper-jumbo sys-libs/zlib !minimal? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit:= ) opencl? ( virtual/opencl ) mozilla? ( dev-libs/nss dev-libs/nspr )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal ) mozilla? ( !minimal )
 SLOT=0
 SRC_URI=https://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( https://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
 _eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=20afb4ff9b4b407b7acd102e69c1b29b
+_md5_=86706d2ce0166260eb6449517997c1ed
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6 b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
index 7f9f8fdffa4d..bcb976148108 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
+DEPEND=!app-crypt/johntheripper-jumbo sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
 DESCRIPTION=fast password cracker
 EAPI=4
 HOMEPAGE=https://www.openwall.com/john/
 IUSE=cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2
 KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
+RDEPEND=!app-crypt/johntheripper-jumbo sys-libs/zlib !minimal? ( >=dev-libs/openssl-0.9.7:0 ) mpi? ( virtual/mpi ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl )
 REQUIRED_USE=openmp? ( !minimal ) mpi? ( !minimal ) cuda? ( !minimal ) opencl? ( !minimal )
 SLOT=0
 SRC_URI=https://www.openwall.com/john/g/john-1.7.9.tar.bz2 !minimal? ( https://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=319d076349157918e260ef984feb78aa
+_md5_=28bf41d648209932cfc8748792524d75
diff --git a/metadata/md5-cache/app-crypt/johntheripper-1.8.0 b/metadata/md5-cache/app-crypt/johntheripper-1.8.0
new file mode 100644
index 000000000000..72f2b0528129
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/johntheripper-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup test
+DEPEND=sys-libs/zlib !app-crypt/johntheripper-jumbo
+DESCRIPTION=fast password cracker
+EAPI=7
+HOMEPAGE=https://www.openwall.com/john/
+IUSE=custom-cflags openmp cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=https://www.openwall.com/john/j/john-1.8.0.tar.xz
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c45bc6b4d0bdb5a0176d8511c8cfb178
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.8.0 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.8.0
new file mode 100644
index 000000000000..583968c9f8eb
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/openssl-1.0.1:0 mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:* sys-libs/zlib app-arch/bzip2
+DESCRIPTION=fast password cracker
+EAPI=7
+HOMEPAGE=http://www.openwall.com/john/
+IUSE=custom-cflags kerberos mpi opencl openmp pcap
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/openssl-1.0.1:0 mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:* sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
+SLOT=0
+SRC_URI=https://github.com/magnumripper/JohnTheRipper/archive/1.8.0-jumbo-1.tar.gz -> JohnTheRipper-1.8.0-jumbo-1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=03b11cdc186ef14c7e82e1a53535020b
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
new file mode 100644
index 000000000000..a0aedb49ae18
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/openssl-1.0.1:0 mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:* sys-libs/zlib app-arch/bzip2
+DESCRIPTION=fast password cracker
+EAPI=7
+HOMEPAGE=http://www.openwall.com/john/
+IUSE=custom-cflags kerberos mpi opencl openmp pcap
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/openssl-1.0.1:0 mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:* sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
+SLOT=0
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c2acfe1751986d406643814882156fe2
diff --git a/metadata/md5-cache/app-crypt/kbfs-2.10.1 b/metadata/md5-cache/app-crypt/kbfs-2.10.1
index c638ce69e1a6..dcd0a29caa0a 100644
--- a/metadata/md5-cache/app-crypt/kbfs-2.10.1
+++ b/metadata/md5-cache/app-crypt/kbfs-2.10.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
 SRC_URI=https://github.com/keybase/kbfs/archive/v2.10.1.tar.gz -> kbfs-2.10.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e430042c69607bdbc927ec777ae28dce
diff --git a/metadata/md5-cache/app-crypt/kbfs-2.11.0 b/metadata/md5-cache/app-crypt/kbfs-2.11.0
new file mode 100644
index 000000000000..e54d56b2ab36
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/kbfs-2.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Keybase Filesystem (KBFS)
+EAPI=6
+HOMEPAGE=https://keybase.io/docs/kbfs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg sys-fs/fuse
+SLOT=0
+SRC_URI=https://github.com/keybase/kbfs/archive/v2.11.0.tar.gz -> kbfs-2.11.0.tar.gz
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e430042c69607bdbc927ec777ae28dce
diff --git a/metadata/md5-cache/app-crypt/kbfs-2.6.0 b/metadata/md5-cache/app-crypt/kbfs-2.6.0
index aaefb89e2250..08c13ffcaeb1 100644
--- a/metadata/md5-cache/app-crypt/kbfs-2.6.0
+++ b/metadata/md5-cache/app-crypt/kbfs-2.6.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
 SRC_URI=https://github.com/keybase/kbfs/archive/v2.6.0.tar.gz -> kbfs-2.6.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5e538935350926e5bb89502a451f59c1
diff --git a/metadata/md5-cache/app-crypt/kbfs-2.8.0 b/metadata/md5-cache/app-crypt/kbfs-2.8.0
index a0ebfdb22cff..2c5cfc776e2d 100644
--- a/metadata/md5-cache/app-crypt/kbfs-2.8.0
+++ b/metadata/md5-cache/app-crypt/kbfs-2.8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
 SRC_URI=https://github.com/keybase/kbfs/archive/v2.8.0.tar.gz -> kbfs-2.8.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e430042c69607bdbc927ec777ae28dce
diff --git a/metadata/md5-cache/app-crypt/kbfs-9999 b/metadata/md5-cache/app-crypt/kbfs-9999
index b66cf1946a80..880be4597327 100644
--- a/metadata/md5-cache/app-crypt/kbfs-9999
+++ b/metadata/md5-cache/app-crypt/kbfs-9999
@@ -7,5 +7,5 @@ IUSE=git
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6073ebd151be1987d5e32ab0ca5c5ccb
diff --git a/metadata/md5-cache/app-crypt/keybase-2.10.1 b/metadata/md5-cache/app-crypt/keybase-2.10.1
index 96e0e0fd3d2c..d7c4e3bacf52 100644
--- a/metadata/md5-cache/app-crypt/keybase-2.10.1
+++ b/metadata/md5-cache/app-crypt/keybase-2.10.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v2.10.1.tar.gz -> keybase-2.10.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=31887a89dc54c35d35839b488a82a4d7
diff --git a/metadata/md5-cache/app-crypt/keybase-2.11.0 b/metadata/md5-cache/app-crypt/keybase-2.11.0
new file mode 100644
index 000000000000..32565afe8f40
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-2.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=~app-crypt/kbfs-2.11.0 >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/keybase/client/archive/v2.11.0.tar.gz -> keybase-2.11.0.tar.gz
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8780e89fdf93d3ca57a827f6e8f4d302
diff --git a/metadata/md5-cache/app-crypt/keybase-2.6.0 b/metadata/md5-cache/app-crypt/keybase-2.6.0
index 255e182ae603..9d400d86d59b 100644
--- a/metadata/md5-cache/app-crypt/keybase-2.6.0
+++ b/metadata/md5-cache/app-crypt/keybase-2.6.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v2.6.0.tar.gz -> keybase-2.6.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d5a2e45ce025305721218573f76e1cea
diff --git a/metadata/md5-cache/app-crypt/keybase-2.7.3 b/metadata/md5-cache/app-crypt/keybase-2.7.3
index 969c2c50c317..1954b02a7083 100644
--- a/metadata/md5-cache/app-crypt/keybase-2.7.3
+++ b/metadata/md5-cache/app-crypt/keybase-2.7.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v2.7.3.tar.gz -> keybase-2.7.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6566000d1382d2fad0a78a22c7436bc0
diff --git a/metadata/md5-cache/app-crypt/keybase-2.8.0 b/metadata/md5-cache/app-crypt/keybase-2.8.0
index 4a3932a7bb6b..432f93f104cb 100644
--- a/metadata/md5-cache/app-crypt/keybase-2.8.0
+++ b/metadata/md5-cache/app-crypt/keybase-2.8.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v2.8.0.tar.gz -> keybase-2.8.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0356cccba119c3f23268f391e58a3573
diff --git a/metadata/md5-cache/app-crypt/keybase-2.9.0 b/metadata/md5-cache/app-crypt/keybase-2.9.0
index 3c56b2cf05ac..1154156fb836 100644
--- a/metadata/md5-cache/app-crypt/keybase-2.9.0
+++ b/metadata/md5-cache/app-crypt/keybase-2.9.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/keybase/client/archive/v2.9.0.tar.gz -> keybase-2.9.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0356cccba119c3f23268f391e58a3573
diff --git a/metadata/md5-cache/app-crypt/keybase-9999 b/metadata/md5-cache/app-crypt/keybase-9999
index 365a3c9b755d..0bfaed73f173 100644
--- a/metadata/md5-cache/app-crypt/keybase-9999
+++ b/metadata/md5-cache/app-crypt/keybase-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://keybase.io/
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg
 SLOT=0
-_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0b43e832508d6f814edf079838376b2d
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
index 5d6bb4a14d1b..257cf2383dd2 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=6
 HOMEPAGE=https://gnupg.org/aegypten2/index.html
 IUSE=caps emacs gnome-keyring fltk gtk ncurses qt5 static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr )
 REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95e0b1cb19a2c97ca3f7e17fb97d35c2
+_md5_=1ecf0d283dcce18e9e493c90216e4b6a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 78be76698487..3f787d1f9d21 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/buildah-1.2 b/metadata/md5-cache/app-emulation/buildah-1.2
index ff89970e725b..72e148d6350d 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.2
+++ b/metadata/md5-cache/app-emulation/buildah-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=!selinux? ( !ostree )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/buildah/archive/v1.2.tar.gz -> buildah-1.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6bfd197acdb2edffa6ef873249185785
diff --git a/metadata/md5-cache/app-emulation/buildah-1.3 b/metadata/md5-cache/app-emulation/buildah-1.3
index a0cab4019dba..3a294e60dae3 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.3
+++ b/metadata/md5-cache/app-emulation/buildah-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=!selinux? ( !ostree )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/buildah/archive/v1.3.tar.gz -> buildah-1.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5a703b2b00d59cdeec50035fef3af7a3
diff --git a/metadata/md5-cache/app-emulation/buildah-1.3-r1 b/metadata/md5-cache/app-emulation/buildah-1.3-r1
index ec6df4dd8877..1e12062635ca 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.3-r1
+++ b/metadata/md5-cache/app-emulation/buildah-1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=!selinux? ( !ostree )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/buildah/archive/v1.3.tar.gz -> buildah-1.3.tar.gz https://github.com/containers/storage/commit/c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch -> buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0fa2a24e67bd57e45fd29773bd6996b7
diff --git a/metadata/md5-cache/app-emulation/buildah-1.4 b/metadata/md5-cache/app-emulation/buildah-1.4
index 3b9630227cdc..b1423202253b 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.4
+++ b/metadata/md5-cache/app-emulation/buildah-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=!selinux? ( !ostree )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.4.tar.gz -> buildah-1.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1bb067d68b6654dd040745d4675d8eb0
diff --git a/metadata/md5-cache/app-emulation/buildah-1.5 b/metadata/md5-cache/app-emulation/buildah-1.5
index 43a24a241241..4cbfded996f3 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.5
+++ b/metadata/md5-cache/app-emulation/buildah-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=!selinux? ( !ostree )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.5.tar.gz -> buildah-1.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1bb067d68b6654dd040745d4675d8eb0
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.31.0 b/metadata/md5-cache/app-emulation/cadvisor-0.31.0
index 9746f3bcf305..d359f87dd50a 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.31.0
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.31.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/cadvisor/archive/v0.31.0.tar.gz -> cadvisor-0.31.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6e29d7c084c9e52c2ef05d38c194c1b4
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.32.0 b/metadata/md5-cache/app-emulation/cadvisor-0.32.0
index 9ffaa0cb796b..3925eb9e3cc2 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.32.0
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.32.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/cadvisor/archive/v0.32.0.tar.gz -> cadvisor-0.32.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c11a7309f5845a82611431050dd2a393
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.5 b/metadata/md5-cache/app-emulation/cloud-init-18.5
new file mode 100644
index 000000000000..26de45d1cc36
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/jinja[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(-)] dev-python/oauthlib[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(-)] dev-python/pyserial[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(-)] >=dev-python/configobj-5.0.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(-)] dev-python/pyyaml[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(-)] dev-python/requests[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(-)] dev-python/jsonpatch[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(-)] dev-python/jsonschema[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(-)] dev-python/six[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(-)] >=dev-python/httpretty-0.7.1[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(-)] dev-python/mock[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(-)] dev-python/nose[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(-)] dev-python/unittest2[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(-)] dev-python/coverage[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(-)] dev-python/contextlib2[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(-)] ) 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(-)]
+DESCRIPTION=Cloud instance initialisation magic
+EAPI=6
+HOMEPAGE=https://launchpad.net/cloud-init
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/jinja[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(-)] dev-python/oauthlib[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(-)] dev-python/pyserial[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(-)] >=dev-python/configobj-5.0.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(-)] dev-python/pyyaml[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(-)] dev-python/requests[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(-)] dev-python/jsonpatch[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(-)] dev-python/jsonschema[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(-)] dev-python/six[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(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger 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=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://launchpad.net/cloud-init/trunk/18.5/+download/cloud-init-18.5.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=036a6ca8a82adc612dfb30adf79efe34
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.3 b/metadata/md5-cache/app-emulation/containerd-1.0.3
index 836004605179..8045d1ebe921 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.3
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.0.3.tar.gz -> containerd-1.0.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5b3e57df20ec690ca1d0d8452d873e43
diff --git a/metadata/md5-cache/app-emulation/containerd-1.1.1 b/metadata/md5-cache/app-emulation/containerd-1.1.1
index 1eae0d05d24e..e6aca5e41c8e 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.1.1
+++ b/metadata/md5-cache/app-emulation/containerd-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.1.1.tar.gz -> containerd-1.1.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=45a275546f132762366836fd54653a71
diff --git a/metadata/md5-cache/app-emulation/containerd-1.1.2 b/metadata/md5-cache/app-emulation/containerd-1.1.2
index 1674af4db0e6..8e04aff0576f 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.1.2
+++ b/metadata/md5-cache/app-emulation/containerd-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.1.2.tar.gz -> containerd-1.1.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=93d275f15bf44e084c23ef8d07f68753
diff --git a/metadata/md5-cache/app-emulation/containerd-1.1.4 b/metadata/md5-cache/app-emulation/containerd-1.1.4
index ef763562bc22..a9355a84dbc8 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.1.4
+++ b/metadata/md5-cache/app-emulation/containerd-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.1.4.tar.gz -> containerd-1.1.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=993ddb240edd1766b38a1859c90285bc
diff --git a/metadata/md5-cache/app-emulation/containerd-1.2.0 b/metadata/md5-cache/app-emulation/containerd-1.2.0
index d78699e1f34f..1eb22a237bda 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.2.0
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.2.0.tar.gz -> containerd-1.2.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=3f3cc8e6a8ca1e078e627e4ce71c7f60
diff --git a/metadata/md5-cache/app-emulation/containerd-1.2.0-r1 b/metadata/md5-cache/app-emulation/containerd-1.2.0-r1
index a084b0fab09f..4b58d7cbd70f 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.2.0-r1
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/runc-1.0.0_rc5 seccomp? ( sys-libs/libseccomp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.2.0.tar.gz -> containerd-1.2.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4965af0fdd25423f498d1524cc7c9f0d
diff --git a/metadata/md5-cache/app-emulation/containerd-1.2.1 b/metadata/md5-cache/app-emulation/containerd-1.2.1
index 764446cd570f..e4e58c079e53 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.2.1
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/runc-1.0.0_rc5 seccomp? ( sys-libs/libseccomp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.2.1.tar.gz -> containerd-1.2.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2ce0a7a99ff9371c893ddc73e58233fd
diff --git a/metadata/md5-cache/app-emulation/containerd-9999 b/metadata/md5-cache/app-emulation/containerd-9999
index 775ba2dbb3a4..f1e1b73348c7 100644
--- a/metadata/md5-cache/app-emulation/containerd-9999
+++ b/metadata/md5-cache/app-emulation/containerd-9999
@@ -7,5 +7,5 @@ IUSE=hardened +seccomp
 LICENSE=Apache-2.0
 RDEPEND=>=app-emulation/runc-1.0.0_rc4 seccomp? ( sys-libs/libseccomp )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4a4aaea26f52796135f9e6249ba051d
diff --git a/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730 b/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
index 1439d1989f33..e909928847c7 100644
--- a/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
+++ b/metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
@@ -10,5 +10,5 @@ RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? (
 RESTRICT=test? ( userpriv ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/containers/storage/archive/17c7d1fee5603ccf6dd97edc14162fc1510e7e23.tar.gz -> containers-storage-0_pre20180730.tar.gz https://github.com/pquerna/ffjson/archive/af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz -> github.com-pquerna-ffjson-af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b83b0f860ca3e0332cf3f979702f4ff4
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.10.1 b/metadata/md5-cache/app-emulation/cri-o-1.10.1
index 2696b001f914..06b25bfd797b 100644
--- a/metadata/md5-cache/app-emulation/cri-o-1.10.1
+++ b/metadata/md5-cache/app-emulation/cri-o-1.10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
 SLOT=0
 SRC_URI=https://github.com/kubernetes-incubator/cri-o/archive/v1.10.1.tar.gz -> cri-o-1.10.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d2dd1a89462fd4bc5698d2d1440448f9
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.10.6 b/metadata/md5-cache/app-emulation/cri-o-1.10.6
index 1369d604a8a5..001ca58ca53a 100644
--- a/metadata/md5-cache/app-emulation/cri-o-1.10.6
+++ b/metadata/md5-cache/app-emulation/cri-o-1.10.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
 SLOT=0
 SRC_URI=https://github.com/kubernetes-incubator/cri-o/archive/v1.10.6.tar.gz -> cri-o-1.10.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e71396a73e6e8241f7dd3119524d27d0
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1 b/metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1
index 29336dad6281..01c27e8caca5 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.0.0-alpha.1.tar.gz -> cri-tools-1.0.0_alpha1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=599b0256c20eeb1f62b8b32240ee99eb
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2 b/metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2
index 511be20643c6..f39035d18ff0 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.0.0-beta.2.tar.gz -> cri-tools-1.0.0_beta2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=6549b512ff3f5bacb6d6fe9477c7b20c
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.11.1 b/metadata/md5-cache/app-emulation/cri-tools-1.11.1
index 1a5dfaf527ed..6364a11ecb06 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.11.1
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.11.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-incubator/cri-tools/archive/v1.11.1.tar.gz -> cri-tools-1.11.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ad0281a8ceccf0c659cede76a46bceef
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.12.0 b/metadata/md5-cache/app-emulation/cri-tools-1.12.0
index a876aa9d5a0c..cd973205c73c 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.12.0
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.12.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.12.0.tar.gz -> cri-tools-1.12.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=6549b512ff3f5bacb6d6fe9477c7b20c
diff --git a/metadata/md5-cache/app-emulation/cri-tools-1.13.0 b/metadata/md5-cache/app-emulation/cri-tools-1.13.0
index 13a97d0e5c08..3ef5ac3b8eb8 100644
--- a/metadata/md5-cache/app-emulation/cri-tools-1.13.0
+++ b/metadata/md5-cache/app-emulation/cri-tools-1.13.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.13.0.tar.gz -> cri-tools-1.13.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=6549b512ff3f5bacb6d6fe9477c7b20c
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.1 b/metadata/md5-cache/app-emulation/docker-18.03.1
index 50c97a2bd992..3aa7cdffea07 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.1
+++ b/metadata/md5-cache/app-emulation/docker-18.03.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.1-ce.tar.gz -> docker-18.03.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22198cd8e8200f61174fc6be6585e169
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.1-r1 b/metadata/md5-cache/app-emulation/docker-18.03.1-r1
index 367e7c03909b..a63f04eda17d 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.1-r1
+++ b/metadata/md5-cache/app-emulation/docker-18.03.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.1-ce.tar.gz -> docker-18.03.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=76a862d045520c569c65492dc417a0ee
diff --git a/metadata/md5-cache/app-emulation/docker-18.06.1-r1 b/metadata/md5-cache/app-emulation/docker-18.06.1-r1
index 6af9a6be8307..14bc0db8a11d 100644
--- a/metadata/md5-cache/app-emulation/docker-18.06.1-r1
+++ b/metadata/md5-cache/app-emulation/docker-18.06.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz -> docker-18.06.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c140c761fddc0cf3cdad3f654cddf08f
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.0 b/metadata/md5-cache/app-emulation/docker-18.09.0
index 1955eb0780ff..dc71947c1033 100644
--- a/metadata/md5-cache/app-emulation/docker-18.09.0
+++ b/metadata/md5-cache/app-emulation/docker-18.09.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.0.tar.gz -> docker-18.09.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=0697395085565f96af4f91bf4021abe9
diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999
index 10b56878dac4..d580ec466099 100644
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ b/metadata/md5-cache/app-emulation/docker-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-1.0.0 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] )
 RESTRICT=installsources strip
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	e764075c9bbce927b424f8e9b7a25dfe	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=facc44632d7c791e3fc9944228968cbb
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.12.2 b/metadata/md5-cache/app-emulation/docker-machine-0.12.2
index b30eafced6bd..bbdc1bf80588 100644
--- a/metadata/md5-cache/app-emulation/docker-machine-0.12.2
+++ b/metadata/md5-cache/app-emulation/docker-machine-0.12.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/machine/archive/v0.12.2.tar.gz -> docker-machine-0.12.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9155c192aeae1048c3d777989c607e89
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.13.0 b/metadata/md5-cache/app-emulation/docker-machine-0.13.0
index 5344fbbec220..7198bf235be4 100644
--- a/metadata/md5-cache/app-emulation/docker-machine-0.13.0
+++ b/metadata/md5-cache/app-emulation/docker-machine-0.13.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/machine/archive/v0.13.0.tar.gz -> docker-machine-0.13.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9155c192aeae1048c3d777989c607e89
diff --git a/metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0 b/metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
index 0d0b2f4fda01..6a0c09dee351 100644
--- a/metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
+++ b/metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-emulation/libvirt:=[qemu,virt-network]
 SLOT=0
 SRC_URI=https://github.com/dhiltgen/docker-machine-kvm/archive/v0.10.0.tar.gz -> docker-machine-kvm-0.10.0.tar.gz https://github.com/docker/machine/archive/v0.10.0.tar.gz -> github.com-docker-machine-v0.10.0.tar.gz https://github.com/libvirt/libvirt-go/archive/c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz -> github.com-libvirt-libvirt-go-c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=30c359ad172606759bac0e16868b95ca
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
index edf111dbe9b5..becfc2c434d4 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/c15b372ef22125880d378167dde44f4b134e1a77.tar.gz -> docker-proxy-0.8.0_p20180411.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=4e5c1b68751567fc06a85744abdfe992
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626
index 27f8a7c9643a..f0fd75c0f78e 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz -> docker-proxy-0.8.0_p20180626.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=714ccda258bc222725c6bcd52d84854b
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
index 1b5db347baf2..3900782967d6 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/6da50d1978302f04c3e2089e29112ea24812f05b.tar.gz -> docker-proxy-0.8.0_p20180907.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=cc501c2bb2825b05ad2de22472f9c2c3
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-9999 b/metadata/md5-cache/app-emulation/docker-proxy-9999
index 33ee61a8fa4f..b84b99cf9c9d 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-9999
+++ b/metadata/md5-cache/app-emulation/docker-proxy-9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=773f8f8ab188059b01172a442b77d36c
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1 b/metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
index 2ad96f88f8ff..413616b5350e 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/docker/distribution/archive/v2.6.2.tar.gz -> docker-registry-2.6.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b41233df88dcd19f1e26c79bde1bbde
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.0 b/metadata/md5-cache/app-emulation/docker-registry-2.7.0
index ef8458765709..335b7a5373c2 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.7.0
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.7.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/docker/distribution/archive/v2.7.0.tar.gz -> docker-registry-2.7.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f96bda23e09f7c21f5aa7909226ec121
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1 b/metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
index 2e7ff9a1367c..ac7776eb60dd 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/docker/distribution/archive/v2.7.0.tar.gz -> docker-registry-2.7.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=fe63c7e27aba124b20c8479511e0f7dd
diff --git a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122 b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
index 37eff0efba10..fe4a184d5667 100644
--- a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
+++ b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
@@ -10,5 +10,5 @@ RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/9f9c96235cc97674e935002fc3d78361b696a69e.tar.gz -> docker-runc-1.0.0_rc4_p20180122.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9a5ee41a56ba9a7ad672045529df69df
diff --git a/metadata/md5-cache/app-emulation/docker-swarm-1.2.0 b/metadata/md5-cache/app-emulation/docker-swarm-1.2.0
index 608939c58c54..bad0edf24d02 100644
--- a/metadata/md5-cache/app-emulation/docker-swarm-1.2.0
+++ b/metadata/md5-cache/app-emulation/docker-swarm-1.2.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/swarm/archive/v1.2.0.tar.gz -> docker-swarm-1.2.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2f52b1c44477bb3a9ed1ec0c7fbde2e5
diff --git a/metadata/md5-cache/app-emulation/flannel-0.10.0 b/metadata/md5-cache/app-emulation/flannel-0.10.0
index abd055be4999..873044ec251d 100644
--- a/metadata/md5-cache/app-emulation/flannel-0.10.0
+++ b/metadata/md5-cache/app-emulation/flannel-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coreos/flannel/archive/v0.10.0.tar.gz -> flannel-0.10.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=097765b5c4a791e5b647aa9597b0c208
diff --git a/metadata/md5-cache/app-emulation/go-secbench-0.1.0 b/metadata/md5-cache/app-emulation/go-secbench-0.1.0
index a1ef63d3a470..f6a7f4255b08 100644
--- a/metadata/md5-cache/app-emulation/go-secbench-0.1.0
+++ b/metadata/md5-cache/app-emulation/go-secbench-0.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qnib/go-secbench/archive/v0.1.0.tar.gz -> go-secbench-0.1.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=0f5428b9773d4719747479a551455b6f
diff --git a/metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1 b/metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
index d7e86e498fa5..e5904800781d 100644
--- a/metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
+++ b/metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
@@ -9,5 +9,5 @@ RDEPEND=app-emulation/docker
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qnib/go-secbench/archive/v0.1.0.tar.gz -> go-secbench-0.1.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2fc9d5e88eab360514b02deb96263a37
diff --git a/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1 b/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
index 2582b87ce92c..8c3c10caecf6 100644
--- a/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
+++ b/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen )
 SLOT=0
 SRC_URI=https://github.com/hyperhq/hyperd/archive/v0.7.0.tar.gz -> hyperd-0.7.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4fbb40a84615d0d49d904a653f9e7d12
diff --git a/metadata/md5-cache/app-emulation/img-0.4.8 b/metadata/md5-cache/app-emulation/img-0.4.8
index 21f022d01c13..31c3f148e132 100644
--- a/metadata/md5-cache/app-emulation/img-0.4.8
+++ b/metadata/md5-cache/app-emulation/img-0.4.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/img/archive/v0.4.8.tar.gz -> img-0.4.8.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=0e720b6a9726cd5b190f76ab8f2d7609
diff --git a/metadata/md5-cache/app-emulation/img-0.4.9 b/metadata/md5-cache/app-emulation/img-0.4.9
index 67d457703257..bae3c50eab60 100644
--- a/metadata/md5-cache/app-emulation/img-0.4.9
+++ b/metadata/md5-cache/app-emulation/img-0.4.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/img/archive/v0.4.9.tar.gz -> img-0.4.9.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8c99f717eddf4583e6d71b909488bfc7
diff --git a/metadata/md5-cache/app-emulation/img-0.5.1 b/metadata/md5-cache/app-emulation/img-0.5.1
index 7e6af56d1f72..d5ff6dfa6db3 100644
--- a/metadata/md5-cache/app-emulation/img-0.5.1
+++ b/metadata/md5-cache/app-emulation/img-0.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/img/archive/v0.5.1.tar.gz -> img-0.5.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9b0590df9053f92f048b2551d6e46a5a
diff --git a/metadata/md5-cache/app-emulation/img-0.5.2 b/metadata/md5-cache/app-emulation/img-0.5.2
index 9f85561bd6f2..1324419e2706 100644
--- a/metadata/md5-cache/app-emulation/img-0.5.2
+++ b/metadata/md5-cache/app-emulation/img-0.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/img/archive/v0.5.2.tar.gz -> img-0.5.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=a8b1c4c0ceb5682bdd5d0ffef3d17653
diff --git a/metadata/md5-cache/app-emulation/img-0.5.4 b/metadata/md5-cache/app-emulation/img-0.5.4
index 277cd42453f1..d9ed9c9572b5 100644
--- a/metadata/md5-cache/app-emulation/img-0.5.4
+++ b/metadata/md5-cache/app-emulation/img-0.5.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/img/archive/v0.5.4.tar.gz -> img-0.5.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=534dc167610a275a3ef30fd6d79a7dbd
diff --git a/metadata/md5-cache/app-emulation/kompose-1.13.0 b/metadata/md5-cache/app-emulation/kompose-1.13.0
index d1f716e16fc1..724ab155a1d8 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.13.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.13.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.13.0.tar.gz -> kompose-1.13.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=dc1c64382cb21988b35e543d8369724b
diff --git a/metadata/md5-cache/app-emulation/kompose-1.14.0 b/metadata/md5-cache/app-emulation/kompose-1.14.0
index 7c1dc0d4b723..4fc38ef374cd 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.14.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.14.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.14.0.tar.gz -> kompose-1.14.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=7943234193c742b2c629e0f5a65fba42
diff --git a/metadata/md5-cache/app-emulation/kompose-1.15.0 b/metadata/md5-cache/app-emulation/kompose-1.15.0
index 5e80d909364b..543e7bc6ded1 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.15.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.15.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.15.0.tar.gz -> kompose-1.15.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=7fdc17694aad0a21b4ed39eedd95f061
diff --git a/metadata/md5-cache/app-emulation/kompose-1.16.0 b/metadata/md5-cache/app-emulation/kompose-1.16.0
index 319eea8ef1ca..6ffbf423c0d3 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.16.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.16.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.16.0.tar.gz -> kompose-1.16.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=3fbd16bf1c3cddbda8201facdec99915
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 08176f084fb3..06ad68b02676 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -3,10 +3,10 @@ DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=6
 HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
+IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs kernel_linux
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdf3bef4f6dfa9b4e44f1402f00b021d
+_md5_=70198b1907f2fcf90c08e48432fca4f0
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-10.3.5 b/metadata/md5-cache/app-emulation/open-vm-tools-10.3.5
new file mode 100644
index 000000000000..fe7bc9c946d2
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-10.3.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=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
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev ) net-libs/rpcsvc-proto
+DESCRIPTION=Opensourced tools for VMware guests
+EAPI=7
+HOMEPAGE=https://github.com/vmware/open-vm-tools
+IUSE=X +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
+REQUIRED_USE=multimon? ( X ) vgauth? ( ssl ) grabbitmqproxy? ( ssl )
+SLOT=0
+SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-10.3.5/open-vm-tools-10.3.5-10430147.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1b22c7d5daec8c1a247ae5c94567d5b0
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.4 b/metadata/md5-cache/app-emulation/reg-0.15.4
index 2c75fdefa3b0..bec58c8e0a26 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.4
+++ b/metadata/md5-cache/app-emulation/reg-0.15.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.4.tar.gz -> reg-0.15.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=73e347e3711074cbabdc37e3f9734430
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.4-r1 b/metadata/md5-cache/app-emulation/reg-0.15.4-r1
index 0cae8755631b..ec6d090c417a 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.4-r1
+++ b/metadata/md5-cache/app-emulation/reg-0.15.4-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.4.tar.gz -> reg-0.15.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1586cb2b9993b41b9b01562e820f6cb2
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.4-r2 b/metadata/md5-cache/app-emulation/reg-0.15.4-r2
index 7065b8859f83..29d9a0bed890 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.4-r2
+++ b/metadata/md5-cache/app-emulation/reg-0.15.4-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.4.tar.gz -> reg-0.15.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b39c3a2a95e109fb7e423fd8417d4ab5
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.5 b/metadata/md5-cache/app-emulation/reg-0.15.5
index 50458bc6b685..170ca524da45 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.5
+++ b/metadata/md5-cache/app-emulation/reg-0.15.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.5.tar.gz -> reg-0.15.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=05f4c62c57dba8144ff3728e53781d82
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.6 b/metadata/md5-cache/app-emulation/reg-0.15.6
index b915e4f5bdb7..d18e49f433a3 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.6
+++ b/metadata/md5-cache/app-emulation/reg-0.15.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.6.tar.gz -> reg-0.15.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=57b08247dd69a51cf7ed7f131d09436b
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.7 b/metadata/md5-cache/app-emulation/reg-0.15.7
index f0a25f21d1c3..b6d1ef01d818 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.7
+++ b/metadata/md5-cache/app-emulation/reg-0.15.7
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.7.tar.gz -> reg-0.15.7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=3464f238e01f66a167c75a2e1b7f46c7
diff --git a/metadata/md5-cache/app-emulation/reg-0.15.8 b/metadata/md5-cache/app-emulation/reg-0.15.8
index 099e50d9b4f4..041f4925bce3 100644
--- a/metadata/md5-cache/app-emulation/reg-0.15.8
+++ b/metadata/md5-cache/app-emulation/reg-0.15.8
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.8.tar.gz -> reg-0.15.8.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=8eb00455a4ba09cde0c0d7469708c1ae
diff --git a/metadata/md5-cache/app-emulation/reg-0.16.0 b/metadata/md5-cache/app-emulation/reg-0.16.0
index 1296aaee158f..4364d469c521 100644
--- a/metadata/md5-cache/app-emulation/reg-0.16.0
+++ b/metadata/md5-cache/app-emulation/reg-0.16.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/v0.16.0.tar.gz -> reg-0.16.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ed0e991e302dc1989d391671c4d4365b
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
index 95a5090d9af1..bf65104ccf67 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz -> runc-1.0.0_rc5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ac29d3474d97bd0823086c36f20408cf
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
index 1e80f7e70fb6..b77f311139d6 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/69663f0bd4b60df09991c08812a60108003fa340.tar.gz -> runc-1.0.0_rc5_p20180509.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=c05a7c91549fd621506f6bf304ee03c8
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc6 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc6
index b51557a3de78..2fdd4b8faacc 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc6
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/ccb5efd37fb7c86364786e9137e22948751de7ed.tar.gz -> runc-1.0.0_rc6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8fe4af121c1ca9b5ad28a0bac1324fae
diff --git a/metadata/md5-cache/app-emulation/runv-0.7.0 b/metadata/md5-cache/app-emulation/runv-0.7.0
index 5f2d4f4a00d5..b2b5093cbc89 100644
--- a/metadata/md5-cache/app-emulation/runv-0.7.0
+++ b/metadata/md5-cache/app-emulation/runv-0.7.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen )
 SLOT=0
 SRC_URI=https://github.com/hyperhq/runv/archive/v0.7.0.tar.gz -> runv-0.7.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=41fcc31cef6bcb9d3232401e35b775f7
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
index 25c3a4870bb9..7021ad64b5fe 100644
--- a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/logger app-emulation/qemu
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/2427500bce5bf9b365dc601790704694cd6c772e.tar.gz -> simplevirt-0.0_p20181011.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a325c84a5962b6054211f030baa8fa95
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.22 b/metadata/md5-cache/app-emulation/skopeo-0.1.22
index 34fb03c6908f..e3f7c05984aa 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.22
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.22
@@ -9,5 +9,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-prog
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/skopeo/archive/v0.1.22.tar.gz -> skopeo-0.1.22.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=e014bbc1d8e9ba03a46a3ec84502c09d
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.30 b/metadata/md5-cache/app-emulation/skopeo-0.1.30
index 680964c6638e..3ae1835c3822 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.30
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.30
@@ -9,5 +9,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-prog
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/skopeo/archive/v0.1.30.tar.gz -> skopeo-0.1.30.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d5a5e8e5174ef16a5c8e073ef2d5b426
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.31 b/metadata/md5-cache/app-emulation/skopeo-0.1.31
index 7c521c96efee..db994914fd70 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.31
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.31
@@ -9,5 +9,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-prog
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/skopeo/archive/v0.1.31.tar.gz -> skopeo-0.1.31.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=134192a56af4390bb965b776e3033a6c
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.32 b/metadata/md5-cache/app-emulation/skopeo-0.1.32
index 0eb50c33009e..3b9f07a69bc4 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.32
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.32
@@ -9,5 +9,5 @@ RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-prog
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/skopeo/archive/v0.1.32.tar.gz -> skopeo-0.1.32.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=92e686415684fc83e3fcf0336a76fe3a
diff --git a/metadata/md5-cache/app-emulation/umoci-0.2.1 b/metadata/md5-cache/app-emulation/umoci-0.2.1
index 8a793ae3d7cf..a6930cfbd7f6 100644
--- a/metadata/md5-cache/app-emulation/umoci-0.2.1
+++ b/metadata/md5-cache/app-emulation/umoci-0.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/umoci/archive/v0.2.1.tar.gz -> umoci-0.2.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2dd7dd520fc400c1ac0c48e9bbd55bd4
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index b2d5d8f79d1c..040b9e10365c 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1 b/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
index bf191ed52302..0dc5a06c466e 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.14.0.tar.gz -> alertmanager-0.14.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=539b0d081674f3b4e07081e0313355f7
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.0 b/metadata/md5-cache/app-metrics/alertmanager-0.15.0
index fd0cd1c76128..eeb1943481ca 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.0
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.0.tar.gz -> alertmanager-0.15.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=224db0fc5ec99a6bca20f45105ea0d67
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.1 b/metadata/md5-cache/app-metrics/alertmanager-0.15.1
index ab0c6db19ffa..51c2faf33132 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.1
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.1.tar.gz -> alertmanager-0.15.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b83b6cd34626de3a11aca0749a45f866
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.2 b/metadata/md5-cache/app-metrics/alertmanager-0.15.2
index b42a1668b5d1..7e3fb2180423 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.2
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.2.tar.gz -> alertmanager-0.15.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e5a963f7f44dc9f4e9e26e50a6eb2466
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.15.3 b/metadata/md5-cache/app-metrics/alertmanager-0.15.3
index 8c456089f8f2..a29a411bce3f 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.3
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.3.tar.gz -> alertmanager-0.15.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ecfc7d08ffe9d9fd9fc35de51755b760
diff --git a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307 b/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
index 5d4327960b3e..3b4b13f40f59 100644
--- a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
+++ b/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/digitalocean/bind_exporter/archive/38ef3a6caa68e8c42a08e72d51e90b00333e6894.tar.gz -> bind_exporter-0.2.0_p20180307.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7517c6be43747e992eed4b6bdca14c5f
diff --git a/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0 b/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
index f868c42fa6b4..a7f4a8b3b5fd 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.12.0.tar.gz -> blackbox_exporter-0.12.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ed749681acece233372e6f715a161b89
diff --git a/metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0 b/metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0
index 5843f8797557..5156356e955e 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.13.0.tar.gz -> blackbox_exporter-0.13.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=072bcaf98784c99c47a22e7d9770d042
diff --git a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6 b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
index dca41fd9d564..4466ae2dd4c9 100644
--- a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
+++ b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/jirwin/burrow_exporter/archive/v0.0.6.tar.gz -> burrow_exporter-0.0.6.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/golang/protobuf/archive/2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz -> github.com-golang-protobuf-2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/client_golang/archive/42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz -> github.com-prometheus-client_golang-42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/Sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-Sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/urfave/cli/archive/ab403a54a148f2d857920810291539e1f817ee7b.tar.gz -> github.com-urfave-cli-ab403a54a148f2d857920810291539e1f817ee7b.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=22a0aa17a981c9c5c3c5b973f839014e
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
index ff37dbc8004d..6d0322001d65 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.0.2.tar.gz -> elasticsearch_exporter-1.0.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=560ff71adadbedfc9f47b9a36024ae09
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
index 6e36afb7c1c1..7a1b8414f449 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.0.4rc1.tar.gz -> elasticsearch_exporter-1.0.4_rc1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=65166befc84e5816f88ec52be1f4b646
diff --git a/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0 b/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
index b53addb078b5..4560de8e8a2d 100644
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
+++ b/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/percona/mongodb_exporter/archive/v0.4.0.tar.gz -> mongodb_exporter-0.4.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=255ff6ff2149b786bcf46ca14784f5eb
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
index 60e1793c46ca..0bf8e8226583 100644
--- a/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/v0.10.0.tar.gz -> mysqld_exporter-0.10.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6db75fad5554436a70f7ef3eb17ef894
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
index 2631b7d8b658..d76e94831f2a 100644
--- a/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/v0.11.0.tar.gz -> mysqld_exporter-0.11.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c5c62816160f2cdb0f4d05c66d4d5e25
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
index 678ef7df1f6c..b2ed68ba9bec 100644
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/hnlq715/nginx-vts-exporter/archive/v0.10.0.tar.gz -> nginx-vts-exporter-0.10.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6b2167245cac20507b830f4f5f6de00f
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
index 3d340754474e..06003066064f 100644
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/hnlq715/nginx-vts-exporter/archive/v0.10.3.tar.gz -> nginx-vts-exporter-0.10.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1c7208c8cb37dcbc1a180062b649a16b
diff --git a/metadata/md5-cache/app-metrics/node_exporter-0.15.2 b/metadata/md5-cache/app-metrics/node_exporter-0.15.2
index 67edecc3957f..7535c1ef87e4 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.15.2
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.15.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.15.2.tar.gz -> node_exporter-0.15.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1d45644441c372e5a411dd64dc4f7767
diff --git a/metadata/md5-cache/app-metrics/node_exporter-0.16.0 b/metadata/md5-cache/app-metrics/node_exporter-0.16.0
index 9c718bfe18e1..6e94dee02047 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.16.0
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.16.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.16.0.tar.gz -> node_exporter-0.16.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6a9b8094b468386a86dc628149a831cc
diff --git a/metadata/md5-cache/app-metrics/node_exporter-0.17.0 b/metadata/md5-cache/app-metrics/node_exporter-0.17.0
index 5702c1d6ba63..0b67812d65f5 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.17.0
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.17.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.17.0.tar.gz -> node_exporter-0.17.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=fdaa8c8ef59c64f7d65151c8179f04a7
diff --git a/metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0 b/metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0
index 0b3bb2e65f44..265c6814f602 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.17.0-rc.0.tar.gz -> node_exporter-0.17.0_rc0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2f49b0b94c4820238f348ce335d70545
diff --git a/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1 b/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
index 09a293a0ea06..12e6110e8c6f 100644
--- a/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
+++ b/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/kumina/openvpn_exporter/archive/0.2.1.tar.gz -> openvpn_exporter-0.2.1.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=11d7b049e083cf3aa4c64650b7f38d97
diff --git a/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2 b/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
index f51b4955c1d3..0dc1c6aa8444 100644
--- a/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
+++ b/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kumina/postfix_exporter/archive/0.1.2.tar.gz -> postfix_exporter-0.1.2.tar.gz https://github.com/coreos/go-systemd/archive/bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz -> github.com-coreos-go-systemd-bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz https://github.com/coreos/pkg/archive/97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz -> github.com-coreos-pkg-97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=aea25bdfa23562c4deaed255d102c452
diff --git a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6 b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
index 4ca9183a2be3..2d04e7f9a399 100644
--- a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
+++ b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wrouesnel/postgres_exporter/archive/v0.4.6.tar.gz -> postgres_exporter-0.4.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=76fc337e3f431b54e67a1b233e09a269
diff --git a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7 b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
index 994d492d2765..62fd59de62fc 100644
--- a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
+++ b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wrouesnel/postgres_exporter/archive/v0.4.7.tar.gz -> postgres_exporter-0.4.7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a8733fd6420a73931d45cc33ead73e5b
diff --git a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523 b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
index 0285330d3e0d..c8d479e7a2fd 100644
--- a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+++ b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/prom2json/archive/4a7436442837da72f9e211d99f0145dff3246b66.tar.gz -> prom2json-0.1.0_p20170523.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=699f93213d211f4afbfd735d1264a53d
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.4.3 b/metadata/md5-cache/app-metrics/prometheus-2.4.3
index c5a3f99f92dc..e27fba9572b4 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.4.3
+++ b/metadata/md5-cache/app-metrics/prometheus-2.4.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.4.3.tar.gz -> prometheus-2.4.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=dad9c1af530887588270a2b6e0e7241f
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.5.0 b/metadata/md5-cache/app-metrics/prometheus-2.5.0
index ac7cdab4cccd..e2207ffc2ad4 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.5.0
+++ b/metadata/md5-cache/app-metrics/prometheus-2.5.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.5.0.tar.gz -> prometheus-2.5.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d05061188770b68dc4fda4fd3958276d
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.6.0 b/metadata/md5-cache/app-metrics/prometheus-2.6.0
index 4fe80e239673..a77159a686e8 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.6.0
+++ b/metadata/md5-cache/app-metrics/prometheus-2.6.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.6.0.tar.gz -> prometheus-2.6.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=20e619d52feb3eaa05fa22e642c7d1ea
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.4.0 b/metadata/md5-cache/app-metrics/pushgateway-0.4.0
index 4eb807f254e2..6c548c106998 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.4.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.4.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.4.0.tar.gz -> pushgateway-0.4.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=134bcdf0847f07efa0e58ce5da6e9059
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.5.0 b/metadata/md5-cache/app-metrics/pushgateway-0.5.0
index a8dbc78f7380..905e47278653 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.5.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.5.0.tar.gz -> pushgateway-0.5.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e40c442a815246b7e2f66f4dd718da0d
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.5.2 b/metadata/md5-cache/app-metrics/pushgateway-0.5.2
index a790cb14d7ba..190bb4df8b02 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.5.2
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.5.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.5.2.tar.gz -> pushgateway-0.5.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=cc6c02cee10c4c9f96cb463fac850145
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.6.0 b/metadata/md5-cache/app-metrics/pushgateway-0.6.0
index aeb8ca7d3f09..146aed0b2c33 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.6.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.6.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.6.0.tar.gz -> pushgateway-0.6.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f5cb1a4acf63ed076c2a74ba08647521
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.7.0 b/metadata/md5-cache/app-metrics/pushgateway-0.7.0
index 74cef7e47fa2..360f88bd15b4 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.7.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.7.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.7.0.tar.gz -> pushgateway-0.7.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=44152957c395b0ec1d8eaebff6a35895
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-0.15.0 b/metadata/md5-cache/app-metrics/redis_exporter-0.15.0
index cbced9524d1b..ed51b32afc3f 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-0.15.0
+++ b/metadata/md5-cache/app-metrics/redis_exporter-0.15.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v0.15.0.tar.gz -> redis_exporter-0.15.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9146c0cd0d395ed0dd6bfda84ea6d218
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-0.20.2 b/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
index 8ac446446925..60f911479034 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
+++ b/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v0.20.2.tar.gz -> redis_exporter-0.20.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=944c56d2bc6d59509fc7dda9c3929cb1
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.11.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.11.0
index 4def896a367f..7c79d0108212 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.11.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.11.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.11.0.tar.gz -> snmp_exporter-0.11.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d0db61ac41356f2796accddd00a02512
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.12.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.12.0
index 061df07c1652..e2ed3af0d203 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.12.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.12.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.12.0.tar.gz -> snmp_exporter-0.12.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ac1a901b8928e4cfde3af5723384df8b
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.13.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.13.0
index f7da121ff721..afb2a8ffa3e8 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.13.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.13.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.13.0.tar.gz -> snmp_exporter-0.13.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b4c233a237127e66f0a913e6a335ac60
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.14.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.14.0
index 4da6041bc18f..b468c82b2107 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.14.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.14.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.14.0.tar.gz -> snmp_exporter-0.14.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a74b2f50d8c9f2d47cba048143c892d9
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
index af8bbc3b4922..560c4a45da70 100644
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+++ b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/timonwong/uwsgi_exporter/archive/v0.7.0.tar.gz -> uwsgi_exporter-0.7.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=78a4d6048c97e40fe634bb0ae8ef6f2d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 8cccde303394..3b84f67b42eb 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/faq-0.0.1 b/metadata/md5-cache/app-misc/faq-0.0.1
index a4e18fcc7e47..525f99283ba1 100644
--- a/metadata/md5-cache/app-misc/faq-0.0.1
+++ b/metadata/md5-cache/app-misc/faq-0.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jzelinskie/faq/archive/0.0.1.tar.gz -> faq-0.0.1.tar.gz https://github.com/Azure/draft/archive/53924464463d2474f410415f1310d2b95fb8965f.tar.gz -> github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/ashb/jqrepl/archive/70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz -> github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz https://github.com/clbanning/mxj/archive/eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz -> github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/globalsign/mgo/archive/baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz -> github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jbrukh/bayesian/archive/bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz -> github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/zeebo/bencode/archive/d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz -> github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz https://github.com/golang/crypto/archive/88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz -> github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz https://github.com/golang/sys/archive/13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz -> github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz https://github.com/go-yaml/yaml/archive/86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz -> github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=aaa523415aefd0443dac19764dd64aee
diff --git a/metadata/md5-cache/app-misc/faq-0.0.2 b/metadata/md5-cache/app-misc/faq-0.0.2
index 5043cc33fbe8..dd9119b962bf 100644
--- a/metadata/md5-cache/app-misc/faq-0.0.2
+++ b/metadata/md5-cache/app-misc/faq-0.0.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jzelinskie/faq/archive/0.0.2.tar.gz -> faq-0.0.2.tar.gz https://github.com/alecthomas/chroma/archive/d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz -> github.com-alecthomas-chroma-d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz https://github.com/Azure/draft/archive/fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz -> github.com-Azure-draft-fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cheekybits/is/archive/68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz -> github.com-cheekybits-is-68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz https://github.com/clbanning/mxj/archive/32282164326064599d3a83e53adcb9b318d78d90.tar.gz -> github.com-clbanning-mxj-32282164326064599d3a83e53adcb9b318d78d90.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/dlclark/regexp2/archive/7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz -> github.com-dlclark-regexp2-7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/globalsign/mgo/archive/efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz -> github.com-globalsign-mgo-efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jbrukh/bayesian/archive/bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz -> github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/spf13/cobra/archive/ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz -> github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz https://github.com/spf13/pflag/archive/583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz -> github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz https://github.com/zeebo/bencode/archive/d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz -> github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz https://github.com/golang/crypto/archive/1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz -> github.com-golang-crypto-1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz https://github.com/golang/sys/archive/7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz -> github.com-golang-sys-7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=df888c9cc95939d38f3e52e5513499b3
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.17 b/metadata/md5-cache/app-misc/go-jira-1.0.17
index 65d1227e987f..42af44ea2210 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.17
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.17
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.17.tar.gz -> go-jira-1.0.17.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=3892f0fe4447f3c3be8c5e11caeca322
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.20 b/metadata/md5-cache/app-misc/go-jira-1.0.20
index a27924ce5aa3..8c1ea91930b0 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.20
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.20
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.20.tar.gz -> go-jira-1.0.20.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=7eafcb0cff1e4d238f62af7168915da2
diff --git a/metadata/md5-cache/app-misc/mkcert-1.0.1 b/metadata/md5-cache/app-misc/mkcert-1.0.1
index 1b3545b81feb..879305a1075e 100644
--- a/metadata/md5-cache/app-misc/mkcert-1.0.1
+++ b/metadata/md5-cache/app-misc/mkcert-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/FiloSottile/mkcert/archive/v1.0.1.tar.gz -> mkcert-1.0.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=42b0d5d182d8da81e06fb7b8e821a4c2
diff --git a/metadata/md5-cache/app-misc/mkcert-1.1.2 b/metadata/md5-cache/app-misc/mkcert-1.1.2
index 9d7244e77b46..a3703dc6336e 100644
--- a/metadata/md5-cache/app-misc/mkcert-1.1.2
+++ b/metadata/md5-cache/app-misc/mkcert-1.1.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/FiloSottile/mkcert/archive/v1.1.2.tar.gz -> mkcert-1.1.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=42b0d5d182d8da81e06fb7b8e821a4c2
diff --git a/metadata/md5-cache/app-misc/notary-0.6.1-r1 b/metadata/md5-cache/app-misc/notary-0.6.1-r1
index 51d5521f7bb2..605ac6f323c6 100644
--- a/metadata/md5-cache/app-misc/notary-0.6.1-r1
+++ b/metadata/md5-cache/app-misc/notary-0.6.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/theupdateframework/notary/archive/v0.6.1.tar.gz -> notary-0.6.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d93fbad1058b24d44b6177769819957c
diff --git a/metadata/md5-cache/app-misc/pet-0.3.0 b/metadata/md5-cache/app-misc/pet-0.3.0
index 1c3a96554125..db22012c3cc8 100644
--- a/metadata/md5-cache/app-misc/pet-0.3.0
+++ b/metadata/md5-cache/app-misc/pet-0.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-go/go-crypto:= dev-go/go-net:= dev-go/go-oauth2:= dev-go/go-protobuf:= dev-go/go-sys:= zsh-completion? ( app-shells/zsh-completions )
 SLOT=0
 SRC_URI=https://github.com/knqyf263/pet/archive/v0.3.0.tar.gz -> pet-0.3.0.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/briandowns/spinner/archive/48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz -> github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz https://github.com/chzyer/readline/archive/f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz -> github.com-chzyer-readline-f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/google/go-github/archive/e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz -> github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz -> github.com-jroimartin-gocui-4f518eddb04b8f73870836b6d1941e8aa3c06637.tar.gz https://github.com/mattn/go-colorable/archive/167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz -> github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz -> github.com-nsf-termbox-go-88b7b944be8bc8d8ec6195fca97c5869ba20f99d.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/golang/appengine/archive/150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz -> github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=df51e1923796930c3c1899ba1384006f
diff --git a/metadata/md5-cache/app-misc/pet-0.3.2 b/metadata/md5-cache/app-misc/pet-0.3.2
index e1382fcf58a0..4bc490c07127 100644
--- a/metadata/md5-cache/app-misc/pet-0.3.2
+++ b/metadata/md5-cache/app-misc/pet-0.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-go/go-crypto:= dev-go/go-net:= dev-go/go-oauth2:= dev-go/go-protobuf:= dev-go/go-sys:= zsh-completion? ( app-shells/zsh-completions )
 SLOT=0
 SRC_URI=https://github.com/knqyf263/pet/archive/v0.3.2.tar.gz -> pet-0.3.2.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/briandowns/spinner/archive/48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz -> github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz https://github.com/chzyer/readline/archive/2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz -> github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/google/go-github/archive/e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz -> github.com-google-go-github-e48060a28fac52d0f1cb758bc8b87c07bac4a87d.tar.gz https://github.com/xanzy/go-gitlab/archive/26ea551e8c159cea42a9f206bc18ae5884d44d0c.tar.gz -> github.com-xanzy-go-gitlab-26ea551e8c159cea42a9f206bc18ae5884d44d0c.tar.gz https://github.com/google/go-querystring/archive/53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz -> github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jroimartin/gocui/archive/c055c87ae801372cd74a0839b972db4f7697ae5f.tar.gz -> github.com-jroimartin-gocui-c055c87ae801372cd74a0839b972db4f7697ae5f.tar.gz https://github.com/mattn/go-colorable/archive/167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz -> github.com-mattn-go-colorable-167de6bfdfba052fa6b2d3664c8f5272e23c9072.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/21a4d435a86280a2927985fd6296de56cbce453e.tar.gz -> github.com-nsf-termbox-go-21a4d435a86280a2927985fd6296de56cbce453e.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/spf13/cobra/archive/ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz -> github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz https://github.com/spf13/pflag/archive/583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz -> github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz https://github.com/golang/appengine/archive/150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz -> github.com-golang-appengine-150dc57a1b433e64154302bdc40b6bb8aefa313a.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=3738f1b7ed371d34ec1e55e7def282bf
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 627ebdabf1d0..043efb635b5b 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/skrooge-2.17.0 b/metadata/md5-cache/app-office/skrooge-2.17.0
new file mode 100644
index 000000000000..0ab105ec9f63
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.17.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) kde? ( >=kde-frameworks/krunner-5.52.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 dev-libs/libxslt virtual/pkgconfig x11-misc/shared-mime-info designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 >=dev-qt/designer-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=6
+HOMEPAGE=https://skrooge.org/
+IUSE=activities designer kde ofx webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) kde? ( >=kde-frameworks/krunner-5.52.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) !app-office/skrooge:4 >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=test? ( designer )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.17.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=587b04374943e814f4ab24675a11cc2b
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 93ceb347a0a1..b59798685b86 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/golop-0.0.1 b/metadata/md5-cache/app-portage/golop-0.0.1
index 4b6b0b3e0534..4b128053ac4a 100644
--- a/metadata/md5-cache/app-portage/golop-0.0.1
+++ b/metadata/md5-cache/app-portage/golop-0.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/klausman/golop/archive/v0.0.1.tar.gz -> golop-0.0.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8785abaf519bc982bfe954cc3be987f2
diff --git a/metadata/md5-cache/app-portage/golop-9999 b/metadata/md5-cache/app-portage/golop-9999
index 971087648613..09235f2b99b2 100644
--- a/metadata/md5-cache/app-portage/golop-9999
+++ b/metadata/md5-cache/app-portage/golop-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/klausman/golop
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b7eeec429c598f671ec137ba2470af4
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index b96271649429..388694a1e5be 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/peco-0.5.1 b/metadata/md5-cache/app-shells/peco-0.5.1
index 0570718d4d6d..86c00cbd0543 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.1
+++ b/metadata/md5-cache/app-shells/peco-0.5.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/peco/peco/archive/v0.5.1.tar.gz -> peco-0.5.1.tar.gz https://github.com/google/btree/archive/0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz -> github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz https://github.com/jessevdk/go-flags/archive/8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz -> github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz https://github.com/lestrrat/go-pdebug/archive/2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz -> github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz https://github.com/mattn/go-runewidth/archive/737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz -> github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz https://github.com/nsf/termbox-go/archive/abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz -> github.com-nsf-termbox-go-abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz https://github.com/pkg/errors/archive/248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz -> github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz https://github.com/stretchr/testify/archive/18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz -> github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8fb4468048fafc5ce8b284908229a9b6
diff --git a/metadata/md5-cache/app-shells/peco-0.5.2 b/metadata/md5-cache/app-shells/peco-0.5.2
index 4ef2c408f12b..b8cc26c13d45 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.2
+++ b/metadata/md5-cache/app-shells/peco-0.5.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/peco/peco/archive/v0.5.2.tar.gz -> peco-0.5.2.tar.gz https://github.com/google/btree/archive/0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz -> github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz https://github.com/jessevdk/go-flags/archive/8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz -> github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz https://github.com/lestrrat/go-pdebug/archive/2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz -> github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz https://github.com/mattn/go-runewidth/archive/737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz -> github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz https://github.com/nsf/termbox-go/archive/abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz -> github.com-nsf-termbox-go-abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz https://github.com/pkg/errors/archive/248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz -> github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz https://github.com/stretchr/testify/archive/18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz -> github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9609a6a75112ad776771ce161c34e981
diff --git a/metadata/md5-cache/app-shells/peco-0.5.3 b/metadata/md5-cache/app-shells/peco-0.5.3
index 74c91bd0456c..1fbf2e02d8e1 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.3
+++ b/metadata/md5-cache/app-shells/peco-0.5.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/peco/peco/archive/v0.5.3.tar.gz -> peco-0.5.3.tar.gz https://github.com/google/btree/archive/0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz -> github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz https://github.com/jessevdk/go-flags/archive/8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz -> github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz https://github.com/lestrrat/go-pdebug/archive/2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz -> github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz https://github.com/mattn/go-runewidth/archive/737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz -> github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz https://github.com/nsf/termbox-go/archive/e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz -> github.com-nsf-termbox-go-e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz https://github.com/pkg/errors/archive/248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz -> github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz https://github.com/stretchr/testify/archive/18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz -> github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b55be6b9879097bc0ebeb33614c7bba1
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ca098ffab673..faf467d2a67b 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.22 b/metadata/md5-cache/dev-db/etcd-3.2.22
index 6381873e5056..2f0d0ab4556f 100644
--- a/metadata/md5-cache/dev-db/etcd-3.2.22
+++ b/metadata/md5-cache/dev-db/etcd-3.2.22
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.2.22.tar.gz -> etcd-3.2.22.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.24 b/metadata/md5-cache/dev-db/etcd-3.2.24
index 47d0f3d00453..5db0a651223d 100644
--- a/metadata/md5-cache/dev-db/etcd-3.2.24
+++ b/metadata/md5-cache/dev-db/etcd-3.2.24
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.2.24.tar.gz -> etcd-3.2.24.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.10 b/metadata/md5-cache/dev-db/etcd-3.3.10
index c5632b22822b..10b500df9347 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.10
+++ b/metadata/md5-cache/dev-db/etcd-3.3.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.10.tar.gz -> etcd-3.3.10.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=3c4eb77314a58f8b19e7f6137823867e
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.8 b/metadata/md5-cache/dev-db/etcd-3.3.8
index dc51f3ef2bb0..bf502faf25b3 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.8
+++ b/metadata/md5-cache/dev-db/etcd-3.3.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.8.tar.gz -> etcd-3.3.8.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.9 b/metadata/md5-cache/dev-db/etcd-3.3.9
index b9ed1539d741..2d455eba38fc 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.9
+++ b/metadata/md5-cache/dev-db/etcd-3.3.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.9.tar.gz -> etcd-3.3.9.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/influxdb-1.5.1 b/metadata/md5-cache/dev-db/influxdb-1.5.1
index 1bf14157925c..18fb2e997e03 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.5.1
+++ b/metadata/md5-cache/dev-db/influxdb-1.5.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.5.1.tar.gz -> influxdb-1.5.1.tar.gz https://github.com/collectd/go-collectd/archive/e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz -> github.com-collectd-go-collectd-e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz -> github.com-RoaringBitmap-roaring-cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz -> github.com-bmizerany-pat-c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz https://github.com/boltdb/bolt/archive/4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz -> github.com-boltdb-bolt-4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz https://github.com/cespare/xxhash/archive/1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz -> github.com-cespare-xxhash-1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz -> github.com-dgrijalva-jwt-go-24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz https://github.com/dgryski/go-bits/archive/2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz -> github.com-dgryski-go-bits-2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz https://github.com/dgryski/go-bitstream/archive/7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz -> github.com-dgryski-go-bitstream-7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz -> github.com-gogo-protobuf-1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz -> github.com-google-go-cmp-18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz https://github.com/influxdata/influxql/archive/21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz -> github.com-influxdata-influxql-21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz -> github.com-influxdata-yarpc-036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz https://github.com/jsternberg/zap-logfmt/archive/5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz -> github.com-jsternberg-zap-logfmt-5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz https://github.com/jwilder/encoding/archive/27894731927e49b0a9023f00312be26733744815.tar.gz -> github.com-jwilder-encoding-27894731927e49b0a9023f00312be26733744815.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/opentracing/opentracing-go/archive/1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz -> github.com-opentracing-opentracing-go-1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz https://github.com/paulbellamy/ratecounter/archive/5a11f585a31379765c190c033b6ad39956584447.tar.gz -> github.com-paulbellamy-ratecounter-5a11f585a31379765c190c033b6ad39956584447.tar.gz https://github.com/peterh/liner/archive/88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz -> github.com-peterh-liner-88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz https://github.com/philhofer/fwd/archive/1612a298117663d7bc9a760ae20d383413859798.tar.gz -> github.com-philhofer-fwd-1612a298117663d7bc9a760ae20d383413859798.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz -> github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz https://github.com/prometheus/procfs/archive/a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz -> github.com-prometheus-procfs-a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz https://github.com/retailnext/hllpp/archive/38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz -> github.com-retailnext-hllpp-38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz https://github.com/tinylib/msgp/archive/ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz -> github.com-tinylib-msgp-ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz https://github.com/xlab/treeprint/archive/06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz -> github.com-xlab-treeprint-06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz https://github.com/uber-go/atomic/archive/54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz -> github.com-uber-go-atomic-54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz https://github.com/uber-go/multierr/archive/fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz -> github.com-uber-go-multierr-fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz -> github.com-golang-crypto-9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz https://github.com/golang/net/archive/9dfe39835686865bff950a07b394c12a98ddc811.tar.gz -> github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz https://github.com/golang/sync/archive/fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz -> github.com-golang-sync-fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz https://github.com/golang/sys/archive/062cd7e4e68206d8bab9b18396626e855c992658.tar.gz -> github.com-golang-sys-062cd7e4e68206d8bab9b18396626e855c992658.tar.gz https://github.com/golang/text/archive/a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz -> github.com-golang-text-a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=49ca3070470a789883481974997ca3c8
diff --git a/metadata/md5-cache/dev-db/influxdb-1.6.3 b/metadata/md5-cache/dev-db/influxdb-1.6.3
index 1a4869b8f7f9..620d5dc630f8 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.6.3
+++ b/metadata/md5-cache/dev-db/influxdb-1.6.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.6.3.tar.gz -> influxdb-1.6.3.tar.gz https://github.com/collectd/go-collectd/archive/e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz -> github.com-collectd-go-collectd-e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz -> github.com-RoaringBitmap-roaring-cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz -> github.com-bmizerany-pat-c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz https://github.com/boltdb/bolt/archive/4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz -> github.com-boltdb-bolt-4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz https://github.com/cespare/xxhash/archive/1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz -> github.com-cespare-xxhash-1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz -> github.com-dgrijalva-jwt-go-24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz https://github.com/dgryski/go-bits/archive/2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz -> github.com-dgryski-go-bits-2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz https://github.com/dgryski/go-bitstream/archive/7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz -> github.com-dgryski-go-bitstream-7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz -> github.com-gogo-protobuf-1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz -> github.com-google-go-cmp-18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz https://github.com/influxdata/influxql/archive/21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz -> github.com-influxdata-influxql-21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz -> github.com-influxdata-yarpc-036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz https://github.com/jsternberg/zap-logfmt/archive/5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz -> github.com-jsternberg-zap-logfmt-5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz https://github.com/jwilder/encoding/archive/27894731927e49b0a9023f00312be26733744815.tar.gz -> github.com-jwilder-encoding-27894731927e49b0a9023f00312be26733744815.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/opentracing/opentracing-go/archive/1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz -> github.com-opentracing-opentracing-go-1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz https://github.com/paulbellamy/ratecounter/archive/5a11f585a31379765c190c033b6ad39956584447.tar.gz -> github.com-paulbellamy-ratecounter-5a11f585a31379765c190c033b6ad39956584447.tar.gz https://github.com/peterh/liner/archive/88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz -> github.com-peterh-liner-88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz https://github.com/philhofer/fwd/archive/1612a298117663d7bc9a760ae20d383413859798.tar.gz -> github.com-philhofer-fwd-1612a298117663d7bc9a760ae20d383413859798.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz -> github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz https://github.com/prometheus/procfs/archive/a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz -> github.com-prometheus-procfs-a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz https://github.com/retailnext/hllpp/archive/38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz -> github.com-retailnext-hllpp-38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz https://github.com/tinylib/msgp/archive/ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz -> github.com-tinylib-msgp-ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz https://github.com/xlab/treeprint/archive/06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz -> github.com-xlab-treeprint-06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz https://github.com/uber-go/atomic/archive/54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz -> github.com-uber-go-atomic-54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz https://github.com/uber-go/multierr/archive/fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz -> github.com-uber-go-multierr-fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz -> github.com-golang-crypto-9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz https://github.com/golang/net/archive/9dfe39835686865bff950a07b394c12a98ddc811.tar.gz -> github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz https://github.com/golang/sync/archive/fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz -> github.com-golang-sync-fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz https://github.com/golang/sys/archive/062cd7e4e68206d8bab9b18396626e855c992658.tar.gz -> github.com-golang-sys-062cd7e4e68206d8bab9b18396626e855c992658.tar.gz https://github.com/golang/text/archive/a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz -> github.com-golang-text-a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=49ca3070470a789883481974997ca3c8
diff --git a/metadata/md5-cache/dev-db/influxdb-1.6.4 b/metadata/md5-cache/dev-db/influxdb-1.6.4
index 8deedd7be4f8..6a095e779adf 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.6.4
+++ b/metadata/md5-cache/dev-db/influxdb-1.6.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.6.4.tar.gz -> influxdb-1.6.4.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/d6540aab65a17321470b1661bfc52da1823871e9.tar.gz -> github.com-RoaringBitmap-roaring-d6540aab65a17321470b1661bfc52da1823871e9.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/6226ea591a40176dd3ff9cd8eff81ed6ca721a00.tar.gz -> github.com-bmizerany-pat-6226ea591a40176dd3ff9cd8eff81ed6ca721a00.tar.gz https://github.com/boltdb/bolt/archive/2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz -> github.com-boltdb-bolt-2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz https://github.com/cespare/xxhash/archive/5c37fe3735342a2e0d01c87a907579987c8936cc.tar.gz -> github.com-cespare-xxhash-5c37fe3735342a2e0d01c87a907579987c8936cc.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/dgryski/go-bitstream/archive/9f22ccc24718d9643ac427c8c897ae1a01575783.tar.gz -> github.com-dgryski-go-bitstream-9f22ccc24718d9643ac427c8c897ae1a01575783.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1adfc126b41513cc696b209667c8656ea7aac67c.tar.gz -> github.com-gogo-protobuf-1adfc126b41513cc696b209667c8656ea7aac67c.tar.gz https://github.com/golang/protobuf/archive/925541529c1fa6821df4e44ce2723319eb2be768.tar.gz -> github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz -> github.com-google-go-cmp-3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz https://github.com/influxdata/influxql/archive/a7267bff5327e316e54c54342b0bc9598753e3d5.tar.gz -> github.com-influxdata-influxql-a7267bff5327e316e54c54342b0bc9598753e3d5.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/f0da2db138cad2fb425541938fc28dd5a5bc6918.tar.gz -> github.com-influxdata-yarpc-f0da2db138cad2fb425541938fc28dd5a5bc6918.tar.gz https://github.com/jsternberg/zap-logfmt/archive/ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6.tar.gz -> github.com-jsternberg-zap-logfmt-ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6.tar.gz https://github.com/jwilder/encoding/archive/b4e1701a28efcc637d9afcca7d38e495fe909a09.tar.gz -> github.com-jwilder-encoding-b4e1701a28efcc637d9afcca7d38e495fe909a09.tar.gz https://github.com/klauspost/compress/archive/6c8db69c4b49dd4df1fff66996cf556176d0b9bf.tar.gz -> github.com-klauspost-compress-6c8db69c4b49dd4df1fff66996cf556176d0b9bf.tar.gz https://github.com/klauspost/cpuid/archive/ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da.tar.gz -> github.com-klauspost-cpuid-ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da.tar.gz https://github.com/klauspost/crc32/archive/cb6bfca970f6908083f26f39a79009d608efd5cd.tar.gz -> github.com-klauspost-crc32-cb6bfca970f6908083f26f39a79009d608efd5cd.tar.gz https://github.com/klauspost/pgzip/archive/0bf5dcad4ada2814c3c00f996a982270bb81a506.tar.gz -> github.com-klauspost-pgzip-0bf5dcad4ada2814c3c00f996a982270bb81a506.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/3247c84500bff8d9fb6d579d800f20b3e091582c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-3247c84500bff8d9fb6d579d800f20b3e091582c.tar.gz https://github.com/mschoch/smat/archive/90eadee771aeab36e8bf796039b8c261bebebe4f.tar.gz -> github.com-mschoch-smat-90eadee771aeab36e8bf796039b8c261bebebe4f.tar.gz https://github.com/opentracing/opentracing-go/archive/328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz -> github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz https://github.com/paulbellamy/ratecounter/archive/524851a93235ac051e3540563ed7909357fe24ab.tar.gz -> github.com-paulbellamy-ratecounter-524851a93235ac051e3540563ed7909357fe24ab.tar.gz https://github.com/peterh/liner/archive/6106ee4fe3e8435f18cd10e34557e5e50f0e792a.tar.gz -> github.com-peterh-liner-6106ee4fe3e8435f18cd10e34557e5e50f0e792a.tar.gz https://github.com/philhofer/fwd/archive/bb6d471dc95d4fe11e432687f8b70ff496cf3136.tar.gz -> github.com-philhofer-fwd-bb6d471dc95d4fe11e432687f8b70ff496cf3136.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/e4aa40a9169a88835b849a6efb71e05dc04b88f0.tar.gz -> github.com-prometheus-common-e4aa40a9169a88835b849a6efb71e05dc04b88f0.tar.gz https://github.com/prometheus/procfs/archive/54d17b57dd7d4a3aa092476596b3f8a933bde349.tar.gz -> github.com-prometheus-procfs-54d17b57dd7d4a3aa092476596b3f8a933bde349.tar.gz https://github.com/retailnext/hllpp/archive/101a6d2f8b52abfc409ac188958e7e7be0116331.tar.gz -> github.com-retailnext-hllpp-101a6d2f8b52abfc409ac188958e7e7be0116331.tar.gz https://github.com/tinylib/msgp/archive/b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1.tar.gz -> github.com-tinylib-msgp-b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1.tar.gz https://github.com/willf/bitset/archive/d860f346b89450988a379d7d705e83c58d1ea227.tar.gz -> github.com-willf-bitset-d860f346b89450988a379d7d705e83c58d1ea227.tar.gz https://github.com/xlab/treeprint/archive/f3a15cfd24bf976c724324cb6846a8b54b88b639.tar.gz -> github.com-xlab-treeprint-f3a15cfd24bf976c724324cb6846a8b54b88b639.tar.gz https://github.com/uber-go/atomic/archive/8474b86a5a6f79c443ce4b2992817ff32cf208b8.tar.gz -> github.com-uber-go-atomic-8474b86a5a6f79c443ce4b2992817ff32cf208b8.tar.gz https://github.com/uber-go/multierr/archive/3c4937480c32f4c13a875a1829af76c98ca3d40a.tar.gz -> github.com-uber-go-multierr-3c4937480c32f4c13a875a1829af76c98ca3d40a.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/c3a3ad6d03f7a915c0f7e194b7152974bb73d287.tar.gz -> github.com-golang-crypto-c3a3ad6d03f7a915c0f7e194b7152974bb73d287.tar.gz https://github.com/golang/net/archive/92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz -> github.com-golang-net-92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/d8e400bc7db4870d786864138af681469693d18c.tar.gz -> github.com-golang-sys-d8e400bc7db4870d786864138af681469693d18c.tar.gz https://github.com/golang/text/archive/f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz -> github.com-golang-text-f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz https://github.com/golang/time/archive/26559e0f760e39c24d730d3224364aef164ee23f.tar.gz -> github.com-golang-time-26559e0f760e39c24d730d3224364aef164ee23f.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=01d816769eb09a654839d723e27b50f1
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.41 b/metadata/md5-cache/dev-db/mysql-5.6.41
deleted file mode 100644
index 22a3bf65872c..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.41
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[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(-)?,static-libs?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=https://www.mysql.com/
-IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[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(-)?,static-libs?] )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.41.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.41.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.41.tar.gz mirror://gentoo/mysql-extras-20181111-2314Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20181111-2314Z.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0b2a87fdb67d426a7c5f0aef5eb67e62
diff --git a/metadata/md5-cache/dev-db/rqlite-4.1.0 b/metadata/md5-cache/dev-db/rqlite-4.1.0
index 53a944578253..8ab8118cf2ef 100644
--- a/metadata/md5-cache/dev-db/rqlite-4.1.0
+++ b/metadata/md5-cache/dev-db/rqlite-4.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/rqlite/rqlite/archive/v4.1.0.tar.gz -> rqlite-4.1.0.tar.gz https://github.com/Bowery/prompt/archive/753711fea478fa77bb2c83f6ec244b814d4a8bad.tar.gz -> github.com-Bowery-prompt-753711fea478fa77bb2c83f6ec244b814d4a8bad.tar.gz https://github.com/armon/go-metrics/archive/0a12dc6f6b9da6da644031a1b9b5a85478c5ee27.tar.gz -> github.com-armon-go-metrics-0a12dc6f6b9da6da644031a1b9b5a85478c5ee27.tar.gz https://github.com/boltdb/bolt/archive/fa5367d20c994db73282594be0146ab221657943.tar.gz -> github.com-boltdb-bolt-fa5367d20c994db73282594be0146ab221657943.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/8aac2701530899b64bdea735a1de8da899815220.tar.gz -> github.com-hashicorp-go-immutable-radix-8aac2701530899b64bdea735a1de8da899815220.tar.gz https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> github.com-hashicorp-go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz https://github.com/hashicorp/golang-lru/archive/0a025b7e63adc15a622f29b0b2c4c3848243bbf6.tar.gz -> github.com-hashicorp-golang-lru-0a025b7e63adc15a622f29b0b2c4c3848243bbf6.tar.gz https://github.com/hashicorp/raft/archive/3b4d64b29e422f04808b905005eb5a38bf9150e8.tar.gz -> github.com-hashicorp-raft-3b4d64b29e422f04808b905005eb5a38bf9150e8.tar.gz https://github.com/hashicorp/raft-boltdb/archive/df631556b57507bd5d0ed4f87468fd93ab025bef.tar.gz -> github.com-hashicorp-raft-boltdb-df631556b57507bd5d0ed4f87468fd93ab025bef.tar.gz https://github.com/labstack/gommon/archive/779b8a8b9850a97acba6a3fe20feb628c39e17c1.tar.gz -> github.com-labstack-gommon-779b8a8b9850a97acba6a3fe20feb628c39e17c1.tar.gz https://github.com/mattn/go-colorable/archive/ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz -> github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz https://github.com/mattn/go-isatty/archive/fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz -> github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz https://github.com/mattn/go-sqlite3/archive/05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz -> github.com-mattn-go-sqlite3-05548ff55570cdb9ac72ff4a25a3b5e77a6fb7e5.tar.gz https://github.com/mkideal/cli/archive/a9c1104566927924fdb041d198f05617492913f9.tar.gz -> github.com-mkideal-cli-a9c1104566927924fdb041d198f05617492913f9.tar.gz https://github.com/mkideal/pkg/archive/3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz -> github.com-mkideal-pkg-3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/golang/sys/archive/062cd7e4e68206d8bab9b18396626e855c992658.tar.gz -> github.com-golang-sys-062cd7e4e68206d8bab9b18396626e855c992658.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=63b15582eb2bf258dd8f92912aaa8453
diff --git a/metadata/md5-cache/dev-db/rqlite-4.3.0 b/metadata/md5-cache/dev-db/rqlite-4.3.0
index a92e00852c7f..67ff5b40fb36 100644
--- a/metadata/md5-cache/dev-db/rqlite-4.3.0
+++ b/metadata/md5-cache/dev-db/rqlite-4.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/rqlite/rqlite/archive/v4.3.0.tar.gz -> rqlite-4.3.0.tar.gz https://github.com/Bowery/prompt/archive/94b504f42fdd503acc3b3c79ec2b517d90e0de8a.tar.gz -> github.com-Bowery-prompt-94b504f42fdd503acc3b3c79ec2b517d90e0de8a.tar.gz https://github.com/armon/go-metrics/archive/783273d703149aaeb9897cf58613d5af48861c25.tar.gz -> github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz https://github.com/boltdb/bolt/archive/fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz -> github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> github.com-hashicorp-go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/labstack/gommon/archive/0a22a0df01a7c84944c607e8a6e91cfe421ea7ed.tar.gz -> github.com-labstack-gommon-0a22a0df01a7c84944c607e8a6e91cfe421ea7ed.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/mattn/go-sqlite3/archive/b8b158db6fdb72096ff3510373df0f61ea8de773.tar.gz -> github.com-mattn-go-sqlite3-b8b158db6fdb72096ff3510373df0f61ea8de773.tar.gz https://github.com/mkideal/cli/archive/a9c1104566927924fdb041d198f05617492913f9.tar.gz -> github.com-mkideal-cli-a9c1104566927924fdb041d198f05617492913f9.tar.gz https://github.com/mkideal/pkg/archive/3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz -> github.com-mkideal-pkg-3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz https://github.com/golang/crypto/archive/a3beeb748656e13e54256fd2cde19e058f41f60f.tar.gz -> github.com-golang-crypto-a3beeb748656e13e54256fd2cde19e058f41f60f.tar.gz https://github.com/golang/sys/archive/c11f84a56e43e20a78cee75a7c034031ecf57d1f.tar.gz -> github.com-golang-sys-c11f84a56e43e20a78cee75a7c034031ecf57d1f.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=fe75ae7f9b9adf1ab968f9767774b14f
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index b2c32ec0de92..395f90292fb4 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25 b/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
index 04474a37cbd6..8d288811b0d7 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
 SLOT=0
 SRC_URI=https://github.com/arduino/arduino-builder/archive/1.3.25.tar.gz -> arduino-builder-1.3.25.tar.gz https://github.com/go-errors/errors/archive/a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz -> github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz https://github.com/jstemmer/go-junit-report/archive/833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz -> github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz https://github.com/stretchr/testify/archive/1661650f989674e3e5bcdcb805536e5d31481526.tar.gz -> github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=40c15e3f58dca92ded79077783d0d8e6
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1 b/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
index db2827b23686..aa4ebbd738b2 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
 SLOT=0
 SRC_URI=https://github.com/arduino/arduino-builder/archive/1.4.1.tar.gz -> arduino-builder-1.4.1.tar.gz https://github.com/arduino/go-properties-map/archive/ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz -> github.com-arduino-go-properties-map-ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41.tar.gz https://github.com/arduino/go-timeutils/archive/d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz -> github.com-arduino-go-timeutils-d1dd9e313b1bfede35fe0bbf46d612e16a50e04e.tar.gz https://github.com/arduino/go-paths-helper/archive/751652ddd9f0a98650e681673c2c73937002e889.tar.gz -> github.com-arduino-go-paths-helper-751652ddd9f0a98650e681673c2c73937002e889.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/go-errors/errors/archive/a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz -> github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/jstemmer/go-junit-report/archive/833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz -> github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz https://github.com/stretchr/testify/archive/1661650f989674e3e5bcdcb805536e5d31481526.tar.gz -> github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz https://github.com/grpc/grpc-go/archive/8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz -> github.com-grpc-grpc-go-8dea3dc473e90c8179e519d91302d0597c0ca1d1.tar.gz https://github.com/google/go-genproto/archive/af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz -> github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=13e5350cc21c31a96f493c8a34d15c17
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 4779ebd30ca3..823bb784f861 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/simgear-2018.3.1 b/metadata/md5-cache/dev-games/simgear-2018.3.1
new file mode 100644
index 000000000000..6a22160317d3
--- /dev/null
+++ b/metadata/md5-cache/dev-games/simgear-2018.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Development library for simulation games
+EAPI=6
+HOMEPAGE=http://www.simgear.org/
+IUSE=+dns debug gdal openmp subversion test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/simgear-2018.3.1.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79493a526ca7ceb217365ad2e7597aae
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index c6c9bad34b27..102e10b0af6d 100644
Binary files a/metadata/md5-cache/dev-go/Manifest.gz and b/metadata/md5-cache/dev-go/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720 b/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
index 909a3ed09646..51ab23af50ee 100644
--- a/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
+++ b/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/russross/blackfriday/archive/8cec3a8.tar.gz -> blackfriday-1.2_p20150720.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=f79ccb72741de6ca18a6cb9acbe19b5f
diff --git a/metadata/md5-cache/dev-go/blackfriday-1.4 b/metadata/md5-cache/dev-go/blackfriday-1.4
index 96cb59a18958..70706b32d2de 100644
--- a/metadata/md5-cache/dev-go/blackfriday-1.4
+++ b/metadata/md5-cache/dev-go/blackfriday-1.4
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=dev-go/sanitized-anchor-name:=
 SLOT=0
 SRC_URI=https://github.com/russross/blackfriday/archive/v1.4.tar.gz -> blackfriday-1.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=68e8bfe1e2b5af728c118fad4429f9cc
diff --git a/metadata/md5-cache/dev-go/blackfriday-9999 b/metadata/md5-cache/dev-go/blackfriday-9999
index 9f2e4be2fd50..594bd8286eab 100644
--- a/metadata/md5-cache/dev-go/blackfriday-9999
+++ b/metadata/md5-cache/dev-go/blackfriday-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/russross/blackfriday
 LICENSE=BSD-2
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1fc2c10294a4bd418437a7e97f4e1e45
diff --git a/metadata/md5-cache/dev-go/cli-0_pre20160306 b/metadata/md5-cache/dev-go/cli-0_pre20160306
index 68584aae1422..47516c91a101 100644
--- a/metadata/md5-cache/dev-go/cli-0_pre20160306
+++ b/metadata/md5-cache/dev-go/cli-0_pre20160306
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0_pre20160306
 SRC_URI=https://github.com/codegangsta/cli/archive/aca5b047ed14d17224157c3434ea93bf6cdaadee.tar.gz -> cli-0_pre20160306.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d150131e115e0b94ed374b03ca9e38b6
diff --git a/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216 b/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
index f64321269ca1..6ac7d6ce6e71 100644
--- a/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
+++ b/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/chouquette/coveraggregator/archive/af12d4d73479a1b49a16bbed8e5c182999dd62be.tar.gz -> coveraggregator-0_pre20170216.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=63ef8c713cb98485f2677bc7a0a4bc7d
diff --git a/metadata/md5-cache/dev-go/delve-0.12.2 b/metadata/md5-cache/dev-go/delve-0.12.2
index 7242b95ef01c..b56bfd0faca4 100644
--- a/metadata/md5-cache/dev-go/delve-0.12.2
+++ b/metadata/md5-cache/dev-go/delve-0.12.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/derekparker/delve/archive/v0.12.2.tar.gz -> delve-0.12.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=a72766e6eee139e35b4f76adbf332638
diff --git a/metadata/md5-cache/dev-go/delve-1.0.0 b/metadata/md5-cache/dev-go/delve-1.0.0
index 78567d4ecbbb..5bb11d3ff2e9 100644
--- a/metadata/md5-cache/dev-go/delve-1.0.0
+++ b/metadata/md5-cache/dev-go/delve-1.0.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/derekparker/delve/archive/v1.0.0.tar.gz -> delve-1.0.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5ecb74d0e548178d8be36f87d29a9334
diff --git a/metadata/md5-cache/dev-go/delve-1.0.0_rc1 b/metadata/md5-cache/dev-go/delve-1.0.0_rc1
index 9e3c370c9c32..eca620bfdad6 100644
--- a/metadata/md5-cache/dev-go/delve-1.0.0_rc1
+++ b/metadata/md5-cache/dev-go/delve-1.0.0_rc1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/derekparker/delve/archive/v1.0.0-rc.1.tar.gz -> delve-1.0.0_rc1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ec11bd41b00dcace0dbc565af867129a
diff --git a/metadata/md5-cache/dev-go/ed25519-0_pre20160420 b/metadata/md5-cache/dev-go/ed25519-0_pre20160420
index 8e8eb1cce37c..5045023d7342 100644
--- a/metadata/md5-cache/dev-go/ed25519-0_pre20160420
+++ b/metadata/md5-cache/dev-go/ed25519-0_pre20160420
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/agl/ed25519/archive/278e1ec8e8a6e017cd07577924d6766039146ced.tar.gz -> ed25519-0_pre20160420.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=79d5574791f74df85f1cca94d172ed9b
diff --git a/metadata/md5-cache/dev-go/fuzzy-0.0.3 b/metadata/md5-cache/dev-go/fuzzy-0.0.3
index a31ecf634d73..63b572f99a3c 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.3
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0.0.3
 SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.3.tar.gz -> fuzzy-0.0.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d2ca8212b4750188b7065f107200c90f
diff --git a/metadata/md5-cache/dev-go/fuzzy-0.0.5 b/metadata/md5-cache/dev-go/fuzzy-0.0.5
index 2b74a276ec45..b4d5a1b47e89 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.5
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0.0.5
 SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.5.tar.gz -> fuzzy-0.0.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=02a377548cb871341cb84e65ee3698a6
diff --git a/metadata/md5-cache/dev-go/glide-0.12.3 b/metadata/md5-cache/dev-go/glide-0.12.3
index 4c75ee598b9f..255fed5e3f55 100644
--- a/metadata/md5-cache/dev-go/glide-0.12.3
+++ b/metadata/md5-cache/dev-go/glide-0.12.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/Masterminds/glide/archive/v0.12.3.tar.gz -> glide-0.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=259d0fab59f5bc4ffcb97e9976b1c8c2
diff --git a/metadata/md5-cache/dev-go/glide-0.13.1 b/metadata/md5-cache/dev-go/glide-0.13.1
index 5ccc1530e147..9b940a712a7f 100644
--- a/metadata/md5-cache/dev-go/glide-0.13.1
+++ b/metadata/md5-cache/dev-go/glide-0.13.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Masterminds/glide/archive/v0.13.1.tar.gz -> glide-0.13.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=332dcb60187ed7640ab155620a113d82
diff --git a/metadata/md5-cache/dev-go/glide-0.13.2 b/metadata/md5-cache/dev-go/glide-0.13.2
index 53326dfab614..b8dc35ce5c9a 100644
--- a/metadata/md5-cache/dev-go/glide-0.13.2
+++ b/metadata/md5-cache/dev-go/glide-0.13.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Masterminds/glide/archive/v0.13.2.tar.gz -> glide-0.13.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9f3a3e59e2eced84680fb41cc23143ef
diff --git a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023 b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
index 4f029dcd4c5a..f7d7a4d7f56d 100644
--- a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+++ b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm
 LICENSE=CC-PD
 SLOT=0/0_pre20151023
 SRC_URI=https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-0_pre20151023.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b00790114e7913fcfcfe8113e0f39b45
diff --git a/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822 b/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
index cd1a3adbe283..b436ebbfb66b 100644
--- a/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
+++ b/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-go/go-bindata
 SLOT=0/0_pre20160822
 SRC_URI=https://github.com/elazarl/go-bindata-assetfs/archive/9a6736ed45b44bf3835afeebb3034b57ed329f3e.tar.gz -> go-bindata-assetfs-0_pre20160822.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=00e416a421efc34792ba337bd841eedf
diff --git a/metadata/md5-cache/dev-go/go-colortext-0_pre20150720 b/metadata/md5-cache/dev-go/go-colortext-0_pre20150720
index 0fa3401e42f7..4869a7d16a20 100644
--- a/metadata/md5-cache/dev-go/go-colortext-0_pre20150720
+++ b/metadata/md5-cache/dev-go/go-colortext-0_pre20150720
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/daviddengcn/go-colortext/archive/3b18c85.tar.gz -> go-colortext-0_pre20150720.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=cc46e3cd823119650b0d5a97b22ad4a6
diff --git a/metadata/md5-cache/dev-go/go-crypto-0_pre20160126 b/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
index f49a5f445ba4..b74fdbc775ed 100644
--- a/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
+++ b/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20160126
 SRC_URI=https://github.com/golang/crypto/archive/1f22c0103821b9390939b6776727195525381532.tar.gz -> go-crypto-0_pre20160126.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=4fb3ca0a9cbfcc7cfc011ec20e8009b8
diff --git a/metadata/md5-cache/dev-go/go-crypto-0_pre20180816 b/metadata/md5-cache/dev-go/go-crypto-0_pre20180816
index 97509dcaff4e..640f68926b92 100644
--- a/metadata/md5-cache/dev-go/go-crypto-0_pre20180816
+++ b/metadata/md5-cache/dev-go/go-crypto-0_pre20180816
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20180816
 SRC_URI=https://github.com/golang/crypto/archive/aabede6cba87e37f413b3e60ebfc214f8eeca1b0.tar.gz -> go-crypto-0_pre20180816.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=f6b7c192d96a38e5def3cac2ece3065d
diff --git a/metadata/md5-cache/dev-go/go-crypto-9999 b/metadata/md5-cache/dev-go/go-crypto-9999
index 62bfc4a11740..7b8fcb22dd5e 100644
--- a/metadata/md5-cache/dev-go/go-crypto-9999
+++ b/metadata/md5-cache/dev-go/go-crypto-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://godoc.org/golang.org/x/crypto
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=256a1e01578b90692cad64db91769784
diff --git a/metadata/md5-cache/dev-go/go-eapache-queue-1.0.2 b/metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
index 06efebb38268..567d4dfc04bb 100644
--- a/metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
+++ b/metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.0.2
 SRC_URI=https://github.com/eapache/queue/archive/v1.0.2.tar.gz -> go-eapache-queue-1.0.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=c4f8107dcf2c95beb48cee3d603a73e3
diff --git a/metadata/md5-cache/dev-go/go-eapache-queue-9999 b/metadata/md5-cache/dev-go/go-eapache-queue-9999
index b92b72e4b560..fce71801c1f9 100644
--- a/metadata/md5-cache/dev-go/go-eapache-queue-9999
+++ b/metadata/md5-cache/dev-go/go-eapache-queue-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/eapache/queue
 LICENSE=MIT
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4f8107dcf2c95beb48cee3d603a73e3
diff --git a/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305 b/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
index 5e3006dc8d98..931303f93b0e 100644
--- a/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
+++ b/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0/0_pre20160305
 SRC_URI=https://github.com/plouc/go-gitlab-client/archive/a526ef09e9e03f673a43ecd4a687abf6c25343ca.tar.gz -> go-gitlab-client-0_pre20160305.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=c9734932bbcf73c1444c5212d0cc61b6
diff --git a/metadata/md5-cache/dev-go/go-md2man-1.0.3 b/metadata/md5-cache/dev-go/go-md2man-1.0.3
index da83b94197c9..0564c305b302 100644
--- a/metadata/md5-cache/dev-go/go-md2man-1.0.3
+++ b/metadata/md5-cache/dev-go/go-md2man-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v1.0.3.tar.gz -> go-md2man-1.0.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=0dbc544379c6e9b608d4740edbd00966
diff --git a/metadata/md5-cache/dev-go/go-md2man-1.0.6 b/metadata/md5-cache/dev-go/go-md2man-1.0.6
index 6c496ad45c1b..634af228c1d8 100644
--- a/metadata/md5-cache/dev-go/go-md2man-1.0.6
+++ b/metadata/md5-cache/dev-go/go-md2man-1.0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-go/blackfriday:=
 SLOT=0
 SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v1.0.6.tar.gz -> go-md2man-1.0.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=01eb7e0b9f40cbf18c9aa0244eb66a28
diff --git a/metadata/md5-cache/dev-go/go-net-0_pre20160216 b/metadata/md5-cache/dev-go/go-net-0_pre20160216
index 9da39d67a515..60ec821446c3 100644
--- a/metadata/md5-cache/dev-go/go-net-0_pre20160216
+++ b/metadata/md5-cache/dev-go/go-net-0_pre20160216
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20160216
 SRC_URI=https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=1f3ff73dc2636633d90e2572fc1d4747
diff --git a/metadata/md5-cache/dev-go/go-net-0_pre20180816 b/metadata/md5-cache/dev-go/go-net-0_pre20180816
index 72f71ba158a5..6bfc0374ccd9 100644
--- a/metadata/md5-cache/dev-go/go-net-0_pre20180816
+++ b/metadata/md5-cache/dev-go/go-net-0_pre20180816
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20180816
 SRC_URI=https://github.com/golang/net/archive/aaf60122140d3fcf75376d319f0554393160eb50.tar.gz -> go-net-0_pre20180816.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=07266805ce3e5b48d40b087e9eaed9a5
diff --git a/metadata/md5-cache/dev-go/go-net-9999 b/metadata/md5-cache/dev-go/go-net-9999
index 9f663133d598..8f9bb133b689 100644
--- a/metadata/md5-cache/dev-go/go-net-9999
+++ b/metadata/md5-cache/dev-go/go-net-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://godoc.org/golang.org/x/net
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=923125b05d333309b3fddb8c7761798f
diff --git a/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701 b/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
index 947a49ea1f2b..95ac07cbe8ed 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
+++ b/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/golang/oauth2/archive/8914e5017ca260f2a3a1575b1e6868874050d95e.tar.gz -> go-oauth2-0_pre20150701.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz -> gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5897d9c914e3d824f24531249a8e5580
diff --git a/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222 b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
index 72763a896501..57b3080a9760 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
+++ b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20160222
 SRC_URI=https://github.com/golang/oauth2/archive/2cd4472c321b6cba78e029d99f0e7fe51032fd21.tar.gz -> go-oauth2-0_pre20160222.tar.gz https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dfa4a6d63ea72a5c5819fdbe0be77d14
diff --git a/metadata/md5-cache/dev-go/go-oauth2-9999 b/metadata/md5-cache/dev-go/go-oauth2-9999
index b6d31d6f0606..12350a9d52ab 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-9999
+++ b/metadata/md5-cache/dev-go/go-oauth2-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/oauth2
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a84375e17e32ed081f4ffc60ce6ddca8
diff --git a/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216 b/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
index 618c4a75f66e..6d6d63565755 100644
--- a/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
+++ b/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20160216
 SRC_URI=https://github.com/golang/protobuf/archive/127091107ff5f822298f1faa7487ffcf578adcf6.tar.gz -> go-protobuf-0_pre20160216.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=0f424afc9280794f039d5fe253c0a884
diff --git a/metadata/md5-cache/dev-go/go-protobuf-1.2.0 b/metadata/md5-cache/dev-go/go-protobuf-1.2.0
index dedff15550b1..a676f7c0c2cb 100644
--- a/metadata/md5-cache/dev-go/go-protobuf-1.2.0
+++ b/metadata/md5-cache/dev-go/go-protobuf-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/1.2.0
 SRC_URI=https://github.com/golang/protobuf/archive/v1.2.0.tar.gz -> go-protobuf-1.2.0.tar.gz https://github.com/google/go-genproto/archive/af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz -> github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz https://github.com/golang/net/archive/aaf60122140d3fcf75376d319f0554393160eb50.tar.gz -> github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ce300bcad70c14debe31ef11f5cbe465
diff --git a/metadata/md5-cache/dev-go/go-resiliency-1.0.0 b/metadata/md5-cache/dev-go/go-resiliency-1.0.0
index ce5e97ef0a60..3a959278f4ab 100644
--- a/metadata/md5-cache/dev-go/go-resiliency-1.0.0
+++ b/metadata/md5-cache/dev-go/go-resiliency-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.0.0
 SRC_URI=https://github.com/eapache/go-resiliency/archive/v1.0.0.tar.gz -> go-resiliency-1.0.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5b577942014abf9d5139518b8c4ee372
diff --git a/metadata/md5-cache/dev-go/go-resiliency-9999 b/metadata/md5-cache/dev-go/go-resiliency-9999
index ae5fdf9398e1..a58eddf2333e 100644
--- a/metadata/md5-cache/dev-go/go-resiliency-9999
+++ b/metadata/md5-cache/dev-go/go-resiliency-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/eapache/go-resiliency
 LICENSE=MIT
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b577942014abf9d5139518b8c4ee372
diff --git a/metadata/md5-cache/dev-go/go-snappy-0_pre20150729 b/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
index 14101676ec8f..a9ff30ee160e 100644
--- a/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
+++ b/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150729
 SRC_URI=https://github.com/golang/snappy/archive/723cc1e459b8eea2dea4583200fd60757d40097a.tar.gz -> go-snappy-0_pre20150729.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=a8357282e3a622c3f0d68853a1b00c9d
diff --git a/metadata/md5-cache/dev-go/go-snappy-0_pre20160213 b/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
index 1433c0c30f1c..d7861dc4f34a 100644
--- a/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
+++ b/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20160213
 SRC_URI=https://github.com/golang/snappy/archive/d1d908a252c22fd7afd36190d5cffb144aa8f777.tar.gz -> go-snappy-0_pre20160213.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=02852c8dd5933f21c179b2e587517208
diff --git a/metadata/md5-cache/dev-go/go-snappy-9999 b/metadata/md5-cache/dev-go/go-snappy-9999
index f592047b4c7c..1b5565121af8 100644
--- a/metadata/md5-cache/dev-go/go-snappy-9999
+++ b/metadata/md5-cache/dev-go/go-snappy-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/golang/snappy
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a8357282e3a622c3f0d68853a1b00c9d
diff --git a/metadata/md5-cache/dev-go/go-spew-0_pre20150619 b/metadata/md5-cache/dev-go/go-spew-0_pre20150619
index fcdbf6cc6d17..01abf9d313c0 100644
--- a/metadata/md5-cache/dev-go/go-spew-0_pre20150619
+++ b/metadata/md5-cache/dev-go/go-spew-0_pre20150619
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=ISC
 SLOT=0/0_pre20150619
 SRC_URI=https://github.com/davecgh/go-spew/archive/2df174808ee097f90d259e432cc04442cf60be21.tar.gz -> go-spew-0_pre20150619.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=f353cb14060c8213ba6f2c173c665ccb
diff --git a/metadata/md5-cache/dev-go/go-spew-9999 b/metadata/md5-cache/dev-go/go-spew-9999
index 75fa8bc1d474..a9150f763b47 100644
--- a/metadata/md5-cache/dev-go/go-spew-9999
+++ b/metadata/md5-cache/dev-go/go-spew-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/davecgh/go-spew
 LICENSE=ISC
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f353cb14060c8213ba6f2c173c665ccb
diff --git a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131 b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
index 5915465433ae..2ab3db93f940 100644
--- a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
+++ b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.1.0_p20160131
 SRC_URI=https://github.com/mattn/go-sqlite3/archive/c5aee9649735e8dadac55eb968ccebd9fa29a881.tar.gz -> go-sqlite3-1.1.0_p20160131.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9245b4ac3991f52a03f8693e327fbedb
diff --git a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307 b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
index e0407ca17b0a..b92e72069f85 100644
--- a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
+++ b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.1.0_p20160307
 SRC_URI=https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=098b20af94b2700b54a3ebf4874fd0d0
diff --git a/metadata/md5-cache/dev-go/go-sys-0_pre20160204 b/metadata/md5-cache/dev-go/go-sys-0_pre20160204
index ffedef7e8ebb..702d70bbd45c 100644
--- a/metadata/md5-cache/dev-go/go-sys-0_pre20160204
+++ b/metadata/md5-cache/dev-go/go-sys-0_pre20160204
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20160204
 SRC_URI=https://github.com/golang/sys/archive/50c6bc5e4292a1d4e65c6e9be5f53be28bcbe28e.tar.gz -> go-sys-0_pre20160204.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=73cf286d97d973561517a68adb298a14
diff --git a/metadata/md5-cache/dev-go/go-sys-0_pre20180816 b/metadata/md5-cache/dev-go/go-sys-0_pre20180816
index 0148fbf8046f..1ceb7c986ebe 100644
--- a/metadata/md5-cache/dev-go/go-sys-0_pre20180816
+++ b/metadata/md5-cache/dev-go/go-sys-0_pre20180816
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20180816
 SRC_URI=https://github.com/golang/sys/archive/1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded.tar.gz -> go-sys-0_pre20180816.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=1457e21de0a935c309e57c462f18a2b7
diff --git a/metadata/md5-cache/dev-go/go-sys-9999 b/metadata/md5-cache/dev-go/go-sys-9999
index 04303b51515c..9e224743accb 100644
--- a/metadata/md5-cache/dev-go/go-sys-9999
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://godoc.org/golang.org/x/sys
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d83aac10e5dc0b3efac92bdc5a594c6
diff --git a/metadata/md5-cache/dev-go/go-text-0.3.0 b/metadata/md5-cache/dev-go/go-text-0.3.0
index 09a51db5ede8..26c17ceb618e 100644
--- a/metadata/md5-cache/dev-go/go-text-0.3.0
+++ b/metadata/md5-cache/dev-go/go-text-0.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0.3.0
 SRC_URI=https://github.com/golang/text/archive/v0.3.0.tar.gz -> go-text-0.3.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d0ad933387b4fac7314214a59a71cb60
diff --git a/metadata/md5-cache/dev-go/go-text-0_pre20160211 b/metadata/md5-cache/dev-go/go-text-0_pre20160211
index 41dd9eb0fb7d..2c36a8a02363 100644
--- a/metadata/md5-cache/dev-go/go-text-0_pre20160211
+++ b/metadata/md5-cache/dev-go/go-text-0_pre20160211
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20160211
 SRC_URI=https://github.com/golang/text/archive/07b9a78963006a15c538ec5175243979025fa7a8.tar.gz -> go-text-0_pre20160211.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=35775eee1181dd397eb3fac57ce7c809
diff --git a/metadata/md5-cache/dev-go/go-text-9999 b/metadata/md5-cache/dev-go/go-text-9999
index e7a4e31e444e..0bafb4373ded 100644
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://godoc.org/golang.org/x/text
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=17bd2b1395d26fe458a8d4e2505a35c2
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20180817 b/metadata/md5-cache/dev-go/go-tools-0_pre20180817
index fea94c7d4d7c..df2ed58c6856 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20180817
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20180817
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0/0_pre20180817
 SRC_URI=https://github.com/golang/tools/archive/7d1dc997617fb662918b6ea95efc19faa87e1cf8.tar.gz -> go-tools-0_pre20180817.tar.gz https://github.com/golang/net/archive/aaf60122140d3fcf75376d319f0554393160eb50.tar.gz -> github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz mirror://gentoo/go-favicon-20181103162401.ico https://dev.gentoo.org/~zmedico/distfiles/go-favicon-20181103162401.ico
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ec567047c1ffd8353f14eee26a1adab6
diff --git a/metadata/md5-cache/dev-go/go-tools-9999 b/metadata/md5-cache/dev-go/go-tools-9999
index 4ee2326a0f3a..bbdc11fb13ad 100644
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://godoc.org/golang.org/x/tools
 LICENSE=BSD
 SLOT=0/9999
 SRC_URI=https://github.com/golang/net/archive/aaf60122140d3fcf75376d319f0554393160eb50.tar.gz -> github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz mirror://gentoo/go-favicon-20181103162401.ico https://dev.gentoo.org/~zmedico/distfiles/go-favicon-20181103162401.ico
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a43345c7e2f0bb3453efb1f548ee2119
diff --git a/metadata/md5-cache/dev-go/go-tour-0_p20180810 b/metadata/md5-cache/dev-go/go-tour-0_p20180810
index 02a65f6f7753..b21a8f9f3d9c 100644
--- a/metadata/md5-cache/dev-go/go-tour-0_p20180810
+++ b/metadata/md5-cache/dev-go/go-tour-0_p20180810
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/golang/tour/archive/d642b9371986f5bb2152547a0d525a57f634c3ef.tar.gz -> go-tour-0_p20180810.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d9a983488cfdac8fa3d86f95fd4bef7e
diff --git a/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819 b/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
index 4fcf0b4ddd32..6cff7aac7491 100644
--- a/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
+++ b/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0/0_p20170819
 SRC_URI=https://github.com/kylelemons/godebug/archive/d65d576e9348f5982d7f6d83682b694e731a45c6.tar.gz -> godebug-pretty-0_p20170819.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=be63015f09f5d45c4eecf605af2da4ce
diff --git a/metadata/md5-cache/dev-go/godep-74 b/metadata/md5-cache/dev-go/godep-74
index e1bad3265a5b..ae0ce29464bb 100644
--- a/metadata/md5-cache/dev-go/godep-74
+++ b/metadata/md5-cache/dev-go/godep-74
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/tools/godep/archive/v74.tar.gz -> godep-74.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b14c461ff3de6201c7bd1dec917e15f9
diff --git a/metadata/md5-cache/dev-go/godep-9999 b/metadata/md5-cache/dev-go/godep-9999
index 660833db7c37..b30fd775e8c6 100644
--- a/metadata/md5-cache/dev-go/godep-9999
+++ b/metadata/md5-cache/dev-go/godep-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/tools/godep
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b14c461ff3de6201c7bd1dec917e15f9
diff --git a/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815 b/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
index c0fef6d0c0c9..971b806eb1b7 100644
--- a/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
+++ b/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
@@ -8,5 +8,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gogo/protobuf/archive/fcdc5011193ff531a548e9b0301828d5a5b97fd8.tar.gz -> gogo-protobuf-0.4_p20170815.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=1e8177eadd50e2572d19516f62667d03
diff --git a/metadata/md5-cache/dev-go/golint-0_pre20180702 b/metadata/md5-cache/dev-go/golint-0_pre20180702
index a69b07917f46..bcdf059d297d 100644
--- a/metadata/md5-cache/dev-go/golint-0_pre20180702
+++ b/metadata/md5-cache/dev-go/golint-0_pre20180702
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<dev-lang/go-1.6 dev-go/go-tools:=
 SLOT=0/0_pre20180702
 SRC_URI=https://github.com/golang/lint/archive/06c8688.tar.gz -> golint-0_pre20180702.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=e051c6286bf2b9ee708ad7a2bf3c2206
diff --git a/metadata/md5-cache/dev-go/gom-0_pre20151110 b/metadata/md5-cache/dev-go/gom-0_pre20151110
index 61636b993142..16bf41951794 100644
--- a/metadata/md5-cache/dev-go/gom-0_pre20151110
+++ b/metadata/md5-cache/dev-go/gom-0_pre20151110
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/mattn/gom/archive/c522e7d.tar.gz -> gom-0_pre20151110.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=70a65498eb2557cbe90fb3c81aff5d61
diff --git a/metadata/md5-cache/dev-go/goptlib-0.6 b/metadata/md5-cache/dev-go/goptlib-0.6
index 547409818a4b..85f84669c44a 100644
--- a/metadata/md5-cache/dev-go/goptlib-0.6
+++ b/metadata/md5-cache/dev-go/goptlib-0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/golang-goptlib/golang-goptlib_0.6.orig.tar.gz -> goptlib-0.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=af3ce7a739b966bdfc831b650d369d36
diff --git a/metadata/md5-cache/dev-go/goversion-1.2.0 b/metadata/md5-cache/dev-go/goversion-1.2.0
index c5d84ee8d1a6..f030eb8a3cc2 100644
--- a/metadata/md5-cache/dev-go/goversion-1.2.0
+++ b/metadata/md5-cache/dev-go/goversion-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/rsc/goversion/archive/v1.2.0.tar.gz -> goversion-1.2.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=77515931836f081181250aecfc3d454d
diff --git a/metadata/md5-cache/dev-go/gox-0.4.0 b/metadata/md5-cache/dev-go/gox-0.4.0
index e187b9c4c99d..0f36f626bd32 100644
--- a/metadata/md5-cache/dev-go/gox-0.4.0
+++ b/metadata/md5-cache/dev-go/gox-0.4.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0/0.4.0
 SRC_URI=https://github.com/mitchellh/gox/archive/v0.4.0.tar.gz -> gox-0.4.0.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=49c16796528036e8e14f6a1b17aa82a0
diff --git a/metadata/md5-cache/dev-go/gox-0_pre20160725 b/metadata/md5-cache/dev-go/gox-0_pre20160725
index 8fe9b1726369..2e083fe7eb2c 100644
--- a/metadata/md5-cache/dev-go/gox-0_pre20160725
+++ b/metadata/md5-cache/dev-go/gox-0_pre20160725
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0/0_pre20160725
 SRC_URI=https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-0_pre20160725.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=def994b0ffa7c138027a82b112075376
diff --git a/metadata/md5-cache/dev-go/qr-0_p20161121 b/metadata/md5-cache/dev-go/qr-0_p20161121
index 0694a8deaf6f..1d0c2b146417 100644
--- a/metadata/md5-cache/dev-go/qr-0_p20161121
+++ b/metadata/md5-cache/dev-go/qr-0_p20161121
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0_p20161121
 SRC_URI=https://github.com/rsc/qr/archive/48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5.tar.gz -> qr-0_p20161121.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=7b13fc2418419ea1d778f68343bba3a2
diff --git a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822 b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
index c52645917a39..4f0fc5bd7643 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/shurcooL/sanitized_anchor_name/archive/244f5ac.tar.gz -> sanitized-anchor-name-0_pre20150822.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=14510d36dbafb3ab11e1db6849adbea7
diff --git a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027 b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
index c0626ffc87bd..776882f82efd 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a.tar.gz -> sanitized-anchor-name-0_pre20151027.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=dd4b2fbd620bd9a8fb5fde2033405f81
diff --git a/metadata/md5-cache/dev-go/sanitized-anchor-name-9999 b/metadata/md5-cache/dev-go/sanitized-anchor-name-9999
index 82e470c16079..78da943bb70e 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-9999
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acf7f279f6bc1fbc422c5dd711a384c5
diff --git a/metadata/md5-cache/dev-go/sarama-1.4.3 b/metadata/md5-cache/dev-go/sarama-1.4.3
index 38ed56229637..57fbd34b684d 100644
--- a/metadata/md5-cache/dev-go/sarama-1.4.3
+++ b/metadata/md5-cache/dev-go/sarama-1.4.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/1.4.3
 SRC_URI=https://github.com/Shopify/sarama/archive/v1.4.3.tar.gz -> sarama-1.4.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=ce40a1f3d48fd251b2004cfb77dccbbc
diff --git a/metadata/md5-cache/dev-go/siphash-1.0.0 b/metadata/md5-cache/dev-go/siphash-1.0.0
index ec3ff1e39332..62356a6ff470 100644
--- a/metadata/md5-cache/dev-go/siphash-1.0.0
+++ b/metadata/md5-cache/dev-go/siphash-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/dchest/siphash/archive/v1.0.0.tar.gz -> siphash-1.0.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=bcab31819bc84f23946cdf95bbc7c330
diff --git a/metadata/md5-cache/dev-go/siphash-1.1.0 b/metadata/md5-cache/dev-go/siphash-1.1.0
index 5492fbe8def6..87456c7aca7c 100644
--- a/metadata/md5-cache/dev-go/siphash-1.1.0
+++ b/metadata/md5-cache/dev-go/siphash-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/dchest/siphash/archive/v1.1.0.tar.gz -> siphash-1.1.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=7d996d72f96305c2dbc6f24d8794e447
diff --git a/metadata/md5-cache/dev-go/toml-0.2.0_p20160716 b/metadata/md5-cache/dev-go/toml-0.2.0_p20160716
index 9cb4a5ab7745..b9fa2d422388 100644
--- a/metadata/md5-cache/dev-go/toml-0.2.0_p20160716
+++ b/metadata/md5-cache/dev-go/toml-0.2.0_p20160716
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/toml/archive/99064174e013895bbd9b025c31100bd1d9b590ca.tar.gz -> toml-0.2.0_p20160716.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=176cbf94d7cee7d920581183c968f035
diff --git a/metadata/md5-cache/dev-go/toml-9999 b/metadata/md5-cache/dev-go/toml-9999
index eb73dbc2e6d6..539d9a9bb5cd 100644
--- a/metadata/md5-cache/dev-go/toml-9999
+++ b/metadata/md5-cache/dev-go/toml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/BurntSushi/toml
 LICENSE=WTFPL-2
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=176cbf94d7cee7d920581183c968f035
diff --git a/metadata/md5-cache/dev-go/twofactor-0_p20170917 b/metadata/md5-cache/dev-go/twofactor-0_p20170917
index b0d70f74998f..44be26e84e95 100644
--- a/metadata/md5-cache/dev-go/twofactor-0_p20170917
+++ b/metadata/md5-cache/dev-go/twofactor-0_p20170917
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0_p20170917
 SRC_URI=https://github.com/gokyle/twofactor/archive/eaad1884d40f9cabff98a57a524c17afd00c9fe7.tar.gz -> twofactor-0_p20170917.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=31db51c31f4c13e6867b17d4d452fa0d
diff --git a/metadata/md5-cache/dev-go/twofactor-0_p20180418 b/metadata/md5-cache/dev-go/twofactor-0_p20180418
index 187ae1d8d59e..e97c1080ff74 100644
--- a/metadata/md5-cache/dev-go/twofactor-0_p20180418
+++ b/metadata/md5-cache/dev-go/twofactor-0_p20180418
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0_p20180418
 SRC_URI=https://github.com/gokyle/twofactor/archive/bbc82ff8de72400ce39a13077627531d9841ad62.tar.gz -> twofactor-0_p20180418.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2e17f183d63ccb56c5ed617e1728cc6a
diff --git a/metadata/md5-cache/dev-go/zglob-0_p20171230 b/metadata/md5-cache/dev-go/zglob-0_p20171230
index 605276e1b79f..89b2605e5862 100644
--- a/metadata/md5-cache/dev-go/zglob-0_p20171230
+++ b/metadata/md5-cache/dev-go/zglob-0_p20171230
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0/0_p20171230
 SRC_URI=https://github.com/mattn/go-zglob/archive/4959821b481786922ac53e7ef25c61ae19fb7c36.tar.gz -> zglob-0_p20171230.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ec2ccd1d7d49b24b039d2a9d297cc36f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9c6db683f8c6..9eebca0b2b4c 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
index 1fe556b4a769..df693e5bbc45 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs test 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-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/18
 SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=63c53d9572b9015a75f71e8f7f06a79f
+_md5_=261a4f062f18ee5a9c12e8d02b19aefd
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 2b122e23b9e6..c4b1e1460bd5 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/pecl-event-2.4.3 b/metadata/md5-cache/dev-php/pecl-event-2.4.3
new file mode 100644
index 000000000000..7e583b9c06b4
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-event-2.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) >=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 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=PHP wrapper for libevent2
+EAPI=6
+HOMEPAGE=https://pecl.php.net/event
+IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=PHP-3
+RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) !dev-php/pecl-libevent php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/event-2.4.3.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=74c4389b7a9f5076403e4505a6079eca
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.3.0 b/metadata/md5-cache/dev-php/pecl-yaml-1.3.0
deleted file mode 100644
index a1645c00c812..000000000000
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-yaml:7 )
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/yaml-1.3.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=220c1a94b7ef441bd7578da4bf5679c3
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.3.1 b/metadata/md5-cache/dev-php/pecl-yaml-1.3.2
similarity index 75%
rename from metadata/md5-cache/dev-php/pecl-yaml-1.3.1
rename to metadata/md5-cache/dev-php/pecl-yaml-1.3.2
index 2484ef8ec618..2e6c7f9a31b5 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.3.1
+++ b/metadata/md5-cache/dev-php/pecl-yaml-1.3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
 EAPI=6
 HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6
+IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php5-6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6 )
+PDEPEND=php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] ) php_targets_php7-3? ( dev-php/pecl-yaml:7[php_targets_php7-3] )
+RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php5-6 )
 SLOT=0
-SRC_URI=https://pecl.php.net/get/yaml-1.3.1.tgz
+SRC_URI=https://pecl.php.net/get/yaml-1.3.2.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c8bb42079506eb895737c64d80c91a08
+_md5_=c1802654d69dec2e09e62bada4f05060
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.0.0 b/metadata/md5-cache/dev-php/pecl-yaml-2.0.0
deleted file mode 100644
index 0111a29cf18c..000000000000
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/yaml-2.0.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a422cdede5883dc4d67613bc40181064
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.0.2 b/metadata/md5-cache/dev-php/pecl-yaml-2.0.4
similarity index 76%
rename from metadata/md5-cache/dev-php/pecl-yaml-2.0.2
rename to metadata/md5-cache/dev-php/pecl-yaml-2.0.4
index a1f0ee2f445e..b36fd706b1a5 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.0.2
+++ b/metadata/md5-cache/dev-php/pecl-yaml-2.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+DEPEND=>=dev-libs/libyaml-0.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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
 EAPI=6
 HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6
+IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php5-6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6 )
+RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php5-6 )
 SLOT=7
-SRC_URI=https://pecl.php.net/get/yaml-2.0.2.tgz
+SRC_URI=https://pecl.php.net/get/yaml-2.0.4.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3c07088c241fec4afe08f1ea69b11c6d
+_md5_=df9303f521a54add9e1de99edbed420d
diff --git a/metadata/md5-cache/dev-php/swoole-4.2.9 b/metadata/md5-cache/dev-php/swoole-4.2.9
new file mode 100644
index 000000000000..db280a1917b9
--- /dev/null
+++ b/metadata/md5-cache/dev-php/swoole-4.2.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libaio dev-libs/boost:0= dev-libs/libpcre http2? ( net-libs/nghttp2:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) mysql? ( php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] ) php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) ) >=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 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=Event-driven asynchronous & concurrent & coroutine networking engine
+EAPI=6
+HOMEPAGE=https://www.swoole.co.uk
+IUSE=debug http2 libressl mysql sockets ssl php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libaio dev-libs/boost:0= dev-libs/libpcre http2? ( net-libs/nghttp2:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) mysql? ( php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] ) php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pecl.php.net/get/swoole-4.2.9.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=fa3e2589a4d043c128df3fc338e495ad
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c13da0e5dd57..341c89059206 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/numpy-1.14.5 b/metadata/md5-cache/dev-python/numpy-1.14.5
index 3a1195dd3faf..d9c8c41d8e40 100644
--- a/metadata/md5-cache/dev-python/numpy-1.14.5
+++ b/metadata/md5-cache/dev-python/numpy-1.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=6
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.14.5.zip doc? ( http://docs.scipy.org/doc/numpy-1.14.5/numpy-html-1.14.5.zip http://docs.scipy.org/doc/numpy-1.14.5/numpy-ref-1.14.5.pdf http://docs.scipy.org/doc/numpy-1.14.5/numpy-user-1.14.5.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=178eb6f746d106257a773eb4e6ca5d25
+_md5_=a5787b8ee6f296123922805142199d58
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 17ff8cb86839..a405a8bc202e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bitrise-1.16.1 b/metadata/md5-cache/dev-util/bitrise-1.16.1
index c7d67f216be3..90d97a0115c4 100644
--- a/metadata/md5-cache/dev-util/bitrise-1.16.1
+++ b/metadata/md5-cache/dev-util/bitrise-1.16.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.16.1.tar.gz -> bitrise-1.16.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=cfbd86d69101118f94c61d30da3f6db0
diff --git a/metadata/md5-cache/dev-util/bitrise-1.19.0 b/metadata/md5-cache/dev-util/bitrise-1.19.0
index e784bb2a489e..48f50c3ae069 100644
--- a/metadata/md5-cache/dev-util/bitrise-1.19.0
+++ b/metadata/md5-cache/dev-util/bitrise-1.19.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-util/envman-1.2.0 >=dev-util/stepman-0.10.0
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.19.0.tar.gz -> bitrise-1.19.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=7d006bec643a9cf1eb5e9b0b8996be24
diff --git a/metadata/md5-cache/dev-util/bitrise-1.20.0 b/metadata/md5-cache/dev-util/bitrise-1.20.0
index 6b57836563a4..655fa689456c 100644
--- a/metadata/md5-cache/dev-util/bitrise-1.20.0
+++ b/metadata/md5-cache/dev-util/bitrise-1.20.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-util/envman-1.2.0 >=dev-util/stepman-0.10.0
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.20.0.tar.gz -> bitrise-1.20.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=caeae143bd0ae35a44790c60203fbe71
diff --git a/metadata/md5-cache/dev-util/bitrise-1.23.0 b/metadata/md5-cache/dev-util/bitrise-1.23.0
index f2fc12ecb454..125dc90bded3 100644
--- a/metadata/md5-cache/dev-util/bitrise-1.23.0
+++ b/metadata/md5-cache/dev-util/bitrise-1.23.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-util/envman-2.1.0 >=dev-util/stepman-0.10.4
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/bitrise/archive/1.23.0.tar.gz -> bitrise-1.23.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=53374e0445ac08f9c60ea843784fd113
diff --git a/metadata/md5-cache/dev-util/clair-2.0.3 b/metadata/md5-cache/dev-util/clair-2.0.3
index b26872267c8e..cddd9d258cb0 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.3
+++ b/metadata/md5-cache/dev-util/clair-2.0.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/bzr dev-vcs/git !!sci-visualization/xd3d
 SLOT=0
 SRC_URI=https://github.com/coreos/clair/archive/v2.0.3.tar.gz -> clair-2.0.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=632fd048bdf51a4504473a64499dbaa3
diff --git a/metadata/md5-cache/dev-util/clair-2.0.4 b/metadata/md5-cache/dev-util/clair-2.0.4
index 3240f8a2b15b..1a530e371d03 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.4
+++ b/metadata/md5-cache/dev-util/clair-2.0.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git !!sci-visualization/xd3d
 SLOT=0
 SRC_URI=https://github.com/coreos/clair/archive/v2.0.4.tar.gz -> clair-2.0.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7a548338ce1a7512c5dd5e87e3be5469
diff --git a/metadata/md5-cache/dev-util/clair-2.0.5 b/metadata/md5-cache/dev-util/clair-2.0.5
index 84d4008cf140..2f89c0d453a3 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.5
+++ b/metadata/md5-cache/dev-util/clair-2.0.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git !!sci-visualization/xd3d
 SLOT=0
 SRC_URI=https://github.com/coreos/clair/archive/v2.0.5.tar.gz -> clair-2.0.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7a548338ce1a7512c5dd5e87e3be5469
diff --git a/metadata/md5-cache/dev-util/clair-2.0.6 b/metadata/md5-cache/dev-util/clair-2.0.6
index dd9094d6c408..41bb76566d5a 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.6
+++ b/metadata/md5-cache/dev-util/clair-2.0.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git !!sci-visualization/xd3d
 SLOT=0
 SRC_URI=https://github.com/coreos/clair/archive/v2.0.6.tar.gz -> clair-2.0.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7a548338ce1a7512c5dd5e87e3be5469
diff --git a/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401 b/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
index 8157ea26729d..c543bb7f3cbd 100644
--- a/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
+++ b/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/gitlab-org/docker-distribution-pruner/repository/archive.tar.gz?ref=207b308c12b1717c6e3d2adf5e1ffe504c64f56e -> docker-distribution-pruner-0_p20170401.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2a895d4f21b0cebebaa800efdc2ffffb
diff --git a/metadata/md5-cache/dev-util/docker-ls-0.3.1 b/metadata/md5-cache/dev-util/docker-ls-0.3.1
index d998571b4c32..0e9d33b0305e 100644
--- a/metadata/md5-cache/dev-util/docker-ls-0.3.1
+++ b/metadata/md5-cache/dev-util/docker-ls-0.3.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mayflower/docker-ls/archive/d80310976c9707e261e57ebfa9acf4e0b1781460.tar.gz -> docker-ls-0.3.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=671a36e6006836a439f5e1eb879a8d7b
diff --git a/metadata/md5-cache/dev-util/drone-0.7.3 b/metadata/md5-cache/dev-util/drone-0.7.3
index ca00b54c229d..5a2e2d476470 100644
--- a/metadata/md5-cache/dev-util/drone-0.7.3
+++ b/metadata/md5-cache/dev-util/drone-0.7.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/f604d592bc356fcade4aec67eba9b7fba8eed655.tar.gz -> drone-0.7.3.tar.gz https://github.com/drone/drone-ui/archive/2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz -> github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a8b9c31b259bb01b1cc2cda281bfdf0d
diff --git a/metadata/md5-cache/dev-util/drone-0.8.5 b/metadata/md5-cache/dev-util/drone-0.8.5
index 637dbc5d4c70..864728fb2ce0 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.5
+++ b/metadata/md5-cache/dev-util/drone-0.8.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/81103a98208b0bfc76be5b07194f359fbc80183b.tar.gz -> drone-0.8.5.tar.gz https://github.com/drone/drone-ui/archive/4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz -> github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/golang/net/archive/6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz -> github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c6c62a6e507f35a30b3d92ef3e64f171
diff --git a/metadata/md5-cache/dev-util/drone-0.8.6 b/metadata/md5-cache/dev-util/drone-0.8.6
index f0b9879a9bc8..f0940a4b7845 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.6
+++ b/metadata/md5-cache/dev-util/drone-0.8.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/c48150767c2700d35dcc29b110a81c8b5969175e.tar.gz -> drone-0.8.6.tar.gz https://github.com/drone/drone-ui/archive/e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz -> github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz https://github.com/golang/protobuf/archive/93b26e6a70e37abb14f2f88194949312b0592a84.tar.gz -> github.com-golang-protobuf-93b26e6a70e37abb14f2f88194949312b0592a84.tar.gz https://github.com/golang/net/archive/3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd.tar.gz -> github.com-golang-net-3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=25de9a1609cbaa737c38ac426cbaf5be
diff --git a/metadata/md5-cache/dev-util/drone-0.8.7 b/metadata/md5-cache/dev-util/drone-0.8.7
index 304437aed7bc..dde81d262128 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.7
+++ b/metadata/md5-cache/dev-util/drone-0.8.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/08739aaed9e95fad15fcefd5cdfe11d7ca66fcbf.tar.gz -> drone-0.8.7.tar.gz https://github.com/drone/drone-ui/archive/e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz -> github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/golang/net/archive/9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz -> github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=728d566374b4c5da79216a2711fc28e1
diff --git a/metadata/md5-cache/dev-util/drone-0.8.8 b/metadata/md5-cache/dev-util/drone-0.8.8
index e55e3b1da149..ac1aaac8eb3f 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.8
+++ b/metadata/md5-cache/dev-util/drone-0.8.8
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/bc22e226d0089b7d575a26f0e7755541aebbc09d.tar.gz -> drone-0.8.8.tar.gz https://github.com/drone/drone-ui/archive/e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz -> github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/golang/net/archive/9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz -> github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=8febea7c1eddc297eea46e6dcc387902
diff --git a/metadata/md5-cache/dev-util/drone-0.8.9 b/metadata/md5-cache/dev-util/drone-0.8.9
index fda814e59ef5..1095bac6e4fb 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.9
+++ b/metadata/md5-cache/dev-util/drone-0.8.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/768ed784bd74b0e0c2d8d49c4c8b6dca99b25e96.tar.gz -> drone-0.8.9.tar.gz https://github.com/drone/drone-ui/archive/e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz -> github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/golang/net/archive/9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz -> github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=94183e3ec9697b4c8314409292fd10c2
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717 b/metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
index f4a82de1edd9..d8c1b1448ed2 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
+++ b/metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
@@ -9,5 +9,5 @@ RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/4a5e8a2acb2c82c5a4e6b96b6849f59962dfb668.tar.gz -> drone-cli-0.7.0_p20170717.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=049e2d7b3a868a04cee607b5be8b11b8
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.6 b/metadata/md5-cache/dev-util/drone-cli-0.8.6
index 836e4d38d7c4..3d53474bfbd8 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.6
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.6
@@ -9,5 +9,5 @@ RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.6.tar.gz -> drone-cli-0.8.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2f650b5537815bcddd9d02a3a8279719
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.0.0 b/metadata/md5-cache/dev-util/drone-cli-1.0.0
index 0bfeb16910b3..cbc23fa2dc50 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.0.0
+++ b/metadata/md5-cache/dev-util/drone-cli-1.0.0
@@ -9,5 +9,5 @@ RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v1.0.0.tar.gz -> drone-cli-1.0.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d360c66b1e7392fcb893fb9e57b76960
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.0.1 b/metadata/md5-cache/dev-util/drone-cli-1.0.1
index 12a6c5699429..ad0ebceb0aca 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.0.1
+++ b/metadata/md5-cache/dev-util/drone-cli-1.0.1
@@ -9,5 +9,5 @@ RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v1.0.1.tar.gz -> drone-cli-1.0.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d360c66b1e7392fcb893fb9e57b76960
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.0.4 b/metadata/md5-cache/dev-util/drone-cli-1.0.4
index 7a7f9fe8fc2d..85c25203ce5b 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.0.4
+++ b/metadata/md5-cache/dev-util/drone-cli-1.0.4
@@ -9,5 +9,5 @@ RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v1.0.4.tar.gz -> drone-cli-1.0.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d360c66b1e7392fcb893fb9e57b76960
diff --git a/metadata/md5-cache/dev-util/envman-1.2.0 b/metadata/md5-cache/dev-util/envman-1.2.0
index 7d7d0bbfef41..44824d113113 100644
--- a/metadata/md5-cache/dev-util/envman-1.2.0
+++ b/metadata/md5-cache/dev-util/envman-1.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/envman/archive/1.2.0.tar.gz -> envman-1.2.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=f625531e7763fdbe3dfde64b372712c6
diff --git a/metadata/md5-cache/dev-util/envman-1.2.1 b/metadata/md5-cache/dev-util/envman-1.2.1
index 4a18794a2ebe..0bd9edc337b3 100644
--- a/metadata/md5-cache/dev-util/envman-1.2.1
+++ b/metadata/md5-cache/dev-util/envman-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/envman/archive/1.2.1.tar.gz -> envman-1.2.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=92531e856cf85236f580fbf0b4634d59
diff --git a/metadata/md5-cache/dev-util/envman-2.1.0 b/metadata/md5-cache/dev-util/envman-2.1.0
index d9a0e686cb86..6237572bc608 100644
--- a/metadata/md5-cache/dev-util/envman-2.1.0
+++ b/metadata/md5-cache/dev-util/envman-2.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/envman/archive/2.1.0.tar.gz -> envman-2.1.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=1e476723ff28f5b61e7a89578c8aa199
diff --git a/metadata/md5-cache/dev-util/promu-0.1.0 b/metadata/md5-cache/dev-util/promu-0.1.0
index b7a57d04d62b..b007ce315df1 100644
--- a/metadata/md5-cache/dev-util/promu-0.1.0
+++ b/metadata/md5-cache/dev-util/promu-0.1.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/v0.1.0.tar.gz -> promu-0.1.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2aced555ccec8a8c2d25e7626299109d
diff --git a/metadata/md5-cache/dev-util/promu-0.1.0_p20180227 b/metadata/md5-cache/dev-util/promu-0.1.0_p20180227
index 39ab2adb15c8..fd703740c3f1 100644
--- a/metadata/md5-cache/dev-util/promu-0.1.0_p20180227
+++ b/metadata/md5-cache/dev-util/promu-0.1.0_p20180227
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/promu/archive/5a3cc08574c63bb853a21c570d719a0fb548dae0.tar.gz -> promu-0.1.0_p20180227.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=e4fde6bdad2b8f6d46c99093fe92d4c2
diff --git a/metadata/md5-cache/dev-util/shc-3.8.9 b/metadata/md5-cache/dev-util/shc-3.8.9
deleted file mode 100644
index 6dc0f258670b..000000000000
--- a/metadata/md5-cache/dev-util/shc-3.8.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A (shell-) script compiler/scrambler
-EAPI=4
-HOMEPAGE=http://www.datsi.fi.upm.es/~frosal
-KEYWORDS=~alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.datsi.fi.upm.es/~frosal/sources/shc-3.8.9.tgz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2f18bd8e03390f787efd5cde2eb321bb
diff --git a/metadata/md5-cache/dev-util/shc-3.9.6 b/metadata/md5-cache/dev-util/shc-3.9.6
index b956b490d4bb..ef451b7bba27 100644
--- a/metadata/md5-cache/dev-util/shc-3.9.6
+++ b/metadata/md5-cache/dev-util/shc-3.9.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A (shell-) script compiler/scrambler
 EAPI=7
 HOMEPAGE=https://neurobin.org/projects/softwares/unix/shc/
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/neurobin/shc/archive/3.9.6.tar.gz -> shc-3.9.6.tar.gz
-_md5_=6ade92e38d16ce7ff60aed3ea3b8ee57
+_md5_=daff12adbbac8b1a3cc8b927c9de01d5
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.0 b/metadata/md5-cache/dev-util/stepman-0.10.0
index d9ab78de71f5..44f9249ee464 100644
--- a/metadata/md5-cache/dev-util/stepman-0.10.0
+++ b/metadata/md5-cache/dev-util/stepman-0.10.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.0.tar.gz -> stepman-0.10.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=00c0673d56b0beb22f60c2d7c6267ba8
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.2 b/metadata/md5-cache/dev-util/stepman-0.10.2
index 9dbfba932a38..4c180e1579d9 100644
--- a/metadata/md5-cache/dev-util/stepman-0.10.2
+++ b/metadata/md5-cache/dev-util/stepman-0.10.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.2.tar.gz -> stepman-0.10.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=1353231c081483d762449c82fc8d2ed6
diff --git a/metadata/md5-cache/dev-util/stepman-0.10.4 b/metadata/md5-cache/dev-util/stepman-0.10.4
index 3d345358bdec..1b07327adcb0 100644
--- a/metadata/md5-cache/dev-util/stepman-0.10.4
+++ b/metadata/md5-cache/dev-util/stepman-0.10.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/bitrise-io/stepman/archive/0.10.4.tar.gz -> stepman-0.10.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=be564f1dce60c38075104fb775e16846
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.34.1 b/metadata/md5-cache/dev-util/stripe-mock-0.34.1
index f797ca12ec5d..ab656f3d3cdc 100644
--- a/metadata/md5-cache/dev-util/stripe-mock-0.34.1
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.34.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.34.1.tar.gz -> stripe-mock-0.34.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=c2e83f9cc3bab9689f5e4be72cbfeb7a
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 70a5057d45ca..a7ccf2af19c6 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.4.2 b/metadata/md5-cache/dev-vcs/git-lfs-2.4.2
index fc3874f02c8a..b0f2e361753a 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.4.2
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.4.2.tar.gz -> git-lfs-2.4.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=87dd9a9cc156fb9060bcff4dfe10ac29
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.5.2 b/metadata/md5-cache/dev-vcs/git-lfs-2.5.2
index a0587a9dafb2..364975d455fb 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.5.2
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/git-lfs/git-lfs/archive/v2.5.2.tar.gz -> git-lfs-2.5.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b21a5bf6202e8191cd13873e5b2f67d7
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-9999 b/metadata/md5-cache/dev-vcs/git-lfs-9999
index dcc3ee5608b1..d52eefc2c35f 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-9999
+++ b/metadata/md5-cache/dev-vcs/git-lfs-9999
@@ -7,5 +7,5 @@ IUSE=+doc
 LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e47233237c7eb8cfa491de168932f0f
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 033d3ce0e136..2b7402ce2351 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.3.1 b/metadata/md5-cache/games-simulation/flightgear-2018.3.1
new file mode 100644
index 000000000000..d5c0fe350a75
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.3.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.3.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.3.1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.3.1.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d86d4aee59db19e52c7163b3e6737c38
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 6e9c75032290..12ea941259e9 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -3,9 +3,10 @@ DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/sim
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
-IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+IUSE=dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
+RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05a9d8e1182024bb3594b8b29e122bf8
+_md5_=41fd16da0d18aceb01cea3994d4a8fdd
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2018.3.1 b/metadata/md5-cache/games-simulation/flightgear-data-2018.3.1
new file mode 100644
index 000000000000..a85219168b1e
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2018.3.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/FlightGear-2018.3.1-data.tar.bz2
+_md5_=3f9da292db63546ff9205a5a2a1ca47d
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index fc4d312cc8cb..5ef53d8c65fc 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.12.0 b/metadata/md5-cache/kde-apps/kcalc-18.12.0
index b37b82e4db50..04b255c5549e 100644
--- a/metadata/md5-cache/kde-apps/kcalc-18.12.0
+++ b/metadata/md5-cache/kde-apps/kcalc-18.12.0
@@ -7,7 +7,8 @@ IUSE=debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcalc-18.12.0.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0af8be7de4c4af4fbf06d2ac703c7d7b
+_md5_=e9578e85b63f52d4249da70e71302d2e
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c0fa80f0fffe..927db4d5eb7c 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/postforward-1.1.0 b/metadata/md5-cache/mail-filter/postforward-1.1.0
index 120f043189d9..afee9c6bc1a9 100644
--- a/metadata/md5-cache/mail-filter/postforward-1.1.0
+++ b/metadata/md5-cache/mail-filter/postforward-1.1.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=mail-filter/postsrsd
 SLOT=0
 SRC_URI=https://github.com/zoni/postforward/archive/v1.1.0.tar.gz -> postforward-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e5cbb34be973b88cf97793559e0dda9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 6b3b0ac0e2f5..1c4e6cd94def 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
index fb669f008e2f..05e07773e3bc 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXext >=dev-libs/glib-2.35.1:2[dbus] >=x11-libs/gtk+-3.0.3:3 >=media-libs/libcanberra-0.26-r2[gtk3] dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=x11-libs/libX11 x11-libs/libXext >=dev-libs/glib-2.35.1:2[dbus] >=x11-libs/gtk+-3.0.3:3 >=media-libs/libcanberra-0.26-r2[gtk3] dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Screenshot utility for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext >=dev-libs/glib-2.35.1:2[dbus] >=x11-li
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.30/gnome-screenshot-3.30.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7522a4088a688cfd9efd6b2c2d430abf
+_md5_=180c4b93b07cf0d0d358c22d917075fc
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a733e2e0fa27..59db7ad7e4cc 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/shaderc-2017.2 b/metadata/md5-cache/media-libs/shaderc-2017.2-r1
similarity index 50%
rename from metadata/md5-cache/media-libs/shaderc-2017.2
rename to metadata/md5-cache/media-libs/shaderc-2017.2-r1
index ca6b0edef87a..0efe73f276fe 100644
--- a/metadata/md5-cache/media-libs/shaderc-2017.2
+++ b/metadata/md5-cache/media-libs/shaderc-2017.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-util/glslang[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(-)?] dev-util/spirv-tools[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(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/nose[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/nose[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=<dev-util/glslang-7.10[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(-)?] dev-util/spirv-tools[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(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/nose[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/nose[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Collection of tools, libraries and tests for shader compilation
 EAPI=6
 HOMEPAGE=https://github.com/google/shaderc
 IUSE=doc test 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=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-util/glslang[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(-)?] dev-util/spirv-tools[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(-)?]
+RDEPEND=<dev-util/glslang-7.10[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(-)?] dev-util/spirv-tools[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(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/7a23a01742b88329fb2260eda007172135ba25d4.tar.gz -> shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz
 _eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5e603850e96510e6d8c9e6713270477
+_md5_=aba89d3659f46a6742cd7d451fbe4c40
diff --git a/metadata/md5-cache/media-libs/shaderc-2018.0 b/metadata/md5-cache/media-libs/shaderc-2018.0
new file mode 100644
index 000000000000..10c7c4cfca11
--- /dev/null
+++ b/metadata/md5-cache/media-libs/shaderc-2018.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-util/glslang-7.10[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(-)?] dev-util/spirv-tools[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(-)?] || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/nose[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/nose[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Collection of tools, libraries and tests for shader compilation
+EAPI=6
+HOMEPAGE=https://github.com/google/shaderc
+IUSE=doc test 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=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-util/glslang-7.10[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(-)?] dev-util/spirv-tools[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(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/shaderc/archive/v2018.0.tar.gz -> shaderc-2018.0.tar.gz
+_eclasses_=cmake-multilib	661cdb9199bcba1aaf2d010e3a9846f3	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d9fc31fe0eb7b655c36bb16422f8e47d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 66d75f4d2d95..9dbba08d427b 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vcdimager-2.0.1 b/metadata/md5-cache/media-video/vcdimager-2.0.1
index b79df8d0fca8..cbbdc87d1c43 100644
--- a/metadata/md5-cache/media-video/vcdimager-2.0.1
+++ b/metadata/md5-cache/media-video/vcdimager-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU VCDimager
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/vcdimager/
 IUSE=static-libs +xml 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 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-2.0.0:0=[-minimal,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(-)?] dev-libs/popt xml? ( dev-libs/libxml2:2 )
 SLOT=0
 SRC_URI=mirror://gnu/vcdimager/vcdimager-2.0.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=553e6f8f74825d77f3012784981da5c6
+_md5_=1e8fbb7526165398a01db75a8f608af6
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index c66f7566ec70..d4aa7f368cc1 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0 b/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
index f0b8febefa8d..97fcc66f4c9b 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.4.3.0.tar.gz -> chronograf-1.4.3.0.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.4.3.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=dddc507158aed15cd4f215da94554887
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.6.2 b/metadata/md5-cache/net-analyzer/chronograf-1.6.2
index 2553c9720b6a..0a8ebbffb447 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.6.2
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.6.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.6.2.tar.gz -> chronograf-1.6.2.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.6.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=e79853a9d7554c8cbafc63bbb0122422
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.7.3 b/metadata/md5-cache/net-analyzer/chronograf-1.7.3
index dd3772d424ae..e7605d6b5eb9 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.7.3
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.7.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.7.3.tar.gz -> chronograf-1.7.3.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.7.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a7e53fa9e6cf78edcf6e0fa781c4f66f
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1 b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
index 438ef031673e..dd3fac44cf5f 100644
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.4.1.tar.gz -> kapacitor-1.4.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1 b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
index 570837062b16..7ad2ccff613d 100644
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
+++ b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.5.1.tar.gz -> kapacitor-1.5.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.14.16-r1 b/metadata/md5-cache/net-analyzer/metasploit-4.14.16-r2
similarity index 97%
rename from metadata/md5-cache/net-analyzer/metasploit-4.14.16-r1
rename to metadata/md5-cache/net-analyzer/metasploit-4.14.16-r2
index 9268f2bb6f4c..e733024ceab6 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.14.16-r1
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.14.16-r2
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java nexpose openvas oracle +pcap test test elibc_FreeBSD ruby_targets_ruby23
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby23] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby23] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/bcrypt-ruby[ruby_targets_ruby23] dev-ruby/bit-struct[ruby_targets_ruby23] >=dev-ruby/builder-3.0[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/filesize:*[ruby_targets_ruby23] >=dev-ruby/jsobfu-0.3.0:*[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] dev-ruby/kissfft[ruby_targets_ruby23] dev-ruby/metasm:1.0.2[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby23] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby23] dev-ruby/metasploit-payloads:1.2.24[ruby_targets_ruby23] dev-ruby/metasploit_payloads-mettle:0.1.9[ruby_targets_ruby23] >=dev-ruby/metasploit-credential-2.0.0[ruby_targets_ruby23] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby23] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby23] dev-ruby/msgpack[ruby_targets_ruby23] dev-ruby/net-ssh:*[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/octokit[ruby_targets_ruby23] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby23] dev-ruby/patch_finder[ruby_targets_ruby23] >=dev-ruby/recog-2.0.14[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-bin_tools[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-exploitation[ruby_targets_ruby23] dev-ruby/rex-java[ruby_targets_ruby23] dev-ruby/rex-mime[ruby_targets_ruby23] dev-ruby/rex-nop[ruby_targets_ruby23] dev-ruby/rex-ole[ruby_targets_ruby23] dev-ruby/rex-powershell[ruby_targets_ruby23] dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-registry[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-sslscan[ruby_targets_ruby23] dev-ruby/rex-rop_builder[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] dev-ruby/rex-zip[ruby_targets_ruby23] dev-ruby/ruby_smb:*[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] >=dev-ruby/pg-0.11:*[ruby_targets_ruby23] dev-ruby/packetfu:1.1.13[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby23] >=dev-ruby/rb-readline-0.5.4[ruby_targets_ruby23] dev-ruby/robots[ruby_targets_ruby23] dev-ruby/sshkey[ruby_targets_ruby23] dev-ruby/tzinfo:*[ruby_targets_ruby23] dev-ruby/windows_error[ruby_targets_ruby23] dev-ruby/xmlrpc[ruby_targets_ruby23] java? ( dev-ruby/rjb[ruby_targets_ruby23] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby23] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby23] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby23] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby23] dev-ruby/network_interface[ruby_targets_ruby23] ) development? ( dev-ruby/fivemat[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby23] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby23] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby23] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby23] dev-ruby/bcrypt-ruby[ruby_targets_ruby23] dev-ruby/bit-struct[ruby_targets_ruby23] >=dev-ruby/builder-3.0[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/filesize:*[ruby_targets_ruby23] >=dev-ruby/jsobfu-0.3.0:*[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] dev-ruby/kissfft[ruby_targets_ruby23] dev-ruby/metasm:1.0.2[ruby_targets_ruby23] >=dev-ruby/metasploit_data_models-2.0.0[ruby_targets_ruby23] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby23] dev-ruby/metasploit-payloads:1.2.24[ruby_targets_ruby23] dev-ruby/metasploit_payloads-mettle:0.1.9[ruby_targets_ruby23] >=dev-ruby/metasploit-credential-2.0.0[ruby_targets_ruby23] >=dev-ruby/metasploit-concern-2.0.0[ruby_targets_ruby23] >=dev-ruby/metasploit-model-2.0.0[ruby_targets_ruby23] dev-ruby/msgpack[ruby_targets_ruby23] dev-ruby/net-ssh:*[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/octokit[ruby_targets_ruby23] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby23] dev-ruby/patch_finder[ruby_targets_ruby23] >=dev-ruby/recog-2.0.14[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] >=dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby23] dev-ruby/rex-arch[ruby_targets_ruby23] dev-ruby/rex-bin_tools[ruby_targets_ruby23] dev-ruby/rex-core[ruby_targets_ruby23] dev-ruby/rex-encoder[ruby_targets_ruby23] dev-ruby/rex-exploitation[ruby_targets_ruby23] dev-ruby/rex-java[ruby_targets_ruby23] dev-ruby/rex-mime[ruby_targets_ruby23] dev-ruby/rex-nop[ruby_targets_ruby23] dev-ruby/rex-ole[ruby_targets_ruby23] dev-ruby/rex-powershell[ruby_targets_ruby23] dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-registry[ruby_targets_ruby23] dev-ruby/rex-socket[ruby_targets_ruby23] dev-ruby/rex-sslscan[ruby_targets_ruby23] dev-ruby/rex-rop_builder[ruby_targets_ruby23] dev-ruby/rex-struct2[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] dev-ruby/rex-zip[ruby_targets_ruby23] dev-ruby/ruby_smb:*[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] >=dev-ruby/pg-0.11:*[ruby_targets_ruby23] dev-ruby/packetfu:1.1.13[ruby_targets_ruby23] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby23] >=dev-ruby/rb-readline-0.5.4[ruby_targets_ruby23] dev-ruby/robots[ruby_targets_ruby23] dev-ruby/sshkey[ruby_targets_ruby23] dev-ruby/tzinfo:*[ruby_targets_ruby23] dev-ruby/windows_error[ruby_targets_ruby23] dev-ruby/xmlrpc[ruby_targets_ruby23] java? ( dev-ruby/rjb[ruby_targets_ruby23] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby23] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby23] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby23] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby23] dev-ruby/network_interface[ruby_targets_ruby23] ) development? ( dev-ruby/fivemat[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby23] ) ) dev-db/postgresql[server] || ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 RESTRICT=strip
 SLOT=4.14
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.14.16.tar.gz -> metasploit-4.14.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	7626123a4b2ce4488597d355f9905486	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0b205fea2a91f20319c622db15e57d53
+_md5_=8d99570687b5cca10d9bd20ecca6806a
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r3 b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
similarity index 97%
rename from metadata/md5-cache/net-analyzer/metasploit-4.17.21-r3
rename to metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
index 260c013125e3..2b74f6b259fa 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r3
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java nexpose openvas oracle +pcap test test elibc_FreeBSD ruby_targets_ruby24
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] || ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 RESTRICT=strip
 SLOT=4.17
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.17.21.tar.gz -> metasploit-4.17.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	7626123a4b2ce4488597d355f9905486	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a0665bb3526e8ab43fd9c0ae0fa9bd1b
+_md5_=8c9297ffd05638d31869d4e72c69d24b
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index d5a4f022f28f..142979653e41 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java nexpose openvas oracle +pcap test test elibc_FreeBSD ruby_targets_ruby24
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] || ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 RESTRICT=strip
 SLOT=9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	7626123a4b2ce4488597d355f9905486	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=08a14c35669e456e19bdc8eee89bd9fa
+_md5_=033313d703fbcb17fb261afd7e15975f
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.5.3 b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
index 54938ff878c8..9a21f12a879b 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.5.3
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.5.3.tar.gz -> telegraf-1.5.3.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/aerospike/aerospike-client-go/archive/95e1ad7791bdbca44707fedbb29be42024900d9c.tar.gz -> github.com-aerospike-aerospike-client-go-95e1ad7791bdbca44707fedbb29be42024900d9c.tar.gz https://github.com/amir/raidman/archive/c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985.tar.gz -> github.com-amir-raidman-c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985.tar.gz https://github.com/apache/thrift/archive/4aaa92ece8503a6da9bc6701604f69acf2b99d07.tar.gz -> github.com-apache-thrift-4aaa92ece8503a6da9bc6701604f69acf2b99d07.tar.gz https://github.com/aws/aws-sdk-go/archive/c861d27d0304a79f727e9a8a4e2ac1e74602fdc0.tar.gz -> github.com-aws-aws-sdk-go-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bsm/sarama-cluster/archive/abf039439f66c1ce78017f560b490612552f6472.tar.gz -> github.com-bsm-sarama-cluster-abf039439f66c1ce78017f560b490612552f6472.tar.gz https://github.com/cenkalti/backoff/archive/b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3.tar.gz -> github.com-cenkalti-backoff-b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3.tar.gz https://github.com/couchbase/go-couchbase/archive/bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28.tar.gz -> github.com-couchbase-go-couchbase-bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28.tar.gz https://github.com/couchbase/gomemcached/archive/4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29.tar.gz -> github.com-couchbase-gomemcached-4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29.tar.gz https://github.com/couchbase/goutils/archive/5823a0cbaaa9008406021dc5daf80125ea30bba6.tar.gz -> github.com-couchbase-goutils-5823a0cbaaa9008406021dc5daf80125ea30bba6.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/dbeaa9332f19a944acb5736b4456cfcc02140e29.tar.gz -> github.com-dgrijalva-jwt-go-dbeaa9332f19a944acb5736b4456cfcc02140e29.tar.gz https://github.com/docker/docker/archive/f5ec1e2936dcbe7b5001c2b817188b095c700c27.tar.gz -> github.com-docker-docker-f5ec1e2936dcbe7b5001c2b817188b095c700c27.tar.gz https://github.com/docker/go-connections/archive/990a1a1a70b0da4c4cb70e117971a4f0babfbf1a.tar.gz -> github.com-docker-go-connections-990a1a1a70b0da4c4cb70e117971a4f0babfbf1a.tar.gz https://github.com/eapache/go-resiliency/archive/b86b1ec0dd4209a588dc1285cdd471e73525c0b3.tar.gz -> github.com-eapache-go-resiliency-b86b1ec0dd4209a588dc1285cdd471e73525c0b3.tar.gz https://github.com/eapache/go-xerial-snappy/archive/bb955e01b9346ac19dc29eb16586c90ded99a98c.tar.gz -> github.com-eapache-go-xerial-snappy-bb955e01b9346ac19dc29eb16586c90ded99a98c.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/d4f545eb108a2d19f9b1a735689dbfb719bc21fb.tar.gz -> github.com-eclipse-paho.mqtt.golang-d4f545eb108a2d19f9b1a735689dbfb719bc21fb.tar.gz https://github.com/go-logfmt/logfmt/archive/390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz -> github.com-go-logfmt-logfmt-390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz https://github.com/go-sql-driver/mysql/archive/2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz -> github.com-go-sql-driver-mysql-2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/go-ini/ini/archive/9144852efba7c4daf409943ee90767da62d55438.tar.gz -> github.com-go-ini-ini-9144852efba7c4daf409943ee90767da62d55438.tar.gz https://github.com/gogo/protobuf/archive/7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8.tar.gz -> github.com-gogo-protobuf-7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8.tar.gz https://github.com/golang/protobuf/archive/8ee79997227bf9b34611aee7946ae64735e6fd93.tar.gz -> github.com-golang-protobuf-8ee79997227bf9b34611aee7946ae64735e6fd93.tar.gz https://github.com/golang/snappy/archive/7db9049039a047d955fe8c19b83c8ff5abd765c7.tar.gz -> github.com-golang-snappy-7db9049039a047d955fe8c19b83c8ff5abd765c7.tar.gz https://github.com/go-ole/go-ole/archive/be49f7c07711fcb603cff39e1de7c67926dc0ba7.tar.gz -> github.com-go-ole-go-ole-be49f7c07711fcb603cff39e1de7c67926dc0ba7.tar.gz https://github.com/google/go-cmp/archive/f94e52cad91c65a63acc1e75d4be223ea22e99bc.tar.gz -> github.com-google-go-cmp-f94e52cad91c65a63acc1e75d4be223ea22e99bc.tar.gz https://github.com/gorilla/mux/archive/392c28fe23e1c45ddba891b0320b3b5df220beea.tar.gz -> github.com-gorilla-mux-392c28fe23e1c45ddba891b0320b3b5df220beea.tar.gz https://github.com/go-sql-driver/mysql/archive/2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz -> github.com-go-sql-driver-mysql-2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz https://github.com/hailocab/go-hostpool/archive/e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz -> github.com-hailocab-go-hostpool-e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz https://github.com/hashicorp/consul/archive/63d2fc68239b996096a1c55a0d4b400ea4c2583f.tar.gz -> github.com-hashicorp-consul-63d2fc68239b996096a1c55a0d4b400ea4c2583f.tar.gz https://github.com/influxdata/tail/archive/a395bf99fe07c233f41fba0735fa2b13b58588ea.tar.gz -> github.com-influxdata-tail-a395bf99fe07c233f41fba0735fa2b13b58588ea.tar.gz https://github.com/influxdata/toml/archive/5d1d907f22ead1cd47adde17ceec5bda9cacaf8f.tar.gz -> github.com-influxdata-toml-5d1d907f22ead1cd47adde17ceec5bda9cacaf8f.tar.gz https://github.com/influxdata/wlog/archive/7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz -> github.com-influxdata-wlog-7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz https://github.com/jackc/pgx/archive/63f58fd32edb5684b9e9f4cfaac847c6b42b3917.tar.gz -> github.com-jackc-pgx-63f58fd32edb5684b9e9f4cfaac847c6b42b3917.tar.gz https://github.com/jmespath/go-jmespath/archive/bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d.tar.gz -> github.com-jmespath-go-jmespath-bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d.tar.gz https://github.com/kardianos/osext/archive/c2c54e542fb797ad986b31721e1baedf214ca413.tar.gz -> github.com-kardianos-osext-c2c54e542fb797ad986b31721e1baedf214ca413.tar.gz https://github.com/kardianos/service/archive/6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893.tar.gz -> github.com-kardianos-service-6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893.tar.gz https://github.com/kballard/go-shellquote/archive/d8ec1a69a250a17bb0e419c386eac1f3711dc142.tar.gz -> github.com-kballard-go-shellquote-d8ec1a69a250a17bb0e419c386eac1f3711dc142.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/Microsoft/go-winio/archive/ce2922f643c8fd76b46cadc7f404a06282678b34.tar.gz -> github.com-Microsoft-go-winio-ce2922f643c8fd76b46cadc7f404a06282678b34.tar.gz https://github.com/miekg/dns/archive/99f84ae56e75126dd77e5de4fae2ea034a468ca1.tar.gz -> github.com-miekg-dns-99f84ae56e75126dd77e5de4fae2ea034a468ca1.tar.gz https://github.com/mitchellh/mapstructure/archive/d0303fe809921458f417bcf828397a65db30a7e4.tar.gz -> github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz https://github.com/multiplay/go-ts3/archive/07477f49b8dfa3ada231afc7b7b17617d42afe8e.tar.gz -> github.com-multiplay-go-ts3-07477f49b8dfa3ada231afc7b7b17617d42afe8e.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/nats-io/go-nats/archive/ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz -> github.com-nats-io-go-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz https://github.com/nats-io/nats/archive/ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz -> github.com-nats-io-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz https://github.com/nats-io/nuid/archive/289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz -> github.com-nats-io-nuid-289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/opencontainers/runc/archive/89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8.tar.gz -> github.com-opencontainers-runc-89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8.tar.gz https://github.com/opentracing-contrib/go-observer/archive/a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz -> github.com-opentracing-contrib-go-observer-a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz https://github.com/opentracing/opentracing-go/archive/06f47b42c792fef2796e9681353e1d908c417827.tar.gz -> github.com-opentracing-opentracing-go-06f47b42c792fef2796e9681353e1d908c417827.tar.gz https://github.com/openzipkin/zipkin-go-opentracing/archive/1cafbdfde94fbf2b373534764e0863aa3bd0bf7b.tar.gz -> github.com-openzipkin-zipkin-go-opentracing-1cafbdfde94fbf2b373534764e0863aa3bd0bf7b.tar.gz https://github.com/pierrec/lz4/archive/5c9560bfa9ace2bf86080bf40d46b34ae44604df.tar.gz -> github.com-pierrec-lz4-5c9560bfa9ace2bf86080bf40d46b34ae44604df.tar.gz https://github.com/pierrec/xxHash/archive/5a004441f897722c627870a981d02b29924215fa.tar.gz -> github.com-pierrec-xxHash-5a004441f897722c627870a981d02b29924215fa.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/prometheus/client_golang/archive/c317fb74746eac4fc65fe3909195f4cf67c5562a.tar.gz -> github.com-prometheus-client_golang-c317fb74746eac4fc65fe3909195f4cf67c5562a.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/dd2f054febf4a6c00f2343686efb775948a8bff4.tar.gz -> github.com-prometheus-common-dd2f054febf4a6c00f2343686efb775948a8bff4.tar.gz https://github.com/prometheus/procfs/archive/1878d9fbb537119d24b21ca07effd591627cd160.tar.gz -> github.com-prometheus-procfs-1878d9fbb537119d24b21ca07effd591627cd160.tar.gz https://github.com/rcrowley/go-metrics/archive/1f30fe9094a513ce4c700b9a54458bbb0c96996c.tar.gz -> github.com-rcrowley-go-metrics-1f30fe9094a513ce4c700b9a54458bbb0c96996c.tar.gz https://github.com/samuel/go-zookeeper/archive/1d7be4effb13d2d908342d349d71a284a7542693.tar.gz -> github.com-samuel-go-zookeeper-1d7be4effb13d2d908342d349d71a284a7542693.tar.gz https://github.com/satori/go.uuid/archive/5bf94b69c6b68ee1b541973bb8e1144db23a194b.tar.gz -> github.com-satori-go.uuid-5bf94b69c6b68ee1b541973bb8e1144db23a194b.tar.gz https://github.com/shirou/gopsutil/archive/384a55110aa5ae052eb93ea94940548c1e305a99.tar.gz -> github.com-shirou-gopsutil-384a55110aa5ae052eb93ea94940548c1e305a99.tar.gz https://github.com/shirou/w32/archive/3c9377fc6748f222729a8270fe2775d149a249ad.tar.gz -> github.com-shirou-w32-3c9377fc6748f222729a8270fe2775d149a249ad.tar.gz https://github.com/Shopify/sarama/archive/3b1b38866a79f06deddf0487d5c27ba0697ccd65.tar.gz -> github.com-Shopify-sarama-3b1b38866a79f06deddf0487d5c27ba0697ccd65.tar.gz https://github.com/Sirupsen/logrus/archive/61e43dc76f7ee59a82bdf3d71033dc12bea4c77d.tar.gz -> github.com-Sirupsen-logrus-61e43dc76f7ee59a82bdf3d71033dc12bea4c77d.tar.gz https://github.com/soniah/gosnmp/archive/5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15.tar.gz -> github.com-soniah-gosnmp-5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15.tar.gz https://github.com/StackExchange/wmi/archive/f3e2bae1e0cb5aef83e319133eabfee30013a4a5.tar.gz -> github.com-StackExchange-wmi-f3e2bae1e0cb5aef83e319133eabfee30013a4a5.tar.gz https://github.com/streadway/amqp/archive/63795daa9a446c920826655f26ba31c81c860fd6.tar.gz -> github.com-streadway-amqp-63795daa9a446c920826655f26ba31c81c860fd6.tar.gz https://github.com/stretchr/objx/archive/1a9d0bb9f541897e62256577b352fdbc1fb4fd94.tar.gz -> github.com-stretchr-objx-1a9d0bb9f541897e62256577b352fdbc1fb4fd94.tar.gz https://github.com/stretchr/testify/archive/4d4bfba8f1d1027c4fdbe371823030df51419987.tar.gz -> github.com-stretchr-testify-4d4bfba8f1d1027c4fdbe371823030df51419987.tar.gz https://github.com/vjeantet/grok/archive/d73e972b60935c7fec0b4ffbc904ed39ecaf7efe.tar.gz -> github.com-vjeantet-grok-d73e972b60935c7fec0b4ffbc904ed39ecaf7efe.tar.gz https://github.com/wvanbergen/kafka/archive/bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee.tar.gz -> github.com-wvanbergen-kafka-bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee.tar.gz https://github.com/wvanbergen/kazoo-go/archive/968957352185472eacb69215fa3dbfcfdbac1096.tar.gz -> github.com-wvanbergen-kazoo-go-968957352185472eacb69215fa3dbfcfdbac1096.tar.gz https://github.com/yuin/gopher-lua/archive/66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz -> github.com-yuin-gopher-lua-66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz https://github.com/zensqlmonitor/go-mssqldb/archive/ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz -> github.com-zensqlmonitor-go-mssqldb-ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz https://github.com/golang/crypto/archive/dc137beb6cce2043eb6b5f223ab8bf51c32459f4.tar.gz -> github.com-golang-crypto-dc137beb6cce2043eb6b5f223ab8bf51c32459f4.tar.gz https://github.com/golang/net/archive/f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz -> github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz https://github.com/golang/sys/archive/739734461d1c916b6c72a63d7efda2b27edb369f.tar.gz -> github.com-golang-sys-739734461d1c916b6c72a63d7efda2b27edb369f.tar.gz https://github.com/golang/text/archive/506f9d5c962f284575e88337e7d9296d27e729d3.tar.gz -> github.com-golang-text-506f9d5c962f284575e88337e7d9296d27e729d3.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fatih/pool/archive/6e328e67893eb46323ad06f0e92cb9536babbabc.tar.gz -> github.com-fatih-pool-6e328e67893eb46323ad06f0e92cb9536babbabc.tar.gz https://github.com/fsnotify/fsnotify/archive/a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.tar.gz -> github.com-fsnotify-fsnotify-a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.tar.gz https://github.com/gorethink/gorethink/archive/7ab832f7b65573104a555d84a27992ae9ea1f659.tar.gz -> github.com-gorethink-gorethink-7ab832f7b65573104a555d84a27992ae9ea1f659.tar.gz https://github.com/go-ldap/ldap/archive/8168ee085ee43257585e50c6441aadf54ecb2c9f.tar.gz -> github.com-go-ldap-ldap-8168ee085ee43257585e50c6441aadf54ecb2c9f.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/olivere/elastic/archive/3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26.tar.gz -> github.com-olivere-elastic-3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26.tar.gz https://github.com/go-tomb/tomb/archive/dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz -> github.com-go-tomb-tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz https://github.com/go-yaml/yaml/archive/4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz -> github.com-go-yaml-yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b54b7f17f9595169a36370f714fdae7f
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.8.3 b/metadata/md5-cache/net-analyzer/telegraf-1.8.3
index 08139833ad98..45d10f9c62c7 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.8.3
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.8.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.8.3.tar.gz -> telegraf-1.8.3.tar.gz https://github.com/GoogleCloudPlatform/google-cloud-go/archive/c728a003b238b26cef9ab6753a5dc424b331c3ad.tar.gz -> github.com-GoogleCloudPlatform-google-cloud-go-c728a003b238b26cef9ab6753a5dc424b331c3ad.tar.gz https://github.com/cloudfoundry/clock/archive/02e53af36e6c978af692887ed449b74026d76fec.tar.gz -> github.com-cloudfoundry-clock-02e53af36e6c978af692887ed449b74026d76fec.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/archive/2b93072101d466aa4120b3c23c2e1b08af01541c.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-stackdriver-2b93072101d466aa4120b3c23c2e1b08af01541c.tar.gz https://github.com/aerospike/aerospike-client-go/archive/1dc8cf203d24cd454e71ce40ab4cd0bf3112df90.tar.gz -> github.com-aerospike-aerospike-client-go-1dc8cf203d24cd454e71ce40ab4cd0bf3112df90.tar.gz https://github.com/alecthomas/template/archive/a0175ee3bccc567396460bf5acd36800cb10c49c.tar.gz -> github.com-alecthomas-template-a0175ee3bccc567396460bf5acd36800cb10c49c.tar.gz https://github.com/alecthomas/units/archive/2efee857e7cfd4f3d0138cc3cbb1b4966962b93a.tar.gz -> github.com-alecthomas-units-2efee857e7cfd4f3d0138cc3cbb1b4966962b93a.tar.gz https://github.com/amir/raidman/archive/1ccc43bfb9c93cb401a4025e49c64ba71e5e668b.tar.gz -> github.com-amir-raidman-1ccc43bfb9c93cb401a4025e49c64ba71e5e668b.tar.gz https://github.com/apache/thrift/archive/f2867c24984aa53edec54a138c03db934221bdea.tar.gz -> github.com-apache-thrift-f2867c24984aa53edec54a138c03db934221bdea.tar.gz https://github.com/aws/aws-sdk-go/archive/bf8067ceb6e7f51e150c218972dccfeeed892b85.tar.gz -> github.com-aws-aws-sdk-go-bf8067ceb6e7f51e150c218972dccfeeed892b85.tar.gz https://github.com/Azure/go-autorest/archive/1f7cd6cfe0adea687ad44a512dfe76140f804318.tar.gz -> github.com-Azure-go-autorest-1f7cd6cfe0adea687ad44a512dfe76140f804318.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/bsm/sarama-cluster/archive/cf455bc755fe41ac9bb2861e7a961833d9c2ecc3.tar.gz -> github.com-bsm-sarama-cluster-cf455bc755fe41ac9bb2861e7a961833d9c2ecc3.tar.gz https://github.com/cenkalti/backoff/archive/2ea60e5f094469f9e65adb9cd103795b73ae743e.tar.gz -> github.com-cenkalti-backoff-2ea60e5f094469f9e65adb9cd103795b73ae743e.tar.gz https://github.com/couchbase/go-couchbase/archive/16db1f1fe037412f12738fa4d8448c549c4edd77.tar.gz -> github.com-couchbase-go-couchbase-16db1f1fe037412f12738fa4d8448c549c4edd77.tar.gz https://github.com/couchbase/gomemcached/archive/0da75df145308b9a4e6704d762ca9d9b77752efc.tar.gz -> github.com-couchbase-gomemcached-0da75df145308b9a4e6704d762ca9d9b77752efc.tar.gz https://github.com/couchbase/goutils/archive/e865a1461c8ac0032bd37e2d4dab3289faea3873.tar.gz -> github.com-couchbase-goutils-e865a1461c8ac0032bd37e2d4dab3289faea3873.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/denisenkom/go-mssqldb/archive/1eb28afdf9b6e56cf673badd47545f844fe81103.tar.gz -> github.com-denisenkom-go-mssqldb-1eb28afdf9b6e56cf673badd47545f844fe81103.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/dimchansky/utfbom/archive/6c6132ff69f0f6c088739067407b5d32c52e1d0f.tar.gz -> github.com-dimchansky-utfbom-6c6132ff69f0f6c088739067407b5d32c52e1d0f.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/ed7b6428c133e7c59404251a09b7d6b02fa83cc2.tar.gz -> github.com-docker-docker-ed7b6428c133e7c59404251a09b7d6b02fa83cc2.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/47565b4f722fb6ceae66b95f853feed578a4a51c.tar.gz -> github.com-docker-go-units-47565b4f722fb6ceae66b95f853feed578a4a51c.tar.gz https://github.com/docker/libnetwork/archive/d7b61745d16675c9f548b19f06fda80d422a74f0.tar.gz -> github.com-docker-libnetwork-d7b61745d16675c9f548b19f06fda80d422a74f0.tar.gz https://github.com/eapache/go-resiliency/archive/ea41b0fad31007accc7f806884dcdf3da98b79ce.tar.gz -> github.com-eapache-go-resiliency-ea41b0fad31007accc7f806884dcdf3da98b79ce.tar.gz https://github.com/eapache/go-xerial-snappy/archive/040cc1a32f578808623071247fdbd5cc43f37f5f.tar.gz -> github.com-eapache-go-xerial-snappy-040cc1a32f578808623071247fdbd5cc43f37f5f.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/36d01c2b4cbeb3d2a12063e4880ce30800af9560.tar.gz -> github.com-eclipse-paho.mqtt.golang-36d01c2b4cbeb3d2a12063e4880ce30800af9560.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/636bf0302bc95575d69441b25a2603156ffdddf1.tar.gz -> github.com-gogo-protobuf-636bf0302bc95575d69441b25a2603156ffdddf1.tar.gz https://github.com/go-ini/ini/archive/358ee7663966325963d4e8b2e1fbd570c5195153.tar.gz -> github.com-go-ini-ini-358ee7663966325963d4e8b2e1fbd570c5195153.tar.gz https://github.com/golang/protobuf/archive/b4deda0973fb4c70b50d226b1af49f3da59f5265.tar.gz -> github.com-golang-protobuf-b4deda0973fb4c70b50d226b1af49f3da59f5265.tar.gz https://github.com/golang/snappy/archive/2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz -> github.com-golang-snappy-2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz https://github.com/go-logfmt/logfmt/archive/390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz -> github.com-go-logfmt-logfmt-390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz https://github.com/googleapis/gax-go/archive/317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz -> github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz https://github.com/google/go-cmp/archive/3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz -> github.com-google-go-cmp-3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/go-ole/go-ole/archive/a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506.tar.gz -> github.com-go-ole-go-ole-a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506.tar.gz https://github.com/go-redis/redis/archive/83fb42932f6145ce52df09860384a4653d2d332a.tar.gz -> github.com-go-redis-redis-83fb42932f6145ce52df09860384a4653d2d332a.tar.gz https://github.com/gorilla/context/archive/08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz -> github.com-gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz https://github.com/gorilla/mux/archive/e3702bed27f0d39777b0b37b664b6280e8ef8fbf.tar.gz -> github.com-gorilla-mux-e3702bed27f0d39777b0b37b664b6280e8ef8fbf.tar.gz https://github.com/go-sql-driver/mysql/archive/d523deb1b23d913de5bdada721a6071e71283618.tar.gz -> github.com-go-sql-driver-mysql-d523deb1b23d913de5bdada721a6071e71283618.tar.gz https://github.com/hailocab/go-hostpool/archive/e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz -> github.com-hailocab-go-hostpool-e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz https://github.com/hashicorp/consul/archive/39f93f011e591c842acc8053a7f5972aa6e592fd.tar.gz -> github.com-hashicorp-consul-39f93f011e591c842acc8053a7f5972aa6e592fd.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/d5fe4b57a186c716b0e00b8c301cbd9b4182694d.tar.gz -> github.com-hashicorp-go-cleanhttp-d5fe4b57a186c716b0e00b8c301cbd9b4182694d.tar.gz https://github.com/hashicorp/go-rootcerts/archive/6bb64b370b90e7ef1fa532be9e591a81c3493e00.tar.gz -> github.com-hashicorp-go-rootcerts-6bb64b370b90e7ef1fa532be9e591a81c3493e00.tar.gz https://github.com/hashicorp/serf/archive/d6574a5bb1226678d7010325fb6c985db20ee458.tar.gz -> github.com-hashicorp-serf-d6574a5bb1226678d7010325fb6c985db20ee458.tar.gz https://github.com/influxdata/go-syslog/archive/eecd51df3ad85464a2bab9b7d3a45bc1e299059e.tar.gz -> github.com-influxdata-go-syslog-eecd51df3ad85464a2bab9b7d3a45bc1e299059e.tar.gz https://github.com/influxdata/tail/archive/c43482518d410361b6c383d7aebce33d0471d7bc.tar.gz -> github.com-influxdata-tail-c43482518d410361b6c383d7aebce33d0471d7bc.tar.gz https://github.com/influxdata/toml/archive/2a2e3012f7cfbef64091cc79776311e65dfa211b.tar.gz -> github.com-influxdata-toml-2a2e3012f7cfbef64091cc79776311e65dfa211b.tar.gz https://github.com/influxdata/wlog/archive/7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz -> github.com-influxdata-wlog-7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz https://github.com/jackc/pgx/archive/da3231b0b66e2e74cdb779f1d46c5e958ba8be27.tar.gz -> github.com-jackc-pgx-da3231b0b66e2e74cdb779f1d46c5e958ba8be27.tar.gz https://github.com/jmespath/go-jmespath/archive/0b12d6b5.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b5.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kardianos/service/archive/615a14ed75099c9eaac6949e22ac2341bf9d3197.tar.gz -> github.com-kardianos-service-615a14ed75099c9eaac6949e22ac2341bf9d3197.tar.gz https://github.com/kballard/go-shellquote/archive/95032a82bc518f77982ea72343cc1ade730072f0.tar.gz -> github.com-kballard-go-shellquote-95032a82bc518f77982ea72343cc1ade730072f0.tar.gz https://github.com/kr/logfmt/archive/b84e30acd515aadc4b783ad4ff83aff3299bdfe0.tar.gz -> github.com-kr-logfmt-b84e30acd515aadc4b783ad4ff83aff3299bdfe0.tar.gz https://github.com/mailru/easyjson/archive/efc7eb8984d6655c26b5c9d2e65c024e5767c37c.tar.gz -> github.com-mailru-easyjson-efc7eb8984d6655c26b5c9d2e65c024e5767c37c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/Microsoft/ApplicationInsights-Go/archive/d2df5d440eda5372f24fcac03839a64d6cb5f7e5.tar.gz -> github.com-Microsoft-ApplicationInsights-Go-d2df5d440eda5372f24fcac03839a64d6cb5f7e5.tar.gz https://github.com/Microsoft/go-winio/archive/a6d595ae73cf27a1b8fc32930668708f45ce1c85.tar.gz -> github.com-Microsoft-go-winio-a6d595ae73cf27a1b8fc32930668708f45ce1c85.tar.gz https://github.com/miekg/dns/archive/5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz -> github.com-miekg-dns-5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz https://github.com/mitchellh/go-homedir/archive/3864e76763d94a6df2f9960b16a20a33da9f9a66.tar.gz -> github.com-mitchellh-go-homedir-3864e76763d94a6df2f9960b16a20a33da9f9a66.tar.gz https://github.com/mitchellh/mapstructure/archive/f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz -> github.com-mitchellh-mapstructure-f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz https://github.com/multiplay/go-ts3/archive/d0d44555495c8776880a17e439399e715a4ef319.tar.gz -> github.com-multiplay-go-ts3-d0d44555495c8776880a17e439399e715a4ef319.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/nats-io/gnatsd/archive/6608e9ac3be979dcb0614b772cc86a87b71acaa3.tar.gz -> github.com-nats-io-gnatsd-6608e9ac3be979dcb0614b772cc86a87b71acaa3.tar.gz https://github.com/nats-io/go-nats/archive/062418ea1c2181f52dc0f954f6204370519a868b.tar.gz -> github.com-nats-io-go-nats-062418ea1c2181f52dc0f954f6204370519a868b.tar.gz https://github.com/nats-io/nuid/archive/289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz -> github.com-nats-io-nuid-289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/opencontainers/go-digest/archive/279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz -> github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz https://github.com/opencontainers/image-spec/archive/d60099175f88c47cd379c4738d158884749ed235.tar.gz -> github.com-opencontainers-image-spec-d60099175f88c47cd379c4738d158884749ed235.tar.gz https://github.com/opentracing-contrib/go-observer/archive/a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz -> github.com-opentracing-contrib-go-observer-a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz https://github.com/opentracing/opentracing-go/archive/1949ddbfd147afd4d964a9f00b24eb291e0e7c38.tar.gz -> github.com-opentracing-opentracing-go-1949ddbfd147afd4d964a9f00b24eb291e0e7c38.tar.gz https://github.com/openzipkin/zipkin-go-opentracing/archive/26cf9707480e6b90e5eff22cf0bbf05319154232.tar.gz -> github.com-openzipkin-zipkin-go-opentracing-26cf9707480e6b90e5eff22cf0bbf05319154232.tar.gz https://github.com/pierrec/lz4/archive/1958fd8fff7f115e79725b1288e0b878b3e06b00.tar.gz -> github.com-pierrec-lz4-1958fd8fff7f115e79725b1288e0b878b3e06b00.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/ae68e2d4c00fed4943b5f6698d504a5fe083da8a.tar.gz -> github.com-prometheus-procfs-ae68e2d4c00fed4943b5f6698d504a5fe083da8a.tar.gz https://github.com/rcrowley/go-metrics/archive/e2704e165165ec55d062f5919b4b29494e9fa790.tar.gz -> github.com-rcrowley-go-metrics-e2704e165165ec55d062f5919b4b29494e9fa790.tar.gz https://github.com/samuel/go-zookeeper/archive/c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz -> github.com-samuel-go-zookeeper-c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/shirou/gopsutil/archive/8048a2e9c5773235122027dd585cf821b2af1249.tar.gz -> github.com-shirou-gopsutil-8048a2e9c5773235122027dd585cf821b2af1249.tar.gz https://github.com/shirou/w32/archive/bb4de0191aa41b5507caa14b0650cdbddcd9280b.tar.gz -> github.com-shirou-w32-bb4de0191aa41b5507caa14b0650cdbddcd9280b.tar.gz https://github.com/Shopify/sarama/archive/a6144ae922fd99dd0ea5046c8137acfb7fab0914.tar.gz -> github.com-Shopify-sarama-a6144ae922fd99dd0ea5046c8137acfb7fab0914.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/soniah/gosnmp/archive/96b86229e9b3ffb4b954144cdc7f98fe3ee1003f.tar.gz -> github.com-soniah-gosnmp-96b86229e9b3ffb4b954144cdc7f98fe3ee1003f.tar.gz https://github.com/StackExchange/wmi/archive/5d049714c4a64225c3c79a7cf7d02f7fb5b96338.tar.gz -> github.com-StackExchange-wmi-5d049714c4a64225c3c79a7cf7d02f7fb5b96338.tar.gz https://github.com/streadway/amqp/archive/e5adc2ada8b8efff032bf61173a233d143e9318e.tar.gz -> github.com-streadway-amqp-e5adc2ada8b8efff032bf61173a233d143e9318e.tar.gz https://github.com/stretchr/objx/archive/477a77ecc69700c7cdeb1fa9e129548e1c1c393c.tar.gz -> github.com-stretchr-objx-477a77ecc69700c7cdeb1fa9e129548e1c1c393c.tar.gz https://github.com/stretchr/testify/archive/f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz -> github.com-stretchr-testify-f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz https://github.com/tidwall/gjson/archive/f123b340873a0084cb27267eddd8ff615115fbff.tar.gz -> github.com-tidwall-gjson-f123b340873a0084cb27267eddd8ff615115fbff.tar.gz https://github.com/tidwall/match/archive/1731857f09b1f38450e2c12409748407822dc6be.tar.gz -> github.com-tidwall-match-1731857f09b1f38450e2c12409748407822dc6be.tar.gz https://github.com/vishvananda/netlink/archive/b2de5d10e38ecce8607e6b438b6d174f389a004e.tar.gz -> github.com-vishvananda-netlink-b2de5d10e38ecce8607e6b438b6d174f389a004e.tar.gz https://github.com/vishvananda/netns/archive/13995c7128ccc8e51e9a6bd2b551020a27180abd.tar.gz -> github.com-vishvananda-netns-13995c7128ccc8e51e9a6bd2b551020a27180abd.tar.gz https://github.com/vjeantet/grok/archive/ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53.tar.gz -> github.com-vjeantet-grok-ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53.tar.gz https://github.com/vmware/govmomi/archive/e3a01f9611c32b2362366434bcd671516e78955d.tar.gz -> github.com-vmware-govmomi-e3a01f9611c32b2362366434bcd671516e78955d.tar.gz https://github.com/wvanbergen/kafka/archive/e2edea948ddfee841ea9a263b32ccca15f7d6c2f.tar.gz -> github.com-wvanbergen-kafka-e2edea948ddfee841ea9a263b32ccca15f7d6c2f.tar.gz https://github.com/wvanbergen/kazoo-go/archive/f72d8611297a7cf105da904c04198ad701a60101.tar.gz -> github.com-wvanbergen-kazoo-go-f72d8611297a7cf105da904c04198ad701a60101.tar.gz https://github.com/yuin/gopher-lua/archive/46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz -> github.com-yuin-gopher-lua-46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz https://github.com/golang/crypto/archive/a2144134853fc9a27a7b1e3eb4f19f1a76df13c9.tar.gz -> github.com-golang-crypto-a2144134853fc9a27a7b1e3eb4f19f1a76df13c9.tar.gz https://github.com/golang/net/archive/a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1.tar.gz -> github.com-golang-net-a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1.tar.gz https://github.com/golang/oauth2/archive/d2e6202438beef2727060aa7cabdd924d92ebfd9.tar.gz -> github.com-golang-oauth2-d2e6202438beef2727060aa7cabdd924d92ebfd9.tar.gz https://github.com/golang/sys/archive/ac767d655b305d4e9612f5f6e33120b9176c4ad4.tar.gz -> github.com-golang-sys-ac767d655b305d4e9612f5f6e33120b9176c4ad4.tar.gz https://github.com/golang/text/archive/f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz -> github.com-golang-text-f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz https://github.com/googleapis/google-api-go-client/archive/19ff8768a5c0b8e46ea281065664787eefc24121.tar.gz -> github.com-googleapis-google-api-go-client-19ff8768a5c0b8e46ea281065664787eefc24121.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/fedd2861243fd1a8152376292b921b394c7bef7e.tar.gz -> github.com-google-go-genproto-fedd2861243fd1a8152376292b921b394c7bef7e.tar.gz https://github.com/grpc/grpc-go/archive/168a6198bcb0ef175f7dacec0b8691fc141dc9b8.tar.gz -> github.com-grpc-grpc-go-168a6198bcb0ef175f7dacec0b8691fc141dc9b8.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/79993219becaa7e29e3b60cb67f5b8e82dee11d6.tar.gz -> github.com-census-instrumentation-opencensus-go-79993219becaa7e29e3b60cb67f5b8e82dee11d6.tar.gz https://github.com/alecthomas/kingpin/archive/947dcec5ba9c011838740e680966fd7087a71d0d.tar.gz -> github.com-alecthomas-kingpin-947dcec5ba9c011838740e680966fd7087a71d0d.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/379148ca0225df7a432012b8df0355c2a2063ac0.tar.gz -> github.com-go-asn1-ber-asn1-ber-379148ca0225df7a432012b8df0355c2a2063ac0.tar.gz https://github.com/fatih/pool/archive/010e0b745d12eaf8426c95f9c3924d81dd0b668f.tar.gz -> github.com-fatih-pool-010e0b745d12eaf8426c95f9c3924d81dd0b668f.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/gorethink/gorethink/archive/7f5bdfd858bb064d80559b2a32b86669c5de5d3b.tar.gz -> github.com-gorethink-gorethink-7f5bdfd858bb064d80559b2a32b86669c5de5d3b.tar.gz https://github.com/go-ldap/ldap/archive/bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9.tar.gz -> github.com-go-ldap-ldap-bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9.tar.gz https://github.com/go-mgo/mgo/archive/9856a29383ce1c59f308dd1cf0363a79b5bef6b5.tar.gz -> github.com-go-mgo-mgo-9856a29383ce1c59f308dd1cf0363a79b5bef6b5.tar.gz https://github.com/olivere/elastic/archive/52741dc2ce53629cbe1e673869040d886cba2cd5.tar.gz -> github.com-olivere-elastic-52741dc2ce53629cbe1e673869040d886cba2cd5.tar.gz https://github.com/go-tomb/tomb/archive/dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz -> github.com-go-tomb-tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6209ce920f6c15dee68662de76658b37
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 329f041bb3ee..df99e8c32dd6 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1 b/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
index de5db35a598e..042d76941464 100644
--- a/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
+++ b/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6 json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=idn? ( !libidn2 ) libidn2? ( !idn ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P2/?version=tar-gz -> bind-9.12.2_p2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=35aa6778609407f98db9c69c57c5bc77
+_md5_=51c2fccf388a91fa0c5039f07417471c
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1 b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
index b4e7850bb9b0..11981f257757 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P2/?version=tar-gz -> bind-9.12.2_p2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=19a8ef3b2c2931d4df93dcac4e3e9861
+_md5_=48cb2694a5746b9e65f74c8a9cfcdd3b
diff --git a/metadata/md5-cache/net-dns/coredns-1.0.5 b/metadata/md5-cache/net-dns/coredns-1.0.5
index bfcb4d7aec54..03860b50af8b 100644
--- a/metadata/md5-cache/net-dns/coredns-1.0.5
+++ b/metadata/md5-cache/net-dns/coredns-1.0.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coredns/coredns/archive/v1.0.5.tar.gz -> coredns-1.0.5.tar.gz https://github.com/mholt/caddy/archive/9619fe224c96d0c4a060e83badbf95b6bd69a0ac.tar.gz -> github.com-mholt-caddy-9619fe224c96d0c4a060e83badbf95b6bd69a0ac.tar.gz https://github.com/miekg/dns/archive/5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz -> github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz https://github.com/prometheus/client_golang/archive/e69720d204a4aa3b0c65dc91208645ba0a52b9cd.tar.gz -> github.com-prometheus-client_golang-e69720d204a4aa3b0c65dc91208645ba0a52b9cd.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/prometheus/procfs/archive/282c8707aa210456a825798969cc27edda34992a.tar.gz -> github.com-prometheus-procfs-282c8707aa210456a825798969cc27edda34992a.tar.gz https://github.com/golang/net/archive/cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz -> github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz https://github.com/golang/text/archive/9e2b64d659da1afe07ce1c9c1dfefc09d188f21e.tar.gz -> github.com-golang-text-9e2b64d659da1afe07ce1c9c1dfefc09d188f21e.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=4df4e3662120c35fa0675792e4b5e99f
diff --git a/metadata/md5-cache/net-dns/coredns-1.1.1 b/metadata/md5-cache/net-dns/coredns-1.1.1
index c4241e1cc2a5..2a67f15191b2 100644
--- a/metadata/md5-cache/net-dns/coredns-1.1.1
+++ b/metadata/md5-cache/net-dns/coredns-1.1.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coredns/coredns/archive/v1.1.1.tar.gz -> coredns-1.1.1.tar.gz https://github.com/mholt/caddy/archive/b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz -> github.com-mholt-caddy-b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz https://github.com/miekg/dns/archive/d174bbf0a57b4ab555db36b0e55f692d5e8dfca8.tar.gz -> github.com-miekg-dns-d174bbf0a57b4ab555db36b0e55f692d5e8dfca8.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz https://github.com/golang/net/archive/b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz -> github.com-golang-net-b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz https://github.com/golang/text/archive/ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz -> github.com-golang-text-ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9ccbc17666a0215f6c74c03b1c4d0e99
diff --git a/metadata/md5-cache/net-dns/coredns-1.2.0 b/metadata/md5-cache/net-dns/coredns-1.2.0
index 001e4545506a..5d192090db11 100644
--- a/metadata/md5-cache/net-dns/coredns-1.2.0
+++ b/metadata/md5-cache/net-dns/coredns-1.2.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coredns/coredns/archive/v1.2.0.tar.gz -> coredns-1.2.0.tar.gz https://github.com/mholt/caddy/archive/b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz -> github.com-mholt-caddy-b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz https://github.com/miekg/dns/archive/5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz -> github.com-miekg-dns-5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz https://github.com/golang/net/archive/b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz -> github.com-golang-net-b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz https://github.com/golang/text/archive/ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz -> github.com-golang-text-ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=75f7de9cb6beb1e43ef024ffbf5f39b2
diff --git a/metadata/md5-cache/net-dns/coredns-1.3.0 b/metadata/md5-cache/net-dns/coredns-1.3.0
index 8a9654e4872e..58ebfe5380ac 100644
--- a/metadata/md5-cache/net-dns/coredns-1.3.0
+++ b/metadata/md5-cache/net-dns/coredns-1.3.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coredns/coredns/archive/v1.3.0.tar.gz -> coredns-1.3.0.tar.gz https://github.com/mholt/caddy/archive/6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz -> github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz https://github.com/miekg/dns/archive/7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz -> github.com-miekg-dns-7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=357b5378b5581a2c31d16632c67a5d9a
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
index d17e085b6b50..4ea80c9af801 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.17.tar.gz -> dnscrypt-proxy-2.0.17.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=907e20161684160f72f9b1ed9c12eec5
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
index 3b07ab82459b..54064835e464 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.19.tar.gz -> dnscrypt-proxy-2.0.19.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=907e20161684160f72f9b1ed9c12eec5
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-9999 b/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
index ba23729b94ea..c65a6cbd39d4 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
 IUSE=pie test +filecaps
 LICENSE=ISC
 SLOT=0
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=907e20161684160f72f9b1ed9c12eec5
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 1362f7541867..b524b0f151e7 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/docker-volume-netshare-0.34 b/metadata/md5-cache/net-fs/docker-volume-netshare-0.34
index 73f6ef9adb56..7355c2bf1d13 100644
--- a/metadata/md5-cache/net-fs/docker-volume-netshare-0.34
+++ b/metadata/md5-cache/net-fs/docker-volume-netshare-0.34
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/ContainX/docker-volume-netshare/archive/v0.34.tar.gz -> docker-volume-netshare-0.34.tar.gz https://github.com/Sirupsen/logrus/archive/85b1699d505667d13f8ac4478c1debbf85d6c5de.tar.gz -> github.com-Sirupsen-logrus-85b1699d505667d13f8ac4478c1debbf85d6c5de.tar.gz https://github.com/dickeyxxx/netrc/archive/3acf1b3de25d89c7688c63bb45f6b07f566555ec.tar.gz -> github.com-dickeyxxx-netrc-3acf1b3de25d89c7688c63bb45f6b07f566555ec.tar.gz https://github.com/docker/go-plugins-helpers/archive/021fd77358602b2c20fc3a1dfd260fd0dace4f53.tar.gz -> github.com-docker-go-plugins-helpers-021fd77358602b2c20fc3a1dfd260fd0dace4f53.tar.gz https://github.com/coreos/go-systemd/archive/24036eb3df68550d24a2736c5d013f4e83366866.tar.gz -> github.com-coreos-go-systemd-24036eb3df68550d24a2736c5d013f4e83366866.tar.gz https://github.com/docker/go-connections/archive/e15c02316c12de00874640cd76311849de2aeed5.tar.gz -> github.com-docker-go-connections-e15c02316c12de00874640cd76311849de2aeed5.tar.gz https://github.com/miekg/dns/archive/e78414ef75607394ad7d917824f07f381df2eafa.tar.gz -> github.com-miekg-dns-e78414ef75607394ad7d917824f07f381df2eafa.tar.gz https://github.com/spf13/cobra/archive/b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37.tar.gz -> github.com-spf13-cobra-b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/golang/net/archive/dfe83d419c9403b40b19d08cdba2afec27b002f7.tar.gz -> github.com-golang-net-dfe83d419c9403b40b19d08cdba2afec27b002f7.tar.gz https://github.com/coreos/pkg/archive/8dbaa491b063ed47e2474b5363de0c0db91cf9f2.tar.gz -> github.com-coreos-pkg-8dbaa491b063ed47e2474b5363de0c0db91cf9f2.tar.gz https://github.com/golang/crypto/archive/850760c427c516be930bc91280636328f1a62286.tar.gz -> github.com-golang-crypto-850760c427c516be930bc91280636328f1a62286.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6c9e62edd1c70eb8a2c8877d73cdd262
diff --git a/metadata/md5-cache/net-fs/docker-volume-netshare-0.35 b/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
index dd0b110d5b73..4ce3f913d792 100644
--- a/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+++ b/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/ContainX/docker-volume-netshare/archive/v0.35.tar.gz -> docker-volume-netshare-0.35.tar.gz https://github.com/Sirupsen/logrus/archive/8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz -> github.com-Sirupsen-logrus-8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz https://github.com/dickeyxxx/netrc/archive/e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz -> github.com-dickeyxxx-netrc-e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz https://github.com/docker/go-plugins-helpers/archive/61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz -> github.com-docker-go-plugins-helpers-61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz https://github.com/coreos/go-systemd/archive/25fe332a900022d06a189ce01108392854c59df1.tar.gz -> github.com-coreos-go-systemd-25fe332a900022d06a189ce01108392854c59df1.tar.gz https://github.com/docker/go-connections/archive/7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz -> github.com-docker-go-connections-7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz https://github.com/miekg/dns/archive/5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz -> github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz https://github.com/spf13/cobra/archive/be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz -> github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz https://github.com/spf13/pflag/archive/ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz -> github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz https://github.com/golang/net/archive/cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz -> github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz https://github.com/golang/crypto/archive/432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz -> github.com-golang-crypto-432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1b275fa2f7fa851d687a0f26ecac67dd
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56 b/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
index 99d5c1a3fb3d..1ad6b31e00c5 100644
--- a/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
+++ b/metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-06T23-26-56Z.tar.gz -> mc-2018.09.06.23.26.56.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8516dc5dea867db960604a3580d9b911
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12 b/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
index 4dc7a8a5e404..1b6f3e81956b 100644
--- a/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
+++ b/metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-10T23-39-12Z.tar.gz -> mc-2018.09.10.23.39.12.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5efdadeebb997b5f3f58901db02ea867
diff --git a/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43 b/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
index b765085847ae..ac6289e90455 100644
--- a/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
+++ b/metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-09-26T00-42-43Z.tar.gz -> mc-2018.09.26.00.42.43.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25 b/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
index ad383827928d..c63625899ba4 100644
--- a/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
+++ b/metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-10-16T23-25-25Z.tar.gz -> mc-2018.10.16.23.25.25.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20 b/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
index 2b6ec0eaa830..7fc23733a521 100644
--- a/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
+++ b/metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-11-06T01-12-20Z.tar.gz -> mc-2018.11.06.01.12.20.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08 b/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
index c76bf8ed36fa..f064276ee17c 100644
--- a/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
+++ b/metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-11-30T01-52-08Z.tar.gz -> mc-2018.11.30.01.52.08.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07 b/metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07
index 7959d18589bf..4f772c63e91d 100644
--- a/metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07
+++ b/metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-12-05T22-59-07Z.tar.gz -> mc-2018.12.05.22.59.07.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22 b/metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22
index 39767fa4cf65..250f9c8654c9 100644
--- a/metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22
+++ b/metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!!app-misc/mc
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/RELEASE.2018-12-12T19-02-22Z.tar.gz -> mc-2018.12.12.19.02.22.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c18d420f66c6fd81ab50593d1ce8e147
diff --git a/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58 b/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
index 1e41d79d77a3..6b7c60f72ffa 100644
--- a/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
+++ b/metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-10-18T00-28-58Z.tar.gz -> minio-2018.10.18.00.28.58.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03 b/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
index 28396f141c4c..028aadfc3c0e 100644
--- a/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
+++ b/metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-10-25T01-27-03Z.tar.gz -> minio-2018.10.25.01.27.03.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02 b/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
index b9ade74febda..ed27968ac991 100644
--- a/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
+++ b/metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-06T01-01-02Z.tar.gz -> minio-2018.11.06.01.01.02.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07 b/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
index 7bb364ede73f..091652443267 100644
--- a/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
+++ b/metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-15T01-26-07Z.tar.gz -> minio-2018.11.15.01.26.07.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48 b/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
index 6c61488265a8..5e01d3a7f519 100644
--- a/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
+++ b/metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-17T01-23-48Z.tar.gz -> minio-2018.11.17.01.23.48.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56 b/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
index 3ec708638ba0..b154904de47a 100644
--- a/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
+++ b/metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-22T02-51-56Z.tar.gz -> minio-2018.11.22.02.51.56.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59 b/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
index 806518f4e21b..186276eb0d15 100644
--- a/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
+++ b/metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-11-30T03-56-59Z.tar.gz -> minio-2018.11.30.03.56.59.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43 b/metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43
index c70cdab3f83c..cd257b7c906e 100644
--- a/metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43
+++ b/metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-12-06T01-27-43Z.tar.gz -> minio-2018.12.06.01.27.43.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19 b/metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19
index b75175342ebb..66bea99fdb8e 100644
--- a/metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19
+++ b/metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-12-13T02-04-19Z.tar.gz -> minio-2018.12.13.02.04.19.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=546e38d414a400b1cd13cca9fd977cff
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 3274636709e5..4c3a65aaf1a1 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/daq-2.0.6 b/metadata/md5-cache/net-libs/daq-2.0.6-r1
similarity index 96%
rename from metadata/md5-cache/net-libs/daq-2.0.6
rename to metadata/md5-cache/net-libs/daq-2.0.6-r1
index fa86892e2c0e..8e88148c52e8 100644
--- a/metadata/md5-cache/net-libs/daq-2.0.6
+++ b/metadata/md5-cache/net-libs/daq-2.0.6-r1
@@ -11,4 +11,4 @@ RDEPEND=dump? ( >=net-libs/libpcap-1.0.0 ) ipq? ( >=net-firewall/iptables-1.4.10
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/snort/daq-2.0.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3de40fd54074f43d04fa3c32fb5e95ab
+_md5_=bb3f0f01ce34698ad8666725af4eccc3
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r6 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r6
deleted file mode 100644
index b4150f180d39..000000000000
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.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.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A network programming library in C++
-EAPI=6
-HOMEPAGE=https://github.com/apenwarr/wvstreams/
-IUSE=pam doc +ssl +dbus debug boost
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8cdaa717339efe854a7f74b4e5b8411
diff --git a/metadata/md5-cache/net-libs/wvstreams-99999 b/metadata/md5-cache/net-libs/wvstreams-99999
index f1aee82774aa..bcfc92af0599 100644
--- a/metadata/md5-cache/net-libs/wvstreams-99999
+++ b/metadata/md5-cache/net-libs/wvstreams-99999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/openssl:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) dev-util/redo virtual/pkgconfig doc? ( app-doc/doxygen ) >=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/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) dev-util/redo virtual/pkgconfig doc? ( app-doc/doxygen ) >=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]
 DESCRIPTION=A network programming library in C++
 EAPI=6
 HOMEPAGE=https://github.com/apenwarr/wvstreams
 IUSE=+dbus debug doc pam static-libs +zlib
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
+RDEPEND=<dev-libs/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
 SLOT=0/5.0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1de548b6db95b151bc2f5ff51e3b1cd1
+_md5_=d494926413de5cbf704a3d35687c0492
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 8bc554173b82..2e98ac258868 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1 b/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
index ba2c20c91727..5f3acb5624d5 100644
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
+++ b/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/cni-plugins
 SLOT=0
 SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v2.0.1.tar.gz -> calico-cni-plugin-2.0.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz -> github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz -> github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/389dfa299845bcf399c16af89987e8775718ea48.tar.gz -> github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz https://github.com/kubernetes/apimachinery/archive/4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz -> github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=35499cccb402ad913d803c02c156336d
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0 b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
index cfb6f66b4843..6daa9357bfa4 100644
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
+++ b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/cni-plugins
 SLOT=0
 SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v3.1.0.tar.gz -> calico-cni-plugin-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/b5b1876b170881a8259f036445ee89c8669db386.tar.gz -> github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=ea761a14a50b4f5450a1bbd393beaef2
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3 b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
index 1296b478ae91..9a424bdb1513 100644
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
+++ b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/cni-plugins
 SLOT=0
 SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v3.1.3.tar.gz -> calico-cni-plugin-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/b5b1876b170881a8259f036445ee89c8669db386.tar.gz -> github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=843c2b49652ed88dc31663ced76d371b
diff --git a/metadata/md5-cache/net-misc/calicoctl-1.5.0 b/metadata/md5-cache/net-misc/calicoctl-1.5.0
index 0ec05508091d..e69b5373b9a4 100644
--- a/metadata/md5-cache/net-misc/calicoctl-1.5.0
+++ b/metadata/md5-cache/net-misc/calicoctl-1.5.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/calicoctl/archive/v1.5.0.tar.gz -> calicoctl-1.5.0.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/mcuadros/go-version/archive/257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz -> github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/olekukonko/tablewriter/archive/be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz -> github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/influxdata/influxdb/archive/392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz -> github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz -> github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz https://github.com/coreos/etcd/archive/17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz -> github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/coreos/go-semver/archive/568e959cd89871e61434c1143528d9162da89ef2.tar.gz -> github.com-coreos-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz -> github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz https://github.com/magiconair/properties/archive/be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz -> github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz https://github.com/mitchellh/mapstructure/archive/d0303fe809921458f417bcf828397a65db30a7e4.tar.gz -> github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz https://github.com/pelletier/go-toml/archive/69d355db5304c0f7f809a2edc054553e7142f016.tar.gz -> github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz https://github.com/spf13/afero/archive/9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz -> github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz -> github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz https://github.com/spf13/pflag/archive/08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz -> github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/vishvananda/netlink/archive/f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz -> github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/net/archive/f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz -> github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz https://github.com/golang/sys/archive/8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz -> github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz https://github.com/golang/text/archive/19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz -> github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/tchap/go-patricia/archive/666120de432aea38ab06bd5c818f04f4129882c9.tar.gz -> github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/client-go/archive/4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz -> github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz https://github.com/kubernetes/apimachinery/archive/b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz -> github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=9740a245c1114b07163b75f94127c9fa
diff --git a/metadata/md5-cache/net-misc/calicoctl-2.0.0 b/metadata/md5-cache/net-misc/calicoctl-2.0.0
index f574f76ad32f..19ff499356b9 100644
--- a/metadata/md5-cache/net-misc/calicoctl-2.0.0
+++ b/metadata/md5-cache/net-misc/calicoctl-2.0.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/calicoctl/archive/v2.0.0.tar.gz -> calicoctl-2.0.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz -> github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/b287c191f362e7313aae0fa08c19b787076ad530.tar.gz -> github.com-influxdata-influxdb-b287c191f362e7313aae0fa08c19b787076ad530.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/olekukonko/tablewriter/archive/65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz -> github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/c893efa28eb45626cdaa76c9f653b62488858837.tar.gz -> github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz -> github.com-pelletier-go-toml-b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz -> github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz -> github.com-prometheus-common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz https://github.com/prometheus/procfs/archive/a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz -> github.com-prometheus-procfs-a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz -> github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz -> github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/314a259e304ff91bd6985da2a7149bbf91237993.tar.gz -> github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz -> github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz https://github.com/kubernetes/apimachinery/archive/5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz -> github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=bb41e587792a69963b2b37e2a1bb3e10
diff --git a/metadata/md5-cache/net-misc/calicoctl-3.1.0 b/metadata/md5-cache/net-misc/calicoctl-3.1.0
index 91ad50c4b6b6..c71dc74ab99f 100644
--- a/metadata/md5-cache/net-misc/calicoctl-3.1.0
+++ b/metadata/md5-cache/net-misc/calicoctl-3.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/calicoctl/archive/v3.1.0.tar.gz -> calicoctl-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz -> github.com-influxdata-influxdb-38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz -> github.com-magiconair-properties-2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/a9d6d1e4dc51df2130326793d49971f238839169.tar.gz -> github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz -> github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz -> github.com-spf13-viper-8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2187060610a140676ad5693ce0b9ea5c
diff --git a/metadata/md5-cache/net-misc/calicoctl-3.1.3 b/metadata/md5-cache/net-misc/calicoctl-3.1.3
index 02bd30da27bc..4d2a82f4b529 100644
--- a/metadata/md5-cache/net-misc/calicoctl-3.1.3
+++ b/metadata/md5-cache/net-misc/calicoctl-3.1.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/calicoctl/archive/v3.1.3.tar.gz -> calicoctl-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz -> github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/c2353362d570a7bfa228149c62842019201cfb71.tar.gz -> github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz -> github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz -> github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz https://github.com/olekukonko/tablewriter/archive/d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz -> github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz -> github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz -> github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=d08ad9cd19694d04d29027157df140c8
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.1 b/metadata/md5-cache/net-misc/cni-plugins-0.7.1
index bf173e3f28ae..dd75af34f7dc 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.1
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.1.tar.gz -> cni-plugins-0.7.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b57e4d4159debe0d68ac2aec511f6363
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.2 b/metadata/md5-cache/net-misc/cni-plugins-0.7.2
index 4c40e398b19d..c73ae9dda721 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.2
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.2.tar.gz -> cni-plugins-0.7.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b57e4d4159debe0d68ac2aec511f6363
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.3 b/metadata/md5-cache/net-misc/cni-plugins-0.7.3
index b514858e436a..4d70ab9bf4ee 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.3
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.3.tar.gz -> cni-plugins-0.7.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=b57e4d4159debe0d68ac2aec511f6363
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.4 b/metadata/md5-cache/net-misc/cni-plugins-0.7.4
index 43cfd5aa619c..79724ce830a2 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.4
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.4.tar.gz -> cni-plugins-0.7.4.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=f9bafa97b368b9435fccb205e0040c09
diff --git a/metadata/md5-cache/net-misc/drive-0.3.9.1 b/metadata/md5-cache/net-misc/drive-0.3.9.1
index 6e3987b8b831..86ea9a7599e3 100644
--- a/metadata/md5-cache/net-misc/drive-0.3.9.1
+++ b/metadata/md5-cache/net-misc/drive-0.3.9.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/odeke-em/drive/archive/v0.3.9.1.tar.gz -> drive-0.3.9.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9.tar.gz https://github.com/boltdb/bolt/archive/fa5367d20c994db73282594be0146ab221657943.tar.gz -> github.com-boltdb-bolt-fa5367d20c994db73282594be0146ab221657943.tar.gz https://github.com/cheggaaa/pb/archive/657164d0228d6bebe316fdf725c69f131a50fb10.tar.gz -> github.com-cheggaaa-pb-657164d0228d6bebe316fdf725c69f131a50fb10.tar.gz https://github.com/codegangsta/inject/archive/33e0aa1cb7c019ccc3fbe049a8262a6403d30504.tar.gz -> github.com-codegangsta-inject-33e0aa1cb7c019ccc3fbe049a8262a6403d30504.tar.gz https://github.com/go-martini/martini/archive/22fa46961aabd2665cf3f1343b146d20028f5071.tar.gz -> github.com-go-martini-martini-22fa46961aabd2665cf3f1343b146d20028f5071.tar.gz https://github.com/golang/protobuf/archive/11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz -> github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz https://github.com/googleapis/gax-go/archive/317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz -> github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz https://github.com/martini-contrib/binding/archive/05d3e151b6cf34dacac6306226a33db68459a3b5.tar.gz -> github.com-martini-contrib-binding-05d3e151b6cf34dacac6306226a33db68459a3b5.tar.gz https://github.com/mattn/go-isatty/archive/fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz -> github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/odeke-em/cache/archive/baf8e436bc97557118cb0bf118ab8ac6aeeda381.tar.gz -> github.com-odeke-em-cache-baf8e436bc97557118cb0bf118ab8ac6aeeda381.tar.gz https://github.com/odeke-em/cli-spinner/archive/610063bb4aeef25f7645b3e6080456655ec0fb33.tar.gz -> github.com-odeke-em-cli-spinner-610063bb4aeef25f7645b3e6080456655ec0fb33.tar.gz https://github.com/odeke-em/command/archive/91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561.tar.gz -> github.com-odeke-em-command-91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561.tar.gz https://github.com/odeke-em/exponential-backoff/archive/96e25d36ae36ad09ac02cbfe653b44c4043a8e09.tar.gz -> github.com-odeke-em-exponential-backoff-96e25d36ae36ad09ac02cbfe653b44c4043a8e09.tar.gz https://github.com/odeke-em/extractor/archive/801861aedb854c7ac5e1329e9713023e9dc2b4d4.tar.gz -> github.com-odeke-em-extractor-801861aedb854c7ac5e1329e9713023e9dc2b4d4.tar.gz https://github.com/odeke-em/go-utils/archive/e8ebaed0777a55fa09937617a157dd51386136c2.tar.gz -> github.com-odeke-em-go-utils-e8ebaed0777a55fa09937617a157dd51386136c2.tar.gz https://github.com/odeke-em/go-uuid/archive/b211d769a9aaba5b2b8bdbab5de3c227116f3c39.tar.gz -> github.com-odeke-em-go-uuid-b211d769a9aaba5b2b8bdbab5de3c227116f3c39.tar.gz https://github.com/odeke-em/log/archive/8d60a6917853243fd746612e6ba47843a794fa82.tar.gz -> github.com-odeke-em-log-8d60a6917853243fd746612e6ba47843a794fa82.tar.gz https://github.com/odeke-em/meddler/archive/d2b51d2b40e786ab5f810d85e65b96404cf33570.tar.gz -> github.com-odeke-em-meddler-d2b51d2b40e786ab5f810d85e65b96404cf33570.tar.gz https://github.com/odeke-em/namespace/archive/0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6.tar.gz -> github.com-odeke-em-namespace-0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6.tar.gz https://github.com/odeke-em/pretty-words/archive/9d37a7fcb4ae6f94b288d371938482994458cecb.tar.gz -> github.com-odeke-em-pretty-words-9d37a7fcb4ae6f94b288d371938482994458cecb.tar.gz https://github.com/odeke-em/rsc/archive/6ad75e1e26192f3d140b6486deb99c9dbd289846.tar.gz -> github.com-odeke-em-rsc-6ad75e1e26192f3d140b6486deb99c9dbd289846.tar.gz https://github.com/odeke-em/semalim/archive/9c88bf5f9156ed06ec5110a705d41b8580fd96f7.tar.gz -> github.com-odeke-em-semalim-9c88bf5f9156ed06ec5110a705d41b8580fd96f7.tar.gz https://github.com/odeke-em/statos/archive/292960a201e2310a667eac7796f4e11cd51021a3.tar.gz -> github.com-odeke-em-statos-292960a201e2310a667eac7796f4e11cd51021a3.tar.gz https://github.com/skratchdot/open-golang/archive/75fb7ed4208cf72d323d7d02fd1a5964a7a9073c.tar.gz -> github.com-skratchdot-open-golang-75fb7ed4208cf72d323d7d02fd1a5964a7a9073c.tar.gz https://github.com/golang/crypto/archive/faadfbdc035307d901e69eea569f5dda451a3ee3.tar.gz -> github.com-golang-crypto-faadfbdc035307d901e69eea569f5dda451a3ee3.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/golang/oauth2/archive/13449ad91cb26cb47661c1b080790392170385fd.tar.gz -> github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz https://github.com/golang/text/archive/14c0d48ead0cd47e3104ada247d91be04afc7a5a.tar.gz -> github.com-golang-text-14c0d48ead0cd47e3104ada247d91be04afc7a5a.tar.gz https://github.com/google/google-api-go-client/archive/39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz -> github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz https://github.com/google/go-genproto/archive/595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz -> github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz https://github.com/grpc/grpc-go/archive/bb78878767b96d411e740439ac820f118e95ae2f.tar.gz -> github.com-grpc-grpc-go-bb78878767b96d411e740439ac820f118e95ae2f.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=be8c1f1b9e11f4533ca8aa22a2f11e69
diff --git a/metadata/md5-cache/net-misc/felix-2.5.1 b/metadata/md5-cache/net-misc/felix-2.5.1
index 15c8a29ae291..73752829fd94 100644
--- a/metadata/md5-cache/net-misc/felix-2.5.1
+++ b/metadata/md5-cache/net-misc/felix-2.5.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/2.5.1.tar.gz -> felix-2.5.1.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/gavv/monotime/archive/47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz -> github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz https://github.com/go-ini/ini/archive/20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz -> github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz https://github.com/gogo/protobuf/archive/100ba4e885062801d56799d78530b73b178a78f3.tar.gz -> github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/projectcalico/libcalico-go/archive/fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz -> github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz https://github.com/coreos/etcd/archive/d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz -> github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/typha/archive/71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz -> github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz https://github.com/coreos/pkg/archive/fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz -> github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/coreos/go-systemd/archive/2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz -> github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz https://github.com/golang/protobuf/archive/8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz -> github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz -> github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz -> github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/vishvananda/netlink/archive/f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz -> github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz https://github.com/vishvananda/netns/archive/86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz -> github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/net/archive/3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz -> github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz https://github.com/golang/sys/archive/43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz -> github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz https://github.com/go-playground/validator/archive/5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz -> github.com-go-playground-validator-5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz https://github.com/tchap/go-patricia/archive/666120de432aea38ab06bd5c818f04f4129882c9.tar.gz -> github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz https://github.com/kubernetes/apimachinery/archive/b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz -> github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz https://github.com/kubernetes/client-go/archive/4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz -> github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2ac9d64ecc45c4262985027f9635e3ed
diff --git a/metadata/md5-cache/net-misc/felix-3.1.0 b/metadata/md5-cache/net-misc/felix-3.1.0
index e67950180794..8a58d355c6ae 100644
--- a/metadata/md5-cache/net-misc/felix-3.1.0
+++ b/metadata/md5-cache/net-misc/felix-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.1.0.tar.gz -> felix-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz -> github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz -> github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/opentracing/opentracing-go/archive/328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz -> github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/projectcalico/typha/archive/6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz -> github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz -> github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz -> github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=06c29a6e2b9bb2836867615fe4849d7c
diff --git a/metadata/md5-cache/net-misc/felix-3.1.3 b/metadata/md5-cache/net-misc/felix-3.1.3
index 750e560a91b5..d5f9fe1e70d0 100644
--- a/metadata/md5-cache/net-misc/felix-3.1.3
+++ b/metadata/md5-cache/net-misc/felix-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.1.3.tar.gz -> felix-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz -> github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz -> github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/opentracing/opentracing-go/archive/6c572c00d1830223701e155de97408483dfcd14a.tar.gz -> github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/projectcalico/typha/archive/5374e9f32bde159a4aa19c821618920f491004be.tar.gz -> github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz -> github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz -> github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=38433d7e4c34ce525f37136a4086f717
diff --git a/metadata/md5-cache/net-misc/istioctl-1.0.2 b/metadata/md5-cache/net-misc/istioctl-1.0.2
index 6006f67e13cc..ebd6b2c30d0f 100644
--- a/metadata/md5-cache/net-misc/istioctl-1.0.2
+++ b/metadata/md5-cache/net-misc/istioctl-1.0.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/istio/istio/archive/1.0.2.tar.gz -> istioctl-1.0.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=e8a613bf7b402e44ebde65dda2b5e4d9
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p12 b/metadata/md5-cache/net-misc/ntp-4.2.8_p12
index 11cf156f1195..9cb629a2b756 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p12
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p12
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=6
 HOMEPAGE=http://www.ntp.org/
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p12-manpages.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=014cf63d662687fe2f2e0eddb8c16688
+_md5_=d18956bfce087b6bf0c4f147c5f61964
diff --git a/metadata/md5-cache/net-misc/rclone-1.42 b/metadata/md5-cache/net-misc/rclone-1.42
index 44daf72f0621..df8dd22c2a51 100644
--- a/metadata/md5-cache/net-misc/rclone-1.42
+++ b/metadata/md5-cache/net-misc/rclone-1.42
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncw/rclone/archive/v1.42.tar.gz -> rclone-1.42.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-1.43.1 b/metadata/md5-cache/net-misc/rclone-1.43.1
index 239801c92753..92a2beb48d62 100644
--- a/metadata/md5-cache/net-misc/rclone-1.43.1
+++ b/metadata/md5-cache/net-misc/rclone-1.43.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncw/rclone/archive/v1.43.1.tar.gz -> rclone-1.43.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-1.44 b/metadata/md5-cache/net-misc/rclone-1.44
index e412dff21ecc..a68eb4321500 100644
--- a/metadata/md5-cache/net-misc/rclone-1.44
+++ b/metadata/md5-cache/net-misc/rclone-1.44
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncw/rclone/archive/v1.44.tar.gz -> rclone-1.44.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-9999 b/metadata/md5-cache/net-misc/rclone-9999
index 196890f31e82..f917ba6c8185 100644
--- a/metadata/md5-cache/net-misc/rclone-9999
+++ b/metadata/md5-cache/net-misc/rclone-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://rclone.org/
 LICENSE=MIT
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index a70c31ad9f76..35e7ced424a0 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/go-ethereum-1.8.15 b/metadata/md5-cache/net-p2p/go-ethereum-1.8.15
index 84d047945cf4..b3f9476e71c8 100644
--- a/metadata/md5-cache/net-p2p/go-ethereum-1.8.15
+++ b/metadata/md5-cache/net-p2p/go-ethereum-1.8.15
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/go:= opencl? ( virtual/opencl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ethereum/go-ethereum/archive/v1.8.15.tar.gz -> go-ethereum-1.8.15.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe
 _md5_=f90badc3e6f60f3bf6b32904e6c3d922
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.38 b/metadata/md5-cache/net-p2p/syncthing-0.14.38
index fded8a7c9156..16bf94463b91 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.38
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.38
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=selinux? ( sec-policy/selinux-syncthing )
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v0.14.38.tar.gz -> syncthing-0.14.38.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a7147aa5f5f8afbdf89d19055f4341e0
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.51 b/metadata/md5-cache/net-p2p/syncthing-0.14.51
index 24a1c14724ea..149c785e5ad8 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.51
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.51
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=selinux? ( sec-policy/selinux-syncthing )
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v0.14.51.tar.gz -> syncthing-0.14.51.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b756ea7b29c8a382d575b16f4e3e3707
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.52 b/metadata/md5-cache/net-p2p/syncthing-0.14.52
index e2f92aedd2c8..d9c5515a27bd 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.52
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.52
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=selinux? ( sec-policy/selinux-syncthing )
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v0.14.52.tar.gz -> syncthing-0.14.52.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ad6e934fcfd8f291879866973d03e541
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index a47cb7d305f0..0b853e985b7f 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6 b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
index 15d703997fd5..3e0403cbb195 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/Yawning/obfs4/archive/obfs4proxy-0.0.6.tar.gz -> obfs4proxy-0.0.6.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2f89ba1fff8ab6fe33c7266528582433
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7 b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
index 8b790a487fae..085d6e55fd70 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/Yawning/obfs4/archive/obfs4proxy-0.0.7.tar.gz -> obfs4proxy-0.0.7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2f89ba1fff8ab6fe33c7266528582433
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-9999 b/metadata/md5-cache/net-proxy/obfs4proxy-9999
index 51c087105a1e..e0d288b73f97 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-9999
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-9999
@@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/Yawning/obfs4
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b20f0a3cb102a30d8deebed299573683
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index d71bd87b146f..83dcfea2e7f0 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3 b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
similarity index 74%
rename from metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
rename to metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
index b36e5ad18328..0268d59ca255 100644
--- a/metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
+++ b/metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib
+DEPEND=dev-libs/openssl:* net-libs/libpcap sys-libs/zlib
 DESCRIPTION=WLAN tool for breaking 802.11 WEP keys
 EAPI=5
 HOMEPAGE=http://wepattack.sourceforge.net/
 IUSE=john
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl net-libs/libpcap sys-libs/zlib john? ( app-crypt/johntheripper )
+RDEPEND=dev-libs/openssl:* net-libs/libpcap sys-libs/zlib john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/wepattack/WepAttack-0.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0772e29c2f49bb3ff79075d9bb34374
+_md5_=6b0708294cb70d0e61b9512b2dd0aedc
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f434dbd8c7cd..94396b7099d3 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/docker_auth-1.3.1 b/metadata/md5-cache/sys-auth/docker_auth-1.3.1
index 0e8bf978ce24..53a80caafec5 100644
--- a/metadata/md5-cache/sys-auth/docker_auth-1.3.1
+++ b/metadata/md5-cache/sys-auth/docker_auth-1.3.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cesanta/docker_auth/archive/1.3.1.tar.gz -> docker_auth-1.3.1.tar.gz https://github.com/dchest/uniuri/archive/8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz -> github.com-dchest-uniuri-8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz https://github.com/deckarep/golang-set/archive/fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz -> github.com-deckarep-golang-set-fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz https://github.com/docker/distribution/archive/0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz -> github.com-docker-distribution-0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz https://github.com/docker/libtrust/archive/aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz -> github.com-docker-libtrust-aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz https://github.com/facebookgo/httpdown/archive/a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz -> github.com-facebookgo-httpdown-a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz https://github.com/facebookgo/clock/archive/600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz -> github.com-facebookgo-clock-600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz https://github.com/facebookgo/stats/archive/1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz -> github.com-facebookgo-stats-1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz https://github.com/go-ldap/ldap/archive/13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz -> github.com-go-ldap-ldap-13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz https://github.com/cesanta/glog/archive/22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz -> github.com-cesanta-glog-22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz https://github.com/schwarmco/go-cartesian-product/archive/c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz -> github.com-schwarmco-go-cartesian-product-c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz https://github.com/syndtr/goleveldb/archive/3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz -> github.com-syndtr-goleveldb-3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz https://github.com/golang/crypto/archive/e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz -> github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz https://github.com/golang/sys/archive/493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz -> github.com-golang-sys-493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/google/google-api-go-client/archive/39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz -> github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz https://github.com/grpc/grpc-go/archive/35170916ff58e89ae03f52e778228e18207e0e02.tar.gz -> github.com-grpc-grpc-go-35170916ff58e89ae03f52e778228e18207e0e02.tar.gz https://github.com/golang/protobuf/archive/11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz -> github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz https://github.com/golang/oauth2/archive/13449ad91cb26cb47661c1b080790392170385fd.tar.gz -> github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz https://github.com/golang/text/archive/ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz -> github.com-golang-text-ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz https://github.com/googleapis/gax-go/archive/8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz -> github.com-googleapis-gax-go-8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz https://github.com/google/go-genproto/archive/595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz -> github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c6d5779a5c5c1b4fe7399406442fb83d
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 2b9a2b3b861c..c42a1f1f03ae 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/megamgr-5.20-r2 b/metadata/md5-cache/sys-block/megamgr-5.20-r2
index 2e029e36fa88..b4ce1028fba6 100644
--- a/metadata/md5-cache/sys-block/megamgr-5.20-r2
+++ b/metadata/md5-cache/sys-block/megamgr-5.20-r2
@@ -8,4 +8,4 @@ LICENSE=LSI
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/ut_linux_mgr_5.20.zip
-_md5_=cbcfa1353dfbd66a5449018b5fdf96fc
+_md5_=064e8181cec031717c6613d17926bcb6
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 6ee17774b1b4..c1c504fba3a3 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11
index 6cf58a2e5b3f..44580418ac7e 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ba8b9d2b6a3687f68d7109159301d064
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5
index c603eb47cc83..216525e31439 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ba8b9d2b6a3687f68d7109159301d064
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3
index b1a69748eeca..c1e659df219b 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ba8b9d2b6a3687f68d7109159301d064
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11
index a6657f2b5a36..92b5a4217abd 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ba8b9d2b6a3687f68d7109159301d064
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11
index 885e4eace8d1..e6563de29d1b 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7ee6abc48bbc1cf10f3e2ee5b6a39831
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5
index 1c2108473eac..2aa5b5f902cb 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7ee6abc48bbc1cf10f3e2ee5b6a39831
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3
index e35af4c8eaf8..84c6581658a6 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7ee6abc48bbc1cf10f3e2ee5b6a39831
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11
index 4a80b4d46879..c7f30e2b3ce7 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=7ee6abc48bbc1cf10f3e2ee5b6a39831
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.11 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.11
index 404264203e2d..6724c01851d0 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8eebf83aa1531162a45dd9c9da2d6f6d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.11.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.5
index cf7ddcdd855b..863a56b3b7bd 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8eebf83aa1531162a45dd9c9da2d6f6d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.12.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.12.3
index 7a359973563e..df052f8dc13e 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.12.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8eebf83aa1531162a45dd9c9da2d6f6d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.11 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.11
index 0976230028ad..2a6043d794ed 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=8eebf83aa1531162a45dd9c9da2d6f6d
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11
index 38d7c3a30404..0e78e4771cf1 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=998f3f123c3c96dc42ce660ab74a03d3
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5
index 6004a3ad795d..00cbe6485532 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=998f3f123c3c96dc42ce660ab74a03d3
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3
index 3d795f9fd3ad..54f7151d382c 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=998f3f123c3c96dc42ce660ab74a03d3
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11
index b218aed1873b..7912b5add6c9 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b929af815e7267c6f64a82515a9e4e72
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.11 b/metadata/md5-cache/sys-cluster/kubectl-1.10.11
index 4b70a9b35672..00901f2bebce 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b5b07d5d9cd12468a189712e02476532
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.11.5 b/metadata/md5-cache/sys-cluster/kubectl-1.11.5
index 2895980ceb8a..228d358d666e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.11.5
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b5b07d5d9cd12468a189712e02476532
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.12.3 b/metadata/md5-cache/sys-cluster/kubectl-1.12.3
index 2ef3d0a73550..c3418d4c7003 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.12.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b5b07d5d9cd12468a189712e02476532
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.0 b/metadata/md5-cache/sys-cluster/kubectl-1.13.0
index 17782aa54898..6947ab0db12f 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.13.0
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.13.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.0.tar.gz -> kubernetes-1.13.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=b5b07d5d9cd12468a189712e02476532
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.1 b/metadata/md5-cache/sys-cluster/kubectl-1.13.1
index 3fbb9b23d044..f72e79666e2e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.13.1
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.13.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9db25e716f08eabc85aacc988a372134
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.11 b/metadata/md5-cache/sys-cluster/kubectl-1.9.11
index 9a7a6538c223..e53bba953260 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ec9bf0e3cf00ad9dff3d561f8497d24c
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.11 b/metadata/md5-cache/sys-cluster/kubelet-1.10.11
index a59a31a287f5..5460353d1f1e 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.11
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.11.tar.gz -> kubernetes-1.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5b5af786c5e5fb76bd50bfa7b576d97e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.11.5 b/metadata/md5-cache/sys-cluster/kubelet-1.11.5
index 5c2cff969325..fcce21806628 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.11.5
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.11.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.5.tar.gz -> kubernetes-1.11.5.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5b5af786c5e5fb76bd50bfa7b576d97e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.12.3 b/metadata/md5-cache/sys-cluster/kubelet-1.12.3
index c8416f930853..37674ca11a33 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.12.3
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.12.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.12.3.tar.gz -> kubernetes-1.12.3.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5b5af786c5e5fb76bd50bfa7b576d97e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.11 b/metadata/md5-cache/sys-cluster/kubelet-1.9.11
index 8159dabcbf1d..afdcbc0e23f0 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.11
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.11.tar.gz -> kubernetes-1.9.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=5b5af786c5e5fb76bd50bfa7b576d97e
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.30.0 b/metadata/md5-cache/sys-cluster/minikube-0.30.0
index eb8c627c603a..1dc0f4b419b5 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.30.0
+++ b/metadata/md5-cache/sys-cluster/minikube-0.30.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-cluster/kubectl-1.10.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v0.30.0.tar.gz -> minikube-0.30.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=043e77cacecd245e583612974a76cf4c
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.31.0 b/metadata/md5-cache/sys-cluster/minikube-0.31.0
index 824fb4a997e5..d17e25e5a6a4 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.31.0
+++ b/metadata/md5-cache/sys-cluster/minikube-0.31.0
@@ -10,5 +10,5 @@ RDEPEND=>=sys-cluster/kubectl-1.10.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v0.31.0.tar.gz -> minikube-0.31.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=043e77cacecd245e583612974a76cf4c
diff --git a/metadata/md5-cache/sys-cluster/swift-2.20.0 b/metadata/md5-cache/sys-cluster/swift-2.20.0
new file mode 100644
index 000000000000..f4dae05fa7ac
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/swift-2.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.8.0[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(-)]
+DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
+EAPI=6
+HOMEPAGE=https://launchpad.net/swift
+IUSE=proxy account container object +memcached python_targets_python2_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] 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=|| ( proxy account container object ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/swift/swift-2.20.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=60c6f121d88402ecc4927a61000e5fdc
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.6.7 b/metadata/md5-cache/sys-cluster/teleport-2.6.7
index ddbe5361cae1..02f52285c8cb 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.6.7
+++ b/metadata/md5-cache/sys-cluster/teleport-2.6.7
@@ -10,5 +10,5 @@ RDEPEND=pam? ( sys-libs/pam )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.6.7.tar.gz -> teleport-2.6.7.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d31f51f24177a0cfdd4756f91e169119
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.7.1 b/metadata/md5-cache/sys-cluster/teleport-2.7.1
index c1b4fd925dc8..a860020930c4 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.7.1
+++ b/metadata/md5-cache/sys-cluster/teleport-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=pam? ( sys-libs/pam )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.7.1.tar.gz -> teleport-2.7.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d31f51f24177a0cfdd4756f91e169119
diff --git a/metadata/md5-cache/sys-cluster/teleport-3.0.0 b/metadata/md5-cache/sys-cluster/teleport-3.0.0
index e48c573200b1..9378570d0342 100644
--- a/metadata/md5-cache/sys-cluster/teleport-3.0.0
+++ b/metadata/md5-cache/sys-cluster/teleport-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=pam? ( sys-libs/pam )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v3.0.0.tar.gz -> teleport-3.0.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-cluster/teleport-3.0.1 b/metadata/md5-cache/sys-cluster/teleport-3.0.1
index 8dbea2294d51..5db0392c62c6 100644
--- a/metadata/md5-cache/sys-cluster/teleport-3.0.1
+++ b/metadata/md5-cache/sys-cluster/teleport-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=pam? ( sys-libs/pam )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v3.0.1.tar.gz -> teleport-3.0.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ab657325f8d9faae6266739d57e32a4e
diff --git a/metadata/md5-cache/sys-cluster/teleport-9999 b/metadata/md5-cache/sys-cluster/teleport-9999
index 0933ce90a31a..256cbd3084e9 100644
--- a/metadata/md5-cache/sys-cluster/teleport-9999
+++ b/metadata/md5-cache/sys-cluster/teleport-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=pam? ( sys-libs/pam )
 RESTRICT=test strip
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca7c65cb6719c1fd177cd0c9edfb4c03
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
index eda97a73a105..87df26e92b69 100644
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.4
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c3dd77f41b8f3fefaabf253ce9656d62
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d27dd53148eb..c375e13fe1d9 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620 b/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
index efcb09c75ff7..0d117a18a1ba 100644
--- a/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
+++ b/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/xetorthio/etcd-fs/archive/395eacbaebccccc5f03ed11dc887ea2f1af300a0.zip -> etcd-fs-0_p20140620.zip
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe
 _md5_=c14e0b661ad8987c88b3d75ec9ab4f24
diff --git a/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517 b/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
index 7906b9a5da49..8bac3946bc16 100644
--- a/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
+++ b/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/xetorthio/etcd-fs/archive/1eeace3bc20b15e4347c631a1cf7b45f3852518a.tar.gz -> etcd-fs-0_p20170517.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe
 _md5_=a6f64bca49c9e20659f135db5218c9cb
diff --git a/metadata/md5-cache/sys-fs/tmsu-0.6.1 b/metadata/md5-cache/sys-fs/tmsu-0.6.1
index ba29f99f171e..dfdf9a30a9c0 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.6.1
+++ b/metadata/md5-cache/sys-fs/tmsu-0.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=zsh-completion? ( app-shells/zsh )
 SLOT=0
 SRC_URI=https://github.com/oniony/TMSU/archive/v0.6.1.tar.gz -> tmsu-0.6.1.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=3ca20d7277f52566bb2eea2cf1fc89d3
diff --git a/metadata/md5-cache/sys-fs/tmsu-0.7.0 b/metadata/md5-cache/sys-fs/tmsu-0.7.0
index d41098e0b15e..2fbcf81371b1 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.7.0
+++ b/metadata/md5-cache/sys-fs/tmsu-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=zsh-completion? ( app-shells/zsh )
 SLOT=0
 SRC_URI=https://github.com/oniony/TMSU/archive/v0.7.0.tar.gz -> tmsu-0.7.0.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b
 _md5_=3ca20d7277f52566bb2eea2cf1fc89d3
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e8cd0310d14e..0fc7b6aea63b 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/ctop-0.5.1 b/metadata/md5-cache/sys-process/ctop-0.5.1
index de88ddfe5e71..537b00a0c814 100644
--- a/metadata/md5-cache/sys-process/ctop-0.5.1
+++ b/metadata/md5-cache/sys-process/ctop-0.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bcicen/ctop/archive/v0.5.1.tar.gz -> ctop-0.5.1.tar.gz https://github.com/fsouza/go-dockerclient/archive/87c7e50e0bcf800ed863c3c3b0fbcc67e3029140.tar.gz -> github.com-fsouza-go-dockerclient-87c7e50e0bcf800ed863c3c3b0fbcc67e3029140.tar.gz https://github.com/docker/docker/archive/c5f178da05b27bda40c863b7d65ef8ef11eb1fbe.tar.gz -> github.com-docker-docker-c5f178da05b27bda40c863b7d65ef8ef11eb1fbe.tar.gz https://github.com/docker/go-units/archive/0dadbb0345b35ec7ef35e228dabb8de89a65bf52.tar.gz -> github.com-docker-go-units-0dadbb0345b35ec7ef35e228dabb8de89a65bf52.tar.gz https://github.com/bcicen/termui/archive/ea10e6ccee219e572ffad0ac1909f1a17f6db7d6.tar.gz -> github.com-bcicen-termui-ea10e6ccee219e572ffad0ac1909f1a17f6db7d6.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/3573b8b52aa7b37b9358d966a898feb387f62437.tar.gz -> github.com-hashicorp-go-cleanhttp-3573b8b52aa7b37b9358d966a898feb387f62437.tar.gz https://github.com/jgautheron/codename-generator/archive/16d037c7cc3c9b552fe4af9828b7338d752dbaf9.tar.gz -> github.com-jgautheron-codename-generator-16d037c7cc3c9b552fe4af9828b7338d752dbaf9.tar.gz https://github.com/maruel/panicparse/archive/25bcac0d793cf4109483505a0d66e066a3a90a80.tar.gz -> github.com-maruel-panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80.tar.gz https://github.com/mattn/go-runewidth/archive/14207d285c6c197daabb5c9793d63e7af9ab2d50.tar.gz -> github.com-mattn-go-runewidth-14207d285c6c197daabb5c9793d63e7af9ab2d50.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/nsf/termbox-go/archive/7994c181db7761ca3c67a217068cf31826113f5f.tar.gz -> github.com-nsf-termbox-go-7994c181db7761ca3c67a217068cf31826113f5f.tar.gz https://github.com/op/go-logging/archive/970db520ece77730c7e4724c61121037378659d9.tar.gz -> github.com-op-go-logging-970db520ece77730c7e4724c61121037378659d9.tar.gz https://github.com/nu7hatch/gouuid/archive/179d4d0c4d8d407a32af483c2354df1d2c91e6c3.tar.gz -> github.com-nu7hatch-gouuid-179d4d0c4d8d407a32af483c2354df1d2c91e6c3.tar.gz https://github.com/golang/net/archive/6c23252515492caf9b228a9d5cabcdbde29f7f82.tar.gz -> github.com-golang-net-6c23252515492caf9b228a9d5cabcdbde29f7f82.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=2dc35b92aadb4bd393dd5a55eae02f7a
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index ed372d20e2d8..d19824c8778e 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/gitea-1.5.2 b/metadata/md5-cache/www-apps/gitea-1.5.2
index 01567daf1387..1f3556ad01e4 100644
--- a/metadata/md5-cache/www-apps/gitea-1.5.2
+++ b/metadata/md5-cache/www-apps/gitea-1.5.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git sys-libs/pam
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/archive/v1.5.2.tar.gz -> gitea-1.5.2.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=74abbbea78990d4628d40a814e8d9f48
diff --git a/metadata/md5-cache/www-apps/hugo-0.40.3 b/metadata/md5-cache/www-apps/hugo-0.40.3
index c678cff05aa4..cfca927bf700 100644
--- a/metadata/md5-cache/www-apps/hugo-0.40.3
+++ b/metadata/md5-cache/www-apps/hugo-0.40.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.40.3.tar.gz -> hugo-0.40.3.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/chroma/archive/85c342e3e3d715ad780edd0ba8728161e99cce24.tar.gz -> github.com-alecthomas-chroma-85c342e3e3d715ad780edd0ba8728161e99cce24.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/20f5889cbdc3c73dbd2862796665e7c465ade7d1.tar.gz -> github.com-cpuguy83-go-md2man-20f5889cbdc3c73dbd2862796665e7c465ade7d1.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/55d61fa8aa702f59229e6cff85793c22e580eaf5.tar.gz -> github.com-russross-blackfriday-55d61fa8aa702f59229e6cff85793c22e580eaf5.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4b857c1b8c8efff43faf2896ac4bf300
diff --git a/metadata/md5-cache/www-apps/hugo-0.42.1 b/metadata/md5-cache/www-apps/hugo-0.42.1
index a0826505ae61..909518ad39c0 100644
--- a/metadata/md5-cache/www-apps/hugo-0.42.1
+++ b/metadata/md5-cache/www-apps/hugo-0.42.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.42.1.tar.gz -> hugo-0.42.1.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/chroma/archive/1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz -> github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ed4bbeda607ea5f7d21905cbdad91d91
diff --git a/metadata/md5-cache/www-apps/hugo-0.44 b/metadata/md5-cache/www-apps/hugo-0.44
index 2450d3699aa1..3d0e876d35c1 100644
--- a/metadata/md5-cache/www-apps/hugo-0.44
+++ b/metadata/md5-cache/www-apps/hugo-0.44
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.44.tar.gz -> hugo-0.44.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz -> github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0470d980c34b879e566ef31607f64ca4
diff --git a/metadata/md5-cache/www-apps/hugo-0.45 b/metadata/md5-cache/www-apps/hugo-0.45
index cce9054e1a0a..5d1bb1da3ccd 100644
--- a/metadata/md5-cache/www-apps/hugo-0.45
+++ b/metadata/md5-cache/www-apps/hugo-0.45
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.45.tar.gz -> hugo-0.45.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz -> github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f30e5427cc8e533ba29af355a64800e2
diff --git a/metadata/md5-cache/www-apps/hugo-0.45.1 b/metadata/md5-cache/www-apps/hugo-0.45.1
index ca577766bebc..e770060d0b94 100644
--- a/metadata/md5-cache/www-apps/hugo-0.45.1
+++ b/metadata/md5-cache/www-apps/hugo-0.45.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.45.1.tar.gz -> hugo-0.45.1.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz -> github.com-alecthomas-chroma-1b755a90bd109f170385cb3964f0abdfd3451145.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=bea638186efb82a4237fc0c5ab99ff50
diff --git a/metadata/md5-cache/www-apps/hugo-0.46 b/metadata/md5-cache/www-apps/hugo-0.46
index 68fd8b9c4053..3314accf5082 100644
--- a/metadata/md5-cache/www-apps/hugo-0.46
+++ b/metadata/md5-cache/www-apps/hugo-0.46
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.46.tar.gz -> hugo-0.46.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz -> github.com-alecthomas-chroma-e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1ff95094a3ff481f9d4ab2d79f93955d
diff --git a/metadata/md5-cache/www-apps/hugo-0.48 b/metadata/md5-cache/www-apps/hugo-0.48
index 5b3bd57cde2e..51a3313fa377 100644
--- a/metadata/md5-cache/www-apps/hugo-0.48
+++ b/metadata/md5-cache/www-apps/hugo-0.48
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.48.tar.gz -> hugo-0.48.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/5d7fef2ae60b501bbf28d476c3f273b8017d8261.tar.gz -> github.com-alecthomas-chroma-5d7fef2ae60b501bbf28d476c3f273b8017d8261.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/ead21651dde39fea129e6e4a612c675693d0f4ff.tar.gz -> github.com-alecthomas-repr-ead21651dde39fea129e6e4a612c675693d0f4ff.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960.tar.gz -> github.com-bep-gitmap-ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/2e9a9507333f3ee28f3fab88c2c3aba34455d734.tar.gz -> github.com-kyokomi-emoji-2e9a9507333f3ee28f3fab88c2c3aba34455d734.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c2353362d570a7bfa228149c62842019201cfb71.tar.gz -> github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz -> github.com-mitchellh-mapstructure-f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz -> github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz https://github.com/pelletier/go-toml/archive/c01d1270ff3e442a8a57cddc1c92dc1138598194.tar.gz -> github.com-pelletier-go-toml-c01d1270ff3e442a8a57cddc1c92dc1138598194.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/46c73eb196baff5bb07288f245b223bd1a30fba6.tar.gz -> github.com-russross-blackfriday-46c73eb196baff5bb07288f245b223bd1a30fba6.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz -> github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz https://github.com/spf13/viper/archive/907c19d40d9a6c9bb55f040ff4ae45271a4754b9.tar.gz -> github.com-spf13-viper-907c19d40d9a6c9bb55f040ff4ae45271a4754b9.tar.gz https://github.com/stretchr/testify/archive/f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz -> github.com-stretchr-testify-f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/f4c29de78a2a91c00474a2e689954305c350adf9.tar.gz -> github.com-golang-net-f4c29de78a2a91c00474a2e689954305c350adf9.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/2be389f392cd91df245b41638f818a1c041f0c08.tar.gz -> github.com-golang-sys-2be389f392cd91df245b41638f818a1c041f0c08.tar.gz https://github.com/golang/text/archive/cb6730876b985e110843c1842a7a63a63677cf08.tar.gz -> github.com-golang-text-cb6730876b985e110843c1842a7a63a63677cf08.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=8dd70365f096292eb33a62d56a8cbd3a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 2824fcf83cc9..75514187b9de 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3160.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3173.0
similarity index 83%
rename from metadata/md5-cache/www-client/opera-developer-59.0.3160.0
rename to metadata/md5-cache/www-client/opera-developer-59.0.3173.0
index e4cd514bdca2..1936a8b40da9 100644
--- a/metadata/md5-cache/www-client/opera-developer-59.0.3160.0
+++ b/metadata/md5-cache/www-client/opera-developer-59.0.3173.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/59.0.3160.0/linux/opera-developer_59.0.3160.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3160.0/linux/opera-developer_59.0.3160.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3160.0/linux/opera-developer_59.0.3160.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3160.0/linux/opera-developer_59.0.3160.0_amd64.deb )
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
new file mode 100644
index 000000000000..e55e8cbc3edb
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_amd64.deb -> vivaldi-snapshot-2.3.1401.7_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_arm64.deb -> vivaldi-snapshot-2.3.1401.7_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_armhf.deb -> vivaldi-snapshot-2.3.1401.7_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_i386.deb -> vivaldi-snapshot-2.3.1401.7_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7aabfb0de07b9e271c8a338b481f0f09
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 9ddc81797ee8..ee0c6831a549 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/browserpass-2.0.13 b/metadata/md5-cache/www-plugins/browserpass-2.0.13
index 11011a003fb0..0d45d67161c6 100644
--- a/metadata/md5-cache/www-plugins/browserpass-2.0.13
+++ b/metadata/md5-cache/www-plugins/browserpass-2.0.13
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/dannyvankooten/browserpass/archive/2.0.13.tar.gz -> browserpass-2.0.13.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=0d1c92dd339946555cf9dd19e2b8284a
diff --git a/metadata/md5-cache/www-plugins/browserpass-2.0.22 b/metadata/md5-cache/www-plugins/browserpass-2.0.22
index 1d1bda421032..7b06d5748bca 100644
--- a/metadata/md5-cache/www-plugins/browserpass-2.0.22
+++ b/metadata/md5-cache/www-plugins/browserpass-2.0.22
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/dannyvankooten/browserpass/archive/2.0.22.tar.gz -> browserpass-2.0.22.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=fd952bb894ff10b020f791f0c9e48a6c
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c61a6c06b85e..f26ab5609f0e 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/caddy-0.10.10 b/metadata/md5-cache/www-servers/caddy-0.10.10
index be796ef5ba3b..1dd4a7ea4c88 100644
--- a/metadata/md5-cache/www-servers/caddy-0.10.10
+++ b/metadata/md5-cache/www-servers/caddy-0.10.10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mholt/caddy/archive/v0.10.10.tar.gz -> caddy-0.10.10.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=cbd8142c206335ba0fdb937c72e6d162
diff --git a/metadata/md5-cache/www-servers/caddy-0.10.11 b/metadata/md5-cache/www-servers/caddy-0.10.11
index 9371fc0ffeda..3d0cbb9765c3 100644
--- a/metadata/md5-cache/www-servers/caddy-0.10.11
+++ b/metadata/md5-cache/www-servers/caddy-0.10.11
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mholt/caddy/archive/v0.10.11.tar.gz -> caddy-0.10.11.tar.gz
-_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_eclasses_=golang-base	e764075c9bbce927b424f8e9b7a25dfe	golang-build	1b46197451ce01766db03a9955597d7b	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
 _md5_=54e80c898faeb02889e12e218e3d9055
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index ad56e6448a3a..a7249eead608 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.0 b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.0
new file mode 100644
index 000000000000..fccd48c59b4c
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4
+DESCRIPTION=terminal emulator which mimics the look and feel of the old cathode tube screens
+EAPI=6
+HOMEPAGE=https://github.com/Swordfish90/cool-retro-term
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/Swordfish90/cool-retro-term/archive/1.1.0.tar.gz -> cool-retro-term-1.1.0.tar.gz https://github.com/Swordfish90/qmltermwidget/archive/0.2.0.tar.gz -> qmltermwidget-0.2.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=596ad5253b97b7d1e3aea4c7cf4b99c6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 65da69872f73..16c274ac32c7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2018-12-18T13:08:34Z
+TIMESTAMP 2018-12-19T05:38:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwY8VJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwZ2VtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA+wg//SCnZdKO65BfhzT4hoL7m1gGhfg+mzUKc2o5abjo2aOusqMAXolRxX5Im
-XJiot/J/sWqQ372ubSL8nErTNihWqIavXLsc1yM9CmQBRCLeHQPWd9BU6GXhMh6v
-OA3NUrGg8ewg19NQLRfNghQeOND5wv2Sg6pLPn8TZDGsU2ag1U/dxIUa9aHGFnaE
-LMt9vMK3ZOAuLMss86rU3phkCYMXlXm1DFSN1bY7tjZFyAObHpRfEMNJqkXXLcTs
-zPQZ/x+MJZv4xLujtIqZlPTrP2AWhqyYbC2UMBHQhW3xkalaWynywfHfdBd/7vVP
-FMeK6YSmMdDEChEtOkGzhQ+oKgxtjJXMC6CbKk+rlaHZynj8GlEAeiIlEzUvCGjA
-NGlJUjJL4cG7TIFSrJyRcy0SkEbBIF45sNSxZ+kU/H2FJGUhzWXpol5J3EdoP5mI
-E9J9G/kG1W5juZNIRCCSuZzZkVGLlmFd1IfikDXF+6vBQt1gZDJTWtb4HCNLt1eB
-dyTxVZypBGGQG3z0nC87/wlEl8YsvLb6VkdeQeZoXLcP30oBLSsamL7OUPnRII3z
-BXOXyHh8u+fyEOiVV3l8nWV/2Sm4kzbOSTVG0VRFU03vdiRpK+6j+WxWcwyaTdOM
-+tXq1sY5EALbkzUXXkoHRn20L14p/2wV2hioAkwiLtVLsxbBV5s=
-=Nktx
+klBWPxAAp9dmXM4BtO4PCDRMIKoGc9thh6IhDJxisE0IrM40Xqh1H/apTIV5GeA/
+jia9GArZW4WLuO35404SB42PYDBXFspyCvUj1BhP5QW/38NEL4AWuy5PZiaJzOrh
++51H/yGc52kjbM3O93QMhRoVf/gF+vWbApl+vq5TzmT9fnOqsuBNc4DWQA/fq7gP
+XhmvcEtdI+exKWBa7jbNNGaQax+cxRF/HDb1px0F5qmUCV2WJMXlRS9QtlUidOgv
+wRsT5/OSObT6fQiZXSpGonqyFPQpkfRLjvp3oesW6KBtiocT2rlaHEkZft3jANb7
+7YArOFvj1y0sjb3FL1DX3dbxEG70hxHTpGj5EkQLFHF5b+QoFpHIJeVqmlURKKLb
+hAtu/ZFRtWPTybWMsH4xzCdbhkBrAodN1ZX77jq62Bon6TdyfVB6Pv93xkn9QKRk
+sGiVK2tbxtj6FmCugxo8FQeGBEVMm0lOaMgmEHSsUk0o0n+Rn4xnCHZRGIoBXJ8Y
+Y3bGkxTpoN4c+8OwYNe3SnKu5UAkf+yhFJ7sOHtBuRLlgyjCeuiJZMr+zBBVUHZ0
+gUxzSkVz2GBVyYVssSwQso5cl4NjxUK/Gu7Vh7nU4hENcSv9TccFAV5iz2O9j+DC
+UKyrVdz+SeTnW7J99F5MZm4jD16mAnA9fXJk6svql3HOQGfnK58=
+=KAZW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 620b6762a090..8f4da9ebebff 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Dec 2018 13:08:30 +0000
+Wed, 19 Dec 2018 05:38:32 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 80e26f90ef4f..99f2f90a769a 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2478,6 +2478,10 @@
       <email>mjo@gentoo.org</email>
       <name>Michael Orlitzky</name>
     </member>
+    <member>
+      <email>whissi@gentoo.org</email>
+      <name>Thomas Deutschmann</name>
+    </member>
   </project>
   <project>
     <email>pms@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index e17e22d4c913..6f7d22c83491 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Dec 18 13:08:30 UTC 2018
+Wed Dec 19 05:38:31 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 3a7239ee5d39..b86ed3013b65 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -3295,7 +3295,7 @@
 1811300209 ./media-video/gpac/gpac-9999.ebuild
 1702282250 ./media-video/gpac/gpac-0.6.1-r2.ebuild
 1712091509 ./media-video/vcdimager/vcdimager-0.7.24.ebuild
-1812151609 ./media-video/vcdimager/vcdimager-2.0.1.ebuild
+1812190039 ./media-video/vcdimager/vcdimager-2.0.1.ebuild
 1702282250 ./media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
 1702282250 ./media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
 1702282250 ./media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
@@ -3399,6 +3399,7 @@
 1802191508 ./www-client/weboob/weboob-9999.ebuild
 1802191508 ./www-client/weboob/weboob-1.3.ebuild
 1802191508 ./www-client/weboob/weboob-9998.ebuild
+1812181839 ./www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
 1812171909 ./www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1400.4_p1.ebuild
 1812121709 ./www-client/opera-beta/opera-beta-58.0.3135.26.ebuild
 1812061609 ./www-client/opera-beta/opera-beta-58.0.3135.21.ebuild
@@ -3407,7 +3408,7 @@
 1809081639 ./www-client/firefox/firefox-52.9.0.ebuild
 1710062321 ./www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
 1708081533 ./www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
-1812032139 ./www-client/opera-developer/opera-developer-59.0.3160.0.ebuild
+1812181709 ./www-client/opera-developer/opera-developer-59.0.3173.0.ebuild
 1812111539 ./www-client/opera-developer/opera-developer-59.0.3167.0.ebuild
 1812112039 ./www-client/firefox-bin/firefox-bin-60.4.0.ebuild
 1806270409 ./www-client/firefox-bin/firefox-bin-52.9.0.ebuild
@@ -4168,6 +4169,7 @@
 1809261509 ./app-crypt/kbfs/kbfs-2.6.0.ebuild
 1808081409 ./app-crypt/kbfs/kbfs-9999.ebuild
 1810311339 ./app-crypt/kbfs/kbfs-2.8.0.ebuild
+1812181709 ./app-crypt/kbfs/kbfs-2.11.0.ebuild
 1811241839 ./app-crypt/kbfs/kbfs-2.10.1.ebuild
 1708210015 ./app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
 1712080239 ./app-crypt/debian-archive-keyring/debian-archive-keyring-2017.6.ebuild
@@ -4247,6 +4249,8 @@
 1811052339 ./app-crypt/hashcat/hashcat-5.0.0.ebuild
 1808032339 ./app-crypt/hashcat/hashcat-4.1.0.ebuild
 1808032339 ./app-crypt/hashcat/hashcat-4.2.0.ebuild
+1812190109 ./app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild
+1812190109 ./app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
 1710072030 ./app-crypt/seahorse/seahorse-3.20.0.ebuild
 1708121939 ./app-crypt/acme-client/acme-client-0.1.16.ebuild
 1809201939 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -4362,9 +4366,9 @@
 1702282250 ./app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
 1702282250 ./app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
 1702282250 ./app-crypt/monkeysphere/monkeysphere-0.39.ebuild
-1811022339 ./app-crypt/johntheripper/johntheripper-1.7.9-r10.ebuild
-1812131839 ./app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
-1811022339 ./app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+1812190109 ./app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+1812190109 ./app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+1812190109 ./app-crypt/johntheripper/johntheripper-1.8.0.ebuild
 1806240109 ./app-crypt/kstart/kstart-4.2.ebuild
 1806240109 ./app-crypt/kstart/kstart-4.1.ebuild
 1809161409 ./app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
@@ -4375,7 +4379,7 @@
 1808310239 ./app-crypt/pinentry/pinentry-1.0.0-r3.ebuild
 1808310239 ./app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
 1810291209 ./app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
-1812042039 ./app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+1812182309 ./app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
 1809182339 ./app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
 1809280333 ./app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
 1807151839 ./app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -4391,6 +4395,7 @@
 1809280333 ./app-crypt/cardpeek/cardpeek-0.7.2.ebuild
 1702282250 ./app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
 1809261509 ./app-crypt/keybase/keybase-2.6.0.ebuild
+1812181709 ./app-crypt/keybase/keybase-2.11.0.ebuild
 1810082339 ./app-crypt/keybase/keybase-2.7.3.ebuild
 1806180739 ./app-crypt/keybase/keybase-9999.ebuild
 1811241839 ./app-crypt/keybase/keybase-2.10.1.ebuild
@@ -5082,7 +5087,7 @@
 1702282250 ./net-libs/daq/daq-0.6.2-r1.ebuild
 1702282250 ./net-libs/daq/daq-2.0.0.ebuild
 1702282250 ./net-libs/daq/daq-2.0.2.ebuild
-1812102009 ./net-libs/daq/daq-2.0.6.ebuild
+1812181809 ./net-libs/daq/daq-2.0.6-r1.ebuild
 1702282250 ./net-libs/daq/daq-0.6.2.ebuild
 1702282250 ./net-libs/libnipper/libnipper-0.12.6-r1.ebuild
 1808282009 ./net-libs/liboping/liboping-1.10.0-r1.ebuild
@@ -5239,11 +5244,10 @@
 1805230309 ./net-libs/libgadu/libgadu-1.11.4.ebuild
 1808240509 ./net-libs/libgadu/libgadu-1.12.2.ebuild
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
-1812180639 ./net-libs/wvstreams/wvstreams-99999.ebuild
+1812181709 ./net-libs/wvstreams/wvstreams-99999.ebuild
 1811031739 ./net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
 1707262210 ./net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
 1811031739 ./net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
-1812180639 ./net-libs/wvstreams/wvstreams-4.6.1-r6.ebuild
 1810091809 ./net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
 1805061738 ./net-libs/libmnl/libmnl-1.0.3-r1.ebuild
 1805061738 ./net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -7313,7 +7317,7 @@
 1811020009 ./dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
 1804120208 ./dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
 1804120208 ./dev-libs/libcdio/libcdio-0.93.ebuild
-1812021839 ./dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+1812190039 ./dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
 1804120208 ./dev-libs/libcdio/libcdio-0.94-r1.ebuild
 1804120208 ./dev-libs/libcdio/libcdio-1.1.0.ebuild
 1804120208 ./dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -8467,6 +8471,7 @@
 1812161139 ./x11-terms/kitty/kitty-0.13.1-r1.ebuild
 1810010309 ./x11-terms/kitty/kitty-0.12.3.ebuild
 1802200238 ./x11-terms/cool-retro-term/cool-retro-term-1.0.1.ebuild
+1812190239 ./x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild
 1810011339 ./x11-terms/xterm/xterm-337.ebuild
 1808310240 ./x11-terms/xterm/xterm-327.ebuild
 1808310240 ./x11-terms/xterm/xterm-333.ebuild
@@ -9060,7 +9065,7 @@
 1806272239 ./app-arch/vimball/vimball-0.5.1.ebuild
 1703221422 ./app-arch/qpress/qpress-1.1.ebuild
 1702282250 ./app-arch/libpar2/libpar2-0.4.ebuild
-1712291639 ./app-arch/stuffit/stuffit-5.2.0.611.ebuild
+1812182009 ./app-arch/stuffit/stuffit-5.2.0.611.ebuild
 1702282250 ./app-arch/duff/duff-0.5.2.ebuild
 1804222238 ./app-arch/unadf/unadf-0.7.12-r1.ebuild
 1807232209 ./app-arch/lzip/lzip-1.20.ebuild
@@ -9295,7 +9300,6 @@
 1811132139 ./dev-db/mysql/mysql-5.7.23-r2.ebuild
 1811292109 ./dev-db/mysql/mysql-5.6.42.ebuild
 1811191739 ./dev-db/mysql/mysql-5.5.62.ebuild
-1811132139 ./dev-db/mysql/mysql-5.6.41.ebuild
 1702282250 ./dev-db/repmgr/repmgr-3.0.1.ebuild
 1707041643 ./dev-db/repmgr/repmgr-3.3.2.ebuild
 1810030009 ./dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
@@ -9816,7 +9820,7 @@
 1708180647 ./media-gfx/apngasm/apngasm-2.7.ebuild
 1708180724 ./media-gfx/apngasm/apngasm-2.91.ebuild
 1805010009 ./media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild
-1812171539 ./media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+1812190209 ./media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
 1812051139 ./media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
 1812051609 ./media-gfx/zbar/zbar-0.20.1.ebuild
 1812130639 ./media-gfx/pqiv/pqiv-2.10.4.ebuild
@@ -13599,7 +13603,7 @@
 1808310239 ./dev-python/numpy/numpy-1.8.2.ebuild
 1809201609 ./dev-python/numpy/numpy-1.10.4.ebuild
 1808310239 ./dev-python/numpy/numpy-1.9.2.ebuild
-1812070609 ./dev-python/numpy/numpy-1.14.5.ebuild
+1812190039 ./dev-python/numpy/numpy-1.14.5.ebuild
 1807211909 ./dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
 1804221108 ./dev-python/quex/quex-0.65.4.ebuild
 1803241638 ./dev-python/sancho/sancho-2.4-r1.ebuild
@@ -15284,7 +15288,7 @@
 1808262339 ./sys-block/blktrace/blktrace-1.1.0.ebuild
 1710091744 ./sys-block/zram-init/zram-init-3.8.ebuild
 1810051309 ./sys-block/zram-init/zram-init-7.1-r1.ebuild
-1801032209 ./sys-block/megamgr/megamgr-5.20-r2.ebuild
+1812190039 ./sys-block/megamgr/megamgr-5.20-r2.ebuild
 1702282250 ./sys-block/rts5229/rts5229-1.07-r6.ebuild
 1810201509 ./sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
 1702282250 ./sys-block/flashbench/flashbench-20120606.ebuild
@@ -16169,6 +16173,7 @@
 1708301834 ./app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
 1802051008 ./app-office/geierlein/geierlein-0.10.0.ebuild
 1702282250 ./app-office/borg/borg-1.7.4-r3.ebuild
+1812190239 ./app-office/skrooge/skrooge-2.17.0.ebuild
 1812140009 ./app-office/skrooge/skrooge-2.16.2.ebuild
 1812021739 ./app-office/glabels/glabels-3.4.1.ebuild
 1809292209 ./app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.6.2.ebuild
@@ -16539,9 +16544,9 @@
 1809031739 ./net-analyzer/nagios/nagios-4.4.2.ebuild
 1804081408 ./net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
 1702282250 ./net-analyzer/bwbar/bwbar-1.2.3.ebuild
-1812072039 ./net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
-1812072039 ./net-analyzer/metasploit/metasploit-9999.ebuild
-1811212139 ./net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+1812190109 ./net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+1812190109 ./net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
+1812190109 ./net-analyzer/metasploit/metasploit-9999.ebuild
 1702282250 ./net-analyzer/tptest/tptest-3.1.7-r2.ebuild
 1803271408 ./net-analyzer/ttcp/ttcp-1.12-r2.ebuild
 1710172153 ./net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
@@ -17793,7 +17798,7 @@
 1802192038 ./net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20170919.ebuild
 1802192038 ./net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
 1807240639 ./net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
-1702282250 ./net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
+1812190109 ./net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
 1702282250 ./net-wireless/mdk/mdk-3.6-r1.ebuild
 1811072309 ./net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.ebuild
 1811072309 ./net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
@@ -18201,12 +18206,11 @@
 1810030039 ./dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
 1705041433 ./dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
 1710092201 ./dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
-1708141800 ./dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
-1708141800 ./dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
-1702282250 ./dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
-1702282250 ./dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
+1812181839 ./dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
+1812181839 ./dev-php/pecl-yaml/pecl-yaml-1.3.2.ebuild
 1802202238 ./dev-php/phpmd/phpmd-2.6.0.ebuild
 1810222209 ./dev-php/swoole/swoole-4.2.3.ebuild
+1812181839 ./dev-php/swoole/swoole-4.2.9.ebuild
 1806250309 ./dev-php/swoole/swoole-4.0.1.ebuild
 1808102239 ./dev-php/swoole/swoole-4.0.4.ebuild
 1809070009 ./dev-php/swoole/swoole-4.1.1.ebuild
@@ -18271,6 +18275,7 @@
 1705312133 ./dev-php/magickwand/magickwand-1.0.9-r3.ebuild
 1802152238 ./dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
 1707101834 ./dev-php/mmslib/mmslib-0.97.ebuild
+1812181839 ./dev-php/pecl-event/pecl-event-2.4.3.ebuild
 1809042209 ./dev-php/pecl-event/pecl-event-2.4.1.ebuild
 1808102239 ./dev-php/pecl-event/pecl-event-2.4.0.ebuild
 1702282250 ./dev-php/pecl-event/pecl-event-2.2.1.ebuild
@@ -20461,8 +20466,7 @@
 1709282011 ./dev-util/gyp/gyp-99999999999999.ebuild
 1806050608 ./dev-util/peg/peg-0.1.18.ebuild
 1702282250 ./dev-util/peg/peg-0.1.15-r1.ebuild
-1702282250 ./dev-util/shc/shc-3.8.9.ebuild
-1811061109 ./dev-util/shc/shc-3.9.6.ebuild
+1812181639 ./dev-util/shc/shc-3.9.6.ebuild
 1805012209 ./dev-util/duma/duma-2.5.13.ebuild
 1710281607 ./dev-util/duma/duma-2.5.15-r2.ebuild
 1806262209 ./dev-util/devhelp/devhelp-3.24.0.ebuild
@@ -27164,6 +27168,7 @@
 1707301222 ./sys-cluster/libquo/libquo-1.2.3.ebuild
 1811101639 ./sys-cluster/slurm/slurm-18.08.3-r1.ebuild
 1811101509 ./sys-cluster/slurm/slurm-17.11.12.ebuild
+1812182209 ./sys-cluster/swift/swift-2.20.0.ebuild
 1712140109 ./sys-cluster/swift/swift-2.16.0.ebuild
 1809290009 ./sys-cluster/swift/swift-2.19.0.ebuild
 1808302039 ./sys-cluster/swift/swift-2018.2.9999.ebuild
@@ -28186,7 +28191,7 @@
 1812012209 ./kde-apps/kubrick/kubrick-18.08.3.ebuild
 1812131839 ./kde-apps/kubrick/kubrick-18.12.0.ebuild
 1812012209 ./kde-apps/kcalc/kcalc-18.08.3.ebuild
-1812131839 ./kde-apps/kcalc/kcalc-18.12.0.ebuild
+1812190239 ./kde-apps/kcalc/kcalc-18.12.0.ebuild
 1812012209 ./kde-apps/kjumpingcube/kjumpingcube-18.08.3.ebuild
 1812131839 ./kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild
 1812012209 ./kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.08.3.ebuild
@@ -28599,7 +28604,7 @@
 1809251739 ./net-dns/bind/bind-9.12.2_p2.ebuild
 1805080938 ./net-dns/bind/bind-9.11.2_p1.ebuild
 1806191109 ./net-dns/bind/bind-9.12.1_p2-r1.ebuild
-1812150139 ./net-dns/bind/bind-9.12.2_p2-r1.ebuild
+1812190039 ./net-dns/bind/bind-9.12.2_p2-r1.ebuild
 1810050639 ./net-dns/dnssec-root/dnssec-root-20150403.ebuild
 1810111809 ./net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
 1810190109 ./net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -28651,7 +28656,7 @@
 1709021756 ./net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
 1709021756 ./net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
 1709021756 ./net-dns/opendnssec/opendnssec-2.0.3.ebuild
-1812150139 ./net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+1812190039 ./net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
 1806092309 ./net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
 1809251739 ./net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild
 1804291239 ./net-dns/bind-tools/bind-tools-9.12.1.ebuild
@@ -30952,7 +30957,7 @@
 1801021440 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
 1806032009 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
 1704232359 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
-1812080509 ./net-misc/ntp/ntp-4.2.8_p12.ebuild
+1812182309 ./net-misc/ntp/ntp-4.2.8_p12.ebuild
 1805261109 ./net-misc/ntp/ntp-4.2.8_p11.ebuild
 1809091139 ./net-misc/qtm/qtm-1.3.19.ebuild
 1702282250 ./net-misc/sshrc/sshrc-0.6.1.ebuild
@@ -31566,6 +31571,7 @@
 1710200145 ./dev-games/simgear/simgear-9999.ebuild
 1805060538 ./dev-games/simgear/simgear-2018.1.1.ebuild
 1806040508 ./dev-games/simgear/simgear-2018.2.1.ebuild
+1812190509 ./dev-games/simgear/simgear-2018.3.1.ebuild
 1811241639 ./dev-qt/assistant/assistant-5.11.1.ebuild
 1812060139 ./dev-qt/assistant/assistant-5.11.3.ebuild
 1812061909 ./dev-qt/qdoc/qdoc-5.11.3.ebuild
@@ -32573,8 +32579,9 @@
 1805301938 ./media-libs/glew/glew-2.1.0.ebuild
 1805120339 ./media-libs/glew/glew-1.10.0-r100.ebuild
 1802131408 ./media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
+1812190609 ./media-libs/shaderc/shaderc-2017.2-r1.ebuild
+1812190609 ./media-libs/shaderc/shaderc-2018.0.ebuild
 1806210209 ./media-libs/shaderc/shaderc-9999.ebuild
-1806210209 ./media-libs/shaderc/shaderc-2017.2.ebuild
 1712092209 ./media-libs/libaacs/libaacs-0.7.1.ebuild
 1712092209 ./media-libs/libaacs/libaacs-0.9.0.ebuild
 1809161639 ./media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -33589,10 +33596,12 @@
 1812161909 ./games-simulation/openrct2/openrct2-0.2.1.ebuild
 1810010039 ./games-simulation/openrct2/openrct2-0.2.0.ebuild
 1702282250 ./games-simulation/flightgear-data/flightgear-data-9999.ebuild
+1812190509 ./games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
 1805060538 ./games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
 1806040509 ./games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
+1812190509 ./games-simulation/flightgear/flightgear-2018.3.1.ebuild
 1805230309 ./games-simulation/flightgear/flightgear-2018.1.1.ebuild
-1805230309 ./games-simulation/flightgear/flightgear-9999.ebuild
+1812190509 ./games-simulation/flightgear/flightgear-9999.ebuild
 1806070239 ./games-simulation/flightgear/flightgear-2018.2.1.ebuild
 1707090132 ./games-simulation/senken/senken-0.3.0-r1.ebuild
 1707090132 ./games-simulation/lincity/lincity-1.13.1-r1.ebuild
@@ -35889,6 +35898,7 @@
 1803270108 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
 1803270108 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
 1711301940 ./app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild
+1812182039 ./app-emulation/open-vm-tools/open-vm-tools-10.3.5.ebuild
 1807050309 ./app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
 1708042250 ./app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild
 1805140238 ./app-emulation/free42/free42-2.0.20.ebuild
@@ -35938,7 +35948,7 @@
 1804270438 ./app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
 1808230609 ./app-emulation/libvirt/libvirt-4.5.0-r1.ebuild
 1812030609 ./app-emulation/libvirt/libvirt-4.9.0.ebuild
-1812030609 ./app-emulation/libvirt/libvirt-9999.ebuild
+1812181909 ./app-emulation/libvirt/libvirt-9999.ebuild
 1801230208 ./app-emulation/winetricks/winetricks-99999999.ebuild
 1808300439 ./app-emulation/winetricks/winetricks-20180815.ebuild
 1801230208 ./app-emulation/winetricks/winetricks-20170823.ebuild
@@ -36007,6 +36017,7 @@
 1801070239 ./app-emulation/playonlinux/playonlinux-4.2.12.ebuild
 1708111153 ./app-emulation/sen/sen-0.5.1.ebuild
 1805022009 ./app-emulation/sen/sen-0.6.0.ebuild
+1812190209 ./app-emulation/cloud-init/cloud-init-18.5.ebuild
 1811201439 ./app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
 1806282309 ./app-emulation/cloud-init/cloud-init-17.2.ebuild
 1811201439 ./app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -37010,7 +37021,7 @@
 1809280334 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
 1810010409 metadata/md5-cache/net-p2p/bitcoind-0.16.3
 1805012209 metadata/md5-cache/net-p2p/xnap-2.5-r3
-1810031239 metadata/md5-cache/net-p2p/syncthing-0.14.51
+1812182239 metadata/md5-cache/net-p2p/syncthing-0.14.51
 1810030549 metadata/md5-cache/net-p2p/qbittorrent-9999
 1809280334 metadata/md5-cache/net-p2p/opendchub-0.8.2
 1809280334 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
@@ -37033,19 +37044,19 @@
 1810010409 metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3
 1809280334 metadata/md5-cache/net-p2p/ctorrent-3.3.2-r3
 1810062239 metadata/md5-cache/net-p2p/amule-2.3.2-r2
-1812131909 metadata/md5-cache/net-p2p/syncthing-0.14.52
+1812182239 metadata/md5-cache/net-p2p/syncthing-0.14.52
 1809280334 metadata/md5-cache/net-p2p/ncdc-1.19.1
 1702282329 metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2
 1809280334 metadata/md5-cache/net-p2p/multibit-0.5.18
 1809280334 metadata/md5-cache/net-p2p/syrep-0.9
-1809181309 metadata/md5-cache/net-p2p/go-ethereum-1.8.15
+1812182239 metadata/md5-cache/net-p2p/go-ethereum-1.8.15
 1812012309 metadata/md5-cache/net-p2p/cpuminer-opt-3.8.8.1-r1
 1809280334 metadata/md5-cache/net-p2p/automatic-0.8.3
 1810030549 metadata/md5-cache/net-p2p/retroshare-0.6.9999
 1810020109 metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
 1809280334 metadata/md5-cache/net-p2p/amule-2.3.2-r1
 1711260441 metadata/md5-cache/net-p2p/bitflu-1.52
-1809280334 metadata/md5-cache/net-p2p/syncthing-0.14.38
+1812182239 metadata/md5-cache/net-p2p/syncthing-0.14.38
 1811261942 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 1809280334 metadata/md5-cache/net-p2p/resilio-sync-2.5.12
 1812110115 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -37054,7 +37065,7 @@
 1711260441 metadata/md5-cache/net-p2p/bitflu-1.51
 1810021239 metadata/md5-cache/net-p2p/rtorrent-0.9.7
 1811261942 metadata/md5-cache/net-p2p/nicotine+-1.4.1
-1812151909 metadata/md5-cache/net-p2p/Manifest.gz
+1812182239 metadata/md5-cache/net-p2p/Manifest.gz
 1811130041 metadata/md5-cache/net-p2p/myster-8.0-r1
 1811261942 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
 1812110140 metadata/md5-cache/net-p2p/ktorrent-5.1.1
@@ -39415,7 +39426,7 @@
 1810030549 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
 1809280334 metadata/md5-cache/media-video/atomicparsley-0.9.0
 1812161939 metadata/md5-cache/media-video/obs-studio-22.0.3
-1812170309 metadata/md5-cache/media-video/Manifest.gz
+1812190039 metadata/md5-cache/media-video/Manifest.gz
 1809280334 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
 1809280334 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
 1809280334 metadata/md5-cache/media-video/ccextractor-0.68
@@ -39429,7 +39440,7 @@
 1812121139 metadata/md5-cache/media-video/mkvtoolnix-29.0.0
 1812110140 metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
 1811261942 metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
-1812151609 metadata/md5-cache/media-video/vcdimager-2.0.1
+1812190039 metadata/md5-cache/media-video/vcdimager-2.0.1
 1809280334 metadata/md5-cache/media-video/libva-utils-2.1.0
 1809280334 metadata/md5-cache/media-video/tivodecode-0.2_pre4
 1812110209 metadata/md5-cache/media-video/unifi-video-3.9.12
@@ -39556,6 +39567,7 @@
 1810030549 metadata/md5-cache/www-client/firefox-bin-52.9.0
 1812112039 metadata/md5-cache/www-client/firefox-bin-60.4.0
 1810030549 metadata/md5-cache/www-client/links-2.16
+1812181839 metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
 1811261942 metadata/md5-cache/www-client/pybugz-0.13
 1809280334 metadata/md5-cache/www-client/luakit-9999
 1809280334 metadata/md5-cache/www-client/dillo-3.0.5
@@ -39572,11 +39584,10 @@
 1810030549 metadata/md5-cache/www-client/qupzilla-2.2.5
 1812130539 metadata/md5-cache/www-client/google-chrome-unstable-72.0.3626.14
 1809280334 metadata/md5-cache/www-client/jd-2.8.9_p150226
-1812171909 metadata/md5-cache/www-client/Manifest.gz
+1812181839 metadata/md5-cache/www-client/Manifest.gz
 1810030549 metadata/md5-cache/www-client/opera-12.16_p1860-r1
 1807161009 metadata/md5-cache/www-client/lynx-2.8.9_pre16
 1810030549 metadata/md5-cache/www-client/uget-2.2.0
-1812032139 metadata/md5-cache/www-client/opera-developer-59.0.3160.0
 1811261942 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
 1812110115 metadata/md5-cache/www-client/otter-0.9.99.3
 1811261942 metadata/md5-cache/www-client/pybugz-9999
@@ -39608,6 +39619,7 @@
 1809280334 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r10
 1812110115 metadata/md5-cache/www-client/midori-6.0
 1809280334 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
+1812181709 metadata/md5-cache/www-client/opera-developer-59.0.3173.0
 1812021639 metadata/md5-cache/www-client/epiphany-3.30.2
 1809280334 metadata/md5-cache/www-client/phantomjs-2.1.1-r1
 1812110115 metadata/md5-cache/www-client/midori-0.5.11-r3
@@ -40255,19 +40267,19 @@
 1702282328 metadata/md5-cache/net-dialup/ppp-scripts-0
 1809280334 metadata/md5-cache/net-fs/wdfs-1.4.2-r1
 1809280334 metadata/md5-cache/net-fs/curlftpfs-0.9.2-r3
-1812062139 metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43
+1812182239 metadata/md5-cache/net-fs/minio-2018.12.06.01.27.43
 1809280334 metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
-1811221839 metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
+1812182239 metadata/md5-cache/net-fs/minio-2018.11.22.02.51.56
 1809280334 metadata/md5-cache/net-fs/s3fs-1.83
 1811091339 metadata/md5-cache/net-fs/samba-4.8.6-r2
 1809280334 metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
 1702282328 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.3
 1811191039 metadata/md5-cache/net-fs/sshfs-2.10-r1
-1810252109 metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
+1812182239 metadata/md5-cache/net-fs/minio-2018.10.25.01.27.03
 1810021239 metadata/md5-cache/net-fs/cifs-utils-6.7
 1812110115 metadata/md5-cache/net-fs/smbtad-1.2.6
 1811261942 metadata/md5-cache/net-fs/nfstest-2.1.2
-1811301709 metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
+1812182239 metadata/md5-cache/net-fs/mc-2018.11.30.01.52.08
 1809280334 metadata/md5-cache/net-fs/ncpfs-2.2.6-r4
 1809280334 metadata/md5-cache/net-fs/btfs-2.17
 1809280334 metadata/md5-cache/net-fs/libnfs-9999
@@ -40275,40 +40287,40 @@
 1810021239 metadata/md5-cache/net-fs/cifs-utils-6.8
 1809280334 metadata/md5-cache/net-fs/netatalk-3.1.10
 1811261942 metadata/md5-cache/net-fs/s3ql-2.26
-1811101609 metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
-1810032339 metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
+1812182239 metadata/md5-cache/net-fs/minio-2018.11.06.01.01.02
+1812182239 metadata/md5-cache/net-fs/mc-2018.09.26.00.42.43
 1810021239 metadata/md5-cache/net-fs/autofs-5.1.3
 1811261942 metadata/md5-cache/net-fs/s3ql-2.25
 1811281239 metadata/md5-cache/net-fs/samba-4.7.12
-1811171039 metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
-1812062139 metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07
+1812182239 metadata/md5-cache/net-fs/minio-2018.11.17.01.23.48
+1812182239 metadata/md5-cache/net-fs/mc-2018.12.05.22.59.07
 1811261942 metadata/md5-cache/net-fs/tahoe-lafs-1.10.2
-1811301439 metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
+1812182239 metadata/md5-cache/net-fs/minio-2018.11.30.03.56.59
 1812110115 metadata/md5-cache/net-fs/cvmfs-2.3.5-r1
-1809280334 metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
+1812182239 metadata/md5-cache/net-fs/mc-2018.09.10.23.39.12
 1811260809 metadata/md5-cache/net-fs/sshfs-3.5.0
 1811261942 metadata/md5-cache/net-fs/s3ql-2.28
 1809280334 metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3
 1809280334 metadata/md5-cache/net-fs/s3fs-1.80
 1809280334 metadata/md5-cache/net-fs/openafs-1.6.22.1
-1810192339 metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
-1809280334 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
-1811151739 metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
+1812182239 metadata/md5-cache/net-fs/minio-2018.10.18.00.28.58
+1812182239 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+1812182239 metadata/md5-cache/net-fs/minio-2018.11.15.01.26.07
 1809280334 metadata/md5-cache/net-fs/netatalk-3.1.11
-1809280334 metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
+1812182239 metadata/md5-cache/net-fs/mc-2018.09.06.23.26.56
 1809280334 metadata/md5-cache/net-fs/libnfs-1.9.7
 1810021239 metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
-1812140309 metadata/md5-cache/net-fs/Manifest.gz
+1812182239 metadata/md5-cache/net-fs/Manifest.gz
 1812011809 metadata/md5-cache/net-fs/nfs-utils-2.3.3
 1811281239 metadata/md5-cache/net-fs/samba-4.9.3
-1812132339 metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19
+1812182239 metadata/md5-cache/net-fs/minio-2018.12.13.02.04.19
 1809280334 metadata/md5-cache/net-fs/libnfs-3.0.0
 1812131009 metadata/md5-cache/net-fs/s3ql-2.32
 1810092309 metadata/md5-cache/net-fs/samba-4.5.16
 1809280334 metadata/md5-cache/net-fs/smbnetfs-0.6.1
 1809280334 metadata/md5-cache/net-fs/openafs-1.6.22.2
 1812140309 metadata/md5-cache/net-fs/samba-4.8.8
-1810192339 metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
+1812182239 metadata/md5-cache/net-fs/mc-2018.10.16.23.25.25
 1809280334 metadata/md5-cache/net-fs/ncpfs-2.2.6-r5
 1810021239 metadata/md5-cache/net-fs/autofs-5.1.2
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -40317,13 +40329,13 @@
 1811261942 metadata/md5-cache/net-fs/nfstest-1.0.2
 1811150109 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.5
 1809280334 metadata/md5-cache/net-fs/netatalk-3.1.8
-1809280334 metadata/md5-cache/net-fs/docker-volume-netshare-0.34
+1812182239 metadata/md5-cache/net-fs/docker-volume-netshare-0.34
 1810021239 metadata/md5-cache/net-fs/autofs-5.1.4
 1809280334 metadata/md5-cache/net-fs/btfs-2.18
 1803150038 metadata/md5-cache/net-fs/davfs2-1.5.4
-1812140009 metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22
+1812182239 metadata/md5-cache/net-fs/mc-2018.12.12.19.02.22
 1810021239 metadata/md5-cache/net-fs/openafs-kernel-1.6.22.2
-1811171609 metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
+1812182239 metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
 1811261942 metadata/md5-cache/net-fs/s3ql-2.24
 1810021239 metadata/md5-cache/app-crypt/af_alg-0.0.1
 1812061909 metadata/md5-cache/app-crypt/certbot-0.28.0
@@ -40369,7 +40381,6 @@
 1810021239 metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
 1810030549 metadata/md5-cache/app-crypt/eid-mw-4.4.1
 1810201839 metadata/md5-cache/app-crypt/acme-sh-9999
-1811022339 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r10
 1711260441 metadata/md5-cache/app-crypt/dehydrated-0.4.0-r3
 1810030549 metadata/md5-cache/app-crypt/gcr-3.20.0
 1810240909 metadata/md5-cache/app-crypt/libmd-1.0.1
@@ -40379,7 +40390,7 @@
 1810290409 metadata/md5-cache/app-crypt/gcr-3.28.0
 1809280333 metadata/md5-cache/app-crypt/monkeysphere-0.39
 1812161409 metadata/md5-cache/app-crypt/easy-rsa-3.0.5
-1809280333 metadata/md5-cache/app-crypt/kbfs-9999
+1812182239 metadata/md5-cache/app-crypt/kbfs-9999
 1812110115 metadata/md5-cache/app-crypt/qca-2.2.0_pre20180606
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2017.5
 1810121909 metadata/md5-cache/app-crypt/ccid-1.4.30
@@ -40404,7 +40415,7 @@
 1809280333 metadata/md5-cache/app-crypt/pkcs11-dump-0.3.4
 1805261309 metadata/md5-cache/app-crypt/libmd-1.0.0
 1809280333 metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
-1810082339 metadata/md5-cache/app-crypt/keybase-2.7.3
+1812182239 metadata/md5-cache/app-crypt/keybase-2.7.3
 1811251309 metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
 1809280333 metadata/md5-cache/app-crypt/coolkey-1.1.0-r7
 1806240109 metadata/md5-cache/app-crypt/kstart-4.2
@@ -40413,16 +40424,18 @@
 1809280333 metadata/md5-cache/app-crypt/af_alg-0_pre20120229
 1809280333 metadata/md5-cache/app-crypt/libykneomgr-0.1.8
 1807061109 metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20180706
-1810311339 metadata/md5-cache/app-crypt/kbfs-2.8.0
+1812182239 metadata/md5-cache/app-crypt/kbfs-2.8.0
 1812030509 metadata/md5-cache/app-crypt/certbot-0.27.1
-1811051809 metadata/md5-cache/app-crypt/keybase-2.9.0
+1812182239 metadata/md5-cache/app-crypt/keybase-2.9.0
 1702282308 metadata/md5-cache/app-crypt/md5deep-4.3
-1809280333 metadata/md5-cache/app-crypt/kbfs-2.6.0
+1812182239 metadata/md5-cache/app-crypt/kbfs-2.6.0
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2017.6
 1810180739 metadata/md5-cache/app-crypt/gpa-0.10.0
 1809280333 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
+1812190109 metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
 1809280333 metadata/md5-cache/app-crypt/stoken-0.92
 1812142009 metadata/md5-cache/app-crypt/gnupg-2.2.12
+1812190109 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.8.0
 1702282308 metadata/md5-cache/app-crypt/etcd-ca-0_p20150423
 1809280333 metadata/md5-cache/app-crypt/ophcrack-3.8.0
 1805012209 metadata/md5-cache/app-crypt/gpg-ringmgr-1.12
@@ -40432,7 +40445,7 @@
 1809280333 metadata/md5-cache/app-crypt/ophcrack-3.7.0
 1809280333 metadata/md5-cache/app-crypt/mcrypt-2.6.8-r3
 1809280333 metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
-1812131839 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
+1812190109 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r11
 1809280333 metadata/md5-cache/app-crypt/pdfcrack-0.16
 1809280333 metadata/md5-cache/app-crypt/pinentry-1.0.0-r3
 1809280333 metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
@@ -40446,17 +40459,17 @@
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2017.7
 1809280333 metadata/md5-cache/app-crypt/signify-23
 1809290409 metadata/md5-cache/app-crypt/pesign-0.112
-1810311339 metadata/md5-cache/app-crypt/keybase-2.8.0
+1812182239 metadata/md5-cache/app-crypt/keybase-2.8.0
 1810030549 metadata/md5-cache/app-crypt/seahorse-3.20.0
-1811241839 metadata/md5-cache/app-crypt/keybase-2.10.1
+1812182239 metadata/md5-cache/app-crypt/keybase-2.10.1
 1809280333 metadata/md5-cache/app-crypt/mit-krb5-1.16.1
 1809280333 metadata/md5-cache/app-crypt/md6sum-1.0-r2
 1809280333 metadata/md5-cache/app-crypt/md5deep-4.4
 1809280333 metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
-1811022339 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
+1812190109 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1809280333 metadata/md5-cache/app-crypt/onak-0.5.0
 1809280333 metadata/md5-cache/app-crypt/jitterentropy-2.1.1
-1812161409 metadata/md5-cache/app-crypt/Manifest.gz
+1812190109 metadata/md5-cache/app-crypt/Manifest.gz
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1809280333 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1809280333 metadata/md5-cache/app-crypt/jetring-0.25
@@ -40471,7 +40484,7 @@
 1809280333 metadata/md5-cache/app-crypt/asedriveiiie-serial-3.5
 1809280333 metadata/md5-cache/app-crypt/ophcrack-3.6.0
 1809280333 metadata/md5-cache/app-crypt/monkeysphere-0.38
-1809280333 metadata/md5-cache/app-crypt/keybase-2.6.0
+1812182239 metadata/md5-cache/app-crypt/keybase-2.6.0
 1702282308 metadata/md5-cache/app-crypt/codecrypt-1.7.2
 1810030549 metadata/md5-cache/app-crypt/xca-2.1.0
 1809280333 metadata/md5-cache/app-crypt/bcwipe-1.9.13
@@ -40483,7 +40496,7 @@
 1811071339 metadata/md5-cache/app-crypt/paperkey-1.5
 1809280333 metadata/md5-cache/app-crypt/cardpeek-0.8.4
 1810202109 metadata/md5-cache/app-crypt/ssdeep-2.14.1
-1809280333 metadata/md5-cache/app-crypt/keybase-9999
+1812182239 metadata/md5-cache/app-crypt/keybase-9999
 1810021239 metadata/md5-cache/app-crypt/veracrypt-1.22
 1812011809 metadata/md5-cache/app-crypt/rhash-1.3.6-r1
 1810030809 metadata/md5-cache/app-crypt/xca-2.1.1
@@ -40503,6 +40516,7 @@
 1812110115 metadata/md5-cache/app-crypt/libnitrokey-3.3
 1809280333 metadata/md5-cache/app-crypt/ima-evm-utils-9999
 1812110115 metadata/md5-cache/app-crypt/zulucrypt-5.1.0
+1812182239 metadata/md5-cache/app-crypt/keybase-2.11.0
 1704271609 metadata/md5-cache/app-crypt/signify-20
 1809280333 metadata/md5-cache/app-crypt/ima-evm-utils-1.1
 1805212239 metadata/md5-cache/app-crypt/kali-archive-keyring-2015.2
@@ -40537,11 +40551,13 @@
 1803270108 metadata/md5-cache/app-crypt/dehydrated-0.6.1
 1809280333 metadata/md5-cache/app-crypt/sign-1.0.7
 1809280333 metadata/md5-cache/app-crypt/pkcs11-data-0.7.4
-1808151104 metadata/md5-cache/app-crypt/cfssl-1.3.2
+1812182239 metadata/md5-cache/app-crypt/kbfs-2.11.0
+1812182239 metadata/md5-cache/app-crypt/cfssl-1.3.2
 1809280333 metadata/md5-cache/app-crypt/hmaccalc-0.9.14
 1812061909 metadata/md5-cache/app-crypt/certbot-apache-0.29.1
-1811241839 metadata/md5-cache/app-crypt/kbfs-2.10.1
+1812182239 metadata/md5-cache/app-crypt/kbfs-2.10.1
 1811261942 metadata/md5-cache/app-crypt/gkeys-9999
+1812190109 metadata/md5-cache/app-crypt/johntheripper-1.8.0
 1812110115 metadata/md5-cache/app-crypt/nitrokey-app-1.3.1
 1709201708 metadata/md5-cache/app-crypt/paperkey-1.4
 1812110115 metadata/md5-cache/app-crypt/zulucrypt-5.4.0
@@ -40577,7 +40593,7 @@
 1811081909 metadata/md5-cache/app-crypt/hashcat-9999
 1809280333 metadata/md5-cache/app-crypt/sbsigntools-0.9.1-r1
 1805131308 metadata/md5-cache/app-crypt/pgpdump-0.33
-1812042039 metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
+1812182309 metadata/md5-cache/app-crypt/pinentry-1.1.0-r2
 1811261942 metadata/md5-cache/app-crypt/acme-tiny-4.0.4
 1706261108 metadata/md5-cache/virtual/linuxtv-dvb-headers-5.8
 1806221339 metadata/md5-cache/virtual/w3m-0
@@ -41096,7 +41112,7 @@
 1811302009 metadata/md5-cache/sys-auth/keystone-12.0.2
 1809280334 metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
 1811302009 metadata/md5-cache/sys-auth/keystone-13.0.2
-1808151104 metadata/md5-cache/sys-auth/docker_auth-1.3.1
+1812182239 metadata/md5-cache/sys-auth/docker_auth-1.3.1
 1809280334 metadata/md5-cache/sys-auth/icmpdn-0.4
 1809280334 metadata/md5-cache/sys-auth/pam-script-1.1.7
 1809280334 metadata/md5-cache/sys-auth/pam_require-0.7
@@ -41123,7 +41139,7 @@
 1811261942 metadata/md5-cache/sys-auth/keystone-2018.2.9999
 1809280334 metadata/md5-cache/sys-auth/google-authenticator-1.05
 1809280334 metadata/md5-cache/sys-auth/libnss-nis-1.4
-1812162239 metadata/md5-cache/sys-auth/Manifest.gz
+1812182239 metadata/md5-cache/sys-auth/Manifest.gz
 1810021239 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 1809280334 metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
 1809280334 metadata/md5-cache/sys-auth/pam-script-1.1.8
@@ -41176,7 +41192,6 @@
 1810272339 metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
 1809280334 metadata/md5-cache/sys-auth/pam-afs-session-1.5
 1809280334 metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
-1812180639 metadata/md5-cache/net-libs/wvstreams-4.6.1-r6
 1809280334 metadata/md5-cache/net-libs/vanessa-socket-0.0.13
 1810021239 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
 1702282329 metadata/md5-cache/net-libs/rpc2-2.10
@@ -41249,6 +41264,7 @@
 1809280334 metadata/md5-cache/net-libs/nodejs-4.9.1
 1809280334 metadata/md5-cache/net-libs/libpri-1.4.15
 1706151408 metadata/md5-cache/net-libs/libasr-1.0.2
+1812181809 metadata/md5-cache/net-libs/daq-2.0.6-r1
 1809280334 metadata/md5-cache/net-libs/libnsl-1.1.0-r3
 1811261942 metadata/md5-cache/net-libs/grpc-1.13.0-r1
 1811180709 metadata/md5-cache/net-libs/shairplay-0_pre20180824
@@ -41408,7 +41424,7 @@
 1810030549 metadata/md5-cache/net-libs/gupnp-av-0.12.10
 1812091639 metadata/md5-cache/net-libs/libmicrohttpd-0.9.62
 1809280334 metadata/md5-cache/net-libs/libmbim-1.6.0
-1812181239 metadata/md5-cache/net-libs/Manifest.gz
+1812181809 metadata/md5-cache/net-libs/Manifest.gz
 1810091539 metadata/md5-cache/net-libs/nghttp2-1.33.0
 1807061439 metadata/md5-cache/net-libs/wandio-1.0.5
 1811240139 metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -41461,7 +41477,7 @@
 1809280334 metadata/md5-cache/net-libs/libnatpmp-20110808-r1
 1810190109 metadata/md5-cache/net-libs/libaccounts-glib-1.23
 1812150909 metadata/md5-cache/net-libs/grpc-1.17.1
-1812180639 metadata/md5-cache/net-libs/wvstreams-99999
+1812181709 metadata/md5-cache/net-libs/wvstreams-99999
 1812110115 metadata/md5-cache/net-libs/onion-0.8
 1811151909 metadata/md5-cache/net-libs/gsoap-2.8.70
 1812110115 metadata/md5-cache/net-libs/libwebsockets-2.0.2
@@ -41518,7 +41534,6 @@
 1702282328 metadata/md5-cache/net-libs/libisds-0.10.6
 1810220409 metadata/md5-cache/net-libs/libupnpp-0.16.1
 1809280334 metadata/md5-cache/net-libs/cppzmq-0_pre150606
-1812102009 metadata/md5-cache/net-libs/daq-2.0.6
 1809280334 metadata/md5-cache/net-libs/openmq-cclient-4.4.1
 1810030549 metadata/md5-cache/net-libs/libgrss-0.7.0
 1812110115 metadata/md5-cache/net-libs/libssh-0.8.4
@@ -43836,7 +43851,7 @@
 1812011809 metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
 1812110115 metadata/md5-cache/dev-libs/beignet-9999
 1810090339 metadata/md5-cache/dev-libs/skalibs-2.7.0.0
-1812172139 metadata/md5-cache/dev-libs/Manifest.gz
+1812190039 metadata/md5-cache/dev-libs/Manifest.gz
 1809280333 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1809280333 metadata/md5-cache/dev-libs/libcli-1.9.7
 1809280333 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -44082,7 +44097,7 @@
 1812110115 metadata/md5-cache/dev-libs/handystats-1.11.1
 1809280333 metadata/md5-cache/dev-libs/leveldb-1.9.0-r6
 1810082209 metadata/md5-cache/dev-libs/girara-0.2.8
-1812021839 metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
+1812190039 metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
 1809280333 metadata/md5-cache/dev-libs/ding-libs-0.4.0
 1809280333 metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
 1809280333 metadata/md5-cache/dev-libs/kpathsea-6.2.2_p20160523
@@ -44662,7 +44677,7 @@
 1810030549 metadata/md5-cache/x11-terms/cool-retro-term-1.0.1
 1810030549 metadata/md5-cache/x11-terms/kitty-0.12.1
 1809280334 metadata/md5-cache/x11-terms/rxvt-unicode-9.21
-1812161139 metadata/md5-cache/x11-terms/Manifest.gz
+1812190239 metadata/md5-cache/x11-terms/Manifest.gz
 1809281109 metadata/md5-cache/x11-terms/terminology-1.1.1
 1811261942 metadata/md5-cache/x11-terms/guake-3.3.2
 1810061639 metadata/md5-cache/x11-terms/gnome-terminal-3.30.1
@@ -44681,6 +44696,7 @@
 1810062339 metadata/md5-cache/x11-terms/mate-terminal-1.18.2
 1806021039 metadata/md5-cache/x11-terms/eterm-0.9.6-r2
 1809280334 metadata/md5-cache/x11-terms/rxvt-unicode-9.22
+1812190239 metadata/md5-cache/x11-terms/cool-retro-term-1.1.0
 1811140409 metadata/md5-cache/x11-terms/alacritty-0.2.3
 1809280334 metadata/md5-cache/x11-terms/lilyterm-0.9.9.4-r2
 1811261942 metadata/md5-cache/x11-terms/guake-3.4.0-r1
@@ -44812,7 +44828,7 @@
 1810021239 metadata/md5-cache/sys-process/numad-9999
 1809280334 metadata/md5-cache/sys-process/daemontools-0.76-r7
 1809280334 metadata/md5-cache/sys-process/numactl-2.0.11
-1808151104 metadata/md5-cache/sys-process/ctop-0.5.1
+1812182239 metadata/md5-cache/sys-process/ctop-0.5.1
 1812110115 metadata/md5-cache/sys-process/memwatch-0.2.1
 1809280334 metadata/md5-cache/sys-process/dumb-init-1.2.1
 1810021239 metadata/md5-cache/sys-process/criu-3.9
@@ -44820,7 +44836,7 @@
 1809280334 metadata/md5-cache/sys-process/prll-0.6.2
 1812131039 metadata/md5-cache/sys-process/parallel-20181122
 1809280334 metadata/md5-cache/sys-process/time-1.7-r3
-1812132039 metadata/md5-cache/sys-process/Manifest.gz
+1812182239 metadata/md5-cache/sys-process/Manifest.gz
 1810021239 metadata/md5-cache/sys-process/latencytop-0.5-r1
 1812110115 metadata/md5-cache/sys-process/memwatch-0.3.1
 1812110115 metadata/md5-cache/sys-process/memwatch-0.3.2
@@ -45200,7 +45216,7 @@
 1809280333 metadata/md5-cache/app-arch/upx-ucl-3.91
 1809280333 metadata/md5-cache/app-arch/xz-utils-5.2.4-r2
 1812110115 metadata/md5-cache/app-arch/snappy-1.1.7
-1712291639 metadata/md5-cache/app-arch/stuffit-5.2.0.611
+1812182009 metadata/md5-cache/app-arch/stuffit-5.2.0.611
 1809280333 metadata/md5-cache/app-arch/pigz-2.3.4
 1809280333 metadata/md5-cache/app-arch/zstd-1.3.2
 1811251839 metadata/md5-cache/app-arch/advancecomp-2.1
@@ -45235,7 +45251,7 @@
 1809280333 metadata/md5-cache/app-arch/tardy-1.28
 1809280333 metadata/md5-cache/app-arch/afio-2.5.1-r1
 1809280333 metadata/md5-cache/app-arch/cfv-1.18.3-r1
-1812151039 metadata/md5-cache/app-arch/Manifest.gz
+1812182009 metadata/md5-cache/app-arch/Manifest.gz
 1812110115 metadata/md5-cache/app-arch/brotli-1.0.3-r1
 1809280333 metadata/md5-cache/app-arch/zstd-1.1.3
 1809280333 metadata/md5-cache/app-arch/pbzip2-1.1.12
@@ -45374,7 +45390,7 @@
 1809280333 metadata/md5-cache/dev-db/cockroach-1.1.3
 1809280333 metadata/md5-cache/dev-db/repmgr-3.3.2
 1809280333 metadata/md5-cache/dev-db/cockroach-1.1.2
-1808151104 metadata/md5-cache/dev-db/rqlite-4.1.0
+1812182239 metadata/md5-cache/dev-db/rqlite-4.1.0
 1806072239 metadata/md5-cache/dev-db/psqlodbc-10.01.0000
 1702282310 metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-12
 1811091509 metadata/md5-cache/dev-db/postgresql-11.1
@@ -45389,7 +45405,7 @@
 1809280333 metadata/md5-cache/dev-db/pgpool2-9999
 1812112109 metadata/md5-cache/dev-db/phpmyadmin-4.8.4
 1809280333 metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
-1809282209 metadata/md5-cache/dev-db/influxdb-1.6.3
+1812182239 metadata/md5-cache/dev-db/influxdb-1.6.3
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1811180239 metadata/md5-cache/dev-db/pgpool2-3.7.5
 1812110115 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.11
@@ -45397,7 +45413,7 @@
 1811261439 metadata/md5-cache/dev-db/postgis-2.4.6
 1812110115 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.11
 1811281439 metadata/md5-cache/dev-db/pgpool2-3.7.7
-1809280333 metadata/md5-cache/dev-db/etcd-3.3.8
+1812182239 metadata/md5-cache/dev-db/etcd-3.3.8
 1804131308 metadata/md5-cache/dev-db/go-etcd-2.0.0-r1
 1809280333 metadata/md5-cache/dev-db/mysql-super-smack-1.3-r4
 1809280333 metadata/md5-cache/dev-db/libodbc++-0.2.5-r2
@@ -45446,9 +45462,9 @@
 1809280333 metadata/md5-cache/dev-db/hyperdex-1.6.0-r1
 1811261942 metadata/md5-cache/dev-db/barman-2.1
 1801031139 metadata/md5-cache/dev-db/sqlcl-bin-17.4.0.354.2224
-1811012109 metadata/md5-cache/dev-db/influxdb-1.6.4
+1812182239 metadata/md5-cache/dev-db/influxdb-1.6.4
 1811130041 metadata/md5-cache/dev-db/db-je-3.3.75
-1809280333 metadata/md5-cache/dev-db/etcd-3.3.9
+1812182239 metadata/md5-cache/dev-db/etcd-3.3.9
 1809280333 metadata/md5-cache/dev-db/libiodbc-3.52.12
 1809280333 metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
 1811110009 metadata/md5-cache/dev-db/mongodb-4.0.4
@@ -45505,7 +45521,7 @@
 1809280333 metadata/md5-cache/dev-db/postgis-9999
 1812110115 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.10
 1809280333 metadata/md5-cache/dev-db/pg_top-3.7.0
-1809280333 metadata/md5-cache/dev-db/etcd-3.2.22
+1812182239 metadata/md5-cache/dev-db/etcd-3.2.22
 1805041839 metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.11
 1809280333 metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1
 1812110115 metadata/md5-cache/dev-db/mysql-5.6.40-r2
@@ -45521,8 +45537,7 @@
 1811080239 metadata/md5-cache/dev-db/lmdb-0.9.22
 1811130041 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1809281540 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1812180609 metadata/md5-cache/dev-db/Manifest.gz
-1812110115 metadata/md5-cache/dev-db/mysql-5.6.41
+1812182309 metadata/md5-cache/dev-db/Manifest.gz
 1809280333 metadata/md5-cache/dev-db/freetds-9999
 1812171439 metadata/md5-cache/dev-db/mongodb-3.6.9
 1810261639 metadata/md5-cache/dev-db/mongodb-4.0.3
@@ -45550,7 +45565,7 @@
 1809280333 metadata/md5-cache/dev-db/freetds-1.00.41
 1809280333 metadata/md5-cache/dev-db/gqlplus-1.16
 1812110115 metadata/md5-cache/dev-db/mydumper-0.9.5
-1809280333 metadata/md5-cache/dev-db/influxdb-1.5.1
+1812182239 metadata/md5-cache/dev-db/influxdb-1.5.1
 1809280333 metadata/md5-cache/dev-db/hyperdex-1.8.0
 1811261942 metadata/md5-cache/dev-db/SchemaSync-0.9.2-r1
 1812110115 metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
@@ -45565,7 +45580,7 @@
 1811251110 metadata/md5-cache/dev-db/qdbm-1.8.78-r2
 1811130041 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
 1812110115 metadata/md5-cache/dev-db/mysql-5.5.61
-1809280333 metadata/md5-cache/dev-db/etcd-3.2.24
+1812182239 metadata/md5-cache/dev-db/etcd-3.2.24
 1812110115 metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
 1809281540 metadata/md5-cache/dev-db/percona-toolkit-3.0.8
 1809280333 metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3
@@ -45584,7 +45599,7 @@
 1809280333 metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
 1808281709 metadata/md5-cache/dev-db/m17n-db-1.7.0
 1805012209 metadata/md5-cache/dev-db/vbisam-2.0
-1811262339 metadata/md5-cache/dev-db/etcd-3.3.10
+1812182239 metadata/md5-cache/dev-db/etcd-3.3.10
 1811261942 metadata/md5-cache/dev-db/sadisplay-0.4.8
 1702282310 metadata/md5-cache/dev-db/textsearch_ja-9.0.0
 1812110115 metadata/md5-cache/dev-db/soci-3.2.3
@@ -45599,7 +45614,7 @@
 1808051809 metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12
 1809280333 metadata/md5-cache/dev-db/sqliteodbc-0.99
 1812110115 metadata/md5-cache/dev-db/clickhouse-18.10.3
-1808151104 metadata/md5-cache/dev-db/rqlite-4.3.0
+1812182239 metadata/md5-cache/dev-db/rqlite-4.3.0
 1812110115 metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
 1809280333 metadata/md5-cache/dev-db/hyperdex-1.8.1
 1809281540 metadata/md5-cache/dev-db/percona-toolkit-3.0.11
@@ -46102,10 +46117,10 @@
 1812140439 metadata/md5-cache/media-gfx/libimagequant-2.12.2
 1812110115 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
 1809280334 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1812171539 metadata/md5-cache/media-gfx/Manifest.gz
+1812190209 metadata/md5-cache/media-gfx/Manifest.gz
 1810182239 metadata/md5-cache/media-gfx/ahoviewer-1.6.4
 1812110115 metadata/md5-cache/media-gfx/lximage-qt-0.7.0
-1812171539 metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
+1812190209 metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
 1805290208 metadata/md5-cache/media-gfx/rotoscope-0.2
 1812110115 metadata/md5-cache/media-gfx/blender-2.79
 1812110115 metadata/md5-cache/media-gfx/cura-3.4.1
@@ -46671,7 +46686,7 @@
 1809280334 metadata/md5-cache/dev-vcs/tkcvs-8.2.3
 1811111440 metadata/md5-cache/dev-vcs/darcs-2.10.1
 1811261942 metadata/md5-cache/dev-vcs/git-cola-2.11
-1808151104 metadata/md5-cache/dev-vcs/git-lfs-2.4.2
+1812182239 metadata/md5-cache/dev-vcs/git-lfs-2.4.2
 1812111409 metadata/md5-cache/dev-vcs/mercurial-4.8.1
 1811261942 metadata/md5-cache/dev-vcs/git-spindle-3.3
 1811261942 metadata/md5-cache/dev-vcs/bzr-2.7.1_pre
@@ -46696,16 +46711,16 @@
 1809280334 metadata/md5-cache/dev-vcs/svn2git-9999
 1811261942 metadata/md5-cache/dev-vcs/mercurial-4.7.2
 1809281540 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1812170209 metadata/md5-cache/dev-vcs/Manifest.gz
+1812182239 metadata/md5-cache/dev-vcs/Manifest.gz
 1809280334 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1809280334 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
 1805012209 metadata/md5-cache/dev-vcs/cvsq-0.4.4
 1811261942 metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
 1810201539 metadata/md5-cache/dev-vcs/guilt-0.36-r1
-1809280334 metadata/md5-cache/dev-vcs/git-lfs-9999
+1812182239 metadata/md5-cache/dev-vcs/git-lfs-9999
 1809281540 metadata/md5-cache/dev-vcs/gitolite-3.6.4
-1809231439 metadata/md5-cache/dev-vcs/git-lfs-2.5.2
+1812182239 metadata/md5-cache/dev-vcs/git-lfs-2.5.2
 1809280334 metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
 1811261942 metadata/md5-cache/dev-vcs/hgsubversion-1.8.6
 1811261942 metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
@@ -46995,7 +47010,7 @@
 1812110115 metadata/md5-cache/mail-filter/rspamd-1.7.9
 1812110115 metadata/md5-cache/mail-filter/rmilter-1.9.2
 1812110115 metadata/md5-cache/mail-filter/postsrsd-1.4-r1
-1809280334 metadata/md5-cache/mail-filter/postforward-1.1.0
+1812182239 metadata/md5-cache/mail-filter/postforward-1.1.0
 1809280334 metadata/md5-cache/mail-filter/anubis-4.1.1
 1805012209 metadata/md5-cache/mail-filter/procmail-lib-20081108
 1809280334 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
@@ -47055,7 +47070,7 @@
 1805012209 metadata/md5-cache/mail-filter/procmail-lib-20091202
 1812050209 metadata/md5-cache/mail-filter/libsrs_alt-1.0
 1809280334 metadata/md5-cache/mail-filter/dspam-3.10.2-r1
-1812111339 metadata/md5-cache/mail-filter/Manifest.gz
+1812182239 metadata/md5-cache/mail-filter/Manifest.gz
 1809280334 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 1812110115 metadata/md5-cache/mail-filter/rspamd-1.7.7
 1811261942 metadata/md5-cache/mail-filter/afew-1.1.0
@@ -49842,7 +49857,7 @@
 1811261942 metadata/md5-cache/dev-python/watchdog-0.8.3-r1
 1811261942 metadata/md5-cache/dev-python/theano-0.9.0
 1811261942 metadata/md5-cache/dev-python/python-magic-0.4.15
-1812180039 metadata/md5-cache/dev-python/Manifest.gz
+1812190039 metadata/md5-cache/dev-python/Manifest.gz
 1811261942 metadata/md5-cache/dev-python/mamba-0.8.6
 1812151239 metadata/md5-cache/dev-python/cython-0.29.2
 1811261942 metadata/md5-cache/dev-python/spyder-3.2.4
@@ -50650,7 +50665,7 @@
 1811261942 metadata/md5-cache/dev-python/theano-0.7.0
 1811261942 metadata/md5-cache/dev-python/piexif-1.0.13
 1811261942 metadata/md5-cache/dev-python/pudge-0.1.3-r1
-1812070609 metadata/md5-cache/dev-python/numpy-1.14.5
+1812190039 metadata/md5-cache/dev-python/numpy-1.14.5
 1811261942 metadata/md5-cache/dev-python/requests-mock-1.5.2
 1811261942 metadata/md5-cache/dev-python/radon-1.4.2
 1811261942 metadata/md5-cache/dev-python/logbook-1.1.0
@@ -51469,7 +51484,7 @@
 1812110115 metadata/md5-cache/sys-block/whdd-2.2
 1810021239 metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
 1809280334 metadata/md5-cache/sys-block/mbuffer-20180625
-1812170309 metadata/md5-cache/sys-block/Manifest.gz
+1812190039 metadata/md5-cache/sys-block/Manifest.gz
 1805012209 metadata/md5-cache/sys-block/scsiping-0.0.1
 1810021239 metadata/md5-cache/sys-block/iscsitarget-0.4.17
 1709272139 metadata/md5-cache/sys-block/tw_cli-10.2.2.1
@@ -51510,7 +51525,7 @@
 1809280334 metadata/md5-cache/sys-block/smp_utils-0.98
 1809280334 metadata/md5-cache/sys-block/dellmgr-5.32-r1
 1808071439 metadata/md5-cache/sys-block/storcli-1.23.02
-1801032209 metadata/md5-cache/sys-block/megamgr-5.20-r2
+1812190039 metadata/md5-cache/sys-block/megamgr-5.20-r2
 1809280334 metadata/md5-cache/sys-block/whdd-3.0
 1810021239 metadata/md5-cache/sys-block/open-iscsi-2.0.873
 1809280334 metadata/md5-cache/sys-block/thin-provisioning-tools-0.4.1
@@ -51993,80 +52008,80 @@
 1809280334 metadata/md5-cache/games-roguelike/rogue-5.4.4
 1810030549 metadata/md5-cache/games-roguelike/stone-soup-0.22.0
 1809280334 metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
-1808151104 metadata/md5-cache/dev-go/siphash-1.0.0
-1811040609 metadata/md5-cache/dev-go/go-tools-9999
-1808151104 metadata/md5-cache/dev-go/glide-0.13.1
-1809280333 metadata/md5-cache/dev-go/go-snappy-9999
-1808250939 metadata/md5-cache/dev-go/fuzzy-0.0.5
-1808151104 metadata/md5-cache/dev-go/sarama-1.4.3
-1808191009 metadata/md5-cache/dev-go/go-sys-0_pre20180816
-1808151104 metadata/md5-cache/dev-go/goptlib-0.6
-1808191009 metadata/md5-cache/dev-go/go-text-0.3.0
-1810282009 metadata/md5-cache/dev-go/glide-0.13.2
-1808151104 metadata/md5-cache/dev-go/delve-0.12.2
-1811040609 metadata/md5-cache/dev-go/go-tools-0_pre20180817
-1808151104 metadata/md5-cache/dev-go/cli-0_pre20160306
-1808151104 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
-1809280333 metadata/md5-cache/dev-go/go-oauth2-9999
-1809280333 metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
-1808151104 metadata/md5-cache/dev-go/siphash-1.1.0
-1808232109 metadata/md5-cache/dev-go/go-tour-0_p20180810
-1808151104 metadata/md5-cache/dev-go/go-crypto-0_pre20160126
-1808151104 metadata/md5-cache/dev-go/blackfriday-1.4
-1808151104 metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
-1808191009 metadata/md5-cache/dev-go/go-crypto-0_pre20180816
-1808151104 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
-1808151104 metadata/md5-cache/dev-go/qr-0_p20161121
-1810080109 metadata/md5-cache/dev-go/go-protobuf-1.2.0
-1808151104 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
-1808151104 metadata/md5-cache/dev-go/ed25519-0_pre20160420
-1809280333 metadata/md5-cache/dev-go/toml-9999
-1808151104 metadata/md5-cache/dev-go/toml-0.2.0_p20160716
-1808151104 metadata/md5-cache/dev-go/gox-0_pre20160725
-1809280333 metadata/md5-cache/dev-go/sanitized-anchor-name-9999
-1808151104 metadata/md5-cache/dev-go/go-text-0_pre20160211
-1809280333 metadata/md5-cache/dev-go/godep-9999
-1808151104 metadata/md5-cache/dev-go/delve-1.0.0
-1809280333 metadata/md5-cache/dev-go/blackfriday-9999
-1808151104 metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
-1808151104 metadata/md5-cache/dev-go/go-sys-0_pre20160204
-1809280333 metadata/md5-cache/dev-go/go-net-9999
-1808151104 metadata/md5-cache/dev-go/go-net-0_pre20160216
-1808151104 metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
-1808151104 metadata/md5-cache/dev-go/gom-0_pre20151110
-1812112339 metadata/md5-cache/dev-go/Manifest.gz
-1808151104 metadata/md5-cache/dev-go/gox-0.4.0
-1809281239 metadata/md5-cache/dev-go/twofactor-0_p20180418
-1809280333 metadata/md5-cache/dev-go/go-sys-9999
-1810282009 metadata/md5-cache/dev-go/go-bindata-0_pre20151023
-1808191009 metadata/md5-cache/dev-go/go-net-0_pre20180816
-1809280333 metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
-1808151104 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
-1808151104 metadata/md5-cache/dev-go/glide-0.12.3
-1808151104 metadata/md5-cache/dev-go/go-md2man-1.0.3
-1808151104 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
-1808151104 metadata/md5-cache/dev-go/godep-74
-1808151104 metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
-1809280333 metadata/md5-cache/dev-go/go-resiliency-9999
-1809280333 metadata/md5-cache/dev-go/go-eapache-queue-9999
-1809140639 metadata/md5-cache/dev-go/golint-0_pre20180702
-1808151104 metadata/md5-cache/dev-go/zglob-0_p20171230
-1808151104 metadata/md5-cache/dev-go/go-resiliency-1.0.0
-1809280333 metadata/md5-cache/dev-go/go-spew-9999
-1808151104 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
-1809280333 metadata/md5-cache/dev-go/goversion-1.2.0
-1809280333 metadata/md5-cache/dev-go/go-crypto-9999
-1808151104 metadata/md5-cache/dev-go/twofactor-0_p20170917
-1809280333 metadata/md5-cache/dev-go/go-text-9999
-1808151104 metadata/md5-cache/dev-go/go-snappy-0_pre20160213
-1808151104 metadata/md5-cache/dev-go/fuzzy-0.0.3
-1808151104 metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
-1808151104 metadata/md5-cache/dev-go/go-md2man-1.0.6
-1808151104 metadata/md5-cache/dev-go/go-snappy-0_pre20150729
-1808151104 metadata/md5-cache/dev-go/go-colortext-0_pre20150720
-1808151104 metadata/md5-cache/dev-go/delve-1.0.0_rc1
-1808151104 metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
-1808151104 metadata/md5-cache/dev-go/go-spew-0_pre20150619
+1812182239 metadata/md5-cache/dev-go/siphash-1.0.0
+1812182239 metadata/md5-cache/dev-go/go-tools-9999
+1812182239 metadata/md5-cache/dev-go/glide-0.13.1
+1812182239 metadata/md5-cache/dev-go/go-snappy-9999
+1812182239 metadata/md5-cache/dev-go/fuzzy-0.0.5
+1812182239 metadata/md5-cache/dev-go/sarama-1.4.3
+1812182239 metadata/md5-cache/dev-go/go-sys-0_pre20180816
+1812182239 metadata/md5-cache/dev-go/goptlib-0.6
+1812182239 metadata/md5-cache/dev-go/go-text-0.3.0
+1812182239 metadata/md5-cache/dev-go/glide-0.13.2
+1812182239 metadata/md5-cache/dev-go/delve-0.12.2
+1812182239 metadata/md5-cache/dev-go/go-tools-0_pre20180817
+1812182239 metadata/md5-cache/dev-go/cli-0_pre20160306
+1812182239 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
+1812182239 metadata/md5-cache/dev-go/go-oauth2-9999
+1812182239 metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
+1812182239 metadata/md5-cache/dev-go/siphash-1.1.0
+1812182239 metadata/md5-cache/dev-go/go-tour-0_p20180810
+1812182239 metadata/md5-cache/dev-go/go-crypto-0_pre20160126
+1812182239 metadata/md5-cache/dev-go/blackfriday-1.4
+1812182239 metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
+1812182239 metadata/md5-cache/dev-go/go-crypto-0_pre20180816
+1812182239 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
+1812182239 metadata/md5-cache/dev-go/qr-0_p20161121
+1812182239 metadata/md5-cache/dev-go/go-protobuf-1.2.0
+1812182239 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
+1812182239 metadata/md5-cache/dev-go/ed25519-0_pre20160420
+1812182239 metadata/md5-cache/dev-go/toml-9999
+1812182239 metadata/md5-cache/dev-go/toml-0.2.0_p20160716
+1812182239 metadata/md5-cache/dev-go/gox-0_pre20160725
+1812182239 metadata/md5-cache/dev-go/sanitized-anchor-name-9999
+1812182239 metadata/md5-cache/dev-go/go-text-0_pre20160211
+1812182239 metadata/md5-cache/dev-go/godep-9999
+1812182239 metadata/md5-cache/dev-go/delve-1.0.0
+1812182239 metadata/md5-cache/dev-go/blackfriday-9999
+1812182239 metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
+1812182239 metadata/md5-cache/dev-go/go-sys-0_pre20160204
+1812182239 metadata/md5-cache/dev-go/go-net-9999
+1812182239 metadata/md5-cache/dev-go/go-net-0_pre20160216
+1812182239 metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
+1812182239 metadata/md5-cache/dev-go/gom-0_pre20151110
+1812182239 metadata/md5-cache/dev-go/Manifest.gz
+1812182239 metadata/md5-cache/dev-go/gox-0.4.0
+1812182239 metadata/md5-cache/dev-go/twofactor-0_p20180418
+1812182239 metadata/md5-cache/dev-go/go-sys-9999
+1812182239 metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+1812182239 metadata/md5-cache/dev-go/go-net-0_pre20180816
+1812182239 metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
+1812182239 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
+1812182239 metadata/md5-cache/dev-go/glide-0.12.3
+1812182239 metadata/md5-cache/dev-go/go-md2man-1.0.3
+1812182239 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
+1812182239 metadata/md5-cache/dev-go/godep-74
+1812182239 metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
+1812182239 metadata/md5-cache/dev-go/go-resiliency-9999
+1812182239 metadata/md5-cache/dev-go/go-eapache-queue-9999
+1812182239 metadata/md5-cache/dev-go/golint-0_pre20180702
+1812182239 metadata/md5-cache/dev-go/zglob-0_p20171230
+1812182239 metadata/md5-cache/dev-go/go-resiliency-1.0.0
+1812182239 metadata/md5-cache/dev-go/go-spew-9999
+1812182239 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
+1812182239 metadata/md5-cache/dev-go/goversion-1.2.0
+1812182239 metadata/md5-cache/dev-go/go-crypto-9999
+1812182239 metadata/md5-cache/dev-go/twofactor-0_p20170917
+1812182239 metadata/md5-cache/dev-go/go-text-9999
+1812182239 metadata/md5-cache/dev-go/go-snappy-0_pre20160213
+1812182239 metadata/md5-cache/dev-go/fuzzy-0.0.3
+1812182239 metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
+1812182239 metadata/md5-cache/dev-go/go-md2man-1.0.6
+1812182239 metadata/md5-cache/dev-go/go-snappy-0_pre20150729
+1812182239 metadata/md5-cache/dev-go/go-colortext-0_pre20150720
+1812182239 metadata/md5-cache/dev-go/delve-1.0.0_rc1
+1812182239 metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
+1812182239 metadata/md5-cache/dev-go/go-spew-0_pre20150619
 1809280334 metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
 1809280334 metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
 1809280334 metadata/md5-cache/games-sports/stormbaancoureur-2.1.6-r1
@@ -52106,7 +52121,7 @@
 1809281540 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1809280333 metadata/md5-cache/app-shells/mpibash-1.2
 1809280333 metadata/md5-cache/app-shells/ctypes-sh-1.1
-1808151104 metadata/md5-cache/app-shells/peco-0.5.1
+1812182239 metadata/md5-cache/app-shells/peco-0.5.1
 1809280333 metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
 1812130809 metadata/md5-cache/app-shells/fish-3.0_beta1
 1809280333 metadata/md5-cache/app-shells/heirloom-sh-050706-r1
@@ -52134,7 +52149,7 @@
 1808151104 metadata/md5-cache/app-shells/bash-completion-2.7-r3
 1811140109 metadata/md5-cache/app-shells/hstr-2.0
 1810181039 metadata/md5-cache/app-shells/posh-0.13.2
-1812130809 metadata/md5-cache/app-shells/Manifest.gz
+1812182239 metadata/md5-cache/app-shells/Manifest.gz
 1804241408 metadata/md5-cache/app-shells/fish-2.6.0
 1702282309 metadata/md5-cache/app-shells/bashdb-4.3.0.91-r2
 1809280333 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911-r1
@@ -52151,7 +52166,7 @@
 1809280333 metadata/md5-cache/app-shells/sash-3.8
 1809280333 metadata/md5-cache/app-shells/mpibash-9999
 1809280333 metadata/md5-cache/app-shells/bash-4.3_p48-r2
-1808151104 metadata/md5-cache/app-shells/peco-0.5.3
+1812182239 metadata/md5-cache/app-shells/peco-0.5.3
 1809280333 metadata/md5-cache/app-shells/bash-3.0_p22
 1809280333 metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
 1809280333 metadata/md5-cache/app-shells/autojump-22.5.1
@@ -52166,7 +52181,7 @@
 1809280333 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
 1812010539 metadata/md5-cache/app-shells/fzy-9999
 1809280333 metadata/md5-cache/app-shells/mksh-52c
-1808151104 metadata/md5-cache/app-shells/peco-0.5.2
+1812182239 metadata/md5-cache/app-shells/peco-0.5.2
 1809280333 metadata/md5-cache/app-shells/ksh-93.20140625
 1809280333 metadata/md5-cache/app-shells/esh-0.8.5-r2
 1812130809 metadata/md5-cache/app-shells/fish-9999
@@ -52434,8 +52449,9 @@
 1809280333 metadata/md5-cache/app-office/multitalk-1.4-r1
 1812110115 metadata/md5-cache/app-office/gnucash-3.3-r1
 1809280333 metadata/md5-cache/app-office/QtBitcoinTrader-1.10.01
-1812140209 metadata/md5-cache/app-office/Manifest.gz
+1812190239 metadata/md5-cache/app-office/Manifest.gz
 1812110115 metadata/md5-cache/app-office/gnucash-3.3
+1812190239 metadata/md5-cache/app-office/skrooge-2.17.0
 1805012209 metadata/md5-cache/app-office/ooextras-20060909
 1812110140 metadata/md5-cache/app-office/kraft-0.80
 1810030549 metadata/md5-cache/app-office/homebank-5.1.3
@@ -52529,7 +52545,7 @@
 1809280334 metadata/md5-cache/net-analyzer/suricata-4.0.4
 1811130041 metadata/md5-cache/net-analyzer/zabbix-3.0.19
 1809280334 metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r4
-1809280334 metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
+1812182239 metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
 1809280334 metadata/md5-cache/net-analyzer/hunt-1.5-r1
 1809280334 metadata/md5-cache/net-analyzer/tracebox-0.2
 1812132039 metadata/md5-cache/net-analyzer/icinga2-2.10.2
@@ -52673,7 +52689,7 @@
 1812110115 metadata/md5-cache/net-analyzer/multimon-ng-9999
 1812110115 metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
 1809280334 metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r2
-1809280334 metadata/md5-cache/net-analyzer/kapacitor-1.5.1
+1812182239 metadata/md5-cache/net-analyzer/kapacitor-1.5.1
 1702282328 metadata/md5-cache/net-analyzer/calamaris-2.59
 1809280334 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r3
 1809280334 metadata/md5-cache/net-analyzer/trafshow-5.2.3
@@ -52699,6 +52715,7 @@
 1805121638 metadata/md5-cache/net-analyzer/ipsumdump-1.86
 1809281540 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.8
 1809280334 metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r1
+1812190109 metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
 1812110115 metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2
 1809280334 metadata/md5-cache/net-analyzer/snort-2.9.4.6-r1
 1809280334 metadata/md5-cache/net-analyzer/amap-5.4
@@ -52753,7 +52770,7 @@
 1810262209 metadata/md5-cache/net-analyzer/netsniff-ng-9999
 1811261942 metadata/md5-cache/net-analyzer/scapy-9999
 1809280334 metadata/md5-cache/net-analyzer/smokeping-2.7.2
-1811010209 metadata/md5-cache/net-analyzer/chronograf-1.6.2
+1812182239 metadata/md5-cache/net-analyzer/chronograf-1.6.2
 1809280334 metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3
 1809280334 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r1
 1702282328 metadata/md5-cache/net-analyzer/bwping-1.9
@@ -52775,7 +52792,7 @@
 1809280334 metadata/md5-cache/net-analyzer/nmap-9999
 1811261942 metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
 1704101139 metadata/md5-cache/net-analyzer/arp-scan-1.9
-1809280334 metadata/md5-cache/net-analyzer/telegraf-1.5.3
+1812182239 metadata/md5-cache/net-analyzer/telegraf-1.5.3
 1809280334 metadata/md5-cache/net-analyzer/nast-0.2.0-r1
 1702282328 metadata/md5-cache/net-analyzer/ike-scan-1.9-r1
 1809280334 metadata/md5-cache/net-analyzer/mrtg-2.17.7
@@ -52790,7 +52807,7 @@
 1811130041 metadata/md5-cache/net-analyzer/zabbix-3.0.22
 1809280334 metadata/md5-cache/net-analyzer/vnstat-9999
 1809280334 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
-1812161809 metadata/md5-cache/net-analyzer/Manifest.gz
+1812190109 metadata/md5-cache/net-analyzer/Manifest.gz
 1809280334 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r2
 1805012209 metadata/md5-cache/net-analyzer/neti-2.0
 1809280334 metadata/md5-cache/net-analyzer/sinfo-0.0.48
@@ -52807,11 +52824,11 @@
 1809280334 metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.9.2
 1809281540 metadata/md5-cache/net-analyzer/symon-2.88
 1809280334 metadata/md5-cache/net-analyzer/snort-2.9.8.3-r2
-1812072039 metadata/md5-cache/net-analyzer/metasploit-9999
+1812190109 metadata/md5-cache/net-analyzer/metasploit-9999
 1809280334 metadata/md5-cache/net-analyzer/nfdump-1.6.15-r1
 1809280334 metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
 1811261942 metadata/md5-cache/net-analyzer/ripe-atlas-tools-1.2.2
-1811020239 metadata/md5-cache/net-analyzer/telegraf-1.8.3
+1812182239 metadata/md5-cache/net-analyzer/telegraf-1.8.3
 1809280334 metadata/md5-cache/net-analyzer/pinger-0.33
 1809280334 metadata/md5-cache/net-analyzer/snort-2.9.8.0
 1809280334 metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
@@ -52833,7 +52850,7 @@
 1809280334 metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
 1811261942 metadata/md5-cache/net-analyzer/wapiti-3.0.0
 1809280334 metadata/md5-cache/net-analyzer/thrulay-0.9-r1
-1811150209 metadata/md5-cache/net-analyzer/chronograf-1.7.3
+1812182239 metadata/md5-cache/net-analyzer/chronograf-1.7.3
 1705181338 metadata/md5-cache/net-analyzer/netwag-5.39.0
 1809280334 metadata/md5-cache/net-analyzer/mrtg-2.17.4-r1
 1809280334 metadata/md5-cache/net-analyzer/pmacct-1.7.1
@@ -52882,7 +52899,7 @@
 1809280334 metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
 1811261942 metadata/md5-cache/net-analyzer/net-snmp-5.8
 1809280334 metadata/md5-cache/net-analyzer/cacti-spine-1.1.28
-1809280334 metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+1812182239 metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
 1812111439 metadata/md5-cache/net-analyzer/munin-2.0.38
 1809280334 metadata/md5-cache/net-analyzer/raddump-0.3.1
 1809280334 metadata/md5-cache/net-analyzer/sguil-server-0.8.0
@@ -52968,6 +52985,7 @@
 1811261942 metadata/md5-cache/net-analyzer/carl-0.9-r2
 1702282328 metadata/md5-cache/net-analyzer/calamaris-2.99.4.0
 1809280334 metadata/md5-cache/net-analyzer/nfdump-1.6.16-r1
+1812190109 metadata/md5-cache/net-analyzer/metasploit-4.14.16-r2
 1810231409 metadata/md5-cache/net-analyzer/vnstat-2.0
 1809280334 metadata/md5-cache/net-analyzer/nbwmon-0.5.2
 1702282328 metadata/md5-cache/net-analyzer/prelude-lml-rules-3.1.0
@@ -52979,7 +52997,6 @@
 1811261942 metadata/md5-cache/net-analyzer/wapiti-9999
 1809280334 metadata/md5-cache/net-analyzer/ngrep-1.45-r3
 1811261942 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1
-1811251110 metadata/md5-cache/net-analyzer/metasploit-4.14.16-r1
 1809230439 metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
 1809280334 metadata/md5-cache/net-analyzer/cloudshark-1.0.3.180
 1809280334 metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
@@ -53011,7 +53028,6 @@
 1805012209 metadata/md5-cache/net-analyzer/nikto-1.36
 1809280334 metadata/md5-cache/net-analyzer/amap-5.4-r1
 1809280334 metadata/md5-cache/net-analyzer/cacti-1.1.38
-1812072039 metadata/md5-cache/net-analyzer/metasploit-4.17.21-r3
 1804021308 metadata/md5-cache/net-analyzer/nikto-2.1.6_p20180122
 1812110115 metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
 1809280334 metadata/md5-cache/net-analyzer/netcat-110-r9
@@ -53320,7 +53336,7 @@
 1811241209 metadata/md5-cache/app-misc/nnn-2.1
 1809280333 metadata/md5-cache/app-misc/reptyr-0.6.2
 1811261942 metadata/md5-cache/app-misc/binwalk-9999
-1808151104 metadata/md5-cache/app-misc/go-jira-1.0.17
+1812182239 metadata/md5-cache/app-misc/go-jira-1.0.17
 1809280333 metadata/md5-cache/app-misc/cmatrix-1.2a-r3
 1812110115 metadata/md5-cache/app-misc/ddate-0.2.2
 1812110115 metadata/md5-cache/app-misc/brewtarget-2.3.1
@@ -53408,7 +53424,7 @@
 1811261942 metadata/md5-cache/app-misc/tails-installer-4.4.8
 1811110009 metadata/md5-cache/app-misc/elasticsearch-6.4.3
 1710122038 metadata/md5-cache/app-misc/when-1.1.37
-1808151104 metadata/md5-cache/app-misc/faq-0.0.1
+1812182239 metadata/md5-cache/app-misc/faq-0.0.1
 1809280333 metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
 1809280333 metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
 1809280333 metadata/md5-cache/app-misc/egads-0.9.5
@@ -53488,7 +53504,7 @@
 1809280333 metadata/md5-cache/app-misc/radeontop-1.1
 1809280333 metadata/md5-cache/app-misc/dvtm-0.14-r1
 1809280333 metadata/md5-cache/app-misc/hexcompare-1.0.4
-1809062109 metadata/md5-cache/app-misc/mkcert-1.1.2
+1812182239 metadata/md5-cache/app-misc/mkcert-1.1.2
 1809280409 metadata/md5-cache/app-misc/tmux-2.8
 1809280333 metadata/md5-cache/app-misc/ktoblzcheck-1.49
 1809280333 metadata/md5-cache/app-misc/banner-1.3.3
@@ -53511,7 +53527,7 @@
 1811261942 metadata/md5-cache/app-misc/chkcrontab-1.7
 1809180947 metadata/md5-cache/app-misc/screenfetch-9999
 1809280333 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
-1812160439 metadata/md5-cache/app-misc/Manifest.gz
+1812182239 metadata/md5-cache/app-misc/Manifest.gz
 1809280333 metadata/md5-cache/app-misc/socnetv-2.2
 1811090209 metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r1
 1809280333 metadata/md5-cache/app-misc/mmv-1.01b_p18
@@ -53551,11 +53567,11 @@
 1702282309 metadata/md5-cache/app-misc/scrub-2.6.1
 1810021239 metadata/md5-cache/app-misc/ddcutil-0.8.6-r1
 1811130041 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
-1808151104 metadata/md5-cache/app-misc/go-jira-1.0.20
+1812182239 metadata/md5-cache/app-misc/go-jira-1.0.20
 1805270804 metadata/md5-cache/app-misc/ifp-line-0.3
 1805212239 metadata/md5-cache/app-misc/aldo-0.7.7
 1811261942 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
-1809070939 metadata/md5-cache/app-misc/faq-0.0.2
+1812182239 metadata/md5-cache/app-misc/faq-0.0.2
 1810030549 metadata/md5-cache/app-misc/kryoflux-dtc-2.6
 1810030549 metadata/md5-cache/app-misc/gcstar-1.7.1
 1812110115 metadata/md5-cache/app-misc/timew-1.0.0
@@ -53584,7 +53600,7 @@
 1810181939 metadata/md5-cache/app-misc/carbon-c-relay-3.4
 1812110115 metadata/md5-cache/app-misc/pdfpc-4.2.1
 1808091800 metadata/md5-cache/app-misc/cbrpager-0.9.22
-1808151104 metadata/md5-cache/app-misc/notary-0.6.1-r1
+1812182239 metadata/md5-cache/app-misc/notary-0.6.1-r1
 1809280333 metadata/md5-cache/app-misc/byobu-5.125
 1809280333 metadata/md5-cache/app-misc/empty-0.6.20b
 1809280333 metadata/md5-cache/app-misc/screen-4.5.1
@@ -53597,7 +53613,7 @@
 1809280333 metadata/md5-cache/app-misc/worker-2.19.6
 1809280333 metadata/md5-cache/app-misc/tmate-2.2.1
 1811130041 metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.11
-1808151104 metadata/md5-cache/app-misc/pet-0.3.0
+1812182239 metadata/md5-cache/app-misc/pet-0.3.0
 1809280333 metadata/md5-cache/app-misc/jail-2.0-r1
 1809280333 metadata/md5-cache/app-misc/figlet-2.2.5-r1
 1809280333 metadata/md5-cache/app-misc/gcal-3.6.3
@@ -53661,7 +53677,7 @@
 1809280333 metadata/md5-cache/app-misc/email2trac-2.6.2-r1
 1811261942 metadata/md5-cache/app-misc/trash-cli-0.12.9.14-r2
 1809280333 metadata/md5-cache/app-misc/klavaro-3.0.1
-1809101639 metadata/md5-cache/app-misc/pet-0.3.2
+1812182239 metadata/md5-cache/app-misc/pet-0.3.2
 1809180947 metadata/md5-cache/app-misc/neofetch-9999
 1805310138 metadata/md5-cache/app-misc/g15composer-3.1
 1809280333 metadata/md5-cache/app-misc/boxes-1.1.2-r1
@@ -53738,7 +53754,7 @@
 1810030549 metadata/md5-cache/app-misc/rbutil-1.4.0
 1803012238 metadata/md5-cache/app-misc/dateutils-0.4.3
 1809280333 metadata/md5-cache/app-misc/ckb-0.2.6-r1
-1808151104 metadata/md5-cache/app-misc/mkcert-1.0.1
+1812182239 metadata/md5-cache/app-misc/mkcert-1.0.1
 1808310239 metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
 1809280333 metadata/md5-cache/app-misc/fdupes-1.5.1
 1809280333 metadata/md5-cache/app-misc/mswinurl_launcher-1.0
@@ -53813,11 +53829,11 @@
 1812061739 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.101
 1812110115 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
 1812110115 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
-1808151104 metadata/md5-cache/www-plugins/browserpass-2.0.13
+1812182239 metadata/md5-cache/www-plugins/browserpass-2.0.13
 1809280334 metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
-1812130539 metadata/md5-cache/www-plugins/Manifest.gz
+1812182239 metadata/md5-cache/www-plugins/Manifest.gz
 1812110115 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
-1809190909 metadata/md5-cache/www-plugins/browserpass-2.0.22
+1812182239 metadata/md5-cache/www-plugins/browserpass-2.0.22
 1809280334 metadata/md5-cache/www-plugins/passff-1.5.1
 1812130539 metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98_beta
 1812110115 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3
@@ -53881,7 +53897,7 @@
 1811130041 metadata/md5-cache/dev-embedded/arduino-1.8.5-r2
 1810241039 metadata/md5-cache/dev-embedded/arduino-ctags-20161123
 1812110115 metadata/md5-cache/dev-embedded/libftdi-1.2-r2
-1810152139 metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
+1812182239 metadata/md5-cache/dev-embedded/arduino-builder-1.4.1
 1809280333 metadata/md5-cache/dev-embedded/tigcc-0.96_beta8-r1
 1703240008 metadata/md5-cache/dev-embedded/libdisasm-0.23
 1809280333 metadata/md5-cache/dev-embedded/libftd2xx-0.4.16-r1
@@ -53926,7 +53942,7 @@
 1809280333 metadata/md5-cache/dev-embedded/urjtag-9999
 1809280333 metadata/md5-cache/dev-embedded/u-boot-tools-2016.03
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.5
-1810241039 metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
+1812182239 metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
 1809280333 metadata/md5-cache/dev-embedded/pk2cmd-1.20
 1809280333 metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
 1809280333 metadata/md5-cache/dev-embedded/uisp-20050207-r1
@@ -53940,7 +53956,7 @@
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.5
 1809280333 metadata/md5-cache/dev-embedded/zmac-1.3
 1809280333 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
-1812111709 metadata/md5-cache/dev-embedded/Manifest.gz
+1812182239 metadata/md5-cache/dev-embedded/Manifest.gz
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-doctools-1.0.9
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.4
 1805012209 metadata/md5-cache/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
@@ -54135,16 +54151,16 @@
 1809280334 metadata/md5-cache/net-wireless/iw-4.3
 1702282330 metadata/md5-cache/net-wireless/bladerf-fpga-0.6.0
 1809280334 metadata/md5-cache/net-wireless/horst-5.0
+1812190109 metadata/md5-cache/net-wireless/wepattack-0.1.3-r4
 1702282330 metadata/md5-cache/net-wireless/hidclient-20120728
 1812110115 metadata/md5-cache/net-wireless/bladerf-9999
 1812042009 metadata/md5-cache/net-wireless/kismet-2018.08_beta1-r4
-1812171939 metadata/md5-cache/net-wireless/Manifest.gz
+1812190109 metadata/md5-cache/net-wireless/Manifest.gz
 1809280334 metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
 1811261942 metadata/md5-cache/net-wireless/jackit-0.0_p20170918
 1812110115 metadata/md5-cache/net-wireless/inspectrum-9999
 1812110115 metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
 1811261942 metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
-1809280334 metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
 1809280334 metadata/md5-cache/net-wireless/osmocom-bb-9999
 1812110115 metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908-r1
 1810021239 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
@@ -54240,7 +54256,6 @@
 1711062139 metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1804271308 metadata/md5-cache/dev-php/awl-0.59
-1809280333 metadata/md5-cache/dev-php/pecl-yaml-2.0.0
 1811020409 metadata/md5-cache/dev-php/PHP_CodeCoverage-1.2.13
 1809280333 metadata/md5-cache/dev-php/pecl-gnupg-1.4.0-r2
 1811020409 metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
@@ -54252,13 +54267,13 @@
 1809191609 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.3
 1809280333 metadata/md5-cache/dev-php/pecl-redis-4.0.0-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-Services_TinyURL-0.1.2-r1
+1812181839 metadata/md5-cache/dev-php/pecl-event-2.4.3
 1811020409 metadata/md5-cache/dev-php/php-codebrowser-1.0.2-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_Traceroute-0.21.3-r1
 1806072239 metadata/md5-cache/dev-php/doctrine-2.6.1
 1809280333 metadata/md5-cache/dev-php/pecl-radius-1.4.0_beta1-r2
 1704251838 metadata/md5-cache/dev-php/json-schema-4.1.0
-1809280333 metadata/md5-cache/dev-php/pecl-yaml-2.0.2
 1806072239 metadata/md5-cache/dev-php/smarty-3.1.32
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4
 1811020409 metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3
@@ -54295,6 +54310,7 @@
 1705280209 metadata/md5-cache/dev-php/adodb-5.20.9
 1811020409 metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
 1801230538 metadata/md5-cache/dev-php/semver-1.4.2
+1812181839 metadata/md5-cache/dev-php/pecl-yaml-1.3.2
 1712220739 metadata/md5-cache/dev-php/PHPMailer-5.2.26-r2
 1809280333 metadata/md5-cache/dev-php/suhosin-0.9.38-r1
 1702282315 metadata/md5-cache/dev-php/libchart-1.3
@@ -54324,6 +54340,7 @@
 1809040339 metadata/md5-cache/dev-php/adodb-5.20.13
 1707271838 metadata/md5-cache/dev-php/cphplib-0.51-r1
 1711141808 metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
+1812181839 metadata/md5-cache/dev-php/swoole-4.2.9
 1809280333 metadata/md5-cache/dev-php/pecl-dbx-1.1.2-r2
 1802130509 metadata/md5-cache/dev-php/phar-io-version-1.0.1
 1811020409 metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
@@ -54442,13 +54459,14 @@
 1703121808 metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
 1811020409 metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
 1702282315 metadata/md5-cache/dev-php/phar-utils-1.0.0
-1812180409 metadata/md5-cache/dev-php/Manifest.gz
+1812181839 metadata/md5-cache/dev-php/Manifest.gz
 1811020409 metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
 1809280333 metadata/md5-cache/dev-php/pecl-http-2.6.0-r1
 1812180409 metadata/md5-cache/dev-php/pecl-redis-4.2.0
 1809280333 metadata/md5-cache/dev-php/pecl-mongodb-1.1.10
 1712101910 metadata/md5-cache/dev-php/fedora-autoloader-1.0.0
 1712191739 metadata/md5-cache/dev-php/PHP_CodeSniffer-3.2.1
+1812181839 metadata/md5-cache/dev-php/pecl-yaml-2.0.4
 1707101839 metadata/md5-cache/dev-php/simpletest-1.1.7
 1811020409 metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.1
 1811020409 metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
@@ -54591,14 +54609,12 @@
 1702282315 metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
 1809280333 metadata/md5-cache/dev-php/pecl-imagick-3.4.3
 1809280333 metadata/md5-cache/dev-php/pecl-lzf-1.6.6
-1809280333 metadata/md5-cache/dev-php/pecl-yaml-1.3.1
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_IDNA2-0.2.0
 1809280333 metadata/md5-cache/dev-php/pecl-cassandra-1.3.2
 1809280333 metadata/md5-cache/dev-php/pecl-dbase-7.0.0_beta1-r1
 1711292040 metadata/md5-cache/dev-php/xdebug-client-2.5.3
 1809280333 metadata/md5-cache/dev-php/pecl-stomp-1.0.9-r1
 1802141738 metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
-1809280333 metadata/md5-cache/dev-php/pecl-yaml-1.3.0
 1811020409 metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
 1809280333 metadata/md5-cache/dev-php/pecl-propro-1.0.2-r2
 1811020409 metadata/md5-cache/dev-php/PEAR-HTML_QuickForm2-2.0.2-r1
@@ -55143,50 +55159,50 @@
 1809280333 metadata/md5-cache/app-text/paps-0.6.8-r2
 1811261942 metadata/md5-cache/app-text/pdfminer-20140328-r1
 1807210139 metadata/md5-cache/app-text/ttf2pk2-2.0_p20170524
-1808151104 metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
-1810291839 metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0
+1812182239 metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
+1812182239 metadata/md5-cache/app-metrics/node_exporter-0.17.0_rc0
 1811302309 metadata/md5-cache/app-metrics/collectd-5.8.1
-1808151104 metadata/md5-cache/app-metrics/snmp_exporter-0.11.0
-1808151104 metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
-1811061709 metadata/md5-cache/app-metrics/prometheus-2.5.0
-1811111839 metadata/md5-cache/app-metrics/alertmanager-0.15.3
-1808151104 metadata/md5-cache/app-metrics/alertmanager-0.15.0
-1808151104 metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
-1809131509 metadata/md5-cache/app-metrics/snmp_exporter-0.13.0
-1812020339 metadata/md5-cache/app-metrics/node_exporter-0.16.0
-1809280333 metadata/md5-cache/app-metrics/pushgateway-0.4.0
-1812111139 metadata/md5-cache/app-metrics/pushgateway-0.7.0
+1812182239 metadata/md5-cache/app-metrics/snmp_exporter-0.11.0
+1812182239 metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
+1812182239 metadata/md5-cache/app-metrics/prometheus-2.5.0
+1812182239 metadata/md5-cache/app-metrics/alertmanager-0.15.3
+1812182239 metadata/md5-cache/app-metrics/alertmanager-0.15.0
+1812182239 metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
+1812182239 metadata/md5-cache/app-metrics/snmp_exporter-0.13.0
+1812182239 metadata/md5-cache/app-metrics/node_exporter-0.16.0
+1812182239 metadata/md5-cache/app-metrics/pushgateway-0.4.0
+1812182239 metadata/md5-cache/app-metrics/pushgateway-0.7.0
 1811300939 metadata/md5-cache/app-metrics/collectd-5.8.0-r1
-1808151104 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
-1808151104 metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
-1810091539 metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
-1812111139 metadata/md5-cache/app-metrics/snmp_exporter-0.14.0
-1808151104 metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
-1808151104 metadata/md5-cache/app-metrics/node_exporter-0.15.2
-1808151104 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
-1808202109 metadata/md5-cache/app-metrics/alertmanager-0.15.2
-1808151104 metadata/md5-cache/app-metrics/alertmanager-0.15.1
-1812172109 metadata/md5-cache/app-metrics/Manifest.gz
-1808151104 metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
-1811061709 metadata/md5-cache/app-metrics/prometheus-2.4.3
+1812182239 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
+1812182239 metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
+1812182239 metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
+1812182239 metadata/md5-cache/app-metrics/snmp_exporter-0.14.0
+1812182239 metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
+1812182239 metadata/md5-cache/app-metrics/node_exporter-0.15.2
+1812182239 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+1812182239 metadata/md5-cache/app-metrics/alertmanager-0.15.2
+1812182239 metadata/md5-cache/app-metrics/alertmanager-0.15.1
+1812182239 metadata/md5-cache/app-metrics/Manifest.gz
+1812182239 metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
+1812182239 metadata/md5-cache/app-metrics/prometheus-2.4.3
 1811261942 metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
-1809062139 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
-1808151104 metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
-1812020339 metadata/md5-cache/app-metrics/node_exporter-0.17.0
-1809280333 metadata/md5-cache/app-metrics/pushgateway-0.5.0
-1809280333 metadata/md5-cache/app-metrics/pushgateway-0.5.2
-1809280333 metadata/md5-cache/app-metrics/redis_exporter-0.20.2
-1808151104 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
-1809070939 metadata/md5-cache/app-metrics/snmp_exporter-0.12.0
-1808151104 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
-1808151104 metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
-1812172109 metadata/md5-cache/app-metrics/prometheus-2.6.0
-1809280333 metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
-1812072239 metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0
-1809280333 metadata/md5-cache/app-metrics/redis_exporter-0.15.0
-1812161609 metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
-1810282009 metadata/md5-cache/app-metrics/pushgateway-0.6.0
-1808151104 metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
+1812182239 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
+1812182239 metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
+1812182239 metadata/md5-cache/app-metrics/node_exporter-0.17.0
+1812182239 metadata/md5-cache/app-metrics/pushgateway-0.5.0
+1812182239 metadata/md5-cache/app-metrics/pushgateway-0.5.2
+1812182239 metadata/md5-cache/app-metrics/redis_exporter-0.20.2
+1812182239 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
+1812182239 metadata/md5-cache/app-metrics/snmp_exporter-0.12.0
+1812182239 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
+1812182239 metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
+1812182239 metadata/md5-cache/app-metrics/prometheus-2.6.0
+1812182239 metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+1812182239 metadata/md5-cache/app-metrics/blackbox_exporter-0.13.0
+1812182239 metadata/md5-cache/app-metrics/redis_exporter-0.15.0
+1812182239 metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
+1812182239 metadata/md5-cache/app-metrics/pushgateway-0.6.0
+1812182239 metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
 1809280333 metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
 1809280333 metadata/md5-cache/app-forensics/ovaldi-5.10.1.4
 1809280333 metadata/md5-cache/app-forensics/unhide-20130526
@@ -55516,14 +55532,14 @@
 1811110009 metadata/md5-cache/www-apps/kibana-bin-6.4.3
 1809280334 metadata/md5-cache/www-apps/nanoblogger-3.2.3
 1809280334 metadata/md5-cache/www-apps/otrs-6.0.4
-1810141609 metadata/md5-cache/www-apps/gitea-1.5.2
+1812182239 metadata/md5-cache/www-apps/gitea-1.5.2
 1809280334 metadata/md5-cache/www-apps/owncloud-10.0.9
 1812120139 metadata/md5-cache/www-apps/moodle-3.6.1
 1811261942 metadata/md5-cache/www-apps/radicale-2.1.10
 1811121509 metadata/md5-cache/www-apps/moodle-3.5.3
 1805311439 metadata/md5-cache/www-apps/phpsysinfo-3.2.3
 1809280334 metadata/md5-cache/www-apps/curator-3.0_p20110120-r2
-1809280334 metadata/md5-cache/www-apps/hugo-0.46
+1812182239 metadata/md5-cache/www-apps/hugo-0.46
 1812132139 metadata/md5-cache/www-apps/grafana-bin-5.4.2
 1812091110 metadata/md5-cache/www-apps/nanoc-4.8.10
 1812152339 metadata/md5-cache/www-apps/nextcloud-15.0.0
@@ -55569,7 +55585,7 @@
 1805311439 metadata/md5-cache/www-apps/dokuwiki-20170219e
 1809280334 metadata/md5-cache/www-apps/venus-20100911-r1
 1812091110 metadata/md5-cache/www-apps/jekyll-sitemap-0.13.0
-1809280334 metadata/md5-cache/www-apps/hugo-0.45
+1812182239 metadata/md5-cache/www-apps/hugo-0.45
 1811261942 metadata/md5-cache/www-apps/novnc-0.6.2-r1
 1811291609 metadata/md5-cache/www-apps/nextcloud-13.0.8
 1809280334 metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
@@ -55579,7 +55595,7 @@
 1812091110 metadata/md5-cache/www-apps/jekyll-3.6.2
 1809280334 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
 1812091110 metadata/md5-cache/www-apps/nanoc-4.9.9
-1809280334 metadata/md5-cache/www-apps/hugo-0.40.3
+1812182239 metadata/md5-cache/www-apps/hugo-0.40.3
 1811212209 metadata/md5-cache/www-apps/icingaweb2-2.6.2
 1812151209 metadata/md5-cache/www-apps/kibana-bin-6.5.2
 1809280334 metadata/md5-cache/www-apps/icingaweb2-9999
@@ -55593,14 +55609,14 @@
 1812130939 metadata/md5-cache/www-apps/nanoc-4.10.4
 1809280334 metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
 1805311439 metadata/md5-cache/www-apps/agendav-1.2.6.2
-1809280334 metadata/md5-cache/www-apps/hugo-0.42.1
+1812182239 metadata/md5-cache/www-apps/hugo-0.42.1
 1806270339 metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1
 1811121509 metadata/md5-cache/www-apps/moodle-3.4.6
 1808151104 metadata/md5-cache/www-apps/postfixadmin-3.1
 1805311439 metadata/md5-cache/www-apps/ampache-3.8.3
 1811121509 metadata/md5-cache/www-apps/moodle-3.1.15
-1809280334 metadata/md5-cache/www-apps/hugo-0.48
-1812152339 metadata/md5-cache/www-apps/Manifest.gz
+1812182239 metadata/md5-cache/www-apps/hugo-0.48
+1812182239 metadata/md5-cache/www-apps/Manifest.gz
 1811261942 metadata/md5-cache/www-apps/scgi-1.14-r1
 1811031839 metadata/md5-cache/www-apps/airdcpp-webui-2.4.0
 1811120709 metadata/md5-cache/www-apps/drupal-8.6.3
@@ -55626,7 +55642,7 @@
 1805311439 metadata/md5-cache/www-apps/dokuwiki-20160626e
 1811261942 metadata/md5-cache/www-apps/radicale-2.1.8
 1811261942 metadata/md5-cache/www-apps/trac-1.2.1
-1809280334 metadata/md5-cache/www-apps/hugo-0.45.1
+1812182239 metadata/md5-cache/www-apps/hugo-0.45.1
 1811261942 metadata/md5-cache/www-apps/nikola-7.8.12
 1809180947 metadata/md5-cache/www-apps/tt-rss-99999999
 1812091110 metadata/md5-cache/www-apps/jekyll-coffeescript-1.1.1
@@ -55680,7 +55696,7 @@
 1809280334 metadata/md5-cache/www-apps/sitebar-3.3.9-r2
 1811121509 metadata/md5-cache/www-apps/moodle-3.3.9
 1811261942 metadata/md5-cache/www-apps/trac-accountmanager-0.4.4
-1809280334 metadata/md5-cache/www-apps/hugo-0.44
+1812182239 metadata/md5-cache/www-apps/hugo-0.44
 1809180947 metadata/md5-cache/www-apps/rutorrent-9999
 1811261942 metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1
 1809280334 metadata/md5-cache/www-apps/otrs-5.0.25
@@ -55918,7 +55934,7 @@
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1812181239 metadata/md5-cache/Manifest.gz
+1812190609 metadata/md5-cache/Manifest.gz
 1809280334 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1809280334 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1809281540 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -55992,7 +56008,7 @@
 1811261942 metadata/md5-cache/dev-util/scons-3.0.1
 1811261942 metadata/md5-cache/dev-util/buildbot-console-view-1.1.2
 1702282322 metadata/md5-cache/dev-util/tkdiff-4.2
-1811091139 metadata/md5-cache/dev-util/drone-cli-1.0.0
+1812182239 metadata/md5-cache/dev-util/drone-cli-1.0.0
 1811261942 metadata/md5-cache/dev-util/buildbot-www-1.3.0
 1808151104 metadata/md5-cache/dev-util/obs-service-generator_driver_update_disk-20130318
 1811261942 metadata/md5-cache/dev-util/spec-cleaner-1.0.6
@@ -56015,7 +56031,7 @@
 1812091110 metadata/md5-cache/dev-util/aruba-0.6.2-r2
 1811261942 metadata/md5-cache/dev-util/buildbot-console-view-1.3.0
 1812110115 metadata/md5-cache/dev-util/schroot-1.6.10-r4
-1809210209 metadata/md5-cache/dev-util/clair-2.0.6
+1812182239 metadata/md5-cache/dev-util/clair-2.0.6
 1808151104 metadata/md5-cache/dev-util/obs-service-download_url-20130318
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
 1811261942 metadata/md5-cache/dev-util/howdoi-1.1.14
@@ -56025,7 +56041,7 @@
 1810021239 metadata/md5-cache/dev-util/lttng-modules-2.7.4
 1809280334 metadata/md5-cache/dev-util/cscope-15.8a-r1
 1803290617 metadata/md5-cache/dev-util/obs-service-github_tarballs-0.2.1
-1808151104 metadata/md5-cache/dev-util/clair-2.0.4
+1812182239 metadata/md5-cache/dev-util/clair-2.0.4
 1809280334 metadata/md5-cache/dev-util/crash-6.1.4
 1812110140 metadata/md5-cache/dev-util/heaptrack-9999
 1811261942 metadata/md5-cache/dev-util/buildbot-1.3.0
@@ -56066,9 +56082,9 @@
 1810021239 metadata/md5-cache/dev-util/perf-4.4.4
 1811160239 metadata/md5-cache/dev-util/mdds-9999
 1809280334 metadata/md5-cache/dev-util/its4-1.1.1-r1
-1808151104 metadata/md5-cache/dev-util/drone-0.7.3
+1812182239 metadata/md5-cache/dev-util/drone-0.7.3
 1809211939 metadata/md5-cache/dev-util/android-ndk-16b
-1810281939 metadata/md5-cache/dev-util/drone-0.8.7
+1812182239 metadata/md5-cache/dev-util/drone-0.8.7
 1812110115 metadata/md5-cache/dev-util/glslang-9999
 1812110140 metadata/md5-cache/dev-util/kdevelop-python-5.2.4
 1810021239 metadata/md5-cache/dev-util/fatrace-0.12
@@ -56152,7 +56168,7 @@
 1811261942 metadata/md5-cache/dev-util/tailor-0.9.35-r1
 1806050508 metadata/md5-cache/dev-util/ostree-2018.5
 1702282322 metadata/md5-cache/dev-util/shtool-2.0.8-r1
-1809280334 metadata/md5-cache/dev-util/docker-ls-0.3.1
+1812182239 metadata/md5-cache/dev-util/docker-ls-0.3.1
 1812110115 metadata/md5-cache/dev-util/glslang-7.10.2984
 1812110115 metadata/md5-cache/dev-util/spirv-tools-2018.4
 1812020639 metadata/md5-cache/dev-util/tup-0.7.8
@@ -56174,7 +56190,7 @@
 1811261942 metadata/md5-cache/dev-util/vint-0.3.18
 1809280334 metadata/md5-cache/dev-util/vtable-dumper-1.2
 1809280334 metadata/md5-cache/dev-util/duma-2.5.15-r2
-1808151104 metadata/md5-cache/dev-util/promu-0.1.0_p20180227
+1812182239 metadata/md5-cache/dev-util/promu-0.1.0_p20180227
 1809280334 metadata/md5-cache/dev-util/makepp-1.18
 1809280334 metadata/md5-cache/dev-util/tinlink-1.0.0
 1812110115 metadata/md5-cache/dev-util/dwarves-1.10_p20140618
@@ -56222,7 +56238,7 @@
 1811151209 metadata/md5-cache/dev-util/checkbashisms-2.18.9
 1812171839 metadata/md5-cache/dev-util/gnome-builder-3.30.2
 1809280334 metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
-1810222339 metadata/md5-cache/dev-util/envman-2.1.0
+1812182239 metadata/md5-cache/dev-util/envman-2.1.0
 1811251839 metadata/md5-cache/dev-util/w32api-4.0.3.1
 1812110115 metadata/md5-cache/dev-util/serialtalk-9999
 1811261942 metadata/md5-cache/dev-util/buildbot-waterfall-view-1.3.0
@@ -56255,7 +56271,7 @@
 1811130041 metadata/md5-cache/dev-util/android-studio-3.1.4.0.173.4907809
 1704112339 metadata/md5-cache/dev-util/cloc-1.72
 1812110115 metadata/md5-cache/dev-util/dwarves-9999
-1811281639 metadata/md5-cache/dev-util/drone-cli-1.0.4
+1812182239 metadata/md5-cache/dev-util/drone-cli-1.0.4
 1809211939 metadata/md5-cache/dev-util/android-ndk-11c
 1809280334 metadata/md5-cache/dev-util/sasm-9999
 1809280334 metadata/md5-cache/dev-util/indent-2.2.11-r1
@@ -56325,7 +56341,7 @@
 1812110140 metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
 1809280334 metadata/md5-cache/dev-util/qbs-1.12.0
 1808151104 metadata/md5-cache/dev-util/obs-service-download_src_package-20130318
-1808151104 metadata/md5-cache/dev-util/bitrise-1.16.1
+1812182239 metadata/md5-cache/dev-util/bitrise-1.16.1
 1809280334 metadata/md5-cache/dev-util/pkgconfig-0.28-r3
 1810021239 metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
 1809280334 metadata/md5-cache/dev-util/visual-regexp-3.0-r1
@@ -56334,7 +56350,7 @@
 1809211939 metadata/md5-cache/dev-util/android-ndk-13b
 1811130041 metadata/md5-cache/dev-util/argouml-0.34
 1810030839 metadata/md5-cache/dev-util/bats-0.4.0_p20170219
-1808201309 metadata/md5-cache/dev-util/stepman-0.10.2
+1812182239 metadata/md5-cache/dev-util/stepman-0.10.2
 1810021239 metadata/md5-cache/dev-util/dropwatch-1.4-r1
 1810262209 metadata/md5-cache/dev-util/lttng-ust-2.10.1
 1809280334 metadata/md5-cache/dev-util/debugedit-4.14.2
@@ -56360,9 +56376,9 @@
 1811251309 metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
 1809280334 metadata/md5-cache/dev-util/atomic-install-0.1.1
 1809280334 metadata/md5-cache/dev-util/unifdef-2.11
-1808151104 metadata/md5-cache/dev-util/clair-2.0.3
+1812182239 metadata/md5-cache/dev-util/clair-2.0.3
 1811261942 metadata/md5-cache/dev-util/gcovr-3.2
-1810222339 metadata/md5-cache/dev-util/bitrise-1.23.0
+1812182239 metadata/md5-cache/dev-util/bitrise-1.23.0
 1809280334 metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
 1812180009 metadata/md5-cache/dev-util/debhelper-11.5.4
 1809280334 metadata/md5-cache/dev-util/sasm-2.2-r1
@@ -56416,7 +56432,7 @@
 1811261942 metadata/md5-cache/dev-util/cdiff-1.0
 1812140309 metadata/md5-cache/dev-util/cmake-3.13.2
 1808151104 metadata/md5-cache/dev-util/pretrace-0.4-r1
-1811161339 metadata/md5-cache/dev-util/drone-0.8.9
+1812182239 metadata/md5-cache/dev-util/drone-0.8.9
 1811292109 metadata/md5-cache/dev-util/pycharm-professional-2018.2.4
 1811151209 metadata/md5-cache/dev-util/checkbashisms-2.18.6
 1811111440 metadata/md5-cache/dev-util/shellcheck-0.4.6
@@ -56428,7 +56444,7 @@
 1809280334 metadata/md5-cache/dev-util/wiggle-0.9-r1
 1810030549 metadata/md5-cache/dev-util/regexxer-0.10
 1809280334 metadata/md5-cache/dev-util/squashmerge-0.1
-1808151104 metadata/md5-cache/dev-util/bitrise-1.20.0
+1812182239 metadata/md5-cache/dev-util/bitrise-1.20.0
 1809280334 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
 1811261942 metadata/md5-cache/dev-util/gyp-20170904022846
 1811261942 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
@@ -56455,7 +56471,7 @@
 1805012209 metadata/md5-cache/dev-util/treecc-0.3.10
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.3.0
 1809280334 metadata/md5-cache/dev-util/gn-0.1445
-1808151104 metadata/md5-cache/dev-util/promu-0.1.0
+1812182239 metadata/md5-cache/dev-util/promu-0.1.0
 1809280334 metadata/md5-cache/dev-util/desktop-file-utils-0.23
 1811251839 metadata/md5-cache/dev-util/mingw64-runtime-5.0.4
 1809280334 metadata/md5-cache/dev-util/crash-7.0.0
@@ -56480,7 +56496,7 @@
 1811251839 metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r1
 1809280334 metadata/md5-cache/dev-util/ragel-6.9
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1812180409 metadata/md5-cache/dev-util/Manifest.gz
+1812182239 metadata/md5-cache/dev-util/Manifest.gz
 1809280334 metadata/md5-cache/dev-util/xdelta-3.1.0
 1809280334 metadata/md5-cache/dev-util/dmake-4.12.2
 1809280334 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -56509,7 +56525,7 @@
 1812161909 metadata/md5-cache/dev-util/kdbg-3.0.0
 1811211739 metadata/md5-cache/dev-util/kbuild-9999
 1812110115 metadata/md5-cache/dev-util/uncrustify-0.68.1
-1808151104 metadata/md5-cache/dev-util/drone-0.8.6
+1812182239 metadata/md5-cache/dev-util/drone-0.8.6
 1811261942 metadata/md5-cache/dev-util/bumpversion-0.5.3
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
 1809280334 metadata/md5-cache/dev-util/appdata-tools-0.1.7
@@ -56558,7 +56574,6 @@
 1811261942 metadata/md5-cache/dev-util/diffoscope-87
 1810231639 metadata/md5-cache/dev-util/electron-2.0.10
 1711260441 metadata/md5-cache/dev-util/artifactory-bin-5.4.4
-1809280334 metadata/md5-cache/dev-util/shc-3.8.9
 1809280334 metadata/md5-cache/dev-util/re2c-0.16
 1811261942 metadata/md5-cache/dev-util/confix-2.3.5-r3
 1809280334 metadata/md5-cache/dev-util/waf-1.9.8
@@ -56604,7 +56619,7 @@
 1811111440 metadata/md5-cache/dev-util/shelltestrunner-1.3.4
 1811261942 metadata/md5-cache/dev-util/cppcheck-1.81
 1812020609 metadata/md5-cache/dev-util/tup-0.7.7
-1809062109 metadata/md5-cache/dev-util/clair-2.0.5
+1812182239 metadata/md5-cache/dev-util/clair-2.0.5
 1809280334 metadata/md5-cache/dev-util/dirdiff-2.1-r2
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
 1812091110 metadata/md5-cache/dev-util/cucumber-messages-2.1.1
@@ -56613,7 +56628,7 @@
 1811261809 metadata/md5-cache/dev-util/pycharm-community-2018.3
 1809211939 metadata/md5-cache/dev-util/android-ndk-10e
 1809280334 metadata/md5-cache/dev-util/btyacc-3.0-r2
-1811111839 metadata/md5-cache/dev-util/drone-0.8.8
+1812182239 metadata/md5-cache/dev-util/drone-0.8.8
 1811261942 metadata/md5-cache/dev-util/meson-0.48.0-r2
 1811261942 metadata/md5-cache/dev-util/cligh-0.2
 1809280334 metadata/md5-cache/dev-util/autoproject-0.20_p5
@@ -56636,7 +56651,7 @@
 1810021239 metadata/md5-cache/dev-util/perf-4.14.33
 1809280334 metadata/md5-cache/dev-util/diffball-1.0.1
 1812082109 metadata/md5-cache/dev-util/cppunit-1.13.2-r2
-1811061109 metadata/md5-cache/dev-util/shc-3.9.6
+1812181639 metadata/md5-cache/dev-util/shc-3.9.6
 1811241709 metadata/md5-cache/dev-util/redo-0.21
 1812110115 metadata/md5-cache/dev-util/uncrustify-0.67
 1811220309 metadata/md5-cache/dev-util/debootstrap-1.0.110
@@ -56645,7 +56660,7 @@
 1811261942 metadata/md5-cache/dev-util/cppcheck-1.84
 1811251839 metadata/md5-cache/dev-util/mingw-runtime-3.20.2
 1805012209 metadata/md5-cache/dev-util/fhist-1.16
-1808151104 metadata/md5-cache/dev-util/stepman-0.10.0
+1812182239 metadata/md5-cache/dev-util/stepman-0.10.0
 1810021239 metadata/md5-cache/dev-util/perf-3.12
 1811261942 metadata/md5-cache/dev-util/cppcheck-9999
 1811261942 metadata/md5-cache/dev-util/buildbot-pkg-1.1.2
@@ -56672,7 +56687,7 @@
 1805212239 metadata/md5-cache/dev-util/obs-service-meta-2
 1812180409 metadata/md5-cache/dev-util/checkbashisms-2.18.11
 1809280334 metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
-1808151104 metadata/md5-cache/dev-util/drone-0.8.5
+1812182239 metadata/md5-cache/dev-util/drone-0.8.5
 1811220309 metadata/md5-cache/dev-util/debhelper-11.5.3
 1809280334 metadata/md5-cache/dev-util/cgdb-9999
 1811261942 metadata/md5-cache/dev-util/scons-3.0.1-r100
@@ -56680,13 +56695,13 @@
 1809180947 metadata/md5-cache/dev-util/abi-compliance-checker-9999
 1809280334 metadata/md5-cache/dev-util/cccc-3.1.5
 1809280334 metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
-1811111409 metadata/md5-cache/dev-util/stripe-mock-0.34.1
+1812182239 metadata/md5-cache/dev-util/stripe-mock-0.34.1
 1801120740 metadata/md5-cache/dev-util/diffstat-1.60
 1809211939 metadata/md5-cache/dev-util/android-ndk-11c-r1
 1809280334 metadata/md5-cache/dev-util/cflow-1.4
 1809280334 metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
 1706221738 metadata/md5-cache/dev-util/patdiff-0.9.0
-1808151104 metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
+1812182239 metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
 1811130041 metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
 1809280334 metadata/md5-cache/dev-util/huc-0.1-r1
 1812110115 metadata/md5-cache/dev-util/catkin-0.7.11
@@ -56703,7 +56718,7 @@
 1809280334 metadata/md5-cache/dev-util/vmtouch-1.3.0
 1809280334 metadata/md5-cache/dev-util/gperf-3.0.4
 1811130041 metadata/md5-cache/dev-util/jarwizard-2.50
-1808151104 metadata/md5-cache/dev-util/drone-cli-0.8.6
+1812182239 metadata/md5-cache/dev-util/drone-cli-0.8.6
 1803290617 metadata/md5-cache/dev-util/obs-service-recompress-0.2
 1812110115 metadata/md5-cache/dev-util/emilpro-3-r3
 1810021239 metadata/md5-cache/dev-util/ply-0_pre20160313
@@ -56724,7 +56739,7 @@
 1809280334 metadata/md5-cache/dev-util/indent-2.2.11_p5
 1809180947 metadata/md5-cache/dev-util/clinfo-9999
 1809280334 metadata/md5-cache/dev-util/xdelta-1.1.4-r1
-1808151104 metadata/md5-cache/dev-util/envman-1.2.0
+1812182239 metadata/md5-cache/dev-util/envman-1.2.0
 1809280334 metadata/md5-cache/dev-util/makeheaders-0_p4
 1809280334 metadata/md5-cache/dev-util/global-6.5.7
 1810021239 metadata/md5-cache/dev-util/lttng-modules-2.7.1
@@ -56820,7 +56835,7 @@
 1810071909 metadata/md5-cache/dev-util/bbe-0.2.2-r1
 1810231639 metadata/md5-cache/dev-util/electron-1.6.18
 1709061209 metadata/md5-cache/dev-util/colm-0.13.0.5
-1808221809 metadata/md5-cache/dev-util/envman-1.2.1
+1812182239 metadata/md5-cache/dev-util/envman-1.2.1
 1811261942 metadata/md5-cache/dev-util/buildbot-grid-view-1.1.2
 1812130239 metadata/md5-cache/dev-util/kdevelop-python-5.3.1
 1809280334 metadata/md5-cache/dev-util/diffuse-0.4.8
@@ -56841,7 +56856,7 @@
 1809280334 metadata/md5-cache/dev-util/crash-7.0.3
 1812110115 metadata/md5-cache/dev-util/vulkan-headers-9999
 1809280334 metadata/md5-cache/dev-util/patchelf-0.9
-1808151104 metadata/md5-cache/dev-util/bitrise-1.19.0
+1812182239 metadata/md5-cache/dev-util/bitrise-1.19.0
 1811111440 metadata/md5-cache/dev-util/bnfc-2.8.1
 1811131839 metadata/md5-cache/dev-util/trace-cmd-9999
 1809280334 metadata/md5-cache/dev-util/re2c-1.1.1
@@ -56853,7 +56868,7 @@
 1812041139 metadata/md5-cache/dev-util/radare2-3.1.2-r1
 1809280334 metadata/md5-cache/dev-util/cyclo-2.1.0
 1811300009 metadata/md5-cache/dev-util/stressapptest-1.0.9
-1811161339 metadata/md5-cache/dev-util/drone-cli-1.0.1
+1812182239 metadata/md5-cache/dev-util/drone-cli-1.0.1
 1809280334 metadata/md5-cache/dev-util/objconv-2.42
 1810030549 metadata/md5-cache/dev-util/gnome-devel-docs-3.22.1
 1811261942 metadata/md5-cache/dev-util/meson-0.46.1
@@ -56870,8 +56885,8 @@
 1712021609 metadata/md5-cache/dev-util/xdelta-3.0.11
 1809280334 metadata/md5-cache/dev-util/rats-2.4
 1702282321 metadata/md5-cache/dev-util/android-ndk-10
-1808151104 metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
-1810222339 metadata/md5-cache/dev-util/stepman-0.10.4
+1812182239 metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
+1812182239 metadata/md5-cache/dev-util/stepman-0.10.4
 1809280334 metadata/md5-cache/dev-util/kup-0.3.4-r1
 1809280334 metadata/md5-cache/dev-util/re2c-1.1-r1
 1809280334 metadata/md5-cache/dev-util/babeltrace-1.2.3
@@ -58639,18 +58654,18 @@
 1811130041 metadata/md5-cache/app-admin/logstash-bin-6.3.2
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1
 1810030549 metadata/md5-cache/app-admin/testdisk-7.1_pre20180322-r1
-1809280333 metadata/md5-cache/app-admin/helm-2.9.1
-1809280333 metadata/md5-cache/app-admin/ksonnet-0.8.0
+1812182239 metadata/md5-cache/app-admin/helm-2.9.1
+1812182239 metadata/md5-cache/app-admin/ksonnet-0.8.0
 1809280333 metadata/md5-cache/app-admin/whowatch-1.8.5
 1809280333 metadata/md5-cache/app-admin/monit-5.25.1
 1809280333 metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
 1810030549 metadata/md5-cache/app-admin/gnome-abrt-1.2.6
 1712251809 metadata/md5-cache/app-admin/sagan-rules-20130430
-1809280333 metadata/md5-cache/app-admin/kube-bench-0.0.20
+1812182239 metadata/md5-cache/app-admin/kube-bench-0.0.20
 1809280333 metadata/md5-cache/app-admin/entr-4.1
 1812091110 metadata/md5-cache/app-admin/fluentd-1.2.0
 1811032139 metadata/md5-cache/app-admin/mongo-tools-3.6.8
-1809280333 metadata/md5-cache/app-admin/consul-1.2.3
+1812182239 metadata/md5-cache/app-admin/consul-1.2.3
 1811281909 metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
 1809280333 metadata/md5-cache/app-admin/whowatch-1.8.6
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.0
@@ -58684,13 +58699,13 @@
 1808310639 metadata/md5-cache/app-admin/superadduser-1.15
 1810261639 metadata/md5-cache/app-admin/mongo-tools-4.0.3
 1811261942 metadata/md5-cache/app-admin/supervisor-3.1.4
-1809280333 metadata/md5-cache/app-admin/consul-1.2.2
-1808151104 metadata/md5-cache/app-admin/consul-replicate-0.2.0
+1812182239 metadata/md5-cache/app-admin/consul-1.2.2
+1812182239 metadata/md5-cache/app-admin/consul-replicate-0.2.0
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.3
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.7.1
 1807231909 metadata/md5-cache/app-admin/graylog2-2.4.6
 1812131639 metadata/md5-cache/app-admin/rsyslog-8.39.0-r1
-1808151104 metadata/md5-cache/app-admin/cli53-0.8.12
+1812182239 metadata/md5-cache/app-admin/cli53-0.8.12
 1804042338 metadata/md5-cache/app-admin/go-updater-0.1.0
 1809280333 metadata/md5-cache/app-admin/webalizer-2.23.08
 1809280333 metadata/md5-cache/app-admin/lnav-0.8.2
@@ -58715,18 +58730,18 @@
 1811261942 metadata/md5-cache/app-admin/glance-17.0.0
 1806241809 metadata/md5-cache/app-admin/newsyslog-1.1.0.81
 1811261942 metadata/md5-cache/app-admin/gixy-0.1.5
-1809280333 metadata/md5-cache/app-admin/cli53-9999
+1812182239 metadata/md5-cache/app-admin/cli53-9999
 1711131908 metadata/md5-cache/app-admin/petrovich-1.0.0-r1
 1809280333 metadata/md5-cache/app-admin/equo-302
 1811300939 metadata/md5-cache/app-admin/sysstat-12.1.1
 1809280333 metadata/md5-cache/app-admin/ranpwd-1.2
 1812171439 metadata/md5-cache/app-admin/mongo-tools-3.6.9
 1804260409 metadata/md5-cache/app-admin/go-updater-0.2.0
-1810282009 metadata/md5-cache/app-admin/kube-bench-0.0.22
+1812182239 metadata/md5-cache/app-admin/kube-bench-0.0.22
 1810141609 metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
 1809280333 metadata/md5-cache/app-admin/gamin-0.1.10-r1
 1809280333 metadata/md5-cache/app-admin/syslog-ng-3.13.2
-1809280333 metadata/md5-cache/app-admin/ksonnet-0.11.0
+1812182239 metadata/md5-cache/app-admin/ksonnet-0.11.0
 1809280333 metadata/md5-cache/app-admin/conserver-8.1.18-r1
 1811261942 metadata/md5-cache/app-admin/webapp-config-1.52-r1
 1811261942 metadata/md5-cache/app-admin/glance-2018.1.9999
@@ -58743,16 +58758,16 @@
 1812151209 metadata/md5-cache/app-admin/logstash-bin-6.5.2
 1809280333 metadata/md5-cache/app-admin/tmpwatch-2.11-r2
 1809280333 metadata/md5-cache/app-admin/fam-2.7.0-r7
-1809280333 metadata/md5-cache/app-admin/kube-bench-0.0.19
+1812182239 metadata/md5-cache/app-admin/kube-bench-0.0.19
 1704231508 metadata/md5-cache/app-admin/systemrescuecd-x86-5.0.0
 1812172139 metadata/md5-cache/app-admin/ansible-2.7.4
 1809281540 metadata/md5-cache/app-admin/rex-1.5.0
 1711200239 metadata/md5-cache/app-admin/newsyslog-1.1-r1
-1809280333 metadata/md5-cache/app-admin/vault-0.11.0
+1812182239 metadata/md5-cache/app-admin/vault-0.11.0
 1809280333 metadata/md5-cache/app-admin/cgmanager-0.41
 1802041208 metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.0
 1812110140 metadata/md5-cache/app-admin/calamares-3.1.13
-1809280333 metadata/md5-cache/app-admin/serf-0.8.1-r1
+1812182239 metadata/md5-cache/app-admin/serf-0.8.1-r1
 1812072339 metadata/md5-cache/app-admin/pass-otp-1.2.0
 1812051039 metadata/md5-cache/app-admin/system-config-printer-1.5.11-r1
 1807091739 metadata/md5-cache/app-admin/needrestart-3.3
@@ -58762,12 +58777,12 @@
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.2
 1809280333 metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.11.1
-1809280333 metadata/md5-cache/app-admin/vault-0.10.4
+1812182239 metadata/md5-cache/app-admin/vault-0.10.4
 1712292010 metadata/md5-cache/app-admin/superadduser-1.0.9
 1809280333 metadata/md5-cache/app-admin/checksec-1.7.5
 1811261942 metadata/md5-cache/app-admin/eclean-kernel-0.4.3
-1812142009 metadata/md5-cache/app-admin/helm-2.11.0
-1809280333 metadata/md5-cache/app-admin/helm-2.10.0
+1812182239 metadata/md5-cache/app-admin/helm-2.11.0
+1812182239 metadata/md5-cache/app-admin/helm-2.10.0
 1812120209 metadata/md5-cache/app-admin/cdist-4.10.4
 1809280333 metadata/md5-cache/app-admin/xstow-1.0.1
 1707202038 metadata/md5-cache/app-admin/openrc-settingsd-1.0.1
@@ -58790,7 +58805,7 @@
 1809280333 metadata/md5-cache/app-admin/chrootuid-1.3-r2
 1811261942 metadata/md5-cache/app-admin/webapp-config-9999
 1809280333 metadata/md5-cache/app-admin/pydf-12-r1
-1809280333 metadata/md5-cache/app-admin/docker-bench-0_p20171206
+1812182239 metadata/md5-cache/app-admin/docker-bench-0_p20171206
 1712251809 metadata/md5-cache/app-admin/sagan-rules-20140617
 1809280333 metadata/md5-cache/app-admin/sysrqd-14
 1809281540 metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -58809,7 +58824,7 @@
 1810172309 metadata/md5-cache/app-admin/puppetdb-6.0.0
 1803302009 metadata/md5-cache/app-admin/needrestart-3.1
 1811111440 metadata/md5-cache/app-admin/haskell-updater-1.3.1
-1809280333 metadata/md5-cache/app-admin/vault-0.10.3
+1812182239 metadata/md5-cache/app-admin/vault-0.10.3
 1812110115 metadata/md5-cache/app-admin/packagekit-qt-1.0.1
 1712092039 metadata/md5-cache/app-admin/eclean-kernel-1.99.4
 1811290039 metadata/md5-cache/app-admin/syslog-ng-3.17.2
@@ -58837,14 +58852,14 @@
 1809280333 metadata/md5-cache/app-admin/logrotate-3.9.1
 1812110115 metadata/md5-cache/app-admin/conky-1.10.8-r4
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.5.4
-1808151104 metadata/md5-cache/app-admin/certmgr-1.6.0
+1812182239 metadata/md5-cache/app-admin/certmgr-1.6.0
 1810021239 metadata/md5-cache/app-admin/longrun-0.9-r4
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.14.2
 1810141609 metadata/md5-cache/app-admin/webmin-1.881
 1812091110 metadata/md5-cache/app-admin/fluentd-1.1.3-r1
 1808151104 metadata/md5-cache/app-admin/gtkdiskfree-2.0.3
 1812110115 metadata/md5-cache/app-admin/lsyncd-2.2.0
-1809280333 metadata/md5-cache/app-admin/kube-bench-0.0.16
+1812182239 metadata/md5-cache/app-admin/kube-bench-0.0.16
 1809280333 metadata/md5-cache/app-admin/prelude-manager-3.0.0
 1809280333 metadata/md5-cache/app-admin/verynice-1.1-r3
 1809280333 metadata/md5-cache/app-admin/su-exec-0.2
@@ -58861,7 +58876,7 @@
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.2
 1810021239 metadata/md5-cache/app-admin/usbview-2.0
 1809280333 metadata/md5-cache/app-admin/eclean-kernel-9999
-1809280333 metadata/md5-cache/app-admin/consul-template-0.18.5-r1
+1812182239 metadata/md5-cache/app-admin/consul-template-0.18.5-r1
 1809280333 metadata/md5-cache/app-admin/prelude-manager-4.1.1
 1708091009 metadata/md5-cache/app-admin/pwgen-2.08
 1809281540 metadata/md5-cache/app-admin/bastille-3.0.9-r1
@@ -58870,7 +58885,7 @@
 1809280333 metadata/md5-cache/app-admin/verynice-1.1-r2
 1809280333 metadata/md5-cache/app-admin/consolehm-1.31
 1812091110 metadata/md5-cache/app-admin/puppet-4.10.12
-1812180009 metadata/md5-cache/app-admin/Manifest.gz
+1812182239 metadata/md5-cache/app-admin/Manifest.gz
 1703071908 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.3
 1811261942 metadata/md5-cache/app-admin/diamond-9999
 1812110115 metadata/md5-cache/app-admin/keepassxc-2.3.3
@@ -58888,13 +58903,13 @@
 1711290640 metadata/md5-cache/app-admin/needrestart-2.11-r1
 1812110140 metadata/md5-cache/app-admin/calamares-3.2.2
 1712300140 metadata/md5-cache/app-admin/makepasswd-1.10
-1809280333 metadata/md5-cache/app-admin/consul-template-0.19.5
+1812182239 metadata/md5-cache/app-admin/consul-template-0.19.5
 1709301039 metadata/md5-cache/app-admin/systemrescuecd-x86-5.1.1
 1811261942 metadata/md5-cache/app-admin/clustershell-1.6-r1
 1810021239 metadata/md5-cache/app-admin/clsync-0.4.2
 1812110115 metadata/md5-cache/app-admin/lastpass-cli-1.3.1-r1
 1809280333 metadata/md5-cache/app-admin/integrit-4.1-r1
-1812111139 metadata/md5-cache/app-admin/helm-2.12.0
+1812182239 metadata/md5-cache/app-admin/helm-2.12.0
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.3
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.5.1
 1809280333 metadata/md5-cache/app-admin/eselect-1.4.13
@@ -58913,7 +58928,7 @@
 1809280333 metadata/md5-cache/app-admin/chroot_safe-1.4
 1810091809 metadata/md5-cache/app-admin/syslog-ng-3.15.1
 1803260038 metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.1
-1809280333 metadata/md5-cache/app-admin/ksonnet-0.9.2
+1812182239 metadata/md5-cache/app-admin/ksonnet-0.9.2
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.10.0
 1809280333 metadata/md5-cache/app-admin/github-backup-utils-2.9.0-r1
 1811191339 metadata/md5-cache/app-admin/restart-services-0.14.2
@@ -58940,7 +58955,7 @@
 1809280333 metadata/md5-cache/app-admin/prelude-manager-3.1.0
 1809280333 metadata/md5-cache/app-admin/kubectx-0.5.0
 1809280333 metadata/md5-cache/app-admin/fleet-1.0.0
-1811161409 metadata/md5-cache/app-admin/vault-0.11.5
+1812182239 metadata/md5-cache/app-admin/vault-0.11.5
 1809280333 metadata/md5-cache/app-admin/ide-smart-1.4-r2
 1810030549 metadata/md5-cache/app-admin/gnome-system-log-3.9.90
 1811261942 metadata/md5-cache/app-admin/glance-2017.2.9999
@@ -58955,10 +58970,10 @@
 1811261942 metadata/md5-cache/app-admin/supervisor-3.3.4
 1811130041 metadata/md5-cache/app-admin/389-console-1.1.7-r1
 1808181209 metadata/md5-cache/app-admin/tenshi-0.17
-1808151104 metadata/md5-cache/app-admin/mtail-3.0.0_rc5
+1812182239 metadata/md5-cache/app-admin/mtail-3.0.0_rc5
 1812110115 metadata/md5-cache/app-admin/conky-1.10.8-r3
 1809280333 metadata/md5-cache/app-admin/eselect-1.4.12
-1812142009 metadata/md5-cache/app-admin/helm-2.12.0-r1
+1812182239 metadata/md5-cache/app-admin/helm-2.12.0-r1
 1809280333 metadata/md5-cache/app-admin/logsentry-1.1.1-r2
 1811261942 metadata/md5-cache/app-admin/diamond-4.0.515
 1812091110 metadata/md5-cache/app-admin/puppet-6.0.4
@@ -58973,7 +58988,7 @@
 1812110115 metadata/md5-cache/app-admin/keepassxc-2.3.4
 1809280333 metadata/md5-cache/app-admin/sagan-0.2.3
 1812131639 metadata/md5-cache/app-admin/rsyslog-8.40.0-r1
-1810282009 metadata/md5-cache/app-admin/consul-1.3.0
+1812182239 metadata/md5-cache/app-admin/consul-1.3.0
 1704121939 metadata/md5-cache/app-admin/profile-cleaner-2.36
 1705041038 metadata/md5-cache/app-admin/gentoo-rsync-mirror-1.0-r5
 1809280333 metadata/md5-cache/app-admin/apache-tools-2.4.34
@@ -59002,7 +59017,7 @@
 1812150409 metadata/md5-cache/app-admin/ansible-2.7.5
 1812151209 metadata/md5-cache/app-admin/filebeat-6.5.2
 1811261942 metadata/md5-cache/app-admin/ansible-lint-3.4.23
-1812121139 metadata/md5-cache/app-admin/gopass-1.8.3
+1812182239 metadata/md5-cache/app-admin/gopass-1.8.3
 1811261942 metadata/md5-cache/app-admin/supernova-2.2.0
 1712300140 metadata/md5-cache/app-admin/diradm-2.9.7.1
 1812110115 metadata/md5-cache/app-admin/lsyncd-2.2.3
@@ -59026,7 +59041,7 @@
 1812110115 metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
 1812151509 metadata/md5-cache/app-admin/packagekit-base-1.1.12
 1811261942 metadata/md5-cache/app-admin/dxf-7.4.1
-1811161409 metadata/md5-cache/app-admin/consul-1.4.0
+1812182239 metadata/md5-cache/app-admin/consul-1.4.0
 1811261942 metadata/md5-cache/app-admin/denyhosts-3.0-r1
 1809280333 metadata/md5-cache/app-admin/passook-20121001
 1702282308 metadata/md5-cache/app-admin/kpcli-3.0
@@ -59045,11 +59060,11 @@
 1705160038 metadata/md5-cache/app-admin/fifo-cronolog-1.1.1-r1
 1812091110 metadata/md5-cache/app-admin/puppet-5.5.6
 1811261942 metadata/md5-cache/app-admin/cdist-4.7.3
-1808151104 metadata/md5-cache/app-admin/mtail-3.0.0_rc4
+1812182239 metadata/md5-cache/app-admin/mtail-3.0.0_rc4
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.6.1
 1804022108 metadata/md5-cache/app-admin/packagekit-1.1.7
 1809280333 metadata/md5-cache/app-admin/apachetop-0.18.4
-1809280333 metadata/md5-cache/app-admin/ksonnet-0.10.2
+1812182239 metadata/md5-cache/app-admin/ksonnet-0.10.2
 1809280333 metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
 1812091110 metadata/md5-cache/app-admin/r10k-1.5.1-r2
 1703110038 metadata/md5-cache/app-admin/pprocm-1.0-r2
@@ -59066,11 +59081,11 @@
 1811261942 metadata/md5-cache/app-admin/gixy-0.1.8
 1812121739 metadata/md5-cache/app-admin/packagekit-1.1.12
 1705150108 metadata/md5-cache/app-admin/filewatcher-2.4.6-r1
-1809280333 metadata/md5-cache/app-admin/kube-bench-0.0.17
+1812182239 metadata/md5-cache/app-admin/kube-bench-0.0.17
 1809050939 metadata/md5-cache/app-admin/systemrescuecd-x86-5.3.0
 1702282308 metadata/md5-cache/app-admin/emacs-updater-1.15
-1810282009 metadata/md5-cache/app-admin/vault-0.11.4
-1808151104 metadata/md5-cache/app-admin/cli53-0.8.9
+1812182239 metadata/md5-cache/app-admin/vault-0.11.4
+1812182239 metadata/md5-cache/app-admin/cli53-0.8.9
 1809280333 metadata/md5-cache/app-admin/ide-smart-1.4-r1
 1811092109 metadata/md5-cache/app-admin/github-backup-utils-2.15.0
 1811261942 metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -59117,21 +59132,21 @@
 1810021239 metadata/md5-cache/net-proxy/haproxy-1.6.11-r2
 1809280334 metadata/md5-cache/net-proxy/hatop-0.7.7
 1809280334 metadata/md5-cache/net-proxy/shadowsocks-libev-3.1.3-r1
-1812110115 metadata/md5-cache/net-proxy/Manifest.gz
+1812182239 metadata/md5-cache/net-proxy/Manifest.gz
 1812110115 metadata/md5-cache/net-proxy/trojan-1.9.0
-1808151104 metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
+1812182239 metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
 1809280334 metadata/md5-cache/net-proxy/redsocks-9999
 1812100209 metadata/md5-cache/net-proxy/dnsproxy-1.16-r2
 1801080139 metadata/md5-cache/net-proxy/3proxy-0.8.9
 1810040009 metadata/md5-cache/net-proxy/haproxy-1.8.14
 1809280334 metadata/md5-cache/net-proxy/nutcracker-0.3.0
 1809280334 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
-1808151104 metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
+1812182239 metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
 1809280334 metadata/md5-cache/net-proxy/haproxy-1.5.14
 1810021239 metadata/md5-cache/net-proxy/haproxy-1.8.8
 1809280334 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
 1809280334 metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
-1809280334 metadata/md5-cache/net-proxy/obfs4proxy-9999
+1812182239 metadata/md5-cache/net-proxy/obfs4proxy-9999
 1810021239 metadata/md5-cache/net-proxy/haproxy-1.9.9999
 1809280334 metadata/md5-cache/net-proxy/http-replicator-3.0-r7
 1810021239 metadata/md5-cache/net-proxy/haproxy-1.7.11
@@ -59741,7 +59756,7 @@
 1811261942 metadata/md5-cache/app-portage/mirrorselect-2.2.2
 1812061439 metadata/md5-cache/app-portage/grs-0.7
 1809280333 metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
-1809280333 metadata/md5-cache/app-portage/golop-9999
+1812182239 metadata/md5-cache/app-portage/golop-9999
 1809280333 metadata/md5-cache/app-portage/portpeek-2.1.26
 1712061709 metadata/md5-cache/app-portage/prefix-chain-setup-0.7
 1809280333 metadata/md5-cache/app-portage/portpeek-2.1.21
@@ -59815,7 +59830,7 @@
 1811261942 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 1809280333 metadata/md5-cache/app-portage/elogviewer-2.9
 1809280333 metadata/md5-cache/app-portage/elogviewer-2.7-r2
-1812161539 metadata/md5-cache/app-portage/Manifest.gz
+1812182239 metadata/md5-cache/app-portage/Manifest.gz
 1809280333 metadata/md5-cache/app-portage/portpeek-2.1.27
 1809281540 metadata/md5-cache/app-portage/g-cpan-0.16.5
 1811261942 metadata/md5-cache/app-portage/elogv-0.7.6.5
@@ -59841,7 +59856,7 @@
 1811261942 metadata/md5-cache/app-portage/install-mask-0.1.1
 1811261942 metadata/md5-cache/app-portage/elogv-0.7.6.6
 1811261942 metadata/md5-cache/app-portage/gemato-9999
-1808151104 metadata/md5-cache/app-portage/golop-0.0.1
+1812182239 metadata/md5-cache/app-portage/golop-0.0.1
 1808310239 metadata/md5-cache/app-portage/elt-patches-20170317
 1811261942 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
 1811111440 metadata/md5-cache/app-portage/hackport-0.5.3
@@ -60560,7 +60575,7 @@
 1810081509 metadata/md5-cache/sys-fs/treesize-0.54.1-r1
 1810030549 metadata/md5-cache/sys-fs/udisks-2.8.0
 1809280334 metadata/md5-cache/sys-fs/jmtpfs-0.5
-1808151104 metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
+1812182239 metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
 1811261942 metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
 1809280334 metadata/md5-cache/sys-fs/davl-1.2.4-r2
 1809280334 metadata/md5-cache/sys-fs/squashfuse-0.1_p20130530
@@ -60682,7 +60697,7 @@
 1810021239 metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
 1808151104 metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
 1809280334 metadata/md5-cache/sys-fs/ext4magic-0.3.2
-1808151104 metadata/md5-cache/sys-fs/tmsu-0.6.1
+1812182239 metadata/md5-cache/sys-fs/tmsu-0.6.1
 1809280334 metadata/md5-cache/sys-fs/udev-init-scripts-27
 1809280334 metadata/md5-cache/sys-fs/btrfs-progs-4.9.1
 1809280334 metadata/md5-cache/sys-fs/mac-fdisk-0.1_p16
@@ -60717,7 +60732,7 @@
 1810021339 metadata/md5-cache/sys-fs/fuse-zip-0.4.5
 1812031739 metadata/md5-cache/sys-fs/f2fs-tools-1.12.0-r1
 1809280334 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1812170209 metadata/md5-cache/sys-fs/Manifest.gz
+1812182239 metadata/md5-cache/sys-fs/Manifest.gz
 1811252339 metadata/md5-cache/sys-fs/mac-fdisk-0.1_p18
 1809280334 metadata/md5-cache/sys-fs/libeatmydata-82
 1811130041 metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
@@ -60775,7 +60790,7 @@
 1809280334 metadata/md5-cache/sys-fs/zerofree-1.0.4
 1806020409 metadata/md5-cache/sys-fs/bindfs-1.13.8
 1811261942 metadata/md5-cache/sys-fs/owfs-3.1_p4-r1
-1808151104 metadata/md5-cache/sys-fs/tmsu-0.7.0
+1812182239 metadata/md5-cache/sys-fs/tmsu-0.7.0
 1802070408 metadata/md5-cache/sys-fs/mp3fs-0.91-r1
 1810021239 metadata/md5-cache/sys-fs/eudev-3.2.5
 1705310108 metadata/md5-cache/sys-fs/ldapfuse-1.0-r1
@@ -60827,7 +60842,7 @@
 1809280334 metadata/md5-cache/sys-fs/snapraid-8.1
 1812121309 metadata/md5-cache/sys-fs/fuse-3.3.0-r1
 1812121509 metadata/md5-cache/sys-fs/lvm2-2.02.183
-1808151104 metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
+1812182239 metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
 1809280334 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
 1809280334 metadata/md5-cache/sys-fs/btrfs-progs-3.16.2
 1810021239 metadata/md5-cache/sys-fs/clamfs-1.0.1-r2
@@ -63296,35 +63311,35 @@
 1708310139 metadata/md5-cache/sys-cluster/openstack-meta-2017.2.9999
 1812022139 metadata/md5-cache/sys-cluster/glusterfs-4.0.2
 1802241038 metadata/md5-cache/sys-cluster/openstack-meta-2018.1.9999
-1811262339 metadata/md5-cache/sys-cluster/kubectl-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.9.11
 1812110115 metadata/md5-cache/sys-cluster/hpx-1.2.0
 1812141709 metadata/md5-cache/sys-cluster/charliecloud-0.9.6
-1812020409 metadata/md5-cache/sys-cluster/kubelet-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/kubelet-1.12.3
 1812110115 metadata/md5-cache/sys-cluster/ceph-12.2.9-r1
 1811261942 metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
 1811261942 metadata/md5-cache/sys-cluster/cinder-2017.2.9999
 1810021239 metadata/md5-cache/sys-cluster/torque-6.0.3
-1812020409 metadata/md5-cache/sys-cluster/kube-proxy-1.12.3
-1812020409 metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kube-proxy-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/kube-scheduler-1.10.11
 1809280334 metadata/md5-cache/sys-cluster/keepalived-1.4.3
 1811261942 metadata/md5-cache/sys-cluster/nova-17.0.7
 1812110115 metadata/md5-cache/sys-cluster/legion-18.05.0
 1811171439 metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
-1810281939 metadata/md5-cache/sys-cluster/kube-proxy-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/kube-proxy-1.9.11
 1812111839 metadata/md5-cache/sys-cluster/pacemaker-1.1.16
 1811111639 metadata/md5-cache/sys-cluster/util-vserver-0.30.216_pre3120-r1
 1812101539 metadata/md5-cache/sys-cluster/charliecloud-0.9.5
 1812110115 metadata/md5-cache/sys-cluster/hpx-9999
 1811261942 metadata/md5-cache/sys-cluster/swift-2.19.0
-1811262339 metadata/md5-cache/sys-cluster/kubectl-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.11.5
 1811252339 metadata/md5-cache/sys-cluster/glusterfs-9999
 1809280334 metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.4.5
 1809280334 metadata/md5-cache/sys-cluster/heartbeat-3.0.6
-1810112239 metadata/md5-cache/sys-cluster/teleport-2.7.1
-1812111339 metadata/md5-cache/sys-cluster/minikube-0.31.0
+1812182239 metadata/md5-cache/sys-cluster/teleport-2.7.1
+1812182239 metadata/md5-cache/sys-cluster/minikube-0.31.0
 1810042109 metadata/md5-cache/sys-cluster/charliecloud-0.9.3
-1810112239 metadata/md5-cache/sys-cluster/teleport-2.6.7
+1812182239 metadata/md5-cache/sys-cluster/teleport-2.6.7
 1809280334 metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
 1812110115 metadata/md5-cache/sys-cluster/legion-9999
 1809280334 metadata/md5-cache/sys-cluster/corosync-2.3.3
@@ -63339,7 +63354,7 @@
 1809280334 metadata/md5-cache/sys-cluster/csync2-2.0
 1812110115 metadata/md5-cache/sys-cluster/legion-17.08.0
 1809280334 metadata/md5-cache/sys-cluster/maui-3.3.1-r3
-1812020409 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.11
 1811261942 metadata/md5-cache/sys-cluster/neutron-2018.1.9999
 1810021239 metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
 1811171439 metadata/md5-cache/sys-cluster/charm-6.5.1-r1
@@ -63353,9 +63368,10 @@
 1811261942 metadata/md5-cache/sys-cluster/heat-10.0.2
 1809280334 metadata/md5-cache/sys-cluster/ampi-0_pre20140616
 1811261942 metadata/md5-cache/sys-cluster/nova-2018.2.9999
-1809280334 metadata/md5-cache/sys-cluster/teleport-9999
-1812020409 metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/teleport-9999
+1812182239 metadata/md5-cache/sys-cluster/kube-scheduler-1.12.3
 1809280334 metadata/md5-cache/sys-cluster/gasnet-1.26.4
+1812182209 metadata/md5-cache/sys-cluster/swift-2.20.0
 1811171439 metadata/md5-cache/sys-cluster/openmpi-3.0.3
 1809280334 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 1812042109 metadata/md5-cache/sys-cluster/cinder-13.0.2
@@ -63370,8 +63386,8 @@
 1811261942 metadata/md5-cache/sys-cluster/heat-2018.2.9999
 1809280334 metadata/md5-cache/sys-cluster/libqb-0.17.1
 1809280334 metadata/md5-cache/sys-cluster/classads-1.0.10
-1808151104 metadata/md5-cache/sys-cluster/zetcd-0.0.4
-1812161509 metadata/md5-cache/sys-cluster/kubectl-1.13.1
+1812182239 metadata/md5-cache/sys-cluster/zetcd-0.0.4
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.13.1
 1812110115 metadata/md5-cache/sys-cluster/legion-18.02.0
 1812110115 metadata/md5-cache/sys-cluster/ceph-13.2.1-r1
 1809280334 metadata/md5-cache/sys-cluster/glusterfs-4.0.0-r1
@@ -63380,17 +63396,17 @@
 1809280334 metadata/md5-cache/sys-cluster/crmsh-2.1.1
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.4.3
 1810141509 metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
-1810112239 metadata/md5-cache/sys-cluster/teleport-3.0.0
+1812182239 metadata/md5-cache/sys-cluster/teleport-3.0.0
 1812110115 metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
 1811261942 metadata/md5-cache/sys-cluster/swift-2.17.0
 1809280334 metadata/md5-cache/sys-cluster/moosefs-1.6.26-r1
 1811261942 metadata/md5-cache/sys-cluster/neutron-2018.2.9999
-1811262339 metadata/md5-cache/sys-cluster/kubectl-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.12.3
 1809280334 metadata/md5-cache/sys-cluster/ploop-1.13.2
 1811261942 metadata/md5-cache/sys-cluster/neutron-2017.2.9999
 1812110115 metadata/md5-cache/sys-cluster/legion-16.10.0
 1812110115 metadata/md5-cache/sys-cluster/legion-16.08.0-r1
-1812020409 metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.3
 1811261942 metadata/md5-cache/sys-cluster/heat-9.0.5
 1811171439 metadata/md5-cache/sys-cluster/mpich-3.2-r1
 1811261942 metadata/md5-cache/sys-cluster/nova-16.1.6
@@ -63398,18 +63414,18 @@
 1811261942 metadata/md5-cache/sys-cluster/polysh-0.4-r1
 1812110115 metadata/md5-cache/sys-cluster/hpx-1.1.0
 1811171439 metadata/md5-cache/sys-cluster/charm-6.5.1-r2
-1812020409 metadata/md5-cache/sys-cluster/kubelet-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kubelet-1.11.5
 1809280334 metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
 1809280334 metadata/md5-cache/sys-cluster/singularity-2.4.2
-1812020409 metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kube-scheduler-1.11.5
 1809280334 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
-1812161539 metadata/md5-cache/sys-cluster/Manifest.gz
+1812182239 metadata/md5-cache/sys-cluster/Manifest.gz
 1811261942 metadata/md5-cache/sys-cluster/cinder-13.0.1
 1809280334 metadata/md5-cache/sys-cluster/cman-lib-2.03.09-r1
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
-1812020409 metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5
-1810281939 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11
-1812020409 metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/kube-apiserver-1.11.5
 1811261942 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
 1811171439 metadata/md5-cache/sys-cluster/openmpi-2.0.2
 1811261942 metadata/md5-cache/sys-cluster/nova-2018.1.9999
@@ -63424,7 +63440,7 @@
 1812110115 metadata/md5-cache/sys-cluster/ceph-13.2.2-r3
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.8.8
 1809280334 metadata/md5-cache/sys-cluster/galera-25.3.24
-1812020409 metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3
+1812182239 metadata/md5-cache/sys-cluster/kube-apiserver-1.12.3
 1812100309 metadata/md5-cache/sys-cluster/glusterfs-4.1.5
 1805012209 metadata/md5-cache/sys-cluster/osc-mpiexec-0.83
 1810021239 metadata/md5-cache/sys-cluster/torque-4.2.10
@@ -63439,12 +63455,12 @@
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
 1809280334 metadata/md5-cache/sys-cluster/feedbackd-master-0.4
 1809280334 metadata/md5-cache/sys-cluster/singularity-2.4
-1810281939 metadata/md5-cache/sys-cluster/minikube-0.30.0
+1812182239 metadata/md5-cache/sys-cluster/minikube-0.30.0
 1808310240 metadata/md5-cache/sys-cluster/openstack-meta-2018.2.9999
 1811171439 metadata/md5-cache/sys-cluster/mvapich2-1.6
 1809280334 metadata/md5-cache/sys-cluster/maui-3.3.1-r2
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
-1812020409 metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kube-apiserver-1.10.11
 1809280334 metadata/md5-cache/sys-cluster/nullmpi-0.7
 1808201309 metadata/md5-cache/sys-cluster/charliecloud-0.9.1
 1810021239 metadata/md5-cache/sys-cluster/ipvsadm-1.28
@@ -63453,18 +63469,18 @@
 1809180947 metadata/md5-cache/sys-cluster/charliecloud-9999
 1812110115 metadata/md5-cache/sys-cluster/hpx-1.0.0
 1809280334 metadata/md5-cache/sys-cluster/pconsole-1.0-r4
-1812020409 metadata/md5-cache/sys-cluster/kubelet-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kubelet-1.10.11
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
 1702282333 metadata/md5-cache/sys-cluster/poolmon-0.5
 1811261942 metadata/md5-cache/sys-cluster/heat-2018.1.9999
 1811171439 metadata/md5-cache/sys-cluster/openmpi-2.0.4
-1812040439 metadata/md5-cache/sys-cluster/kubectl-1.13.0
-1810281939 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.13.0
+1812182239 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.11
 1809280334 metadata/md5-cache/sys-cluster/moosefs-1.6.27
 1811261942 metadata/md5-cache/sys-cluster/swift-2017.2.9999
 1809280334 metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
 1811171439 metadata/md5-cache/sys-cluster/libquo-1.2.4-r1
-1811262339 metadata/md5-cache/sys-cluster/kubectl-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kubectl-1.10.11
 1810021239 metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
 1809280334 metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
 1811171439 metadata/md5-cache/sys-cluster/libquo-1.2.9
@@ -63483,8 +63499,8 @@
 1811261942 metadata/md5-cache/sys-cluster/neutron-11.0.6-r1
 1812110115 metadata/md5-cache/sys-cluster/ceph-12.2.10
 1809280334 metadata/md5-cache/sys-cluster/gasnet-1.28.0
-1810281939 metadata/md5-cache/sys-cluster/kubelet-1.9.11
-1810191139 metadata/md5-cache/sys-cluster/teleport-3.0.1
+1812182239 metadata/md5-cache/sys-cluster/kubelet-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/teleport-3.0.1
 1811111639 metadata/md5-cache/sys-cluster/util-vserver-0.30.216_pre3120
 1809280334 metadata/md5-cache/sys-cluster/gasnet-1.28.2
 1811171439 metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
@@ -63492,7 +63508,7 @@
 1806232209 metadata/md5-cache/sys-cluster/ucx-1.3.0
 1812110115 metadata/md5-cache/sys-cluster/hpx-0.9.99
 1810021239 metadata/md5-cache/sys-cluster/dlm-2.03.11
-1810281939 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11
+1812182239 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.11
 1812110115 metadata/md5-cache/sys-cluster/legion-17.05.0
 1711090039 metadata/md5-cache/sys-cluster/csync2-2.0-r1
 1809280334 metadata/md5-cache/sys-cluster/openais-1.1.4-r1
@@ -63501,12 +63517,12 @@
 1810021239 metadata/md5-cache/sys-cluster/open-mx-1.5.4
 1809280334 metadata/md5-cache/sys-cluster/galera-25.3.23
 1809280334 metadata/md5-cache/sys-cluster/keepalived-1.4.5
-1812020409 metadata/md5-cache/sys-cluster/kube-proxy-1.11.5
+1812182239 metadata/md5-cache/sys-cluster/kube-proxy-1.11.5
 1811261942 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
 1809280334 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
 1811261942 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
 1810190139 metadata/md5-cache/sys-cluster/poolmon-0.6
-1812020409 metadata/md5-cache/sys-cluster/kube-proxy-1.10.11
+1812182239 metadata/md5-cache/sys-cluster/kube-proxy-1.10.11
 1810021239 metadata/md5-cache/sys-cluster/torque-4.1.7-r1
 1809280334 metadata/md5-cache/sys-cluster/corosync-2.3.5
 1809280334 metadata/md5-cache/x11-apps/mkfontscale-1.1.3
@@ -63934,7 +63950,7 @@
 1711231638 metadata/md5-cache/app-backup/furball-0.5
 1811261942 metadata/md5-cache/app-backup/holland-lib-common-1.0.10
 1810281339 metadata/md5-cache/app-backup/bacula-5.2.13-r7
-1809280333 metadata/md5-cache/app-backup/restic-0.9.2
+1812182239 metadata/md5-cache/app-backup/restic-0.9.2
 1811261942 metadata/md5-cache/app-backup/holland-backup-random-1.0.10
 1811261942 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
 1810030549 metadata/md5-cache/app-backup/backintime-9999
@@ -63987,7 +64003,7 @@
 1809281540 metadata/md5-cache/app-backup/amanda-3.5-r1
 1810152309 metadata/md5-cache/app-backup/rdedup-1.0.2
 1812171109 metadata/md5-cache/app-backup/snapper-0.5.6-r1
-1812171109 metadata/md5-cache/app-backup/Manifest.gz
+1812182239 metadata/md5-cache/app-backup/Manifest.gz
 1809280333 metadata/md5-cache/app-backup/luckybackup-0.4.9
 1809280333 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 1809280333 metadata/md5-cache/app-backup/rear-1.15-r1
@@ -64008,7 +64024,7 @@
 1811261942 metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
 1809280333 metadata/md5-cache/app-backup/dar-2.5.11
 1809180947 metadata/md5-cache/app-backup/mkstage4-9999
-1809280333 metadata/md5-cache/app-backup/restic-0.8.3
+1812182239 metadata/md5-cache/app-backup/restic-0.8.3
 1712281839 metadata/md5-cache/app-backup/mylvmbackup-0.14
 1809281540 metadata/md5-cache/app-backup/amanda-3.4.4
 1811261942 metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -64034,7 +64050,7 @@
 1811261942 metadata/md5-cache/app-backup/duplicity-0.7.15
 1810281339 metadata/md5-cache/app-backup/bacula-9.0.6-r4
 1811261942 metadata/md5-cache/app-backup/holland-1.0.10
-1810190109 metadata/md5-cache/app-backup/restic-0.9.3
+1812182239 metadata/md5-cache/app-backup/restic-0.9.3
 1806091639 metadata/md5-cache/app-backup/mkstage4-0.1
 1811261942 metadata/md5-cache/app-backup/attic-9999
 1811261942 metadata/md5-cache/app-backup/borgbackup-1.1.6
@@ -64208,7 +64224,7 @@
 1809280333 metadata/md5-cache/app-benchmarks/siege-4.0.4
 1810021239 metadata/md5-cache/app-benchmarks/bootchart2-0.14.7-r1
 1809280333 metadata/md5-cache/app-benchmarks/tiobench-0.4.2
-1812120439 metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017
+1812182239 metadata/md5-cache/app-benchmarks/hey-0.1.1_p20181017
 1804040008 metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
 1809280333 metadata/md5-cache/app-benchmarks/pipebench-0.40-r2
 1809280333 metadata/md5-cache/app-benchmarks/bashmark-0.6.2
@@ -64226,7 +64242,7 @@
 1809180947 metadata/md5-cache/app-benchmarks/sysbench-9999
 1807111209 metadata/md5-cache/app-benchmarks/geekbench-3.4.2
 1809280333 metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1
-1812162239 metadata/md5-cache/app-benchmarks/Manifest.gz
+1812182239 metadata/md5-cache/app-benchmarks/Manifest.gz
 1809280333 metadata/md5-cache/app-benchmarks/wrk-3.1.2
 1811072139 metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r3
 1809280333 metadata/md5-cache/app-benchmarks/dbench-4.0
@@ -64655,7 +64671,7 @@
 1812131839 metadata/md5-cache/kde-apps/akonadi-notes-18.12.0
 1812110140 metadata/md5-cache/kde-apps/eventviews-18.08.3
 1812131839 metadata/md5-cache/kde-apps/libkmahjongg-18.12.0
-1812172239 metadata/md5-cache/kde-apps/Manifest.gz
+1812190239 metadata/md5-cache/kde-apps/Manifest.gz
 1812131839 metadata/md5-cache/kde-apps/konqueror-18.12.0
 1812110140 metadata/md5-cache/kde-apps/granatier-18.08.3
 1812110140 metadata/md5-cache/kde-apps/kiten-18.08.3
@@ -64730,7 +64746,7 @@
 1812131839 metadata/md5-cache/kde-apps/kaccounts-providers-18.12.0
 1812110140 metadata/md5-cache/kde-apps/kmail-18.08.3
 1812131839 metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.0
-1812131839 metadata/md5-cache/kde-apps/kcalc-18.12.0
+1812190239 metadata/md5-cache/kde-apps/kcalc-18.12.0
 1812110140 metadata/md5-cache/kde-apps/ksirk-18.08.3
 1812110140 metadata/md5-cache/kde-apps/ktimer-18.08.3
 1812131839 metadata/md5-cache/kde-apps/grantlee-editor-18.12.0
@@ -64877,13 +64893,13 @@
 1809280334 metadata/md5-cache/net-dns/odsclient-1.03-r1
 1809280334 metadata/md5-cache/net-dns/bind-tools-9.12.1
 1809280334 metadata/md5-cache/net-dns/mdns-repeater-20110921
-1808151104 metadata/md5-cache/net-dns/coredns-1.1.1
+1812182239 metadata/md5-cache/net-dns/coredns-1.1.1
 1810241309 metadata/md5-cache/net-dns/c-ares-1.15.0
 1810111809 metadata/md5-cache/net-dns/dnssec-root-20170203-r1
 1809280334 metadata/md5-cache/net-dns/hash-slinger-2.7
 1809280334 metadata/md5-cache/net-dns/maradns-2.0.14
 1809280334 metadata/md5-cache/net-dns/bind-dns-keygen-9.3.2.39-r1
-1812161539 metadata/md5-cache/net-dns/coredns-1.3.0
+1812182239 metadata/md5-cache/net-dns/coredns-1.3.0
 1809281540 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 1809280334 metadata/md5-cache/net-dns/idnkit-2.3
 1809280334 metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -64892,7 +64908,7 @@
 1809280334 metadata/md5-cache/net-dns/djbdns-1.05-r33
 1812110115 metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
 1809280334 metadata/md5-cache/net-dns/sheerdns-1.0.3
-1808151104 metadata/md5-cache/net-dns/coredns-1.0.5
+1812182239 metadata/md5-cache/net-dns/coredns-1.0.5
 1809280334 metadata/md5-cache/net-dns/bind-9.12.1_p2-r1
 1809280334 metadata/md5-cache/net-dns/ndu-0.4-r4
 1809280334 metadata/md5-cache/net-dns/dnsdist-1.2.0
@@ -64904,10 +64920,10 @@
 1811092009 metadata/md5-cache/net-dns/pdns-4.1.5
 1812081539 metadata/md5-cache/net-dns/ddclient-3.9.0-r1
 1809280334 metadata/md5-cache/net-dns/c-ares-1.14.0
-1808151104 metadata/md5-cache/net-dns/coredns-1.2.0
+1812182239 metadata/md5-cache/net-dns/coredns-1.2.0
 1812051339 metadata/md5-cache/net-dns/nsd-4.1.25
 1809280334 metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
-1812150139 metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
+1812190039 metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
 1808151104 metadata/md5-cache/net-dns/s6-dns-2.2.0.1
 1809280334 metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
 1809280334 metadata/md5-cache/net-dns/tinystats-1.1
@@ -64918,12 +64934,12 @@
 1809280339 metadata/md5-cache/net-dns/openresolv-3.9.0
 1809280334 metadata/md5-cache/net-dns/totd-1.5.1
 1702282328 metadata/md5-cache/net-dns/validns-0.8
-1811160739 metadata/md5-cache/net-dns/dnscrypt-proxy-9999
+1812182239 metadata/md5-cache/net-dns/dnscrypt-proxy-9999
 1809280334 metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
 1809280334 metadata/md5-cache/net-dns/bind-9.11.2_p1
 1702282328 metadata/md5-cache/net-dns/dnswalk-2.0.2
 1809280334 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-1812170309 metadata/md5-cache/net-dns/Manifest.gz
+1812190039 metadata/md5-cache/net-dns/Manifest.gz
 1811130041 metadata/md5-cache/net-dns/libidn-1.33-r2
 1809280334 metadata/md5-cache/net-dns/getdns-1.4.2-r2
 1812081539 metadata/md5-cache/net-dns/ddclient-3.9.0-r2
@@ -64937,12 +64953,12 @@
 1809280334 metadata/md5-cache/net-dns/bind-9.12.2_p1
 1809280334 metadata/md5-cache/net-dns/avahi-0.6.32
 1809280334 metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
-1810040909 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
+1812182239 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.17
 1809280334 metadata/md5-cache/net-dns/rbldnsd-0.998
 1809280334 metadata/md5-cache/net-dns/bind-9.11.3-r1
 1809280334 metadata/md5-cache/net-dns/idnkit-1.0-r2
 1811181839 metadata/md5-cache/net-dns/unbound-1.8.1
-1812150139 metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
+1812190039 metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
 1809280334 metadata/md5-cache/net-dns/pdns-ldap-backend-0.2
 1810262209 metadata/md5-cache/net-dns/knot-2.7.3
 1809280334 metadata/md5-cache/net-dns/avahi-0.7-r2
@@ -64953,7 +64969,7 @@
 1809280334 metadata/md5-cache/net-dns/ddclient-3.8.1-r5
 1806072239 metadata/md5-cache/net-dns/dnscap-20130814
 1702282328 metadata/md5-cache/net-dns/validns-0.7
-1811230139 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
+1812182239 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.19
 1702282328 metadata/md5-cache/net-dns/resolvconf-symlink-0
 1809280334 metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
 1808151104 metadata/md5-cache/net-dns/s6-dns-2.3.0.0
@@ -67123,13 +67139,13 @@
 1811130041 metadata/md5-cache/net-misc/mindterm-3.4
 1809280334 metadata/md5-cache/net-misc/openssh-blacklist-0.4.1
 1810030549 metadata/md5-cache/net-misc/vinagre-3.22.0-r3
-1809280334 metadata/md5-cache/net-misc/rclone-1.42
+1812182239 metadata/md5-cache/net-misc/rclone-1.42
 1810092309 metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
 1809280334 metadata/md5-cache/net-misc/rancid-git-2.3.8
 1812110209 metadata/md5-cache/net-misc/lldpd-1.0.3
 1809280334 metadata/md5-cache/net-misc/stunnel-5.44
 1812110115 metadata/md5-cache/net-misc/remmina-1.2.31.2
-1808151104 metadata/md5-cache/net-misc/calicoctl-3.1.3
+1812182239 metadata/md5-cache/net-misc/calicoctl-3.1.3
 1811081809 metadata/md5-cache/net-misc/proxytunnel-9999
 1809280334 metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r2
 1809280334 metadata/md5-cache/net-misc/portfwd-0.29-r1
@@ -67144,16 +67160,16 @@
 1811181539 metadata/md5-cache/net-misc/htpdate-1.2.0
 1810030549 metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.8
 1804022138 metadata/md5-cache/net-misc/autossh-1.4e
-1808151104 metadata/md5-cache/net-misc/calicoctl-1.5.0
+1812182239 metadata/md5-cache/net-misc/calicoctl-1.5.0
 1812051039 metadata/md5-cache/net-misc/modemmanager-1.8.2
 1812170109 metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
 1710031639 metadata/md5-cache/net-misc/spiped-1.6.0-r1
 1809280334 metadata/md5-cache/net-misc/ser2net-2.7-r1
-1808151104 metadata/md5-cache/net-misc/drive-0.3.9.1
+1812182239 metadata/md5-cache/net-misc/drive-0.3.9.1
 1811071339 metadata/md5-cache/net-misc/sgopherd-18.08
 1811261942 metadata/md5-cache/net-misc/httpie-0.9.4
 1809280339 metadata/md5-cache/net-misc/iprange-1.0.4
-1812080509 metadata/md5-cache/net-misc/ntp-4.2.8_p12
+1812182309 metadata/md5-cache/net-misc/ntp-4.2.8_p12
 1809280334 metadata/md5-cache/net-misc/sks-1.1.6-r2
 1805012209 metadata/md5-cache/net-misc/nat-traverse-0.6
 1809280334 metadata/md5-cache/net-misc/cgterm-1.6
@@ -67205,7 +67221,7 @@
 1809280334 metadata/md5-cache/net-misc/axel-2.14.1
 1809180947 metadata/md5-cache/net-misc/iperf-2.99999.99999
 1705171708 metadata/md5-cache/net-misc/puf-1.0.0-r1
-1811271709 metadata/md5-cache/net-misc/rclone-1.44
+1812182239 metadata/md5-cache/net-misc/rclone-1.44
 1812161909 metadata/md5-cache/net-misc/youtube-dl-2018.12.09
 1811261942 metadata/md5-cache/net-misc/gns3-server-2.1.3-r4
 1702282329 metadata/md5-cache/net-misc/ucarp-1.5.2-r5
@@ -67226,7 +67242,7 @@
 1811260109 metadata/md5-cache/net-misc/minidlna-1.2.1
 1809280334 metadata/md5-cache/net-misc/curl-7.61.1
 1809280334 metadata/md5-cache/net-misc/l7-filter-userspace-0.11
-1809280334 metadata/md5-cache/net-misc/felix-3.1.0
+1812182239 metadata/md5-cache/net-misc/felix-3.1.0
 1806081609 metadata/md5-cache/net-misc/bird-1.6.4
 1809280334 metadata/md5-cache/net-misc/gsasl-1.8.0-r1
 1702282329 metadata/md5-cache/net-misc/pmsvn-1.0.7
@@ -67243,7 +67259,7 @@
 1809280334 metadata/md5-cache/net-misc/jwhois-4.0-r1
 1809280334 metadata/md5-cache/net-misc/udpcast-20120424-r1
 1809280334 metadata/md5-cache/net-misc/netifrc-0.2.3
-1809280334 metadata/md5-cache/net-misc/felix-2.5.1
+1812182239 metadata/md5-cache/net-misc/felix-2.5.1
 1702282329 metadata/md5-cache/net-misc/stuntman-1.2.7
 1811251110 metadata/md5-cache/net-misc/mikutter-9999
 1809280334 metadata/md5-cache/net-misc/dhcpcd-6.11.3
@@ -67285,7 +67301,7 @@
 1809280334 metadata/md5-cache/net-misc/connman-1.35-r1
 1812052339 metadata/md5-cache/net-misc/python-x2go-0.6.0.2
 1811261942 metadata/md5-cache/net-misc/s3cmd-1.6.1
-1809280334 metadata/md5-cache/net-misc/rclone-1.43.1
+1812182239 metadata/md5-cache/net-misc/rclone-1.43.1
 1809280334 metadata/md5-cache/net-misc/openssh-7.8_p1
 1812110115 metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
 1809280334 metadata/md5-cache/net-misc/dropbear-2017.75
@@ -67422,7 +67438,7 @@
 1809301509 metadata/md5-cache/net-misc/econnman-1.1
 1812092039 metadata/md5-cache/net-misc/teamviewer-14.0.14470
 1804061408 metadata/md5-cache/net-misc/bird-1.6.3-r1
-1808151104 metadata/md5-cache/net-misc/cni-plugins-0.7.2
+1812182239 metadata/md5-cache/net-misc/cni-plugins-0.7.2
 1811251110 metadata/md5-cache/net-misc/mikutter-3.5.4-r1
 1805012209 metadata/md5-cache/net-misc/ndisc6-1.0.2
 1809280334 metadata/md5-cache/net-misc/vde-2.3.2-r4
@@ -67486,9 +67502,9 @@
 1809280334 metadata/md5-cache/net-misc/ofono-1.23
 1809280334 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
 1810021239 metadata/md5-cache/net-misc/dahdi-2.10.0.1-r1
-1809280334 metadata/md5-cache/net-misc/felix-3.1.3
+1812182239 metadata/md5-cache/net-misc/felix-3.1.3
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
-1812180739 metadata/md5-cache/net-misc/Manifest.gz
+1812182309 metadata/md5-cache/net-misc/Manifest.gz
 1811111440 metadata/md5-cache/net-misc/haeredes-0.4.4
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1809280334 metadata/md5-cache/net-misc/nxplayer-5.1.24.1
@@ -67522,12 +67538,12 @@
 1809280334 metadata/md5-cache/net-misc/l7-filter-userspace-0.12_beta1
 1812051539 metadata/md5-cache/net-misc/stunnel-5.50
 1809280334 metadata/md5-cache/net-misc/buka-3.0.1
-1809210209 metadata/md5-cache/net-misc/cni-plugins-0.7.3
+1812182239 metadata/md5-cache/net-misc/cni-plugins-0.7.3
 1809280334 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r10
 1810070139 metadata/md5-cache/net-misc/openssh-7.5_p1-r4
 1809280334 metadata/md5-cache/net-misc/netifrc-0.4.0-r1
 1811261942 metadata/md5-cache/net-misc/nyx-2.0.4
-1811081909 metadata/md5-cache/net-misc/cni-plugins-0.7.4
+1812182239 metadata/md5-cache/net-misc/cni-plugins-0.7.4
 1809280334 metadata/md5-cache/net-misc/chrony-9999
 1809280334 metadata/md5-cache/net-misc/pps-tools-0.0.20120407
 1704081208 metadata/md5-cache/net-misc/geoipupdate-2.3.1
@@ -67592,7 +67608,7 @@
 1810030549 metadata/md5-cache/net-misc/networkmanager-wireguard-9999
 1811291609 metadata/md5-cache/net-misc/x2goserver-4.1.0.3
 1810021239 metadata/md5-cache/net-misc/dahdi-2.10.2-r2
-1808151104 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
+1812182239 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
 1811090209 metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
 1809280334 metadata/md5-cache/net-misc/dahdi-tools-2.10.2
 1808272209 metadata/md5-cache/net-misc/unison-2.48.4-r1
@@ -67627,7 +67643,7 @@
 1810122239 metadata/md5-cache/net-misc/megatools-1.10.2
 1702282329 metadata/md5-cache/net-misc/stuntman-1.2.9
 1809280334 metadata/md5-cache/net-misc/rdate-1.4-r4
-1809280334 metadata/md5-cache/net-misc/rclone-9999
+1812182239 metadata/md5-cache/net-misc/rclone-9999
 1810021239 metadata/md5-cache/net-misc/openvswitch-2.10.0-r1
 1809280334 metadata/md5-cache/net-misc/iputils-20171016_pre
 1811080309 metadata/md5-cache/net-misc/ubridge-0.9.14
@@ -67647,7 +67663,7 @@
 1809280334 metadata/md5-cache/net-misc/netifrc-0.2.2
 1808272209 metadata/md5-cache/net-misc/unison-2.51.2
 1809280334 metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
-1808151104 metadata/md5-cache/net-misc/calicoctl-3.1.0
+1812182239 metadata/md5-cache/net-misc/calicoctl-3.1.0
 1811260739 metadata/md5-cache/net-misc/minidlna-1.2.1-r1
 1809280334 metadata/md5-cache/net-misc/dahdi-tools-2.8.0
 1811261942 metadata/md5-cache/net-misc/electron-cash-3.1.3
@@ -67659,7 +67675,7 @@
 1702282329 metadata/md5-cache/net-misc/pmsvn-1.0.5
 1812110115 metadata/md5-cache/net-misc/apt-cacher-ng-3.2
 1809280334 metadata/md5-cache/net-misc/tn5250-0.17.4-r1
-1810302309 metadata/md5-cache/net-misc/istioctl-1.0.2
+1812182239 metadata/md5-cache/net-misc/istioctl-1.0.2
 1805212239 metadata/md5-cache/net-misc/cbqinit-0.7.3-r3
 1809280334 metadata/md5-cache/net-misc/lldpd-1.0.1-r1
 1811261942 metadata/md5-cache/net-misc/switzerland-0.1.0
@@ -67699,7 +67715,7 @@
 1810152109 metadata/md5-cache/net-misc/dropbox-58.3.88-r1
 1809280334 metadata/md5-cache/net-misc/pimpd-0.8
 1812110115 metadata/md5-cache/net-misc/owncloud-client-2.4.2
-1808151104 metadata/md5-cache/net-misc/calicoctl-2.0.0
+1812182239 metadata/md5-cache/net-misc/calicoctl-2.0.0
 1812090339 metadata/md5-cache/net-misc/zerotier-1.2.12
 1811162209 metadata/md5-cache/net-misc/hblink-9999
 1811141639 metadata/md5-cache/net-misc/wget-1.19.5-r1
@@ -67718,7 +67734,7 @@
 1811120509 metadata/md5-cache/net-misc/megatools-1.10.2-r1
 1812170439 metadata/md5-cache/net-misc/anydesk-4.0.1
 1809280334 metadata/md5-cache/net-misc/chrony-3.4
-1808151104 metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
+1812182239 metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
 1809280334 metadata/md5-cache/net-misc/axel-2.15
 1702282329 metadata/md5-cache/net-misc/midentd-2.3.1-r2
 1809280334 metadata/md5-cache/net-misc/gwhois-20120626
@@ -67737,7 +67753,7 @@
 1809280334 metadata/md5-cache/net-misc/efax-0.9a-r4
 1811261942 metadata/md5-cache/net-misc/crossbar-17.8.1
 1809280334 metadata/md5-cache/net-misc/openrdate-1.2
-1808151104 metadata/md5-cache/net-misc/cni-plugins-0.7.1
+1812182239 metadata/md5-cache/net-misc/cni-plugins-0.7.1
 1809280334 metadata/md5-cache/net-misc/kafkacat-1.3.1
 1811061039 metadata/md5-cache/net-misc/igmpproxy-0.2.1
 1702282329 metadata/md5-cache/net-misc/cbugzilla-0.2.1
@@ -67751,7 +67767,7 @@
 1809280334 metadata/md5-cache/net-misc/chrony-3.1
 1806262009 metadata/md5-cache/net-misc/autossh-1.4f
 1809280334 metadata/md5-cache/net-misc/dhcdrop-0.5
-1808151104 metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
+1812182239 metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
 1811261942 metadata/md5-cache/net-misc/trackma-0.7.3
 1811261942 metadata/md5-cache/net-misc/electrum-3.0.5
 1810021239 metadata/md5-cache/net-misc/oidentd-2.0.8-r6
@@ -67828,6 +67844,7 @@
 1809280333 metadata/md5-cache/dev-games/clanlib-4.0.0
 1809280333 metadata/md5-cache/dev-games/flatzebra-0.1.6
 1812110115 metadata/md5-cache/dev-games/physfs-9999
+1812190509 metadata/md5-cache/dev-games/simgear-2018.3.1
 1812110115 metadata/md5-cache/dev-games/ogre-1.9.0-r1
 1803260208 metadata/md5-cache/dev-games/hlsdk-2.3-r1
 1812110115 metadata/md5-cache/dev-games/physfs-2.0.3-r2
@@ -67844,7 +67861,7 @@
 1809280333 metadata/md5-cache/dev-games/mercator-0.3.3
 1809280333 metadata/md5-cache/dev-games/quake4-sdk-1.4.2
 1812110115 metadata/md5-cache/dev-games/mygui-3.2.2
-1812110115 metadata/md5-cache/dev-games/Manifest.gz
+1812190509 metadata/md5-cache/dev-games/Manifest.gz
 1809280333 metadata/md5-cache/dev-games/ode-0.12
 1812110115 metadata/md5-cache/dev-games/ogre-1.11.2
 1809280333 metadata/md5-cache/dev-games/higan-ananke-094
@@ -68680,7 +68697,7 @@
 1811241409 metadata/md5-cache/www-servers/lighttpd-1.4.51
 1809280334 metadata/md5-cache/www-servers/monkeyd-9999
 1809280334 metadata/md5-cache/www-servers/lighttpd-9999
-1808151104 metadata/md5-cache/www-servers/caddy-0.10.11
+1812182239 metadata/md5-cache/www-servers/caddy-0.10.11
 1809280334 metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
 1811080309 metadata/md5-cache/www-servers/nginx-1.14.1
 1812071209 metadata/md5-cache/www-servers/apache-2.4.35
@@ -68705,7 +68722,7 @@
 1809280334 metadata/md5-cache/www-servers/sniproxy-0.5.0
 1810271539 metadata/md5-cache/www-servers/nginx-unit-1.5
 1809280334 metadata/md5-cache/www-servers/thttpd-2.27.1
-1812180909 metadata/md5-cache/www-servers/Manifest.gz
+1812182239 metadata/md5-cache/www-servers/Manifest.gz
 1812131909 metadata/md5-cache/www-servers/nginx-1.14.2-r1
 1811061539 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
 1807172039 metadata/md5-cache/www-servers/nginx-unit-1.3
@@ -68716,7 +68733,7 @@
 1812091110 metadata/md5-cache/www-servers/thin-1.7.2
 1809280334 metadata/md5-cache/www-servers/gatling-0.12-r2
 1811130041 metadata/md5-cache/www-servers/tomcat-8.0.50
-1808151104 metadata/md5-cache/www-servers/caddy-0.10.10
+1812182239 metadata/md5-cache/www-servers/caddy-0.10.10
 1809280334 metadata/md5-cache/www-servers/fnord-1.11-r1
 1811261942 metadata/md5-cache/www-servers/gunicorn-19.3.0
 1811061909 metadata/md5-cache/www-servers/nginx-1.15.6
@@ -68846,6 +68863,7 @@
 1809280334 metadata/md5-cache/media-libs/libaacs-0.7.1
 1812010209 metadata/md5-cache/media-libs/kvazaar-1.2.0
 1712040139 metadata/md5-cache/media-libs/libdvbcsa-1.1.0
+1812190609 metadata/md5-cache/media-libs/shaderc-2017.2-r1
 1812110115 metadata/md5-cache/media-libs/allegro-5.2.4.0
 1809280334 metadata/md5-cache/media-libs/giblib-1.2.4-r1
 1809280334 metadata/md5-cache/media-libs/giflib-5.1.4
@@ -68963,7 +68981,6 @@
 1812081309 metadata/md5-cache/media-libs/libmtp-1.1.16
 1808151104 metadata/md5-cache/media-libs/fmod-4.38.00
 1810030549 metadata/md5-cache/media-libs/libxspf-1.2.0
-1812110115 metadata/md5-cache/media-libs/shaderc-2017.2
 1809280334 metadata/md5-cache/media-libs/libtimidity-0.2.4
 1809280334 metadata/md5-cache/media-libs/leptonica-1.74.4
 1809280334 metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
@@ -69138,7 +69155,7 @@
 1812110115 metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
 1811052309 metadata/md5-cache/media-libs/raptor-2.0.15-r1
 1809280334 metadata/md5-cache/media-libs/gavl-1.2.0
-1812170309 metadata/md5-cache/media-libs/Manifest.gz
+1812190609 metadata/md5-cache/media-libs/Manifest.gz
 1809280334 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1811090209 metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -69465,6 +69482,7 @@
 1809280334 metadata/md5-cache/media-libs/libdv-1.0.0-r2
 1809280334 metadata/md5-cache/media-libs/openexr-2.2.0-r1
 1809280334 metadata/md5-cache/media-libs/libhdhomerun-20140121
+1812190609 metadata/md5-cache/media-libs/shaderc-2018.0
 1810030549 metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r2
 1702282326 metadata/md5-cache/media-libs/libquvi-scripts-0.4.20
 1810030549 metadata/md5-cache/media-libs/gegl-0.3.34
@@ -69889,7 +69907,7 @@
 1806040509 metadata/md5-cache/games-simulation/flightgear-data-2018.2.1
 1809280334 metadata/md5-cache/games-simulation/senken-0.3.0-r1
 1809280334 metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
-1812110115 metadata/md5-cache/games-simulation/flightgear-9999
+1812190509 metadata/md5-cache/games-simulation/flightgear-9999
 1812110115 metadata/md5-cache/games-simulation/openrct2-0.2.0
 1809280334 metadata/md5-cache/games-simulation/crashtest-1.1-r1
 1812110115 metadata/md5-cache/games-simulation/flightgear-2018.1.1
@@ -69902,11 +69920,13 @@
 1809280334 metadata/md5-cache/games-simulation/micropolis-1.0-r1
 1809280334 metadata/md5-cache/games-simulation/singularity-0.30c-r2
 1809280334 metadata/md5-cache/games-simulation/gl117-1.3.2-r1
+1812190509 metadata/md5-cache/games-simulation/flightgear-2018.3.1
 1812110115 metadata/md5-cache/games-simulation/flightgear-2018.2.1
 1812110115 metadata/md5-cache/games-simulation/openrct2-9999
-1812161909 metadata/md5-cache/games-simulation/Manifest.gz
+1812190509 metadata/md5-cache/games-simulation/Manifest.gz
 1808091800 metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
 1805060538 metadata/md5-cache/games-simulation/flightgear-data-2018.1.1
+1812190509 metadata/md5-cache/games-simulation/flightgear-data-2018.3.1
 1810030549 metadata/md5-cache/games-simulation/openttd-1.8.0
 1809280334 metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
 1810030549 metadata/md5-cache/games-simulation/openttd-9999
@@ -72055,11 +72075,11 @@
 1811040839 metadata/md5-cache/app-emulation/libvirt-glib-2.0.0
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
 1811050039 metadata/md5-cache/app-emulation/wine-any-3.18
-1811040809 metadata/md5-cache/app-emulation/buildah-1.4
+1812182239 metadata/md5-cache/app-emulation/buildah-1.4
 1810182309 metadata/md5-cache/app-emulation/fuse-1.5.6
-1809062039 metadata/md5-cache/app-emulation/img-0.4.9
+1812182239 metadata/md5-cache/app-emulation/img-0.4.9
 1812042109 metadata/md5-cache/app-emulation/diskimage-builder-2.18.0
-1812161639 metadata/md5-cache/app-emulation/cri-tools-1.13.0
+1812182239 metadata/md5-cache/app-emulation/cri-tools-1.13.0
 1806040439 metadata/md5-cache/app-emulation/dlx-1.0.0
 1702282308 metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
 1809280333 metadata/md5-cache/app-emulation/ganeti-htools-0.3.1
@@ -72081,11 +72101,11 @@
 1809180947 metadata/md5-cache/app-emulation/rex-client-9999
 1811280539 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.22.126460
 1812151739 metadata/md5-cache/app-emulation/xen-tools-4.11.1
-1808260339 metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
-1808151104 metadata/md5-cache/app-emulation/docker-machine-0.12.2
+1812182239 metadata/md5-cache/app-emulation/containers-storage-0_pre20180730
+1812182239 metadata/md5-cache/app-emulation/docker-machine-0.12.2
 1809280333 metadata/md5-cache/app-emulation/uae-0.8.29-r2
 1805292338 metadata/md5-cache/app-emulation/coldfire-0.3.1
-1808151104 metadata/md5-cache/app-emulation/reg-0.15.4
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.4
 1812030609 metadata/md5-cache/app-emulation/qemu-3.0.0
 1809280333 metadata/md5-cache/app-emulation/spim-8.0-r3
 1811261942 metadata/md5-cache/app-emulation/virt-manager-1.4.3-r1
@@ -72094,14 +72114,14 @@
 1805121908 metadata/md5-cache/app-emulation/libspectrum-1.4.2
 1811050039 metadata/md5-cache/app-emulation/wine-d3d9-3.19
 1809280333 metadata/md5-cache/app-emulation/x48-0.6.4-r1
-1810282039 metadata/md5-cache/app-emulation/docker-18.03.1-r1
+1812182239 metadata/md5-cache/app-emulation/docker-18.03.1-r1
 1809280333 metadata/md5-cache/app-emulation/hercules-3.12
 1809280333 metadata/md5-cache/app-emulation/rkt-1.29.0
-1811150039 metadata/md5-cache/app-emulation/img-0.5.4
+1812182239 metadata/md5-cache/app-emulation/img-0.5.4
 1805091208 metadata/md5-cache/app-emulation/libdsk-1.5.8
 1811261942 metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1
 1812110115 metadata/md5-cache/app-emulation/dynamips-0.2.18
-1808151104 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
+1812182239 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
 1809280333 metadata/md5-cache/app-emulation/ski-1.3.2-r3
 1810070209 metadata/md5-cache/app-emulation/lxc-3.0.2
@@ -72111,17 +72131,17 @@
 1808240739 metadata/md5-cache/app-emulation/wine-mono-4.7.1
 1809280333 metadata/md5-cache/app-emulation/simh-3.9.0-r1
 1811261942 metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
-1812040439 metadata/md5-cache/app-emulation/docker-registry-2.7.0
+1812182239 metadata/md5-cache/app-emulation/docker-registry-2.7.0
 1809280333 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.0-r2
 1811261942 metadata/md5-cache/app-emulation/cloud-init-17.2
 1810030549 metadata/md5-cache/app-emulation/winetricks-20180513
 1810021239 metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
-1809280333 metadata/md5-cache/app-emulation/cri-o-1.10.1
-1811272309 metadata/md5-cache/app-emulation/skopeo-0.1.32
+1812182239 metadata/md5-cache/app-emulation/cri-o-1.10.1
+1812182239 metadata/md5-cache/app-emulation/skopeo-0.1.32
 1809280333 metadata/md5-cache/app-emulation/ski-1.3.2-r2
 1812110115 metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
-1808151104 metadata/md5-cache/app-emulation/kompose-1.16.0
-1809251609 metadata/md5-cache/app-emulation/reg-0.15.7
+1812182239 metadata/md5-cache/app-emulation/kompose-1.16.0
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.7
 1812011809 metadata/md5-cache/app-emulation/libcacard-2.6.0
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.118
 1812030609 metadata/md5-cache/app-emulation/virt-manager-9999
@@ -72136,7 +72156,7 @@
 1812111639 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.0.127378_rc1
 1811130041 metadata/md5-cache/app-emulation/edumips64-1.1
 1811300109 metadata/md5-cache/app-emulation/vice-3.1
-1809280333 metadata/md5-cache/app-emulation/buildah-1.3
+1812182239 metadata/md5-cache/app-emulation/buildah-1.3
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
 1804131308 metadata/md5-cache/app-emulation/docker-swarm-1.2.5
 1811260509 metadata/md5-cache/app-emulation/lxc-3.0.3
@@ -72151,15 +72171,15 @@
 1811261942 metadata/md5-cache/app-emulation/docker-compose-1.23.1-r1
 1810030549 metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
 1810030549 metadata/md5-cache/app-emulation/winetricks-20180603
-1808151104 metadata/md5-cache/app-emulation/reg-0.15.4-r2
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.4-r2
 1810021139 metadata/md5-cache/app-emulation/qemu-guest-agent-2.12.0-r1
-1808151104 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
+1812182239 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
 1705261309 metadata/md5-cache/app-emulation/vmips-1.3.1
 1809280333 metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5
 1811260509 metadata/md5-cache/app-emulation/lxc-templates-3.0.3
-1810021239 metadata/md5-cache/app-emulation/docker-9999
+1812182239 metadata/md5-cache/app-emulation/docker-9999
 1811051909 metadata/md5-cache/app-emulation/spice-protocol-0.12.14
-1808151104 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
+1812182239 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
 1708172038 metadata/md5-cache/app-emulation/libcacard-2.5.1
 1811280539 metadata/md5-cache/app-emulation/virtualbox-5.2.22
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-16.0.0
@@ -72167,24 +72187,24 @@
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.126
 1812111639 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.0_rc1
-1811091339 metadata/md5-cache/app-emulation/docker-18.09.0
-1809280333 metadata/md5-cache/app-emulation/runv-0.7.0
+1812182239 metadata/md5-cache/app-emulation/docker-18.09.0
+1812182239 metadata/md5-cache/app-emulation/runv-0.7.0
 1811052209 metadata/md5-cache/app-emulation/lxc-templates-3.0.2
-1810120139 metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
+1812182239 metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
 1809280333 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
-1809280333 metadata/md5-cache/app-emulation/containerd-1.0.3
+1812182239 metadata/md5-cache/app-emulation/containerd-1.0.3
 1809280333 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.16
 1811252009 metadata/md5-cache/app-emulation/wine-d3d9-3.21
-1810311539 metadata/md5-cache/app-emulation/img-0.5.2
+1812182239 metadata/md5-cache/app-emulation/img-0.5.2
 1810201539 metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
 1812110115 metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
 1811280539 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460
-1812142009 metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
-1811251739 metadata/md5-cache/app-emulation/runc-1.0.0_rc6
+1812182239 metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
+1812182239 metadata/md5-cache/app-emulation/runc-1.0.0_rc6
 1810030549 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1
-1808151104 metadata/md5-cache/app-emulation/docker-machine-0.13.0
+1812182239 metadata/md5-cache/app-emulation/docker-machine-0.13.0
 1812111839 metadata/md5-cache/app-emulation/vkd3d-1.0
-1809280333 metadata/md5-cache/app-emulation/docker-proxy-9999
+1812182239 metadata/md5-cache/app-emulation/docker-proxy-9999
 1710122038 metadata/md5-cache/app-emulation/docker-bench-security-1.3.3
 1812110115 metadata/md5-cache/app-emulation/dynamips-0.2.14-r2
 1810021239 metadata/md5-cache/app-emulation/open-vm-tools-10.1.10
@@ -72193,25 +72213,26 @@
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-15.3.0
 1811252009 metadata/md5-cache/app-emulation/wine-any-3.21
 1812110115 metadata/md5-cache/app-emulation/nemu-9999
-1811071609 metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1
+1812182239 metadata/md5-cache/app-emulation/cri-tools-1.0.0_alpha1
 1811261942 metadata/md5-cache/app-emulation/lxc-2.1.1-r1
+1812182039 metadata/md5-cache/app-emulation/open-vm-tools-10.3.5
 1809280333 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1
 1810021239 metadata/md5-cache/app-emulation/spice-vdagent-0.17.0_p20180319-r1
 1811261942 metadata/md5-cache/app-emulation/docker-compose-1.19.0
 1809280333 metadata/md5-cache/app-emulation/ganeti-2.15.2-r7
-1809280333 metadata/md5-cache/app-emulation/containerd-1.1.1
+1812182239 metadata/md5-cache/app-emulation/containerd-1.1.1
 1809280333 metadata/md5-cache/app-emulation/lxc-templates-3.0.1
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
 1811171839 metadata/md5-cache/app-emulation/rkt-1.30.0
 1809280333 metadata/md5-cache/app-emulation/softgun-0.22
 1811120439 metadata/md5-cache/app-emulation/xen-tools-4.10.2-r1
-1809062039 metadata/md5-cache/app-emulation/reg-0.15.5
-1808151104 metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.5
+1812182239 metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
 1811050039 metadata/md5-cache/app-emulation/wine-vanilla-3.19
 1812160109 metadata/md5-cache/app-emulation/lxd-3.7
 1810021239 metadata/md5-cache/app-emulation/qemu-2.12.1
-1812111339 metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
-1812162239 metadata/md5-cache/app-emulation/Manifest.gz
+1812182239 metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
+1812190209 metadata/md5-cache/app-emulation/Manifest.gz
 1810030549 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1809180947 metadata/md5-cache/app-emulation/docker-gc-9999
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -72221,68 +72242,69 @@
 1812030609 metadata/md5-cache/app-emulation/qemu-9999
 1809280333 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
 1812030609 metadata/md5-cache/app-emulation/spice-9999
-1812111139 metadata/md5-cache/app-emulation/containerd-1.2.1
+1812182239 metadata/md5-cache/app-emulation/containerd-1.2.1
 1810030549 metadata/md5-cache/app-emulation/winetricks-20180217
-1811091139 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
+1812182239 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-17.5.0
 1811050039 metadata/md5-cache/app-emulation/wine-d3d9-3.18
-1809280333 metadata/md5-cache/app-emulation/containerd-9999
+1812182239 metadata/md5-cache/app-emulation/containerd-9999
 1809280333 metadata/md5-cache/app-emulation/dinero-4.7-r1
-1812111339 metadata/md5-cache/app-emulation/docker-18.06.1-r1
-1811071609 metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2
+1812182239 metadata/md5-cache/app-emulation/docker-18.06.1-r1
+1812182239 metadata/md5-cache/app-emulation/cri-tools-1.0.0_beta2
 1811261942 metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1
 1811112109 metadata/md5-cache/app-emulation/wine-staging-3.20
-1808151104 metadata/md5-cache/app-emulation/umoci-0.2.1
+1812182239 metadata/md5-cache/app-emulation/umoci-0.2.1
 1811050039 metadata/md5-cache/app-emulation/wine-staging-9999
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-15.1.0
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-16.2.5
-1812030609 metadata/md5-cache/app-emulation/libvirt-9999
+1812181909 metadata/md5-cache/app-emulation/libvirt-9999
 1809280333 metadata/md5-cache/app-emulation/xtrs-4.9d-r4
 1811280539 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.22
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-15.3.1
+1812190209 metadata/md5-cache/app-emulation/cloud-init-18.5
 1809280333 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.3
-1808151104 metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
+1812182239 metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
 1809280333 metadata/md5-cache/app-emulation/spice-protocol-9999
 1812151739 metadata/md5-cache/app-emulation/xen-4.11.1
-1808151104 metadata/md5-cache/app-emulation/go-secbench-0.1.0
+1812182239 metadata/md5-cache/app-emulation/go-secbench-0.1.0
 1805121908 metadata/md5-cache/app-emulation/fuse-utils-1.4.1
-1808151104 metadata/md5-cache/app-emulation/docker-swarm-1.2.0
+1812182239 metadata/md5-cache/app-emulation/docker-swarm-1.2.0
 1811050039 metadata/md5-cache/app-emulation/wine-d3d9-9999
 1809280333 metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.96
 1809280333 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.0-r1
 1812071939 metadata/md5-cache/app-emulation/libguestfs-1.38.6
-1808151104 metadata/md5-cache/app-emulation/kompose-1.15.0
+1812182239 metadata/md5-cache/app-emulation/kompose-1.15.0
 1810030549 metadata/md5-cache/app-emulation/playonlinux-4.2.12
 1810021239 metadata/md5-cache/app-emulation/libvirt-4.5.0-r1
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.117
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
 1808151104 metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
-1811150039 metadata/md5-cache/app-emulation/reg-0.16.0
+1812182239 metadata/md5-cache/app-emulation/reg-0.16.0
 1810021239 metadata/md5-cache/app-emulation/open-vm-tools-10.1.15
 1811261942 metadata/md5-cache/app-emulation/docker-compose-1.21.2-r1
 1811050039 metadata/md5-cache/app-emulation/wine-vanilla-9999
 1810021239 metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
-1809280333 metadata/md5-cache/app-emulation/containerd-1.1.4
+1812182239 metadata/md5-cache/app-emulation/containerd-1.1.4
 1811261942 metadata/md5-cache/app-emulation/cloud-init-9999
 1811050039 metadata/md5-cache/app-emulation/wine-vanilla-3.18
-1809280333 metadata/md5-cache/app-emulation/buildah-1.2
-1808151104 metadata/md5-cache/app-emulation/kompose-1.14.0
-1809280333 metadata/md5-cache/app-emulation/buildah-1.3-r1
+1812182239 metadata/md5-cache/app-emulation/buildah-1.2
+1812182239 metadata/md5-cache/app-emulation/kompose-1.14.0
+1812182239 metadata/md5-cache/app-emulation/buildah-1.3-r1
 1810021239 metadata/md5-cache/app-emulation/open-vm-tools-10.2.5
 1812030609 metadata/md5-cache/app-emulation/virt-manager-2.0.0
 1702282308 metadata/md5-cache/app-emulation/xcpc-20070122
-1808170609 metadata/md5-cache/app-emulation/skopeo-0.1.31
+1812182239 metadata/md5-cache/app-emulation/skopeo-0.1.31
 1810030549 metadata/md5-cache/app-emulation/wine-desktop-common-20150204
 1811111409 metadata/md5-cache/app-emulation/xen-4.10.2-r1
-1812111339 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626
+1812182239 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180626
 1808240739 metadata/md5-cache/app-emulation/wine-mono-4.6.4
 1809080339 metadata/md5-cache/app-emulation/ganeti-instance-image-0.6-r1
-1809280333 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
+1812182239 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
 1702282308 metadata/md5-cache/app-emulation/grub-xen-host-1.0
 1809280333 metadata/md5-cache/app-emulation/ganeti-2.15.2-r5
-1812111139 metadata/md5-cache/app-emulation/cadvisor-0.32.0
+1812182239 metadata/md5-cache/app-emulation/cadvisor-0.32.0
 1811252009 metadata/md5-cache/app-emulation/wine-staging-3.21
 1812111639 metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127378_rc1
 1812030609 metadata/md5-cache/app-emulation/spice-0.14.0-r2
@@ -72290,22 +72312,22 @@
 1809280333 metadata/md5-cache/app-emulation/ganeti-2.15.2-r6
 1709080309 metadata/md5-cache/app-emulation/docker-bench-security-1.3.2
 1811231339 metadata/md5-cache/app-emulation/xen-4.10.2-r2
-1809261739 metadata/md5-cache/app-emulation/img-0.5.1
+1812182239 metadata/md5-cache/app-emulation/img-0.5.1
 1809280333 metadata/md5-cache/app-emulation/spectemu-0.99.3
 1705261309 metadata/md5-cache/app-emulation/vmips-1.3
 1812111839 metadata/md5-cache/app-emulation/vkd3d-9999
-1811071609 metadata/md5-cache/app-emulation/cri-tools-1.12.0
+1812182239 metadata/md5-cache/app-emulation/cri-tools-1.12.0
 1808240739 metadata/md5-cache/app-emulation/wine-mono-4.7.3
 1809280333 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.0
 1709030709 metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0
 1811110009 metadata/md5-cache/app-emulation/xen-tools-4.11.0-r3
 1811261942 metadata/md5-cache/app-emulation/sen-0.5.1
-1811280709 metadata/md5-cache/app-emulation/buildah-1.5
+1812182239 metadata/md5-cache/app-emulation/buildah-1.5
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
 1812111639 metadata/md5-cache/app-emulation/virtualbox-modules-6.0.0_rc1
-1810281939 metadata/md5-cache/app-emulation/containerd-1.2.0
-1811091409 metadata/md5-cache/app-emulation/containerd-1.2.0-r1
-1808151104 metadata/md5-cache/app-emulation/skopeo-0.1.30
+1812182239 metadata/md5-cache/app-emulation/containerd-1.2.0
+1812182239 metadata/md5-cache/app-emulation/containerd-1.2.0-r1
+1812182239 metadata/md5-cache/app-emulation/skopeo-0.1.30
 1811280539 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.22
 1803291839 metadata/md5-cache/app-emulation/spice-protocol-0.12.13
 1807071609 metadata/md5-cache/app-emulation/fuse-utils-1.4.3
@@ -72318,35 +72340,35 @@
 1812110115 metadata/md5-cache/app-emulation/nemu-2.1.0
 1809280333 metadata/md5-cache/app-emulation/hercules-3.10
 1811130041 metadata/md5-cache/app-emulation/edumips64-1.2
-1809280333 metadata/md5-cache/app-emulation/flannel-0.10.0
-1811091409 metadata/md5-cache/app-emulation/cri-tools-1.11.1
+1812182239 metadata/md5-cache/app-emulation/flannel-0.10.0
+1812182239 metadata/md5-cache/app-emulation/cri-tools-1.11.1
 1812071609 metadata/md5-cache/app-emulation/libguestfs-1.36.15
-1808151104 metadata/md5-cache/app-emulation/reg-0.15.4-r1
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.4-r1
 1812111639 metadata/md5-cache/app-emulation/virtualbox-6.0.0_rc1
-1808151104 metadata/md5-cache/app-emulation/kompose-1.13.0
+1812182239 metadata/md5-cache/app-emulation/kompose-1.13.0
 1809280333 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.11
 1811112109 metadata/md5-cache/app-emulation/wine-vanilla-3.20
 1812110115 metadata/md5-cache/app-emulation/qt-virt-manager-9999
 1811280539 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.22
 1809280333 metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
-1809131609 metadata/md5-cache/app-emulation/cadvisor-0.31.0
+1812182239 metadata/md5-cache/app-emulation/cadvisor-0.31.0
 1810030549 metadata/md5-cache/app-emulation/winetricks-20170823
 1809280333 metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
-1810021239 metadata/md5-cache/app-emulation/docker-18.03.1
+1812182239 metadata/md5-cache/app-emulation/docker-18.03.1
 1809280333 metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
-1809280333 metadata/md5-cache/app-emulation/containerd-1.1.2
+1812182239 metadata/md5-cache/app-emulation/containerd-1.1.2
 1809280333 metadata/md5-cache/app-emulation/free42-2.0.20
 1811261942 metadata/md5-cache/app-emulation/glean-1.10.3
 1809280333 metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
-1809181709 metadata/md5-cache/app-emulation/reg-0.15.6
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.6
 1811220209 metadata/md5-cache/app-emulation/xen-4.11.0-r4
-1812041339 metadata/md5-cache/app-emulation/cri-o-1.10.6
-1808151104 metadata/md5-cache/app-emulation/img-0.4.8
-1809280333 metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
-1808151104 metadata/md5-cache/app-emulation/skopeo-0.1.22
+1812182239 metadata/md5-cache/app-emulation/cri-o-1.10.6
+1812182239 metadata/md5-cache/app-emulation/img-0.4.8
+1812182239 metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
+1812182239 metadata/md5-cache/app-emulation/skopeo-0.1.22
 1805012209 metadata/md5-cache/app-emulation/vmips-cross-bin-1.0
-1811052239 metadata/md5-cache/app-emulation/reg-0.15.8
+1812182239 metadata/md5-cache/app-emulation/reg-0.15.8
 1812130409 metadata/md5-cache/app-emulation/vagrant-2.2.2-r1
 1811252009 metadata/md5-cache/app-emulation/wine-vanilla-3.21
 1809280334 metadata/md5-cache/gnustep-base/gnustep-gui-0.26.2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4d7c73c05f35..f7ef20a56fcf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Dec 2018 13:30:01 +0000
+Wed, 19 Dec 2018 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ace843680b96..34efdc31e0d5 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-efd47d31aa6113f111136d40df1f858a73f2b570 1545125465 2018-12-18T09:31:05+00:00
+a6df6b586912812298cedb516a7c3b3d3862101c 1545188180 2018-12-19T02:56:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index adc4707af447..d1efb8ea5d01 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1545138301 Tue 18 Dec 2018 01:05:01 PM UTC
+1545197701 Wed 19 Dec 2018 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 620b6762a090..3f2728cf75f7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Dec 2018 13:08:30 +0000
+Wed, 19 Dec 2018 05:38:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5216515cdaa6..2790fa238017 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 6e81baaa9258..2689343e214a 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,7 +1,7 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
 DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
-EBUILD metasploit-4.14.16-r1.ebuild 11753 BLAKE2B b518ce4b25780a57fc6decff248d89605405f413bcd5594ad68c77f308c18fdbf510a4107aaea48d83bc11fc58b35f4f9ce00761050a1ace5cd861cd8d0d0c8a SHA512 d8c7d67c369832985ee425849840dfb5dbae204f6dbd04f4db1e8fd08574d8a2dcbc84ee48918e6362d47503455b1bfbd1b97ea990ba88626666c5166609e26c
-EBUILD metasploit-4.17.21-r3.ebuild 12195 BLAKE2B 2eec8813e7f983166bfe7f37eb76bae14004b5845d71bac4c69c0174f588935018aafae90960bbb127c8a11c095d5b49a72022edaefa273bc3659a6728a6ca23 SHA512 3677a2154e64028858adb070549ebe7e9a30d2c46aa46efcead1e58f1ce073c83957a816b786b004632955a5def645dd5f018a086528af58e2126cbd3746ad92
-EBUILD metasploit-9999.ebuild 12196 BLAKE2B ff302af42faf902246132eab32c1409b975e4528d0b964b19cd1e666bee501d9d122ebccd5e1aace626557654371d7dbccbdc78c5a62a5c5de10ba78c8709eef SHA512 490b71ba9c4997bf3a8232fac408ffe3d84c8459ba43a4c2de3ec551221879a59cb202b776b97af931a141ca98ba2a14379c808d624f0b7483ed62e05932b291
+EBUILD metasploit-4.14.16-r2.ebuild 11790 BLAKE2B 7be237aa33f8531c4cafd4a6f7820a1f198c44ee8d0daf9343fd889f3d416645847c47d217ea4388e39f7f107c266c9a4e6e8e376d12110d0a79b11a6534c1b0 SHA512 ab81d9a5c7d6183b0cc1def2005346469d1ebcc21b35141ab8c27c9438cf0e138ddd344e96312f5f99b312245f1fefd48e6b3ccbf32da8c4ce085dd594562199
+EBUILD metasploit-4.17.21-r4.ebuild 12232 BLAKE2B 7729ff7c6cbf93fd7766fb830ad1fd22ff8a2abf0039fc9cd68b5cd3257a55a557bd1431363d23e14b9237e9eeed4c1b281b91e8e07d196ff4f706eaf78da4f9 SHA512 cff44c78b703209830a56e7ca97cd875611831c6f61fa9b7a0fc6ace7359b4b7181e20b71b8c8cd7bd238e28767b8b28675628e684433b85569ea0df970659d5
+EBUILD metasploit-9999.ebuild 12233 BLAKE2B ca4c7be9911d83f9a0526e9de9dcb3f79d3c3646a926de7ab733adfcb0a63fe13c5a18d38281b6511a8bdf99d018a9ab3be165b091603ecb5ba0db41a36458a1 SHA512 9c7c91775d1f40dfe2d7e55b15d090c71717ee5a26bcc0364e3109fd0ddca6f9de6b84eb3459356d6fb247a7657c83e7422503ce99065b33a05bc1d7d654eb38
 MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
diff --git a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
rename to net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
index 10055eaae1ce..745c97397180 100644
--- a/net-analyzer/metasploit/metasploit-4.14.16-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
@@ -115,7 +115,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
similarity index 99%
rename from net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
rename to net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 32cb686d0d8d..2481fa5180bd 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index c4fc0fdabcdb..6b043c85b993 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -123,7 +123,7 @@ ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	|| ( >=app-crypt/johntheripper-1.7.9-r1[-minimal] app-crypt/johntheripper-jumbo )
 	net-analyzer/nmap"
 RDEPEND+=" ${COMMON_DEPEND}
 	>=app-eselect/eselect-metasploit-0.16"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 8ff2caea8507..4e762c315850 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 6b26c0b33411..aa51fc50aa09 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -8,6 +8,6 @@ EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5
 EBUILD bind-tools-9.11.4_p2.ebuild 3208 BLAKE2B 2283d2ace001715cb60542f169c5604fa049b2105a848991b4b7b2a2b66d8630c10e1d65cb832209ff74a26184e1dd93762fbd63348fa9bfe1850cfce1634f4d SHA512 7d5e6d989b952e6400e272fa02383c201342c0373f36a8561f22df549ec12fb7d414adf60689bb9801006e552779b13f5efd1b339ca1a161c1b9166bf4e0f92b
 EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
 EBUILD bind-tools-9.12.2_p1.ebuild 3439 BLAKE2B 3b924df8db1dd9034ea43e9f12da6f180fec964d146820a0b3dc1b4395b4fad579ea98be33f7e38da7ddedf02808274237b5af69231044c55192f1c80c776bba SHA512 65f9e22ba1c9816865abf24b6746b3f519b61ee3a79ccff5b198a0b8399cc96e7aabbc99c3e98f4251fee3f18d96b8ef135699c0411cdd3c0b1c3af519c68a57
-EBUILD bind-tools-9.12.2_p2-r1.ebuild 3569 BLAKE2B ee0ef47d6b75a0a5f6e6625194a4fc73fb2fd621183aae59f60c8897ffb6ade5dc32c9b0294aa86789f188eb96562fbd839c01f9cdba29dcfe67c8493b31cef6 SHA512 991489c6093e080a431292167b51caf6a1caa038cfe8cfd5a997eaa090e845db2878d461d00bca1fbaed862814586d8e099980bd61a90dcde6fb361acb4263b4
+EBUILD bind-tools-9.12.2_p2-r1.ebuild 3568 BLAKE2B f5c3b4cfe9fe7c4f6d17957baa2021d3a0864f5e1bc1952564722063d682a4ddbe4adaa6f3ffbed999faf1f22b9e328eb339205634f3e10ce976f4519e7fb22d SHA512 94c4c208d3a0607ffecbfc88947e1254f6da5b839199ecda8cbfe8fbf90e93f6e35b91a86fe3c0b6f8083ae22ac7ed0994faa63ca5003af3bbe9d8b877f188f3
 EBUILD bind-tools-9.12.2_p2.ebuild 3500 BLAKE2B f4cd34890a0427f88efddc39d1c13ac5ad6ddbf556c5341dd755d71d9b573e9664a00a0362bc5b58a3d1a5931e85dd9537b7225a7382bc2e68ec505b980624cd SHA512 902440e7475a939acbfe67a4ce56edcb2ddfda46424d320f160b72dbef3387c183d707035157a5ae918e4b266768da880fc8219594a75f575daec9543988b2ab
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
index 40cf56b73426..29287dfa2457 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7b6da26ced97..67be1789429b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,6 +21,6 @@ EBUILD bind-9.11.3-r1.ebuild 12181 BLAKE2B 8efe68cae507e1d58df6081419c9db121d7b5
 EBUILD bind-9.11.4_p2.ebuild 12227 BLAKE2B f92c267892ca96749ab23e61a958fc2d7d1e0750cdc461d8a7f28967fd3936e9c72bac0875a690237e3e5c104a0495ed6c76bbd74f47cc026c054ddfb1b728e6 SHA512 282fea5fa00fa226a983e6321bebba11c5abf321baa632296a40d66ba9b0c77977cba8e299130883081bfbb6a58e48c9e154ce6635cfd725f9ab72a14a8df169
 EBUILD bind-9.12.1_p2-r1.ebuild 12140 BLAKE2B 3c4198382162186541ca90b176b5c3bed82be1e38d48f2e5b2a3d2329e9a9b757b7b69362e5c9276ca158e250a3764d411aad3e55655f21ef92c3bade0dd0890 SHA512 e36ce712b00c80f4518907e7e58e01a1d83b0118544ee3ea5cf15d8906574e09d834831c6af6da23e0cd1884bc1b070720cc85f52a02ff11b13ab3d3b3983236
 EBUILD bind-9.12.2_p1.ebuild 12169 BLAKE2B 365eee1da0687002f634366c1cee23c5dc89457a17d55d2bdad09cb4dee212a22d8059048c4b1bebac77454d9420dc02671879ec3256241a412653c012af98b2 SHA512 e7624673a93893b33bb9c4307968d5673d9cf5ce97eb7c5f99d51ad56da80befee7cb10cc0363a014f2a1707e7951da61c662b928860b74cc848ac9fe8e32518
-EBUILD bind-9.12.2_p2-r1.ebuild 12361 BLAKE2B cfd2f5280e666839fe792ae6bde40189ff19b97f68c6d1386a8656cc7455c2cc6ceced61e815612019f0229de76dc613c39f2b49a5435c5e4283553c759997fa SHA512 5ebc01e9b28a0d7b1554e126ceaaa4d3b1bb8798c6fc21987d8d345cde99d874f2957759f02c9ad958e97ce32b1f841a6bb292b2f268d37a8c3fbe276b2cf834
+EBUILD bind-9.12.2_p2-r1.ebuild 12360 BLAKE2B cc8490e19bb09ae96e5840e9631cd1b598c3ef14ad64aac7637e03237080094872691a6d8b8fa77ac27c2cad9183c2a5e9a1465e067430afce2c476d9eddb7f1 SHA512 39c7993fe5dc2a7dd1a6280d5d6b475540f00f68104448971586594ea42ba75d14e2589cda304e49012e5d907549c9cdea00139bcccd9b5a599e3685cb8fe5af
 EBUILD bind-9.12.2_p2.ebuild 12291 BLAKE2B 4753e676680d30b6335b2345851dcd05a4d29404f2d543f47dbb80007748ef1e474e4e4671b682a4f5af857b7df78fd1ceaf1afc5685897c5232767ee3cdb9e8 SHA512 75c3631b02a630c7e2a7e452ed65b0ef355b9108b4db84aedd44f7cfbb282aa22f8f5392a2c23f7aefa832a23c7a1c9032ea5037be5a6680269c008e038c1cd4
 MISC metadata.xml 1352 BLAKE2B 89e5d161d824bd1b9a9e9c6ab49457b12d856a8eeb4dba9fb2f3ea987fb88ef708aca88d0d654aeba4ade9d49dc190f9d3e18f86e2c2c874e017aabe7ea8f079 SHA512 47171fcafd8b7b316166e8ba565cc3126ccf2cca4b447abffb7120c34f9ea22243539857d040bf17c509862a9d42d564ccbe151e533a4961516799c5d73d30ab
diff --git a/net-dns/bind/bind-9.12.2_p2-r1.ebuild b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
index abb6d7a6afba..be3eb4ed9739 100644
--- a/net-dns/bind/bind-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
 json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 06b3d2ac0ebd..fc4650a358e7 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 1ee08cf10d2a..c14588da709f 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,5 +1,7 @@
 AUX daq-2.0.2-libpcap-check.patch 1000 BLAKE2B 9407ae9fee8095143ad63fef090b49bb1f6048d7fbd22eb03fd88d9a3266b5b0f0add7ad17b1e95040ca429a163c946d7bc1236c6a21bb64b93990ec07f42213 SHA512 9382026f9d93ae922299ae25a98b6e38c2bbb0619009f73feef6a7ce1ce499b5bde886323be80c7863cf8ed0c245f2b04d244166073f2435c6db915ca5afa17f
 AUX daq-2.0.2-parallel-grammar.patch 1355 BLAKE2B fe4c2938da34cfaafb4918e779c5675b8ae0befd9878763cb8f67c62b73485c0ef825b9a4eb2fe7386001579d22f1a00615349879ab702ef1db0f9dd518ba309 SHA512 18ba4e4cdaf9551504d201b76f3983e3eb33a267c2f5952006e9297e7c5de88ff1464adb103ffce9dba99339bdbbffc616ff6b659ce20179c55a1bb0173b4483
+AUX daq-2.0.6-parallel-grammar.patch 560 BLAKE2B 73cae026bca21c573a3871b1a7d97d3fce93f0d66328a840003b0b538792bd8439745081bbda3742d59b5f0880a4a844e919b6db6a19601bebababfe138d1ebe SHA512 d22182c91be6283a057f7f33ea093ba064f8a880fbebc3342ae0ab2d2923fee2fbb2ef1ec69b144b0dfb2fbca09c0f6a6421a961a88832d7b952907e6c2e2665
+AUX daq-2.0.6-static-libs.patch 5093 BLAKE2B a374f1d8aa237f55a102dff62084ff3cf62b9672f72448af4f6a1c29aff1f3453e0a49bd4d6c8b209d928425f71bf21d2272a9f6733fb72cc31e52f7ffdc04d2 SHA512 ef793b31c2759366f9890afb8229ce6e47552d4634ea3ae05c77dd55eb674be5e35a9443d271414671945b85dfb7f316a347df94ffea687a382f0b562b191102
 DIST daq-0.6.2.tar.gz 451581 BLAKE2B 64eebeb669eefc6715b206de19e823708a8e4255d5898d5f6d4b80889360611950764432c941a2a930582ab9b8c2300cfdb41784f008f4ef1c248f3469819d4e SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125
 DIST daq-2.0.0.tar.gz 480030 BLAKE2B ab25ce133833babbdaecd74c79d319739e5bfa34bfa100d35c19569c935fe58b425ea817a12f6d2fc1ff47a6e8097b822e2d5ac5dc295cdde516811f139accff SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c
 DIST daq-2.0.2.tar.gz 474447 BLAKE2B fa80d435056d672eaa15f003649d90dba91986780f372cd4e953b676e414232516c5fc43065f5497d38299e0309c58b2734458f9e5aa1b93cdfa29dfe72b622d SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd
@@ -8,5 +10,5 @@ EBUILD daq-0.6.2-r1.ebuild 1902 BLAKE2B b63c75041b5cf855b68b86a316cb47636e8e491a
 EBUILD daq-0.6.2.ebuild 1932 BLAKE2B c8a683e11312124f500f67f390231270d114ef480a3cd75653f12e4c767645f8229ab52079c904df9be11babfb2fb7487b89050870ef6edb18eb29449cddfe7a SHA512 9b25bca43e52172bc9f1a3c43dc90d6bebfa2934eeeea579f7e4e8e3d0a9ae3210ae53249f4aab723fbf2d026dc053755462426f1d14cfa0f2a420222c2a091a
 EBUILD daq-2.0.0.ebuild 1901 BLAKE2B 60904e1b66d7c02e650e54bba013b8f64087404efee0121e7e91994201396ba0a0b3d5c9116c3132dfe4a4c7a50e916f347e0861ef0c338a13d0f556487b3c1b SHA512 ce7a7fbd708e662da4b1ebd4bed6b688e8339feb9a15db188e74925f122ab421775e1a5698d2bec1d6a204a7c9667fb0a54749cd98595d45e89ba925e012d254
 EBUILD daq-2.0.2.ebuild 2001 BLAKE2B 98a7568d9bfba601bcf36e87f9a5002c489415aaf5012b891b5f129f054848549a797b921bccb051df93cb8d56d385c4025ffeb304576920b565a66d0b1d2b9b SHA512 554b8c496b10d62ca9cefd1239738c64108b6d63a61401dbfc57109f22b255f7a24a5f419f859bd8672b073850b6604f233ac0be15d4739da15c2c0bad6435a5
-EBUILD daq-2.0.6.ebuild 1919 BLAKE2B 6b00b05a0708f723d1cae3470375b5fdc962517be411e4e84b45d5651c2db2656e2717c61041a9d31a5bb040ef97af0230e805f53e1a774770fe81720f80db3d SHA512 3f8b35fa92e765cf482b1e4943d6965915bcd088bd21d50d96469518db55ffb36eff720594ece5b1a1f14188db21b6ccc770b657861bf855b6c10f766581a7af
+EBUILD daq-2.0.6-r1.ebuild 2054 BLAKE2B e7015e149d24266328350ce2a9f68ab92ea242a4398640c03d777c1d98bb6dcde7f7803183c47eb8d4fac94a48dee15e0647480afa5f3758d4f1ec28ab447574 SHA512 320b47135f5184ba74a09811caafe4cc5c9736999eec76e9b166032a355581944839f3ff97c7945db43d8f6f5e9b3600f277b33678e742f6da58f05a538fc0ae
 MISC metadata.xml 1416 BLAKE2B 33ab28e9bac28d75031405b2ce3b47f2b797d244853bef86f586330a1bc7558a21edf325297e0aeccce08e5eefdd29fad45cb50da6f6e6d62ee82c56d7c17b81 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa
diff --git a/net-libs/daq/daq-2.0.6.ebuild b/net-libs/daq/daq-2.0.6-r1.ebuild
similarity index 92%
rename from net-libs/daq/daq-2.0.6.ebuild
rename to net-libs/daq/daq-2.0.6-r1.ebuild
index 42db13440514..ff91d75a4a1d 100644
--- a/net-libs/daq/daq-2.0.6.ebuild
+++ b/net-libs/daq/daq-2.0.6-r1.ebuild
@@ -27,6 +27,10 @@ DEPEND="
 	pcap? ( ${PCAP_DEPEND} )
 "
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
 
 src_prepare() {
 	default
@@ -39,15 +43,16 @@ src_configure() {
 	# cross-compiling doesn't break on us.
 	daq_cv_libpcap_version_1x=yes \
 	econf \
-		$(use_enable ipv6) \
-		$(use_enable pcap pcap-module) \
 		$(use_enable afpacket afpacket-module) \
 		$(use_enable dump dump-module) \
-		$(use_enable nfq nfq-module) \
 		$(use_enable ipq ipq-module) \
+		$(use_enable ipv6) \
+		$(use_enable nfq nfq-module) \
+		$(use_enable pcap pcap-module) \
 		$(use_enable static-libs static) \
+		--disable-bundled-modules \
 		--disable-ipfw-module \
-		--disable-bundled-modules
+		--enable-shared
 }
 
 DOCS=( ChangeLog README )
diff --git a/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
new file mode 100644
index 000000000000..1911caf72ea6
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/673390
+
+--- a/sfbpf/Makefile.am
++++ b/sfbpf/Makefile.am
+@@ -43,13 +43,14 @@
+ libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
+ 
+ # use of $@ and $< here is a GNU idiom that borks BSD
+-sf_scanner.c: $(srcdir)/scanner.l
++sf_scanner.c: $(srcdir)/scanner.l tokdefs.h
+ 	@rm -f $(srcdir)/sf_scanner.c
+ 	$(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
+ 
+ sf_scanner.o: sf_scanner.c tokdefs.h
+ 
+ tokdefs.h: sf_grammar.c
++
+ sf_grammar.c: $(srcdir)/grammar.y
+ 	@rm -f sf_grammar.c tokdefs.h
+ 	$(V_YACC) -d $(srcdir)/grammar.y
diff --git a/net-libs/daq/files/daq-2.0.6-static-libs.patch b/net-libs/daq/files/daq-2.0.6-static-libs.patch
new file mode 100644
index 000000000000..fb91c2c39e44
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.6-static-libs.patch
@@ -0,0 +1,151 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -268,7 +268,8 @@
+ 
+ AC_CHECK_LIB([dl], [dlopen], [LIBDL="-ldl"])
+ 
+-AM_CONDITIONAL([BUILD_SHARED_MODULES], [ test "$enable_shared" = yes ])
++AM_CONDITIONAL([BUILD_STATIC_LIBRARIES], [ test "$enable_shared" = no ])
++AM_CONDITIONAL([BUILD_STATIC_MODULES], [ test "$enable_shared" = no ])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([inttypes.h memory.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -4,12 +4,15 @@
+ 
+ include_HEADERS = daq.h daq_api.h daq_common.h
+ 
+-lib_LTLIBRARIES = libdaq.la libdaq_static.la
++lib_LTLIBRARIES = libdaq.la
++
++if BUILD_STATIC_LIBRARIES
++    lib_LTLIBRARIES += libdaq_static.la
++    libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
++    libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST
++    libdaq_static_la_LDFLAGS = -static
++endif
+ 
+ libdaq_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
+ libdaq_la_LDFLAGS = -version-info 2:4:0 @XCCFLAGS@
+ libdaq_la_LIBADD = @LIBDL@
+-
+-libdaq_static_la_SOURCES = daq_base.c daq_mod_ops.c daq.h daq_api.h daq_common.h
+-libdaq_static_la_CFLAGS = -DSTATIC_MODULE_LIST
+-libdaq_static_la_LDFLAGS = -static
+--- a/os-daq-modules/Makefile.am
++++ b/os-daq-modules/Makefile.am
+@@ -6,7 +6,9 @@
+ 
+ pkglib_LTLIBRARIES =
+ 
+-lib_LTLIBRARIES = libdaq_static_modules.la
++if BUILD_STATIC_MODULES
++    pkglib_LTLIBRARIES += libdaq_static_modules.la
++endif
+ libdaq_static_modules_la_SOURCES = \
+ daq_static_modules.c \
+ daq_static_modules.h
+@@ -15,88 +17,88 @@
+ libdaq_static_modules_la_LIBADD =
+ 
+ if BUILD_AFPACKET_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_afpacket.la
+     daq_afpacket_la_SOURCES = daq_afpacket.c
+     daq_afpacket_la_CFLAGS = -DBUILDING_SO
+     daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_afpacket_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_afpacket.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_AFPACKET_MODULE
+ endif
++endif
+ 
+ if BUILD_PCAP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_pcap.la
+     daq_pcap_la_SOURCES = daq_pcap.c
+     daq_pcap_la_CFLAGS = -DBUILDING_SO
+     daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_pcap_la_LIBADD = -lpcap
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_pcap.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_PCAP_MODULE
+ endif
++endif
+ 
+ if BUILD_DUMP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_dump.la
+     daq_dump_la_SOURCES = daq_dump.c
+     daq_dump_la_CFLAGS = -DBUILDING_SO
+     daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_dump_la_LIBADD = -lpcap
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_dump.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_DUMP_MODULE
+ endif
++endif
+ 
+ if BUILD_IPFW_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_ipfw.la
+     daq_ipfw_la_SOURCES = daq_ipfw.c
+     daq_ipfw_la_CFLAGS = -DBUILDING_SO
+     daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_ipfw_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_ipfw.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_IPFW_MODULE
+ endif
++endif
+ 
+ if BUILD_IPQ_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_ipq.la
+     daq_ipq_la_SOURCES = daq_ipq.c
+     daq_ipq_la_CFLAGS = -DBUILDING_SO
+     daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+     daq_ipq_la_LIBADD = -lipq @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_ipq.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_IPQ_MODULE
+ endif
++endif
+ 
+ if BUILD_NFQ_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_nfq.la
+     daq_nfq_la_SOURCES = daq_nfq.c
+     daq_nfq_la_CFLAGS = -DBUILDING_SO
+     daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+     daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_nfq.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_NFQ_MODULE
+ endif
++endif
+ 
+ if BUILD_NETMAP_MODULE
+-if BUILD_SHARED_MODULES
+     pkglib_LTLIBRARIES += daq_netmap.la
+     daq_netmap_la_SOURCES = daq_netmap.c
+     daq_netmap_la_CFLAGS = -DBUILDING_SO
+     daq_netmap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+     daq_netmap_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
+-endif
++if BUILD_STATIC_MODULES
+     libdaq_static_modules_la_SOURCES += daq_netmap.c
+     libdaq_static_modules_la_CFLAGS += -DBUILD_NETMAP_MODULE
+ endif
++endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf -I$(top_builddir)/sfbpf
+ 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index f4a8130dc970..c5c8364988f7 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -5,7 +5,6 @@ AUX wvstreams-4.6.1-fix-c++14.patch 1205 BLAKE2B 9f7574dc2e1f4fdb77e3498bf427dcb
 AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c80978614c94d9e482e55434ab3aa9ec62468b7fa87c737d2812f56c8acd6a221234f80548ccae65f20e46d7e7ba2b1ad3748 SHA512 cfac44a0c80d58e67d4a3be17cca3008f6c7bba02b434701fcf07a1209220edf93b4d0dc1f478456e07e28f9e39ab9d19a52a07ad1f9ecd09028ef5446cebfa5
 AUX wvstreams-4.6.1-glibc212.patch 497 BLAKE2B d4ba5b6e687b7746f4be510721ee5fc7fda4d5f8c7c7e9b14479e0301de6329925b8a876ec3e98007d7edcc3646685c1e18b45d4b91ed891a69df4950ccb4415 SHA512 467ef4faad88b4ba150a05f95147bbd2ba8d297bbb5e32a1c85e482b62786e1ec82f6ae8a8f62426c01239ec9e9da899f38fcd7a7d4737dd9a8c9d6de0bdedb1
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 399 BLAKE2B c290744f06cd7781ce64fa43e0d7a076b80fa3130425e2ad19768f6cf3f88bcd007b6ab5d3fc2fef24396cb064c76917a577f25f9329cecbc3c41f1500f4008a SHA512 98d8c8b529e9ce6c8219f70dbec8f9270d14952e88e3f0f0cf16e58cfed2cad8a2bd4039d2006290f9567beaeb5ec77ef500fb5bc812b7a3bac6a1bf4e2888aa
-AUX wvstreams-4.6.1-openssl-1.1.patch 18446 BLAKE2B 9ce3f05bb8656cfcc9d1b06b987b7e50f22952e24bc48b7d2e3ebff9ca49182512830d01b6cd8d9424c50268cb9262617660a49ea93d7e56a7bad53c799caa7c SHA512 1f8f6a689651cc2205a026dfde63839b9ddd53dabc60e902f51c6c889ceb922c8c7c5badd03d84b74fc534006aef0e58410a31d8d553c48610fce49c3ab72f83
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
 AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
@@ -13,6 +12,5 @@ DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e53091
 EBUILD wvstreams-4.6.1-r3.ebuild 2404 BLAKE2B fb696df3dbda56527f29646f03d3f4cfd7507b9af6d08b50771fff15770c35e96bdb19e61b3651abd72f63beb17096216a85b10fd01ef7306ca082406e8e6c68 SHA512 f4a95c3d74d79315e297a78c99ab2fca17b953c2b2b0f62934ed1de78b3ef98aba423057033eee1936717ff32f469b404875944f81b8e6f723f8cd701990ace9
 EBUILD wvstreams-4.6.1-r4.ebuild 2038 BLAKE2B dc58084533c0dd159f6cece9f3e71a0fd986ea9ea79b5042f597f323f34787f2084b1f823cfa014f820c65317b3d27ffa0da7cf138caac68a4c229282d2e5d82 SHA512 b2a9ead8d0b3bb82b8b7dc2f08c51994ba43abae7cda7177ee700d1410652f46f07a8464dacefa8356fb2a97b9d23de005f070fc94b82a14ace273d3061101f2
 EBUILD wvstreams-4.6.1-r5.ebuild 2112 BLAKE2B a48edb2558858a642096d3d5ca9026556d96983d509a4c5cf1d13fee70780354c5b268583c720aaf76f41d3cef73d406fb76b44fd798f9cd075305f527fcb352 SHA512 343a767d872bb15a883444b531461860f57b367478065b6bf190d2db1dffe7576d2e9e63a76a7ff1b66cc7e44c764692e0fe731a895bf937602ef9dc38866d20
-EBUILD wvstreams-4.6.1-r6.ebuild 2098 BLAKE2B 0bc3157be4cb9070be669bf72313376f21ed6d44cfbfac0991e3df839134c3fa929890198313940b6c96127c49f66528f8762fd8fb696dea9eba81644bbd67ea SHA512 7ba739c3698c4022640e4271bf11dc6fb12a4f0453d0a8ef62ad78e62446b0c75753c30afcbb3ef89d4c486c69358e645808827100259af2ca1a7f8c97100163
-EBUILD wvstreams-99999.ebuild 1902 BLAKE2B bd131aaff17764f7614fd1383cde63885018aa25c47c07e037c9afbca30be3eae5610d6dab849f84add57f0b81caff20b9936a6bbef148412172f65726042b5c SHA512 261befa6aa1cede996def64773b5108aee03f3abe4a746fdfd572d519d1779491a217a8725a094108c90fe1fdf130c6b51a2f6309c1ab5db6709c3ef3a9d9c81
-MISC metadata.xml 571 BLAKE2B 6a897339a2711205b12d9691dfbd66db1bccd26b70a3a04beb5f0c67ac29d56d8d56c140694bd01754e973f1298963fcf7fd00bb906776c76e20c07d32af8cd2 SHA512 06d9119c6aa441daa82a0384c3480b73cfb7652b3efe81d26498371aab2f26eede94843738bc43c28a38cec2514ae29989d2c46b4f08dd65dfe6f85f47139092
+EBUILD wvstreams-99999.ebuild 1907 BLAKE2B ae0a110b682b12e3bdb9a896e8d20defbfd4ef32f53ed58729d91ced4fecaade6f36bfc6282143aa4307ea5a1ac3e27ec5fa4546ed24fe57f2e583a0926e5259 SHA512 8a8a507e142f5731b0bb1608399ad988fba56cb3060b8e55351a963e1fe1d94aa432e04740ea9f5560c9f317892d03f72c8d2d58194dc5bef0d99bcec6f046d5
+MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.patch
deleted file mode 100644
index 88d854e27552..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-From 5506a74e1b033776ad441b4554716cdcfa88fe03 Mon Sep 17 00:00:00 2001
-From: Reiner Herrmann <reiner@reiner-h.de>
-Date: Sat, 28 Jul 2018 23:26:17 +0200
-Subject: [PATCH] Port to OpenSSL 1.1
-
----
- crypto/wvcrl.cc           | 38 +++++++++++++-------------------------
- crypto/wvdiffiehellman.cc | 30 +++++++++++++++++++-----------
- crypto/wvdigest.cc        | 16 ++++++++--------
- crypto/wvocsp.cc          | 35 +++++++++--------------------------
- crypto/wvx509.cc          | 31 ++++++++++++++++---------------
- crypto/wvx509mgr.cc       | 27 ++++++++++++++++-----------
- include/wvdiffiehellman.h |  2 +-
- include/wvdigest.h        | 14 ++++++--------
- include/wvtripledes.h     | 10 +++++-----
- 9 files changed, 93 insertions(+), 110 deletions(-)
-
-diff --git a/crypto/wvcrl.cc b/crypto/wvcrl.cc
-index fa00c760..880ad85d 100644
---- a/crypto/wvcrl.cc
-+++ b/crypto/wvcrl.cc
-@@ -357,31 +357,19 @@ bool WvCRL::isrevoked(WvStringParm serial_number) const
- 	ASN1_INTEGER *serial = serial_to_int(serial_number);
- 	if (serial)
- 	{
--	    X509_REVOKED mayberevoked;
--	    mayberevoked.serialNumber = serial;
--	    if (crl->crl->revoked)
--	    {
--		int idx = sk_X509_REVOKED_find(crl->crl->revoked, 
--					       &mayberevoked);
--		ASN1_INTEGER_free(serial);
--		if (idx >= 0)
--                {
--                    debug("Certificate is revoked.\n");
--		    return true;
--                }
--                else
--                {
--                    debug("Certificate is not revoked.\n");
--		    return false;
--                }
--	    }
--	    else
--	    {
--		ASN1_INTEGER_free(serial);
--		debug("CRL does not have revoked list.\n");
--                return false;
--	    }
--	    
-+	    X509_REVOKED *revoked_entry = NULL;
-+	    int idx = X509_CRL_get0_by_serial(crl, &revoked_entry, serial);
-+	    ASN1_INTEGER_free(serial);
-+	    if (idx >= 1 || revoked_entry)
-+            {
-+                debug("Certificate is revoked.\n");
-+	        return true;
-+            }
-+            else
-+            {
-+                debug("Certificate is not revoked.\n");
-+	        return false;
-+            }
- 	}
- 	else
- 	    debug(WvLog::Warning, "Can't convert serial number to ASN1 format. "
-diff --git a/crypto/wvdiffiehellman.cc b/crypto/wvdiffiehellman.cc
-index 7c0bf329..15cd1040 100644
---- a/crypto/wvdiffiehellman.cc
-+++ b/crypto/wvdiffiehellman.cc
-@@ -39,24 +39,25 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
- {
-     int problems;
-     int check;
--    {
-+
- 	info = DH_new();
--	info->p = BN_bin2bn(_key, _keylen, NULL);
-+	BIGNUM *p = BN_bin2bn(_key, _keylen, NULL);
- // 	info->p->top = 0;
- // 	info->p->dmax = _keylen * 8 / BN_BITS2;
- // 	info->p->neg = 0;
- // 	info->p->flags = 0;
- 
--	info->g = BN_new();
--	BN_set_word(info->g, generator);
-+	BIGNUM *g = BN_new();
-+	BN_set_word(g, generator);
- // 	info->g->d = &generator;
- //  	info->g->top = 0;
- //  	info->g->dmax = 1;
- //  	info->g->neg = 0;
- //  	info->g->flags = 0;
--    }
- 
--    check = BN_mod_word(info->p, 24);
-+	DH_set0_pqg(info, p, NULL, g);
-+
-+    check = BN_mod_word(p, 24);
-     DH_check(info, &problems);
-     if (problems & DH_CHECK_P_NOT_PRIME)
-  	log(WvLog::Error, "Using a composite number for authentication.\n");
-@@ -64,7 +65,7 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
- 	log(WvLog::Error,"Using an unsafe prime number for authentication.\n");
-     if (problems & DH_NOT_SUITABLE_GENERATOR)
- 	log(WvLog::Error, "Can you just use 2 instead of %s (%s)!!\n",
--	    BN_bn2hex(info->g), check);
-+	    BN_bn2hex(g), check);
-     if (problems & DH_UNABLE_TO_CHECK_GENERATOR)
- 	log(WvLog::Notice, "Using a strange argument for diffie-hellman.\n");
-     DH_generate_key(info);
-@@ -72,18 +73,23 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
- 
- int WvDiffieHellman::pub_key_len()
- {
--    return BN_num_bytes(info->pub_key);
-+    const BIGNUM *pub_key = NULL;
-+	DH_get0_key(info, &pub_key, NULL);
-+    return BN_num_bytes(pub_key);
- }
- 
- int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
- {
--    int key_len = BN_num_bytes(info->pub_key);
-+	const BIGNUM *pub_key = NULL;
-+	DH_get0_key(info, &pub_key, NULL);
-+
-+    int key_len = BN_num_bytes(pub_key);
-     if (key_len < len)
- 	len = key_len;
- 
-     // alloca is stack allocated, don't free it.
-     unsigned char *foo = (unsigned char*)alloca(key_len);
--    BN_bn2bin(info->pub_key, foo);
-+    BN_bn2bin(pub_key, foo);
-     outbuf.put(foo, len);
- 
-     return len;
-@@ -91,8 +97,10 @@ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
- 
- bool WvDiffieHellman::create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf)
- {
-+   const BIGNUM *pub_key = NULL;
-+   DH_get0_key(info, &pub_key, NULL);
-     unsigned char *foo = (unsigned char *)alloca(DH_size(info));
--   log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(info->pub_key),
-+   log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(pub_key),
-        hexdump_buffer(inbuf.peek(0, in_len), in_len, false));
-     int len = DH_compute_key (foo, BN_bin2bn(inbuf.get(in_len), in_len, NULL), 
- 			      info);
-diff --git a/crypto/wvdigest.cc b/crypto/wvdigest.cc
-index 150edeea..73ebb5d4 100644
---- a/crypto/wvdigest.cc
-+++ b/crypto/wvdigest.cc
-@@ -13,10 +13,10 @@
- 
- /***** WvEVPMDDigest *****/
- 
--WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
-+WvEVPMDDigest::WvEVPMDDigest(const EVP_MD*_evpmd) :
-     evpmd(_evpmd), active(false)
- {
--    evpctx = new EVP_MD_CTX;
-+    evpctx = EVP_MD_CTX_new();
-     _reset();
- }
- 
-@@ -24,7 +24,7 @@ WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
- WvEVPMDDigest::~WvEVPMDDigest()
- {
-     cleanup();
--    delete evpctx;
-+    EVP_MD_CTX_free(evpctx);
- }
- 
- 
-@@ -60,7 +60,7 @@ bool WvEVPMDDigest::_reset()
-     // the typecast is necessary for API compatibility with different
-     // versions of openssl.  None of them *actually* change the contents of
-     // the pointer.
--    EVP_DigestInit(evpctx, (env_md_st *)evpmd);
-+    EVP_DigestInit(evpctx, evpmd);
-     active = true;
-     return true;
- }
-@@ -79,7 +79,7 @@ void WvEVPMDDigest::cleanup()
- 
- size_t WvEVPMDDigest::digestsize() const
- {
--    return EVP_MD_size((env_md_st *)evpmd);
-+    return EVP_MD_size(evpmd);
- }
- 
- 
-@@ -104,14 +104,14 @@ WvHMACDigest::WvHMACDigest(WvEVPMDDigest *_digest,
- {
-     key = new unsigned char[keysize];
-     memcpy(key, _key, keysize);
--    hmacctx = new HMAC_CTX;
-+    hmacctx = HMAC_CTX_new();
-     _reset();
- }
- 
- WvHMACDigest::~WvHMACDigest()
- {
-     cleanup();
--    delete hmacctx;
-+    HMAC_CTX_free(hmacctx);
-     deletev key;
-     delete digest;
- }
-@@ -145,7 +145,7 @@ bool WvHMACDigest::_finish(WvBuf &outbuf)
- bool WvHMACDigest::_reset()
- {
-     cleanup();
--    HMAC_Init(hmacctx, key, keysize, (env_md_st *)digest->getevpmd());
-+    HMAC_Init(hmacctx, key, keysize, digest->getevpmd());
-     active = true;
-     return true;
- }
-diff --git a/crypto/wvocsp.cc b/crypto/wvocsp.cc
-index ddb2de49..7d5da072 100644
---- a/crypto/wvocsp.cc
-+++ b/crypto/wvocsp.cc
-@@ -118,9 +118,10 @@ bool WvOCSPResp::check_nonce(const WvOCSPReq &req) const
- 
- bool WvOCSPResp::signedbycert(const WvX509 &cert) const
- {
--    EVP_PKEY *skey = X509_get_pubkey(cert.cert);
--    int i = OCSP_BASICRESP_verify(bs, skey, 0);
--    EVP_PKEY_free(skey);
-+    STACK_OF(X509) *sk = sk_X509_new_null();
-+    sk_X509_push(sk, cert.cert);
-+    int i = OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY);
-+    sk_X509_free(sk);
- 
-     if(i > 0)
-         return true;
-@@ -131,33 +132,15 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
- 
- WvX509 WvOCSPResp::get_signing_cert() const
- {
--    if (!bs || !sk_X509_num(bs->certs))
-+    const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
-+    if (!bs || !sk_X509_num(certs))
-         return WvX509();
- 
--    // note: the following bit of code is taken almost verbatim from
--    // ocsp_vfy.c in OpenSSL 0.9.8. Copyright and attribution should 
--    // properly belong to them
--
--    OCSP_RESPID *id = bs->tbsResponseData->responderId;
--
--    if (id->type == V_OCSP_RESPID_NAME)
--    {
--        X509 *x = X509_find_by_subject(bs->certs, id->value.byName);
--        if (x)
--            return WvX509(X509_dup(x));
-+    X509 *signer = NULL;
-+    if (OCSP_resp_get0_signer(bs, &signer, NULL) == 1) {
-+        return WvX509(X509_dup(signer));
-     }
- 
--    if (id->value.byKey->length != SHA_DIGEST_LENGTH) return NULL;
--    unsigned char tmphash[SHA_DIGEST_LENGTH];
--    unsigned char *keyhash = id->value.byKey->data;
--    for (int i = 0; i < sk_X509_num(bs->certs); i++)
--    {
--        X509 *x = sk_X509_value(bs->certs, i);
--        X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL);
--        if(!memcmp(keyhash, tmphash, SHA_DIGEST_LENGTH))
--            return WvX509(X509_dup(x));
--    }
--    
-     return WvX509();
- }
- 
-diff --git a/crypto/wvx509.cc b/crypto/wvx509.cc
-index 93dae06f..eed6c18e 100644
---- a/crypto/wvx509.cc
-+++ b/crypto/wvx509.cc
-@@ -974,7 +974,7 @@ static void add_aia(WvStringParm type, WvString identifier,
-     sk_ACCESS_DESCRIPTION_push(ainfo, acc);
-     acc->method = OBJ_txt2obj(type.cstr(), 0);
-     acc->location->type = GEN_URI;
--    acc->location->d.ia5 = M_ASN1_IA5STRING_new();
-+    acc->location->d.ia5 = ASN1_IA5STRING_new();
-     unsigned char *cident 
- 	= reinterpret_cast<unsigned char *>(identifier.edit());
-     ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len());
-@@ -1059,7 +1059,7 @@ void WvX509::set_crl_urls(WvStringList &urls)
-         GENERAL_NAMES *uris = GENERAL_NAMES_new();
-         GENERAL_NAME *uri = GENERAL_NAME_new();
-         uri->type = GEN_URI;
--        uri->d.ia5 = M_ASN1_IA5STRING_new();
-+        uri->d.ia5 = ASN1_IA5STRING_new();
-         unsigned char *cident
- 	    = reinterpret_cast<unsigned char *>(i().edit());    
-         ASN1_STRING_set(uri->d.ia5, cident, i().len());
-@@ -1158,10 +1158,15 @@ WvString WvX509::get_extension(int nid) const
-         if (ext)
-         {
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#else
-             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#endif
-+            ASN1_OCTET_STRING *ext_data_str = X509_EXTENSION_get_data(ext);
-             if (!method)
-             {
-                 WvDynBuf buf;
--                buf.put(ext->value->data, ext->value->length);
-+                buf.put(ext_data_str->data, ext_data_str->length);
-                 retval = buf.getstr();
-             }
-             else
-@@ -1172,21 +1173,21 @@ WvString WvX509::get_extension(int nid) const
-                 // even though it's const (at least as of version 0.9.8e). 
-                 // gah.
- #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
--                const unsigned char * ext_value_data = ext->value->data;
-+                const unsigned char * ext_value_data = ext_data_str->data;
- #else
-                 unsigned char *ext_value_data = ext->value->data;
- #endif
-                 if (method->it)
-                 {
-                     ext_data = ASN1_item_d2i(NULL, &ext_value_data,
--                                             ext->value->length, 
-+                                             ext_data_str->length, 
-                                              ASN1_ITEM_ptr(method->it));
-                     TRACE("Applied generic conversion!\n");
-                 }
-                 else
-                 {
-                     ext_data = method->d2i(NULL, &ext_value_data,
--                                           ext->value->length);
-+                                           ext_data_str->length);
-                     TRACE("Applied method specific conversion!\n");
-                 }
-                 
-@@ -1321,13 +1322,13 @@ bool WvX509::verify(WvBuf &original, WvStringParm signature) const
-         return false;
-     
-     /* Verify the signature */
--    EVP_MD_CTX sig_ctx;
--    EVP_VerifyInit(&sig_ctx, EVP_sha1());
--    EVP_VerifyUpdate(&sig_ctx, original.peek(0, original.used()),
-+    EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
-+    EVP_VerifyInit(sig_ctx, EVP_sha1());
-+    EVP_VerifyUpdate(sig_ctx, original.peek(0, original.used()),
- 		     original.used());
--    int sig_err = EVP_VerifyFinal(&sig_ctx, sig_buf, sig_size, pk);
-+    int sig_err = EVP_VerifyFinal(sig_ctx, sig_buf, sig_size, pk);
-     EVP_PKEY_free(pk);
--    EVP_MD_CTX_cleanup(&sig_ctx); // Again, not my fault... 
-+    EVP_MD_CTX_free(sig_ctx); // Again, not my fault... 
-     if (sig_err != 1) 
-     {
-         debug("Verify failed!\n");
-@@ -1446,19 +1447,19 @@ void WvX509::set_ski()
- {
-     CHECK_CERT_EXISTS_SET("ski");
- 
--    ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
--    ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
-+    ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
-+    ASN1_BIT_STRING *pk = X509_get0_pubkey_bitstr(cert);
-     unsigned char pkey_dig[EVP_MAX_MD_SIZE];
-     unsigned int diglen;
- 
-     EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
- 
--    M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
-+    ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
-     X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0, 
- 					oct);
-     X509_add_ext(cert, ext, -1);
-     X509_EXTENSION_free(ext);
--    M_ASN1_OCTET_STRING_free(oct);
-+    ASN1_OCTET_STRING_free(oct);
- }
- 
- 
-diff --git a/crypto/wvx509mgr.cc b/crypto/wvx509mgr.cc
-index f249eeca..156d3a49 100644
---- a/crypto/wvx509mgr.cc
-+++ b/crypto/wvx509mgr.cc
-@@ -350,6 +350,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
-         return false;
-     }
- 
-+    uint32_t ex_flags = X509_get_extension_flags(cert);
-+    uint32_t ex_kusage = X509_get_key_usage(cert);
-     if (cert == unsignedcert.cert)
-     {
- 	debug("Self Signing!\n");
-@@ -362,8 +364,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
-         return false;
-     }
- #endif
--    else if (!((cert->ex_flags & EXFLAG_KUSAGE) && 
--               (cert->ex_kusage & KU_KEY_CERT_SIGN)))
-+    else if (!((ex_flags & EXFLAG_KUSAGE) && 
-+               (ex_kusage & KU_KEY_CERT_SIGN)))
-     {
- 	debug("This Certificate is not allowed to sign certificates!\n");
- 	return false;
-@@ -390,6 +392,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
- 
- bool WvX509Mgr::signcrl(WvCRL &crl) const
- {
-+    uint32_t ex_flags = X509_get_extension_flags(cert);
-+    uint32_t ex_kusage = X509_get_key_usage(cert);
-     if (!isok() || !crl.isok())
-     {
-         debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
-@@ -403,12 +407,12 @@ bool WvX509Mgr::signcrl(WvCRL &crl) const
-               "CRLs!\n");
-         return false;
-     }
--    else if (!((cert->ex_flags & EXFLAG_KUSAGE) && 
--	  (cert->ex_kusage & KU_CRL_SIGN)))
-+    else if (!((ex_flags & EXFLAG_KUSAGE) && 
-+	  (ex_kusage & KU_CRL_SIGN)))
-     {
- 	debug("Certificate not allowed to sign CRLs! (%s %s)\n", 
--              (cert->ex_flags & EXFLAG_KUSAGE),
--	      (cert->ex_kusage & KU_CRL_SIGN));
-+              (ex_flags & EXFLAG_KUSAGE),
-+	      (ex_kusage & KU_CRL_SIGN));
- 	return false;
-     }
- #endif
-@@ -454,7 +458,6 @@ WvString WvX509Mgr::sign(WvBuf &data) const
- {
-     assert(rsa);
- 
--    EVP_MD_CTX sig_ctx;
-     unsigned char sig_buf[4096];
-     
-     EVP_PKEY *pk = EVP_PKEY_new();
-@@ -467,20 +470,22 @@ WvString WvX509Mgr::sign(WvBuf &data) const
- 	return WvString::null;
-     }
-     
--    EVP_SignInit(&sig_ctx, EVP_sha1());
--    EVP_SignUpdate(&sig_ctx, data.peek(0, data.used()), data.used());
-+    EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
-+    EVP_SignInit(sig_ctx, EVP_sha1());
-+    EVP_SignUpdate(sig_ctx, data.peek(0, data.used()), data.used());
-     unsigned int sig_len = sizeof(sig_buf);
--    int sig_err = EVP_SignFinal(&sig_ctx, sig_buf, 
-+    int sig_err = EVP_SignFinal(sig_ctx, sig_buf, 
- 				&sig_len, pk);
-     if (sig_err != 1)
-     {
- 	debug("Error while signing.\n");
- 	EVP_PKEY_free(pk);
-+	EVP_MD_CTX_free(sig_ctx);
- 	return WvString::null;
-     }
- 
-     EVP_PKEY_free(pk);
--    EVP_MD_CTX_cleanup(&sig_ctx); // this isn't my fault ://
-+    EVP_MD_CTX_free(sig_ctx); // this isn't my fault ://
-     WvDynBuf buf;
-     buf.put(sig_buf, sig_len);
-     debug("Signature size: %s\n", buf.used());
-diff --git a/include/wvdiffiehellman.h b/include/wvdiffiehellman.h
-index af75ffa9..a2d001f8 100644
---- a/include/wvdiffiehellman.h
-+++ b/include/wvdiffiehellman.h
-@@ -27,7 +27,7 @@ class WvDiffieHellman
-     bool create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf);
- 
- protected:
--    struct dh_st *info;
-+    DH *info;
-     BN_ULONG generator;
- 
- private:
-diff --git a/include/wvdigest.h b/include/wvdigest.h
-index fdc39bd6..f2eed401 100644
---- a/include/wvdigest.h
-+++ b/include/wvdigest.h
-@@ -9,10 +9,8 @@
- 
- #include "wvencoder.h"
- #include <stdint.h>
-+#include <openssl/evp.h>
- 
--struct env_md_st;
--struct env_md_ctx_st;
--struct hmac_ctx_st;
- 
- /**
-  * Superclass for all message digests.
-@@ -45,8 +43,8 @@ class WvDigest : public WvEncoder
- class WvEVPMDDigest : public WvDigest
- {
-     friend class WvHMACDigest;
--    const env_md_st *evpmd;
--    env_md_ctx_st *evpctx;
-+    const EVP_MD *evpmd;
-+    EVP_MD_CTX *evpctx;
-     bool active;
- 
- public:
-@@ -54,13 +52,13 @@ class WvEVPMDDigest : public WvDigest
-     virtual size_t digestsize() const;
- 
- protected:
--    WvEVPMDDigest(const env_md_st *_evpmd);
-+    WvEVPMDDigest(const EVP_MD *_evpmd);
-     virtual bool _encode(WvBuf &inbuf, WvBuf &outbuf,
-         bool flush); // consumes input
-     virtual bool _finish(WvBuf &outbuf); // outputs digest
-     virtual bool _reset(); // supported: resets digest value
-     
--    const env_md_st *getevpmd()
-+    const EVP_MD *getevpmd()
-         { return evpmd; }
- 
- private:
-@@ -104,7 +102,7 @@ class WvHMACDigest : public WvDigest
-     WvEVPMDDigest *digest;
-     unsigned char *key;
-     size_t keysize;
--    hmac_ctx_st *hmacctx;
-+    HMAC_CTX *hmacctx;
-     bool active;
- 
- public:
-diff --git a/include/wvtripledes.h b/include/wvtripledes.h
-index 185fe8a9..a442e7a0 100644
---- a/include/wvtripledes.h
-+++ b/include/wvtripledes.h
-@@ -70,11 +70,11 @@ class WvTripleDESEncoder : public WvCryptoEncoder
- 
- private:
-     Mode mode;
--    des_cblock key;
--    des_key_schedule deskey1;
--    des_key_schedule deskey2;
--    des_key_schedule deskey3;
--    des_cblock ivec; // initialization vector
-+    DES_cblock key;
-+    DES_key_schedule deskey1;
-+    DES_key_schedule deskey2;
-+    DES_key_schedule deskey3;
-+    DES_cblock ivec; // initialization vector
-     int ivecoff; // current offset into initvec
- };
- 
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index 276931e4f6fc..bc7e48187998 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -5,7 +5,7 @@
 <email>jer@gentoo.org</email>
 </maintainer>
   <upstream>
-    <remote-id type="github">apenwarr/wvstreams</remote-id>
+    <remote-id type="google-code">wvstreams</remote-id>
   </upstream>
   <use>
     <flag name="boost">
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r6.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r6.ebuild
deleted file mode 100644
index 1f564c66d33c..000000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="https://github.com/apenwarr/wvstreams/"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="pam doc +ssl +dbus debug boost"
-
-#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
-RESTRICT="test"
-
-#QA Fail: xplc is compiled as a part of wvstreams.
-#It'll take a larger patching effort to get it extracted, since upstream integrated it
-#more tightly this time. Probably for the better since upstream xplc seems dead.
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( virtual/pam )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )
-"
-DOCS="ChangeLog README*"
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-glibc212.patch
-	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-	"${FILESDIR}"/${P}-2048-bytes-should-be-enough-right-question-mark.patch
-	"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		--cache-file="${T}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--with-openssl \
-		--with-zlib \
-		--without-qt \
-		--without-tcl \
-		--without-valgrind
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-}
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index 4181ca4eaebd..8665f2087f92 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="+dbus debug doc pam static-libs +zlib"
 
 RDEPEND="
-	dev-libs/openssl:0=
+	<dev-libs/openssl-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c987ac7dc45e..c3c4e4569af4 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 22c21778c6e2..9cab7e3e985a 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -22,5 +22,5 @@ DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c714
 DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
 DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
 EBUILD ntp-4.2.8_p11.ebuild 4517 BLAKE2B 87ccf28c99af3848df8ca2bfc5825358d6c38d2045939b3d8a7c6509a83493ef1de004e4afdc466c453335b637c63895446c351cb2072193620e2af4883c2fbf SHA512 e8d5662377daa1c0ea1e9c1d746b05cf16944d8b3c3d9811307bca1cf6be923899390597019f9a5d203acfdec00d252860110ca0f434bffc43a25c42162696ff
-EBUILD ntp-4.2.8_p12.ebuild 4574 BLAKE2B 1415410b62825b1b9c8d0b72da066ffa90e3a18a757e025da5357371d966b0c419078d77f73b049619e147c9918d8970ace57f87e8d4943e823e87f2cd75d386 SHA512 df92634fa99918bd24d6c55a272b06dbe95d3805bcb2b1842a2a0d1b925853030327ef80c16d317c08ce48895e7b6afc1df41bed3dc151277c53d91eee28d49b
+EBUILD ntp-4.2.8_p12.ebuild 4573 BLAKE2B a25b4b0330e11545512346af8166d32fb4af0309d599c56954784be2636c7131b23c1807f28bb89e555ac4c7481332aef461dd240ae43df0ba2355c285487462 SHA512 5cfa2f0e7f24f193721d2daa1e4533fb43e2c3ee359fbeb73bcd467385169c9594a4953e5192a8bb996aaa76c1e4b9a7a87426d38f289a81bc92375c3d84e53c
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 39fa971f10b0..64b253d2de28 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 049ca482320b..a8d5c8385c19 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/wepattack/Manifest b/net-wireless/wepattack/Manifest
index c8ada6754982..521824ed0458 100644
--- a/net-wireless/wepattack/Manifest
+++ b/net-wireless/wepattack/Manifest
@@ -2,5 +2,5 @@ AUX wepattack-0.1.3-filter-mac-address.patch 6727 BLAKE2B cdd1ff764e3cc409baa80b
 AUX wepattack-0.1.3-missed-string.h-warnings-fix.patch 608 BLAKE2B f0bd227ddc9e778101802cd988451d374bec0e619f06f180d7275e793d0e8815c08e9a2f9e12614a4efeac2b44fc3cd0bd9ae1c59bd4a650702e21ddde335d58 SHA512 30b92627c616a1e2d07300765d6b2e2b1e097e424820c21d98f814ff153ab87375e913deb9f2e60d61ddd64768865d35e3b5d73b2e700caf7fc85a3f484b719b
 AUX wepattack.conf 181 BLAKE2B 62d5a4b333fea32a5c5fe81e71a5b30ed90914361fda8c23dba208e6e4134651f257c337eaa1c8e95c5be5a4323443dad91ea51e1ab47e40064c5231299f8b07 SHA512 51c056be0c8b77e0af5c3ca40ee38244c6d5b7c55be4ac1d6a0e0db721c4be7e1ef235588d27b124a2f281d626fc5904234fb4d2d2e344047582e600ae6037d7
 DIST WepAttack-0.1.3.tar.gz 25063 BLAKE2B 48923fd891a57a61edf5a3c75e84c3194ddad79adf7b588b54f4709cfbbad43537011f5e1a6c303f35cace50835802871113d7815bfcd1b08d167449e5007a0f SHA512 fe8d9843613fc29b7802f699311cb67fe3546a17a279ebc2e150cce155e726270dc937b1c941d9e9287b813febf171fe56053f6b010c4f2021e45e572f91fdf4
-EBUILD wepattack-0.1.3-r3.ebuild 1139 BLAKE2B eb9de977a4707e1e9e09e61b8ef57581e7d0c785ba817d542595a1cf7e0cf2c916d8c504ffd6a4c84f158b946485d5e9d7a34c4769f62bf2620c4fc88d1c89d2 SHA512 27d480523b0d9a8450213675bdd3fe7e2c4612ff8f751973270cef0e389432f229388dd15a3856341cea8dc7d91b8d71ef116ebe2e37cc7a8876787e36059510
+EBUILD wepattack-0.1.3-r4.ebuild 1174 BLAKE2B 07963ddd83b699e0b137aee8dd66daa1253a25c057e16af6ae238712118401f85c0dc5fb642f017ce569b8058af4fad969ade83ab1d940e56cd5bb8753122df2 SHA512 588d8965e2be86abdd9a576d94d8e616fce8be4b3f0edb0e531074d34fb3e38386a6a254d5fd7ddded2e3864a3d97ad6e3de31699240af9a13f48bfd9bf21567
 MISC metadata.xml 738 BLAKE2B afff49099c9884048e58980250796970f9222ea864eb9889ace2b5cd26efbc6292e658d252d03cd7f7f93e006e57fa7a7eef6bb3eb1c68fc86c7c77706a1447a SHA512 5b2f7f73769ca63b32574a04ce6031ae4d664d65c23aea972aec5cafcbd8602a4cb3cddab078c75c6645c3bbf12f0b658916295834c7dfcddd9b2fac3c5649f9
diff --git a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
similarity index 89%
rename from net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
rename to net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
index a10ba9a107d9..cc200b2888b8 100644
--- a/net-wireless/wepattack/wepattack-0.1.3-r3.ebuild
+++ b/net-wireless/wepattack/wepattack-0.1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,13 +15,13 @@ KEYWORDS="amd64 x86"
 IUSE="john"
 
 DEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:*
 	net-libs/libpcap
 	sys-libs/zlib
 "
 
 RDEPEND="${DEPEND}
-	john? ( app-crypt/johntheripper )"
+john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b34fa4ec1adf..adcdbabdc122 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e813e0be5d70..24b5043eb3b7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -322,6 +322,8 @@ app-crypt/hmaccalc:fips - Enable NSS FIPS mode and support only the FIPS-complia
 app-crypt/johntheripper:cuda - Use nvidia cuda toolkit for speeding up cracking on capable devices
 app-crypt/johntheripper:mozilla - Support mozilla password cracking
 app-crypt/johntheripper:opencl - Enable opencl support for speeding up cracking on capable devices
+app-crypt/johntheripper-jumbo:opencl - Build with opencl/GPU cracking support
+app-crypt/johntheripper-jumbo:pcap - Build with pcap support
 app-crypt/kbfs:git - Build the Git remote helper for storing repositories in Keybase
 app-crypt/kstart:afs - Enables afs support which means you can acquire an afs token and set PAGs. It's recommended to set this USE if you need authenticated access to an AFS cell for your daemon/app.
 app-crypt/libb2:native-cflags - Use CFLAGS as determined by configure script. These flags will enable all CPU specific features it find available, to further optimise the implementation. This discards any existing CFLAGS set in make.conf or similar.
@@ -1160,6 +1162,7 @@ app-office/scribus:templates - Document tamplates
 app-office/scribus:tk - Install tk based scripts e.g. FontSample.py
 app-office/skrooge:activities - Enable kactivities support
 app-office/skrooge:designer - Build plugins for dev-qt/designer
+app-office/skrooge:webkit - Build with dev-qt/qtwebkit instead of dev-qt/qtwebengine
 app-office/texmacs:netpbm - Add support for media-libs/netpbm
 app-office/texstudio:video - Use phonon for video embedding
 app-office/wps-office:sharedfonts - Install WPS fonts available system wide
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 83e337fcd660..cea51be7c228 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/megamgr/Manifest b/sys-block/megamgr/Manifest
index e3bcf56d083d..053a135bd8dd 100644
--- a/sys-block/megamgr/Manifest
+++ b/sys-block/megamgr/Manifest
@@ -1,3 +1,3 @@
 DIST ut_linux_mgr_5.20.zip 253549 BLAKE2B eb173d349e5399229f55ec073246993068caea01dcc707ec11d34a418cd42368eb80028e4363cad7e1bb707558e6eb8b629a2071387bff40471daa98d1d14c94 SHA512 3f942ab3d7a192bc1a945945d20545ffdbbbdd9c4af238701cf7357fe5b3f405c2e777da7c42908e1acb676499ee87aec261bcad729a4d787f8e098af132bda6
-EBUILD megamgr-5.20-r2.ebuild 914 BLAKE2B 476d1dac1eecced221946e970d79aeba39e72f7c910973179554fae68db82965c951552fe412094761ac376b7c82db53481226852c48cb1ef11ffc25d2f283a0 SHA512 23a8829725629eab170ddc438759980ea5a5e0d7ea9a308a12acb18e00066f4abe707e454aadd0f6a58a58937ed520823613ef0c743f4b53c0fbbffeb587852f
+EBUILD megamgr-5.20-r2.ebuild 923 BLAKE2B 770e46c6c599797b3f98aefc4d67fb398ce34d8ccf89fd0dec47e9f7dd83e4fa6c194cd42c9b6855d056c205a2552365ca687a4ef6069761ec4fcd7337b64dc8 SHA512 b55035e19b2d988f53555f8dfa69b5f1aa93fab4046bd180d38beef54f73b99a20af5607d2dd8c5ae3df21c331c72d08ecba3ffd1eda2d629cc8dd2c4c7b0b59
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-block/megamgr/megamgr-5.20-r2.ebuild b/sys-block/megamgr/megamgr-5.20-r2.ebuild
index 1ebc56400d12..7688cadd9b6c 100644
--- a/sys-block/megamgr/megamgr-5.20-r2.ebuild
+++ b/sys-block/megamgr/megamgr-5.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ QA_PRESTRIPPED="/opt/bin/megamgr"
 pkg_nofetch() {
 	einfo "Upstream has implement a mandatory clickthrough EULA for distfile download"
 	einfo "Please visit ${SRC_URI}"
-	einfo "And place ${A} in ${DISTDIR}"
+	einfo "And place ${A} in your DISTDIR directory"
 }
 
 src_install() {
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5d4c05ee003a..04ea00a3adbb 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 8cd4962fce13..af75766c0bfc 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,9 +5,11 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696
 DIST swift-2.17.0.tar.gz 2527561 BLAKE2B baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8 SHA512 d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
 DIST swift-2.19.0.tar.gz 2977206 BLAKE2B 05f53e7deb7948924ed36f7fcef164dd72254a90329e88a20ffae1f97ca632967d2e4de34a95c29008f8d636ec95b6860238f77f28b2f9f7ebe78ddb8c784a6c SHA512 fa6f08bacb7488762efaf8dd067cacd82adbc0ca773ee9b9c4a23d05d448eea9d79af2c9fbd619f4a458634e0af3cc3ce8fb8eb0d7cf0c10c7d3c28955000afd
+DIST swift-2.20.0.tar.gz 3012428 BLAKE2B 48cfb52bce8d89836ede3d82cde197e282b55cec7fa9366c18102a2259a2c96553c573c92b884e6471a3ff5a5fc88ff3eeadbb200c691db3c6b20b6881132576 SHA512 15f1082a94f16684001b1d6eaa635500d41dd2ed0b65b87d8fc2363f96179cbc4d40a6faee10e966ad954e45035ed77c31dc265daa2c7c9d17a0e81890e6bc79
 EBUILD swift-2.16.0.ebuild 3698 BLAKE2B 971a44109dc7fbc2230be6db33db966eb1596969953bb1ce03d9133683223f9c17553602397d5555dc88515e6dc5c283f829903ffbfcef1cd63c2cf855c9d8ef SHA512 5fa5c18cd19412aae6e41a544058b29cde20c3a9d84c89c27767ec7f8bff4021a559562e44bbd11b722fd6950b3529734ec42ab9a8bee930e6200160b873953e
 EBUILD swift-2.17.0.ebuild 3698 BLAKE2B 4b120f81788a76de5a14012714fe0dc94d9d51cc6261737d6498cdbd1130c32e6553128ee8e268553c1fc8b51277ceba6b61c32cdcbf087647d806718e83c51e SHA512 d805c50cec482f3a76a283c7f604a8de8e0c3b580f0c43ab9d2ce7c0cb4e4735cfb4e08fdba05598625bc4dc4ab7e2157acaafc70bf568b5a8fb928cb94c91ea
 EBUILD swift-2.19.0.ebuild 3930 BLAKE2B cc022f6b23f888b2f934ad55dc5ae71772cdfa98e5b1ea86b99e1ad42c3fa6f1945267d2494c5443f8b3210a7673bc12c11bb63aee88eb6d1fc25fce60ae7528 SHA512 71aaa9d9c9f21077e759857bffc22d7f8ae1f3d7b1517adae9365826a34d77ae0761e44d22e15ab6551e353744009a6238ae61068dd858da20108fd0e4b89410
+EBUILD swift-2.20.0.ebuild 3932 BLAKE2B 1037e13564f3c736e7aa60f702a6c9022dd61c7fdb102d1da59137ecfa389ac2e11a785b7d87c3d82b401886c2ef43fae7b66ad883998457d4a7e92e0e00ad22 SHA512 d37d3965cc3bda4ea288068ce23fe4519f64981d901830f73ed263e69062810e7f38e693ed1922462b5a519009f1559b12f1e7546c4e4404f557bfe07d4a1c9d
 EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff
 EBUILD swift-2018.1.9999.ebuild 3840 BLAKE2B 1a700bd807c4cc9e6e62da8f29f72e8d45877230d08f7d8fc2047c936c7bfac9788e50c69215f47b6e6b498a8f8fa065b8bbf8c830dc5c6bb1fe10e6fed500fa SHA512 7aff849abb17a19ec0f9feb5c1d1d26428aaa91a764617e662c9bb89c4760d6ab2a36550b60f2674a4867a681af69b79ba3b6d69d9122f335b1c10345eb4187c
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
diff --git a/sys-cluster/swift/swift-2.20.0.ebuild b/sys-cluster/swift/swift-2.20.0.ebuild
new file mode 100644
index 000000000000..d51f090760b4
--- /dev/null
+++ b/sys-cluster/swift/swift-2.20.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="proxy account container object +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners root:swift "/etc/swift" || die "fowners failed"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 7f95803ee9c0..1681040f15bf 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index e556552c3a7c..0c8ff1c7b7bd 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_59.0.3160.0_amd64.deb 72435028 BLAKE2B 8ba17f834c9a29cc17b8f8cc71d6b97cfb8f0676f99be5fec7b188130631ea3a28023d1278c48a01a0096aa7213f82f3026a0cfd179ffe30c7df8fecce89155f SHA512 8dc338e649cedf6ff1a65b2d4e3d219ccb17be9641c1b648387a00e19392530a6dc47c5fdddf1ee6bb23e6b0c5ae95534ada72c2a911efbc90102a66d2980e1d
 DIST opera-developer_59.0.3167.0_amd64.deb 73096270 BLAKE2B b00420395ffed9e2256bc1e2e751791201eb06eced5749c20519e1575a9fecfc1830f8235d6fa45e32b6ebe11a697018468bc0611b9f7e47ef3e5bfd1f210d21 SHA512 0d2f54678d526b99c3c41e31f0396d0597412f83ab58be6965117a03d150f889579df447c2a1b99744ade59ffb49f303d2e646955ce91cd5e57d0c2d28baa2b5
-EBUILD opera-developer-59.0.3160.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-developer_59.0.3173.0_amd64.deb 72521136 BLAKE2B e3a819b0795c10322be4d586ef13852becb583ae38eaae350447e304a74a0a3bbc0f114bfa268222e2ce03927c20dfe0f152b9791bf746279869d7c0990c2d93 SHA512 164bd8f5b44c13f561c9a22a5c44192e74302261bc74d0d2bf11a15c1ec0449839cff4e5a05a6d3abc0e0aa0e686277dc447d4f5757b9e3c1399a3d20fcc2e28
 EBUILD opera-developer-59.0.3167.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-developer-59.0.3173.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-59.0.3160.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3173.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-59.0.3160.0.ebuild
rename to www-client/opera-developer/opera-developer-59.0.3173.0.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index a4faed5723ed..52ad52466295 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,5 +2,10 @@ DIST vivaldi-snapshot-2.3.1400.4_p1-amd64.deb 59269660 BLAKE2B 7190ebcb97c215dd4
 DIST vivaldi-snapshot-2.3.1400.4_p1-arm64.deb 51037220 BLAKE2B 8230038a2493d9cd23af01e112d09e49fd8b5408d55d753dd1d6cb8f9e78d7f47f8fef08744d02973d49bc4cc68192939574a7871691a59129cb98d97f6ab6e7 SHA512 4b851d9280341e5c8f9f9bb7828e54261bcc3c6f2c78d31969ccde58041595432ce8f0dcd1ccf7f3c4d96eba0f3920ecee841e344ca63a88d75be47a038c98ee
 DIST vivaldi-snapshot-2.3.1400.4_p1-armhf.deb 51869356 BLAKE2B dd76979b66ddf2d5beb9751e993a2d55f7be0ec2a98c4f1f4a2a78543dda45ea32e3039c61736336f228a29675d1a53c0950999d7c9f26a385683973a77982a8 SHA512 d0ed327735ccb2bbe176a1ed59b5170969b5573746f556cb39f9a28de986c545fba9019543e6667044b2df4374ecacf545c14c69593ae256f39ffbcaddbdfe4b
 DIST vivaldi-snapshot-2.3.1400.4_p1-i386.deb 58129700 BLAKE2B ef3ca8780007254b756af7018bdeb9a0f53dd0a18dd60b9d08a947dd6edb9a02c9de365fe4927009a91e1f889fe0ed290a64452ec5fe6c30cb1398b6d81f3a71 SHA512 efb43b98fce4cdbc5347c018ea0ffb5bc3d4f13c5eae9c168d15338e1283d7da9a2714fa47f024d480c524e1fc1296761f8aaefbe34d8cd9feed238e08627249
+DIST vivaldi-snapshot-2.3.1401.7_p1-amd64.deb 59257968 BLAKE2B 68b88dbb6429a2ac367b6d1979017bb4c0fb3021562d800a1dc72a4c1ccac3202f013f53305e2d9fd00e71c762ed00754387ca4cb511c3b9cb1118a11be77c70 SHA512 7c27b693279d5effc0ddc002a66bed30050ae8f3cbeb8a73a26ac60758bea6586f5f46fbae7c8a691da8bfabefbe2e710204eaed2cb7573bc89e8dfed8e9929f
+DIST vivaldi-snapshot-2.3.1401.7_p1-arm64.deb 51056662 BLAKE2B 7f0482296794f47a4ae313d584cddc5e354ce924be5b5003f6c6675030174b6748289e64ae15565065195ec5d40c92ef6ba7e605bf265e52a795df529ccfc4d3 SHA512 9003455db6f53a49ce22dbd2333a1cc63f4a0bf6f5f905ebf701c90d1a082b9ec9a88d3deb96895c90d2a4c859b1c7e80bf8a3b832e49a1b511f5381e606fc95
+DIST vivaldi-snapshot-2.3.1401.7_p1-armhf.deb 51876552 BLAKE2B dfbd0f5dbfeada178b139852db99f92b990e65de80e2a1b87ace3bc512604e53d35cb8d433fd8feeff5af92c0b7e137491aa1a7fc191b777c0097339514c1784 SHA512 cd1b451f32b9a7ecb1bb9d95b1a6fa42ba8f041ee76799e69d6a1d2751ff76cacc6a2bee57fb5027dab5ccea0f4e3096f4a04c1f0edf4d7038aa7b91ff9e0094
+DIST vivaldi-snapshot-2.3.1401.7_p1-i386.deb 58125218 BLAKE2B 329cf66570385f844570d21f32bbbdf81cd650fdc23a17034ee9fa054a7086b91d86ffb9354b669cf58c39d19248a4f1cefe5caa6ff54a1c7a0e6c4b919d5035 SHA512 247621ccd9aa26d48c5df8660c9b5f0398646e9182b5a2f12668493246284a428e35b3efc5ab47e06b5d7e446d45868b929c45334b0cb09a3923693abbc78e04
 EBUILD vivaldi-snapshot-2.3.1400.4_p1.ebuild 2674 BLAKE2B 21fdd7d1ce8d63ad936b71a57fd13ee73546e287523ebc0194f652b85f3e4c25ce0b2a365b5d04df11553bb54ab691225aefae981db9c79cb31961fd36fa1c46 SHA512 e7cc7cd199a578ee87569349e0ec5d42cdd24c9fd095b72f742535df8c5dadb6697d334badc850aa98a664c3c72994ae4662ff0d0761b9bc7eb590c4df6964ea
+EBUILD vivaldi-snapshot-2.3.1401.7_p1.ebuild 2674 BLAKE2B 21fdd7d1ce8d63ad936b71a57fd13ee73546e287523ebc0194f652b85f3e4c25ce0b2a365b5d04df11553bb54ab691225aefae981db9c79cb31961fd36fa1c46 SHA512 e7cc7cd199a578ee87569349e0ec5d42cdd24c9fd095b72f742535df8c5dadb6697d334badc850aa98a664c3c72994ae4662ff0d0761b9bc7eb590c4df6964ea
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
new file mode 100644
index 000000000000..b45ca4cd1521
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index dc8006d7fb90..e1aeca5fa485 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index 75ccce7fe566..601256199cb6 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -1,4 +1,7 @@
 DIST cool-retro-term-1.0.1.tar.gz 7735425 BLAKE2B b59996137cd66bfcd33d51cd14722cf671aabdc0e8bb8258694f6754105a1bcd75d5e37d0c2b844d65c05dcce7c3fe0f2a48eebb42957415cd899edf7f507adb SHA512 4206ec33d80b511755cf97f136309a66cc67fac6ff5d275245b0bf96c438ed31d20747acf2b829ffcd1b55d84ae9c6b28013db3ab6a0e2f0573e4da516827ea0
+DIST cool-retro-term-1.1.0.tar.gz 1973348 BLAKE2B 9490b05db849bdc08e83215651081e175a59888b2dc1a516fa380fcf10d5b9443e9d214009d06e6b0741cad6c16857357753c846be18b7fd9455c7a3e28ec728 SHA512 70a0fdd3653fa91b92f796d865bd1256fa39228ff536dad95d0eadee502e6babbc56ae6e0275913ec38573669e4f03938dd559128cbf46209149bd60171391e6
 DIST qmltermwidget-0.1.0.tar.gz 196864 BLAKE2B c1be94c175e7de9314ca2ff72319024b058707111e964ac31fddc4fc5f7afe0bcae623c8b58ffe731c2536fc0c3fd267dd621e82f6a7ff3ebe95c842fc9b60cb SHA512 d628b02deb9cce1bb1c1365b045d18a4d1afa641abb928979dba79c7aa58cd940d4974052a5dd6dd2f68d938451b28f3d2e15ab54430e4432c0b174bb4ee62d0
+DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
 EBUILD cool-retro-term-1.0.1.ebuild 1178 BLAKE2B 1b94c08f71d5f1e9c97a02f5d945f70addce08b8206ac13081a63120aaf58df80b80742c6b02a922011f2041f9b65749f06cd955cf3638ad1dd6e1b19988ff6e SHA512 cc86dba1b3773d45506b60c1f625c7b439c56aaed40acd27710550ab8f010d9b9db3a52958279c2f4975fc9f7afa6094e26066f9102099a1a28404d76217e073
+EBUILD cool-retro-term-1.1.0.ebuild 1216 BLAKE2B 0759849f5ff9671d273c01f0116d72e7c38d5ccc8c7eb2b29532c9f81b4f6b0af18a57b7253910edbbd3a4ef522f977c901b6e108e246989b89cd3136e5d0bf1 SHA512 3cc44e6ea4e6268690a39d767858e73eeee3a3d03e05d663d7971edc2d07f5f0fae82f1ebd62a8f4f6337aaea37f11ad47051e8a9b32d00a8f5cb167cc5480dc
 MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466
diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild
new file mode 100644
index 000000000000..1fe6e1ea0e55
--- /dev/null
+++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+QTW_PN=qmltermwidget
+QTW_PV=0.2.0
+QTW_P=${QTW_PN}-${QTW_PV}
+
+DESCRIPTION="terminal emulator which mimics the look and feel of the old cathode tube screens"
+HOMEPAGE="https://github.com/Swordfish90/cool-retro-term"
+SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Swordfish90/qmltermwidget/archive/${QTW_PV}.tar.gz -> ${QTW_P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtdeclarative:5[localstorage]
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	rmdir qmltermwidget || die
+	mv "${WORKDIR}/${QTW_P}" qmltermwidget || die
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	# default attempts to install directly to /usr
+	emake INSTALL_ROOT="${D}" install || die
+	doman packaging/debian/cool-retro-term.1
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }