diff --git a/Manifest b/Manifest
index 2543e6bd6b43..14ba00049df9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28968 BLAKE2B d4fd56870e1f2ad7c644e84876d0369b76681d4f058c8384a88ea8927e28cb64d55c4213831b0d8768e6eb2ba6bec09122fa41eda3f6be7b5289fd3ce64e9ac1 SHA512 c0df0e178f61dd219b647ed0b0d960ef3e13e5a4126df657e725f93014c711501516bcfcc8bc823b4ff19346e86c4c1b8ed75e01e3bb05673ecb18ed873fb37e
-TIMESTAMP 2018-03-31T14:38:22Z
+MANIFEST Manifest.files.gz 29009 BLAKE2B bc90642e3db972dd554aa552881bd67c2c7903dba175bf630224fdeb6fca7d109ddfec6276e1f015619b18a452860707412fa2038a2bb4b6c72d4282716e3496 SHA512 e882989818d6ca4f12aa14be1a923b968fcec92f6f99df1885cf32ea3f98113b85990d75bdbeeb263d3ba8ebf14efcf4ba993e7f43a7edd0003ad57ae407c6ab
+TIMESTAMP 2018-04-01T08:08:19Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq/nV5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrAk3NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmpg/+KnhmC4bSWn5r67Cm2pOj1ociLY8/mDPCCEB7B1TQqYYzb+Gp/67kA9lh
-/CbQ3jmwGUgIhZ2zrvB/QiaFxTDo6zWMBgVSMOhfuV9D+P6E3wVOUN8FkrUA8cn4
-HilbTgfMu7MBzN9WfsF/6gDpCMElgCPyx10mdxuNKryUZI2C4sOJwo5H9N9Krgw0
-IP7FSYV7U7YFlI5aVncEW/YUzw1KrAcXi7RdGumFIV+6wY+beVssDUU/kpVyol5j
-z9z08y8sZdTB65Ey2EE2f/aF55LvuSCCEKIc7SaEJ1UOhcu0jRaI5ipSeO6q0IDx
-cPMfWNs9cQk7Zmb5Ue7o3FAj/D+W2xIkdGkSzhgEz98uIvAz54MM4lH8fv16F6/Z
-1PGPW+YgK50T7tR31ZynMmTXdbuV8uS2Di0/RUY1+hHvBQ+vl+yzhMcPVHYjQlCG
-7UuT0RZITw9OtAK4dQpr/2RC+JhWokoRU3W+z+bPGXcR+RRckwvJTZPpGXLyy3jS
-aFsBgLg+UlhvR6TtSmWNjI3Qk9wdP9XL2huMs6j7DcgZoWrwdfMqNdunM+/XxaRX
-gKIZYAqN6AFSv7ucCNl2gLpqNf6NDpMlMAOXlJplS529MTwpgmBSpPG7mT2NFb4c
-02zSRVKI+A+iWcojxTY/UrsY7krhPQ1dJwmDr+TyuFlnY8h5RY4=
-=lhhy
+klCUVA//YGgbX0Bv7Cq9E+ZMERTz3vcaexUWbosfcOGgYhH0ztsQxl7n0JdIVi5c
+yKL2DMOyxiH691YduorLrs/O79D4PTdCteCMDD4c8XjyZkIm4B9zth2EK/56d8P9
+ybdoRZXM8Bg2AoEqD6PdmQ6oejl94bL63Ia7EvnF+fNXDCVGYvk+5bUbBSL89yYL
+j6CMZezrgI+cKhHXXVpLcbpBSPgqCYtMgOfMHUHcnSmCHZqubZhQOANiL1KQMGbN
+HFFVEbZi84um1mXB4wqArKlzTnGyyBmDan2MSDmJW1yQA5f0ikPISkBgO0NK4T/O
+jow4xIYUw+YuHEJJLbjlYwfB9RZj4oHwRJRB287swUjA6yp2ncArfqoxGpXk7/eG
+JLiPIZ8TX95xJaNCFPvtD29qGQcS9h4DMK0ch6vy2o7xsQGZ6Wwp7wRHYQDf9JiI
+rNqkd6gimdtMQEn0bwHRZUWQK7YbzOqqUw0Rqg92wZthD30OPpZJhdLGV3VNOONk
+o1RF23i7smdCShafszkgZ21mksVZ6/8f00EfwTN+3PpUPcadDErafLOj342hZreU
+ZYcyhO4CJ6rsVqgLHCJn/I7bSzzJ6drEgm0u4Ux89Krwzf21kF+Np49jTKolMChM
+DCUPWnJ+oTKGs9gCuPT/1+eIS4YK88FfGDYQjujtck9WJ8v+3YQ=
+=YE2r
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 01a23582e01f..b6a49c1df9f3 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3ea3dabdbacd..b2cb3da78647 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 9c292c3336db..9334529c8786 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,6 +6,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2658 BLAKE2B 830ea9f04a16a045c49ca1394e4623136aaf2f98841ca23b385d6913005e73058485e32cc6ddf25a2f702eb91b524483e33a06b1c59b15fdd5e9581f10450935 SHA512 0fa016c595f7d19a60c4017ad254ce21e40a00e05743851d07af1b5e05f44f63b5de4a9d63a8fd7a6928fc988b779f19de8137c8ad328307a5ee98f1388d4492
+EBUILD apache-tools-2.4.29.ebuild 2657 BLAKE2B 8ce57db2791cabda2304cca05bd023b09e7516f505d278caef6bec6f4a356165ac01dddb3076cfea8638d2ab7cc8d2131ef6d4b6f1adfd021911fd8ce4e76cee SHA512 c68bd22cf194f89187053c9c3a2a86ecb39321aaba39b6cccff755385e28d4b1405e84018009c29b5a14c3ff6d00f5fc8c845e05703421f3a63e52f5395689d8
 EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
index 1f535af4d854..7921ae4a88ed 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 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 ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 6db93d7fb184..2000490bb598 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -1,3 +1,5 @@
 DIST kubectx-0.4.0_p20180118.tar.gz 398084 BLAKE2B fda8cae93e221fc4732b7cedbd44465541cdd7f31b29fbbfde781ea34b2c2d644ad6735d6bf7fa1ebcf04cc2b9dc3ac8e883808cd04c8a256b004a3293cee240 SHA512 04123596724dfc4dacc0beb578c716a3909d98d7df7dbf3c1439b5bb29ac14ea7b366be3e2252550ed89474c58ce83b028af79b0cd288f1ecd62c6c3f2729f62
+DIST kubectx-0.4.1.tar.gz 397910 BLAKE2B 60b0ac75cf6358a3660c3e59f85e5c27a670095ad973edbf2b53350726b48f1036aa90dd999cf149c10956a43692389ab2e87c63bce3b711ae2c7cb894157753 SHA512 dcaf1c8f71f69037f9341ff29befb2507d7bfa11a25e6e864000b802fe1221d6b47f2f78faa6c490711e65d0dda4b289e5ed1ffc261e4d2142054f48d1aac140
 EBUILD kubectx-0.4.0_p20180118.ebuild 789 BLAKE2B 199715ce5c3fab1bc97580c7625888ae244585bb6d1f9efc24ee99188258c8540086b386e9efaaf77eb129f425fcb646c42e7908196a5b370d823846c404c50f SHA512 9b59c77fe6d81d3d794d0d21a6ae4441ce1546a587bb6dd27516c8741293ead21ebd5011237235e578f24ec3bee6d396a53de48fd38fa0dea55fbb24ada96bcd
+EBUILD kubectx-0.4.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
 MISC metadata.xml 324 BLAKE2B 78b22be6aaf9e018d9e75f572304e37680db02da78e20dd603c0c0c1eaaafdf37ae7b4d1534c743581e319cede030c25ce77fc701b10e4359522fe1cfe48ce04 SHA512 0361b6396f21c195af41c0f2fac3030071ad28d736ec3b7b731346b4cde955be334deb1ab0974f9b273d4dec63e6fffcaf288aa707e517bea6971cfc9e07b551
diff --git a/app-admin/kubectx/kubectx-0.4.1.ebuild b/app-admin/kubectx/kubectx-0.4.1.ebuild
new file mode 100644
index 000000000000..bcdb869a0ef6
--- /dev/null
+++ b/app-admin/kubectx/kubectx-0.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-cluster/kubectl"
+
+src_install() {
+	dobin kubectx kubens
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1b9b3e0384bf..69d8a58fd6cc 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 3c1ef62a4abe..74f10306808a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -25,6 +25,6 @@ EBUILD clamav-0.99.2-r1.ebuild 5125 BLAKE2B 330ee8e4625368933a519481a204839153e6
 EBUILD clamav-0.99.2-r3.ebuild 5182 BLAKE2B d635013b30e5ec0ea2ec7a9329d1534595bbbb51b0bd79c3d1e0e545993223dfc384cc28bf907f478f8ae354b8b3543df1c2f8bafd4a89d01d3fa5c6bbdd4099 SHA512 754c23b5f2dd0d664f79ad07d0dbf1944a58418f36c9d2e01f8fbf88eb6f883bf825cd16a43ca3916417a3dc4e0de8dda49f345a002e74f2caaa1b1e1da3fd97
 EBUILD clamav-0.99.3-r1.ebuild 5238 BLAKE2B 21836637c6f099309f59ef7bc317d14d11dcb5396a5c426fbc026f51a792a87560230101cd81ae23ba51e6e869532229cbcbc830fe4bca65fd7ba54be15d34c5 SHA512 df1fd4de0d11ba5db5de7d010ebf220c8c00aabb86c196ae5f7da0111ba605be17745afe15b1bcba1b9b795463efb4e61d62502332fc0365e6e1eff823d3da6b
 EBUILD clamav-0.99.3-r2.ebuild 5306 BLAKE2B 0eee180fc83ef2de04d9bf02992c1a804049f363b69c98476bc9280fd0d1ae54fde61b025fc2c41f5d9b0820106df917199417394e444fc4c3bc3963e8fc31fe SHA512 2481be4ee556d68a8dd930df5e3942badb65baa2e0097b1f15c7bbc666cd30d880ea8b9fbf16c6318c67ebbc77bc29860d4d7aefe92e23fdb41c85155f0b4fac
-EBUILD clamav-0.99.4-r1.ebuild 5170 BLAKE2B e90181a2453ed5a4a4e723c7013ca1407dfbe192132c38d86a65dfce2469aab7e5240ede1a615dea22b2ecdca730d01bbf020c409f62cbecab61e4515df96cb8 SHA512 027ed6c0c252f1d3f453dfcaa0e0222ac36587b3f40f994ef4efcdc00c1d3695d80f5b2d142fe02376a9872fd473aebf51bd8cb13686b762965155c6ee99e7d1
+EBUILD clamav-0.99.4-r1.ebuild 5169 BLAKE2B 9ba3ca66cc42d82b3f237afca77648f5b8928bd7d3290592098764cd5d8b49c1c786c743c77733a107e52ef6bb2352211141e56819581b71649a73b34f22a1e5 SHA512 3d824800c7a5b74e6dabe82f3b5b2d8102b9d77e9deece45d94eb0c84d9ff4d32355205bc9a7b35889c2b16a23f39d693b8a68d580b665172189a411de04630c
 EBUILD clamav-0.99.4.ebuild 5062 BLAKE2B 35e77bc4f949b867cac5838cc8050c9bcc3724c7ce7240949a298ac15bed397d6732823028b6e67b228cc502c28e4f970aab9c42f4fde20c2b2fdfe2b54763ff SHA512 7cfced7ba233b4f3d62a38094d4af7de17c80776fe2d73e99994449faf1a1486270307cd90e2165840aa4d92685d8dacfb2224e2af27604422007f6372d55e09
 MISC metadata.xml 740 BLAKE2B 2cc1cd27896d7a032b476bbbe6a1b176c95657de5267cc77f6fc1ce1758603d9cf0caa0f3a614bc4a366695a089833474c30afc607ba1dee2caaff1dfc9e6c48 SHA512 baff0fa3285a5bfd17b408dc88ad573df07ec4de5e2827d352465347c5ebceb466172c4f369dac5680c927cad3a887a60721358e43b26e8cd7eaf3cebcaba832
diff --git a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
index 5092f5f35ff1..b91754667041 100644
--- a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 506ce195b61f..d03779dbab73 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 7812d2061e03..8319f7224620 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,4 +1,4 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
 DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
-EBUILD file-roller-3.24.1.ebuild 2223 BLAKE2B a1d82e9e382095697fd75e0d180c8629fd64f27b7fb18a7ddf38912018e2856f05251aee55962e9212965d4bfd9fb307627f4895350cafd67b7afe5b16e96594 SHA512 d1ffae59e371bc1f01f7e487039a13437e3afaec545e69266693c05a2b0219d5075af9c9111ace747eef1029c8d6fd3fb824f6c378a4b4678be6cad59f872b85
+EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
index 61e1a7c6e37d..e916e5b37d95 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index a4440a444a65..8081cf51603b 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -4,5 +4,5 @@ DIST unace-nonfree_2.5-9.debian.tar.xz 16900 BLAKE2B f7120278d0bd7b5ccccd76b4ffb
 DIST unace-nonfree_2.5.orig.tar.gz 122509 BLAKE2B b395139e2f58bf0ef65774a0725bd3340eb1aca4a6680915eaecb93d5d744fca9f5e53a8866e861421b4fa08f462571d7662f68c091c35ed84e3bc367d9f846c SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b
 EBUILD unace-2.5-r3.ebuild 737 BLAKE2B 01bfcd31d54fd225a0adbe86203ec7a7c615bacc9ed27496511181313d0f68f942f15bb4240cde22fbfc7bcb031e6a34ab0969b43d4ebc190ce7a8d5c4c8a04e SHA512 5fae9bb1a6c8ab462faf143282a2276f1d523a28a20b3d4e73e417e1ef5b47b2fee88f66b065456d54b2e03a27f5ed5470ebd15d1646a8c28c47730306307ab1
 EBUILD unace-2.5-r4.ebuild 745 BLAKE2B 1670cffdd677a2ed4890852a7e132e98221a8c89e6b094b83e0bb4d26244a6001bbd8dde7a703c0f5da6e17df99e39dc176072f7e0e657078f65e262ec8447f7 SHA512 98543d7914ec4c5113585018750f5cbb4bcc0f5e16c30b19c017cfa09fb4f6c525610065e79f49c73901491f67308212919275d3548c9241e3342a4a97f81230
-EBUILD unace-2.5-r5.ebuild 682 BLAKE2B 9b1c99369cbf57f47e01ca30cb80d7b080f6911c23781fd351013fada73bd2148b54830a27ed4ba19cdebd938ffd561edb8a25b06234c39cb7d8f879e56b458a SHA512 43cd9ac59965302dbfa15a90a050fb0d0787d44ac3377fedb2e2c0cf9a110d46b9f4ddb00ebf2378b499ed2e074c74d3ba23cf5a442ae9d305f69aaeea546fc3
+EBUILD unace-2.5-r5.ebuild 681 BLAKE2B 229631e4ede44389fd50bdb8486f0001ea03b35a07ffcc201c2dfc417d84efd0a339b9bc227a67bc359d88d827234fab6918b03b141a1154d8938f31b17dc092 SHA512 4439f3088f9bb552922e2fe3706d4382f3d67ce400755b26d1cce13e8d4f12f7da1dd984b8fa3e858416078bed0890b322ce2ad9fbb2e3e5e797fa96e53f9751
 MISC metadata.xml 334 BLAKE2B 70154980d5673f6a7b222729a9d122d52b6a9eeb273105a0a99f8c8a334f9b2ce7b723e0055de15205177da6c833a989c5c19c60a551e9df9041e559096b53ea SHA512 13504f823b15124d38de0d351767169e9b51ed0f397175b3bb59ee7c16684c494d1adf2dc2be5cdea91e2f9186c5e318ee514d37b821eeec73f9f14ed5d731c4
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
index 5d71b9628854..ffcf264cfe78 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.
 
 LICENSE="freedist"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 PATCHES=( "${WORKDIR}"/debian/patches/ )
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index eebed1671cb9..f9f64a49fa03 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 516fad6bdf88..e579b9c99591 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,3 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-EBUILD gummi-0.6.6-r1.ebuild 916 BLAKE2B d9eecaaceb5a63d0b2e8a4743898b1490e23a4e13f50b70a6b3836d20222fae83dbcbee9f3b1397b599e3be0fe600b80090aadad7a38d8135134ef7a4bb87bbe SHA512 c270fab91385edb852fdffe343a2b435c82cffc8c3857172665d5365c0ccff02b645528e9c928fb966c0713a2aeaf1693100ddb83728f59458083403c03bb61c
+EBUILD gummi-0.6.6-r1.ebuild 923 BLAKE2B 5192de8451af829ae3a9a2b673c17bb84263304d0ed1dc0a4249843c58ea0fd743d09f3dcdfe627dd22fa21ae4e42d444f63e25994c815178e6dd9c54def2668 SHA512 e65c0d73e2e9f4210048e50dda8247f1bebef281a5528edae821e45b407545933091c9446a7dc47d4c140f169d283281c643eece5bfab8c87f13bf24667f9a8c
 MISC metadata.xml 696 BLAKE2B fc79a12f64bb7a8961b064fad0deffdaaa483b26cf2899594828396bad3c431bebfaa6cd4c1259b2e8ebff13cc569b4ba787065cd241007a78b5c391f9279149 SHA512 dc55d2a4588bb6d42e4e97c8a383ea5a8b22668ca59083cb3acb50b703c2f6478b6dd51c1af82f622cb4c9b5da8062d80c569212383e7a904023eb39d84f5f9f
diff --git a/app-editors/gummi/gummi-0.6.6-r1.ebuild b/app-editors/gummi/gummi-0.6.6-r1.ebuild
index 1c0c17e25b5f..e1b1546fc67e 100644
--- a/app-editors/gummi/gummi-0.6.6-r1.ebuild
+++ b/app-editors/gummi/gummi-0.6.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 46720f3fd815..b79cd4680c0b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -12,6 +12,6 @@ EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c40
 EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
-EBUILD gvim-8.0.1645.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296
+EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
 EBUILD gvim-9999.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296
 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/gvim-8.0.1645.ebuild b/app-editors/gvim/gvim-8.0.1645.ebuild
index 1de46facaa9c..7b9da4cf8c27 100644
--- a/app-editors/gvim/gvim-8.0.1645.ebuild
+++ b/app-editors/gvim/gvim-8.0.1645.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 5792ae1b8f3c..eebf5cee3c0c 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,5 +4,5 @@ DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
 EBUILD scite-3.5.5.ebuild 2116 BLAKE2B 6804a7de3d7d491d901a7ed2c0acaded903864579b1045fea2845ff63754f35328ad39e1308e9c4462cbe63d147e3d22844dbef37b0469235a8356e4de722bad SHA512 3cb6bea06bb846d448eb5643037cf961d916fdcca96efce4202fb4eb351741300f170b91c777831129dab523fc1644bf1955b586811cdb3b02dcd4a93a9f98bb
 EBUILD scite-3.6.5-r1.ebuild 2242 BLAKE2B 2203a916c7e4b9eeb2c78dc15aa8bab6ba18021c8796ee5b3eb03f198d04360153622fbf031bfe5bac10ce1e1880cb1bea61d5ebca4b068daf272ece5f19ecee SHA512 1fa0330ecbaef2dd14b39eb5b285a6ce7db9ee227749675e9658d278b3c0cab26920f633525717e129e7a95ea134b8cd95aab839ea180c8099512d408c2c8969
-EBUILD scite-4.0.2.ebuild 2697 BLAKE2B 6f4a3d594f4a98980006c4b9c4ff8e38ccd57440ba7813b780fdc9d2a8aa62a51eae65dd23d59ef01ed8b095f5e4f41f4aca03f1ff141dee76652ca661a85131 SHA512 4e45e4056e891f35ccd46518523d3cfa6f10fd7fcdd95c2d1aecc3abf88c1556538b0f80cddde7fd3cd8adb737a9575c5dd9c165b4a5560f8f7762b713e92554
+EBUILD scite-4.0.2.ebuild 2696 BLAKE2B fb806e58076633f9afd123427367262817bd3ce41d9d3541dbad8cbe250e2bc354112b78335f074a7cd11f5960279743620bd00c8d5e5621566374c85fbd7190 SHA512 e42f8edb2cba0438baba51879f5f376a12d7fce542f2ebaaedd9a8c2623b515f4d28b207d128fc3521315520da80ad887edbb701ab0ccd0cf405a5880dec98c4
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index 36a304e51703..b480aae0dade 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b04b45972542..34d0c599c62c 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index d836e4f0d9b3..889551609ccc 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,4 +1,4 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
-EBUILD ghub-2.0.0.ebuild 490 BLAKE2B a96add2961b13f3dfe3da9ae81223a92cc81e822b314379d5217e6591f4dcf323d38208d8b278f6094273ab901c72ed96f5b920ff445a43599b030e303450ac0 SHA512 8f4c91c9485dcb48253231006114a7f8112e250e296b89d752caee2d85fe9587941f27a35178d658aec29b56eb71d891154d35f147c91b154288b5c7fcfd21fb
+EBUILD ghub-2.0.0.ebuild 491 BLAKE2B c80d78142751618b9ca62759099663feae8c8ee73f7aa2ced2cae9e9e9840a04a17b6406ae392df2a2fe53b458aa1d04fda0f23f395c0c816d2e455de28fc131 SHA512 4506d4292a0ac7d0fb3a5ac8bf133e0e5b598305b5edff4a8f30746481e5581beb59fbfe475a97453c3dca9f4be95e1c181e0cc75634c76cf2813f9a8d11cca8
 MISC metadata.xml 1273 BLAKE2B d1248c9061827cfb587b5d4a54ba5aeaba5be8302bc1a2f11252b9fe0946d96ce292f01983a2e82b23008649ee44af169d570a3226887fc22852edb022d1608a SHA512 e8161b23fd2310b303508c80c6af7b428c77ce2eb594bc3bd52b71eab874350d8f8920fa7e348fe48b5f6302fe6242665724dfbe83e308ee5e9d0e8813f2dbf1
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
index 4b577810fe60..86b8b246a84b 100644
--- a/app-emacs/ghub/ghub-2.0.0.ebuild
+++ b/app-emacs/ghub/ghub-2.0.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="minuscule client library for the Github API"
 HOMEPAGE="https://magit.vc/manual/ghub"
 SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7d20cf4a3b13..03f76ba93a6a 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 5f5ddc817efb..84ef23e051d6 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,7 @@
 DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
+DIST docker-compose-1.20.1.tar.gz 246159 BLAKE2B 32836f06239d6f1506ecebac48c8b56c58620d0ba309b8469c073ec3b048bf3743afb1ff6f63d2031df4bb316191d9cd32d5cf85a2cb86544254c6054a7dd502 SHA512 faba24ea501c4e4aaf04bddf1d498eaa7702385458ac7a41f6054e9153f9e03e1e6f50aebc5156d6a814d567aedea1d16ff532872a1765bbabbd3c8da47e36e0
 EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7
 EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
+EBUILD docker-compose-1.20.1.ebuild 2422 BLAKE2B 5f465712c50acb6a47baa4ed2c306a418084f3bd761d5f48e085587610769c15b2c61190693c7ac9e50bef6e3aff7a1cbbfc0311c6090fe50992fc4cb7922a82 SHA512 f6a848ea0ea2cb4ef7d9c1715d6d2b4e4f9fe81af1ea79d3f151d00b00b9d3166f55720257c75138d9f80ea27e6a35fa49c6f26e09461c7c5861fcb2d1f9c52c
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
new file mode 100644
index 000000000000..9e085b82c016
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.1.4[${PYTHON_USEDEP}]
+	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 486a641b47a8..8644ab8a21d0 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index b41c4c5e1c5c..4b7ac83e9b9c 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,6 +2,6 @@ DIST unicode-data-10.0.0-UCD.zip 5991193 BLAKE2B 4724c6f11156b8d97c924c1e08232d2
 DIST unicode-data-10.0.0-Unihan.zip 6632227 BLAKE2B 2bd290b083c87752c3462b8fe7a8c13e3943c69083ba7fbbcc659ca40476e984de1d49a102648d0a669bdaac81babb4c15d0ccba7769e3e4eb1db9efba778f67 SHA512 377f53ddc9ae514e8866c0e6b79f9b1d3613fad5a7e29c57a06baf8be84cbada0703b1c660401e7dbd2bb861b09fa9159b77322f42b34f5a0dc0d8f70ac4db12
 DIST unicode-data-9.0.0-UCD.zip 5655592 BLAKE2B bacfd82142e2327d5633a927d6283d1bf3d43d0476b43ca5b23190abafba5aec3f29a59f096a651acc320a7bbf5f511aaa39e1f09b9fe24e96b0623610bec6a0 SHA512 e9bdf8ed6647b4d0bd83c6fcd885cb450fddbf84dac376e9771bddbb7ee1e8ea1ca8c2ca79e23832c26a4819dd62f86fcfa6eb6a1fcc7294185f5bc78be8fa2a
 DIST unicode-data-9.0.0-Unihan.zip 6558824 BLAKE2B 18900bacb9ec84eef99758a1647f657685f2fc40d705b7cd8f88ea727d9494aab38cf4d40829d52afca7c11087e6b2b2c03547c14980b7d206ba241bff3d3e47 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e
-EBUILD unicode-data-10.0.0.ebuild 812 BLAKE2B 0e8756ba54471c423029c4c0d72965613081148d1b3054089c111e61d52e7a7c0354f78b28ed6af185620e52aeb71c226f08d9c9a919867a0421697cd97babf4 SHA512 d866d1397f09dbdbb3f350a78d28bf3706a9fdca9a4f37613d33fa7593bc5218113de06cc424ed46daa0b136aab1a6a14567954887b7d1cee93d3e96c8a13d5b
+EBUILD unicode-data-10.0.0.ebuild 810 BLAKE2B 9af82de2ed3c2a391bf465fdc47c56fe728c2319f17f6b2f100b621523c0bbc6face788088dda4328b99a5222fbaf9b51d1d461830f78c5b542c85123948e5e0 SHA512 1ff729cecaae572d648251071e96482cbe1569cb3080a21c3c333bcca19f67705d62a6758c3f86489148101fa635f87c725fea4a4af9eb900823b53efa0189f5
 EBUILD unicode-data-9.0.0.ebuild 800 BLAKE2B d031a95a58bf1d2253c6316e87835f22a7e2dd8fa0ab825e62cc8780c92892bed91c5271660688291cd50a451b9c31962b01cfa28a4a74838b6f73e882702274 SHA512 e47297daa5421946234c9878839dda124ac8b9c825c0c51b1594e9b683c1a0de74d8f96347a085e87b89fd571d0e3598493c7440e67ec582d866c6b01ec170e7
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
index 5d361856f32f..52c12875205d 100644
--- a/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-10.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7b4b8d695ce9..1700c3814e37 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index a1055498139a..d5aaab05ad78 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,4 +1,4 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
 EBUILD away-0.9.5-r1.ebuild 846 BLAKE2B d774832642767b543d15faf8ed8ef6dc497c4b3147d11e5c2a3a013845d0a9bc9baebc85b6f87259df1b726495d2aebac322e29dbdd9dcea2e7b7fc04b952289 SHA512 1ed2bf3c0a588bd5400c17f71859049b2c24dccaf3f00ac4c8374cf07838542a4e8069d1874b16143ce70daf0857d63adb3677c87d4cdbeb0b4c057ce50714e4
-EBUILD away-0.9.5-r2.ebuild 787 BLAKE2B a39cf4d61cd5a7767d1149410bc098f3d3895d7a12fe14176e03a6de11d7321485354f93076880ea428d2c0533165f13c3aa6dd0f72db1798a7d012a800650e3 SHA512 e6c7807bb64488147e92a12ec33f6ad77fa2e49d5043f859d40e5de720a56893aadb3d5e98b9b4ea869e57d7741b4305eccab4af810e5411e9b5502d719844ef
+EBUILD away-0.9.5-r2.ebuild 786 BLAKE2B 4cc45dc3045028b35a57ce83474c3c23ab65e047d60c3f666cff5cf979842b2e95afb9911fc82c2e37b10edbf71cc3809ad2ba3ef04e0da93ca8f8813b29e8d6 SHA512 ad838b611e9c23e92fe6389099c5887bc79743f5f3392295e8b07bdf0796327a8db0170051c60b4194c985c469bc24cfc4b65a12c5febdb54283bc29bef84478
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index 36184acaa9af..879e37460c93 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
 RDEPEND=">=sys-libs/pam-0.75"
 DEPEND="${RDEPEND}"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 17b608582890..a512cad8c3ea 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 632 BLAKE2B 3aab9f756c907ecb0afcc68f130b28aa60239f570b7c91393a79197d731a0fddcf940627c00d7acf3dd8e60bb587cfcc596b74285f8e4480338f13b4924061cb SHA512 23cc641518bf0ad3f674e16523a70a24051a0708d10e691c2c9a535be254586eeb1eab16cb5620b2178f7b130aabbf7a4683a678752f1d94deb9c4152867161f
+EBUILD calendar-0.9.1-r1.ebuild 631 BLAKE2B 5d37602d6ee43874dcee35ce1f20dff81295429ff0365fe4b273befa46c954cfd618429b36163a9361d5c5fa4911191a0be3546c4d6eb997172dd4bf6650473d SHA512 633951f6ac4490db0f6bffd1cf9750131f6f4a8aa0c9fe8ad3f2de2b45d2f090760154bbd30d32ed98e95c8d31bbcff61a3fcef69d1fbeed73565201a70d25e0
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 788efd4a52a0..ceb410dac85b 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index d4234fa9604e..17f510ac043a 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 915 BLAKE2B f1651c621f844888537b03fb297de41b3052ae86ff8ff9d8a730607f70e524f90ca0afee12718672ce8a526a378f0b6ece6e09326b74ca46a4a705224325bb92 SHA512 6098adbefbd84118e01a06c5ac956cbc8735c568bbba5f214c21c7402505e265d81ac1027ffc68c5c98bdd7c37a4094c7cabb75419d977d8067223418de074ea
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 914 BLAKE2B 98e4f899ee14a9b79906329216dd68a392f964004ba34ffcf57e3f0ca04fd8cb4cbd77cf265c8868430ee2300d8b971ee25aea06dc9b5132e02cd2a9b69608b8 SHA512 055e5c0398eeb24718b70ba50db43a357d6dd52fcda61304a7023eab93f9c14c1246e69cb2fd6ad02bc69bd2b1b0a53e4a8bd9dbbd52e362bc13a7170a165e9f
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 504daacd2695..93674ba4e99b 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm64 ia64 ~ppc ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 6c2d49a3c891..1dddc431e580 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 6c42bfccd62b..6f5d27b4ee90 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -9,6 +9,6 @@ DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e
 EBUILD portage-utils-0.62.ebuild 2243 BLAKE2B 383eb4fa9791b2f9f99b6a71004a410342b1751b5e987f698f8a70df90fa1186ed6f91050788cfb68f983df5fece3be98da5b65cd7aa62678f1b534554e09736 SHA512 b6f941532e77f9670b7ccfcfb2fa8ef039335e88ccaeb6d32370aab032674435e1acfbc633a22ce98f736626351df77d8e2ee9bf6e5bdb37f0c6427c4fdc317b
 EBUILD portage-utils-0.63.ebuild 1190 BLAKE2B bc78f2a5ec957e2bb6a60f9377028579ca6fffffd4b46803d977dc463ea3e4dace74de224e5d88262a92e46b81882c6ded1bdb38595a5cbdf62ba4754bae5e3c SHA512 dcc3384a68e6f44066eb9eaa35909cca3076724939d38800d8a3290354dcf11809c19274605acf5f88423418ec76b9a0e8b7e1dcce2b19ef8f1e61f1dbab3a0f
 EBUILD portage-utils-0.64-r1.ebuild 1398 BLAKE2B 758b9c648ba5b99d785a41b2c841aa1696aceec018b44edc1bc48efd7e4612173f8c77ed94239cbce3baa4dc1e7a16d25db862bbe38496bca41a7980584cbb45 SHA512 98e4047ac08e739af34409aa6963c27e481376d24d6dd3dea031928b19d2ba8bee4d89f2345f46e67c5cc3e09112d5c00bcb29d8383f44566b19ddc3c6a6c71d
-EBUILD portage-utils-0.64.ebuild 1309 BLAKE2B 51b5176cd52cbef728acd31e0ca1d1563d656272da448aa602ddb30d501d777ee22a2b19bb3a3dd110a0f3613b2375c8603694cc474d8e7d4d1d98785b23768c SHA512 24a5017ddbd7281b520a8d600e9c2416243f9d0c98500c62f21f7238bb098a2f96c96d99f6fa51dcec9b9776dd31d53c0be3adaf10d514a3869aea04fb148dae
+EBUILD portage-utils-0.64.ebuild 1308 BLAKE2B cd497cc22dbda169a006b1a14e5264eacd5594ae35d48511e8d605d48d96135f5a3dab037955bbc8b634ac68982d29b31398d7302d8989cab365150400d72fb2 SHA512 f99299e75aa903edcf4e556671ad2653f5d430b1b84e6d8404a4bcd889731c0c180ab8451295f4da62f51a36459e83b993072e54753fbb619be124955bce3cf5
 EBUILD portage-utils-0.65.ebuild 1334 BLAKE2B 6b2c8edcbc9b741884de727da07206f00db0e3d5c039c9d0a0dee3ee53d6ca550df56880ad3be875831c1eb7b7efffda5c373ce1a4e25c731318b0c9a11ae038 SHA512 40ff0725e9d17a38dae97463a28959b52dee0e845027ab35383fb03aaab3b3b7f4c72cf2359a862e2f4f59f42cbb63b36f175b7e874aab0ffe2a0549b25640a9
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 74b28b849f53..ac15d58a075a 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 63faed093970..339ff228b9db 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index e7cdecf63529..1e07ce2db890 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -4,5 +4,5 @@ AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
 EBUILD convertlit-1.8-r1.ebuild 882 BLAKE2B a92251a0e9897e3d58adca13750dfe611411084c9c3e0a43357d9924ea79ca56b0b558129fa7409a756ebf92429b2442118bf41e5269765a2d69c63f0e9172d1 SHA512 6dc7d07e27d0ccb621aedc5c9f9c8f99a311645fcb6f1f3761ccbed34c8af4f7b0741bb08ecbb4e4a5994ab2ecc39c6f37772d0799b2c0f8842707dbb5ab7c39
-EBUILD convertlit-1.8-r3.ebuild 954 BLAKE2B f848569d668c4e7e970be069c05fa36cd00141b32132242490e73c70b7e482dc57aa5fd4c809b4c4cd089ffb6d41d1603011a947c388042c7768a922340f9c6c SHA512 74e7ad8907e287eae40833e38059d3ba822255e0ece6a37ae3f28ab2750ae486a107790a3432c56ee9b41e6da19a6435c59568fd3ba77b7c71573bd45a3ef62d
+EBUILD convertlit-1.8-r3.ebuild 953 BLAKE2B ec34cbeeab8effd72817f0b00be2cd0975e3c3f8be7743adb07842bd182e9a35ec6996859288112fbde2f29a83cd4705eb11cf5ec02a9bd53c51d2fcf4840b27 SHA512 e8ad68bfa1dbc8bdcec156a542c92c4749ab9278fe20fae53e49410d4feebe2ee35d345a36ed201cd8b50b2757af26f668e0611bd83ada9b3c1495f171a8b26b
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index b1d9bc946204..099fd657fd92 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8105bcd99ccc..09d70578c343 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index efe587bb95e1..d091afd890f1 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -3,5 +3,5 @@ DIST mysqltuner-1.6.0.tar.gz 53424 BLAKE2B abcb2bad72d1186d510281720850a1ebe7255
 DIST mysqltuner-1.6.18.tar.gz 169074 BLAKE2B e138e29db2f0b1abf88b2d8268732fd9f05043abf320d8d97493d6abb3880e5664eaea39392406297e3125789ffc172f6347922ba14a00af16beb3f6f8080802 SHA512 8067b7ac4a4fe7398ee2cdc463a30042f46972f97680b49912dca46fd1d835989aa4115568dbe5473ff28c4d956bf0ad70537318db788dd56bc93ad220e6bcb6
 EBUILD mysqltuner-1.2.0.ebuild 610 BLAKE2B c873ff07723563bfe328f8e85344bf13ac2198301df221a428d9df44624560b3153afc6b3e4302b7559231cf3fa7b7e1e6cea808bb5e396805fbd0375a494cfb SHA512 1c1b7b88aab98615706e5593d325cdb437028bda1a5d2ee7b82d987e9146c0a7cf8396ff87e7ed96aa90eb9075a4291b19960dd27e50cd8be4284374d5785df4
 EBUILD mysqltuner-1.6.0.ebuild 745 BLAKE2B e20d3d91ab9bb85faad0f53c8b2a4fd7c7e10fe02f5847aef4a5d6195f0208b6c286d2b82a28e0ffc1f67c5c6cce4f4323cf7dcd1178bd984cf09dc0a5d7e813 SHA512 2a3d3c301ffe70d15c125e279970d2ee2aa9a28e3f7146a6fc0c6ba15203962c1405839996df9eb0c35ef5ecad23993cc49d7b5645f17611e9b2bfaa83ff3e16
-EBUILD mysqltuner-1.6.18.ebuild 821 BLAKE2B 14c8ba55b827e12ae91fc8dda4e04b0efa5bcfd106d3f9ac82c7c2c5782f1a5e92446f5d6bd3b0aa61200a5883939d953ee861535b3f35258bc3d4aba73e5c80 SHA512 0969eb735b46b9d44af586a6347d48af5ea666c569b2d251148e8864e806a4ac393e0a169b29aff546e75cd983014741ae7286ee903799d8c6d2e2663b58fc3a
+EBUILD mysqltuner-1.6.18.ebuild 820 BLAKE2B 0b6ea1c654fc05c86f08fbd6b02489fc3fb31dc36594475147293f14c36d94c2b6d558c9405e78498796f27479ad6ed67e4c8c028a0106c870e6c39c565e88d6 SHA512 f9a2e5d75d05909c22f2e78deae3f755f61342c0b5edc02edcba247e3fe65ec496fec71b7f0538fa33608e8dd2f44873b30f5e0eef7378a1f94d1c12f311e937
 MISC metadata.xml 329 BLAKE2B d077c83fc6fa3835f649af5c44a6f2390c2a0c7bcaf61fb5c6817e828b1a4589511a45217b991d3b9abb1e916ff36ce4cf5f906d45bc3ba99d3affc3327da1b5 SHA512 3bf9adc56a18f131c90d2524e83bb1e43a2cf49286e2c4c215cd95f1ff8792e0a4e325a36350a95e187396e0aa39640238ab57f57682c914e97c5663a815275f
diff --git a/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild b/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
index 4bb2ed7b6a9b..02ae046adc48 100644
--- a/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index b0c17b0d573a..6af84909add0 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
index 1cfb10743189..67a52f25bd1a 100644
--- a/dev-haskell/language-docker/Manifest
+++ b/dev-haskell/language-docker/Manifest
@@ -1,3 +1,5 @@
 DIST language-docker-2.0.1.tar.gz 31658 BLAKE2B d2f4ed51db1f6367ccb53aafc25e7473d4b7b1cf1b0d4f4e0692ca5db4b2f245ade1b80b37f9989c0a50be6b76996107c1b8e06024981e68ed1c9d96fb2f209d SHA512 f716f99dc23bf9e0de68e658330ee90befb3724a53ae97604c9a8369535db679dd9a5851c2961996619f4a3cf3ea462df487063a3e08afff7cd0c47538fc624a
+DIST language-docker-4.0.1.tar.gz 32259 BLAKE2B a222009b1beecd515f6b5b769f665c688c166fac3c15a9ebc156e3f0308699f5d615a4146d3f0de0be2ec7e08891bffbffffc813905db8bf59f43b0e0f93b982 SHA512 39732c7e8055abf27d22d2ca9d838b97b85d5d3df715a9f28e2550083f5f60e61b98c0cbbe00be46e0bcdf2289a5aa7a02f1ae2adb404ee6589ba903a4424639
 EBUILD language-docker-2.0.1.ebuild 1079 BLAKE2B fff9d69117ae6912eebdb2b97fa6f6648f8201f2db6cfbe6dfc2d3193a5b477440eab803550f33f82e9ef7407e78f14b81e55ce8f72d4d3e94b8009aac780c66 SHA512 9f99dbb7fcc63e888294c001475161b56c94359953a7c3ec014a838b8814706855f1f1d7dac3c51c7e989fac184f39f367e552f264f955676673dc82efb6c986
+EBUILD language-docker-4.0.1.ebuild 882 BLAKE2B 8929988eb776419e4afd088dd981ca91c8d4f48742e652a1cd3b990a52decf95ea1c8a54b34017f6bae2c9dffd84e37cce9b9587cb460543967149d3d2c4d426 SHA512 5435d355110244f12285c29184b406b7f48030369a3f541cc855275c4faa6fe0fc700400bbe672f59e3fc2963fbf8f9036e6dd001f0348e2f8b9fa8dff6d05a5
 MISC metadata.xml 589 BLAKE2B a6e7a2c01fe4fa9b0c1b0b18e612e7a1b39459bafea5ff32139ef28e09079c22845de6123df9d1977942fa7d0e791807b118f8f7be4b763372c289370f8cd668 SHA512 e9062624fda6b6ee56e3343948ad43d54e3c294c78e6421a1ffb1761f9254234a7189520247f0e3a4875ddc7492307902f27adcc5f0686911b6d4698bd41330a
diff --git a/dev-haskell/language-docker/language-docker-4.0.1.ebuild b/dev-haskell/language-docker/language-docker-4.0.1.ebuild
new file mode 100644
index 000000000000..1d5bec781d83
--- /dev/null
+++ b/dev-haskell/language-docker/language-docker-4.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
+HOMEPAGE="https://github.com/hadolint/language-docker#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/free:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/glob
+		dev-haskell/hspec
+		>=dev-haskell/hunit-1.2
+		dev-haskell/quickcheck )
+"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d017618bfe08..a2dfaac4e8ad 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
index 3a22b2c24068..56eabc112506 100644
--- a/dev-java/cdegroot-db/Manifest
+++ b/dev-java/cdegroot-db/Manifest
@@ -2,5 +2,5 @@ AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faab
 AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
 DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
 EBUILD cdegroot-db-0.08-r1.ebuild 864 BLAKE2B e3a38203c2fe58a6266e2c98c99b6abe34ed6606256478a2c8238a1b07b48d01c9fe047f7fd7c680f26ccb5ca4311ddd89fe99c2453b30d595e316ff521f5124 SHA512 685922ae9b839edc402286835e2e0c2fe91662106f532435986667040db3fa1a42e687c2da9620f19bf375f10c3893b59ba48a4d05a043aba4de6108a0256949
-EBUILD cdegroot-db-0.08-r2.ebuild 855 BLAKE2B e5d7ee7b418937d4f351db8e0597d6aab90dd5d48f4ece08f128d34a20998ed9316ea48261d13d9b4364a61361fc141ea9528c12c0592f0276e0127325c3a22f SHA512 13f181df64f56a1dacabd3cd440dc10add66f40dc886263a98faf07a4cf9615c9ec847f5f08e8af8e8d92ae0f208002c3d4b1bb50c07dc834db04abb9433f9e6
+EBUILD cdegroot-db-0.08-r2.ebuild 854 BLAKE2B 7e6b689b7b49418fffd2c63c29c7a73b8363c3289dac93e57160cb7b4c7b580482324202477ebe25698d5db985bab7d14ecfe2f2000799107b34f3fa4cec4317 SHA512 62d48b510790bb3214608343307c0e30098c77c56064f8ba1c0b21e93c22c1291a656f24f7a66632a823c9c444be8416ae2b7ddecde3da93ac7f5915656ee4eb
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
index e6c249f3a034..9334505bad21 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index ff9faf9c39ff..b2a628a0fbc9 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,4 +1,4 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 605 BLAKE2B 102c1c5d402089ba6183ac0788451dfb366bc310d1717af92b9c221022dc32f284a1ec88fbe4a26658a3a7bc03214ac2290e76a6727fd837a1cff3b1db33d475 SHA512 a30f17d74cca3440139610c750264a6852dd80478e5b3671c99f55d31e062042c18a7dcfc7f2b761361f859030603fcbbc0981658b3360b29043c27ef356959b
+EBUILD sun-jaf-1.1.1-r1.ebuild 604 BLAKE2B ca96d6b689ee7331372f518ee533df809edcf83a82efb8da8c216fedb2703f32d7a097bcf04964be1fa85f941395aa493e73ea58b881b787cd7bf4b28c112be7 SHA512 15f582c7bda9489bc2849435a98207c6b451d2aa70e6dae96c48e86d01d3e65faa9cc1ea9135009cc48fbd766a7c346c24289403cf70ace30216da5b803fc5aa
 EBUILD sun-jaf-1.1.1.ebuild 1266 BLAKE2B 1a17eb9a250e2674871ef5cd4d76e38e5a19316eea75f2ef6f13544a8e94c3e0993f9908246e5a8a40a6510aa5ccbd58989579d4c514790fc6f0a780e0051cbd SHA512 355d421f1146d4b3d3e4dac18eb586b3000bf74943330a9617be9d0ce49d7a03e4c338a6708e8f44985e8d2100988be7460b13adc844575298509d198004572f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
index 12ce2187ba9f..ee575afa19cc 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
 HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="CDDL"
 SLOT="0"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 90a5e5da9c65..7a1cc0d23efc 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index b2e7c35b4438..53141a712e1e 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -9,15 +9,11 @@ DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 BLAKE2B 6be0a48e8bc4e5fed4d34f8aa
 DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8360e904c2545380513afd328077c584e8af0bf6bd818aa03e5a58c350cbb98facc1c9dccb02b06adcb27233875497cf5d33265912 SHA512 6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
+DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415
 DIST go1.10.src.tar.gz 18300467 BLAKE2B 2058c450fb72f008464381443d180902b9a0bb11691d112d16bcc1a3f5177bfc39d15ed4532c0d85997398b2f07e40c1f9fedf46f1d0e08c636af1e44bd8ef10 SHA512 59f089e1ffb2d3aba5ada329d4f0d1181c3c4f01fa64f19d0b753f8a989cb59cf290ad88d215cadc18ef99aba8518e44c9bc258c07eaffc834c55e4a37bd4651
-DIST go1.9.1.src.tar.gz 16377700 BLAKE2B 63558227bdbff43da788c43e082e54dfa0210e53de650b3e2a4ab09c55a9937a0d1fee66be8263653c2d8be774611f2485c7e673b8a5fbc7f7c0adc5fd4fdc1f SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793
-DIST go1.9.2.src.tar.gz 16383591 BLAKE2B 3ad9d0e7b6b817a4eab7ffcca30ba86a0e50e68ed028b11f54b8813f4b1a9a0598c79d501c733e7fbf77831c8f7df681692f9aa6b860b16a6288dcab59d40226 SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5
-DIST go1.9.3.src.tar.gz 16385451 BLAKE2B 0d16eba4d411a5ddb1915a305725e9762874568abb048cc5c8939e82481d7d530902d532b62c8fe10fe7e31465617171d17cb5aaf3ee51aa29b9a66837bf6874 SHA512 31c564af58b78c648c9bece8fa2ed3334feb80316b07b16f6286319e26d317da90d1af0464c3a2f776a3da72d31b22b063dbc620b93114bf142a11e8a625e527
 DIST go1.9.4.src.tar.gz 16392325 BLAKE2B c5a503e8c539f31a1bbef9c6d89263b7214fb433476830c205153aa07ee0debc273eb004dddd662f81cc6cd2d4d949af654a4f4db1c890530feadc90ce05e630 SHA512 1a7c830e07507ff7b89025adfb5c713444d97301f8ad47ef2564722c1e28186e946350f07e22777fbdd6f2f589c334eb01dfd589e97cb8a86f73669547badb0b
+EBUILD go-1.10.1.ebuild 5648 BLAKE2B f9224a1e959a38b43a289c2d52e864d132031302dd77af354b37d560e3b961701173d7a07ca1551acde62605ff018fd262c1620580b2e968537ef82f0d270b60 SHA512 efd46c94c61f2cde931ed64ca7b80500e88f407999e49eb402675ab7f40507e2a5d27e1df23571d85c36fd31b4c8479c6c66c4ae0c25399b99ac5dca008e747f
 EBUILD go-1.10.ebuild 5648 BLAKE2B f9224a1e959a38b43a289c2d52e864d132031302dd77af354b37d560e3b961701173d7a07ca1551acde62605ff018fd262c1620580b2e968537ef82f0d270b60 SHA512 efd46c94c61f2cde931ed64ca7b80500e88f407999e49eb402675ab7f40507e2a5d27e1df23571d85c36fd31b4c8479c6c66c4ae0c25399b99ac5dca008e747f
-EBUILD go-1.9.1.ebuild 5581 BLAKE2B ad0fc38ca45942e4047137143513d7ce9c8a473278dca5b941b377e0454407d2878e625854448d3898cf5f3f9c4fc37a5e43f84d3e1c8e79da055dfecc0651dc SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997
-EBUILD go-1.9.2.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
-EBUILD go-1.9.3.ebuild 5584 BLAKE2B 235e48cd961466acd6fa167d10425588aba877b407f5b0abaeae2b69df440c528e7a6f217ea0d7d677d119be740523bf874aff9655e4f59704fade25d25fed84 SHA512 3794c681a1dccdcd4d644265b303a3f5b272d548694a3a07f1352133f1a7d918518a5c6165980e5a51828228a6740121a36cf1f5dcd399c974cb27b4b12728e4
 EBUILD go-1.9.4.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
 EBUILD go-9999.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.9.2.ebuild b/dev-lang/go/go-1.10.1.ebuild
similarity index 97%
rename from dev-lang/go/go-1.9.2.ebuild
rename to dev-lang/go/go-1.10.1.ebuild
index 3d97b87631e8..ca35487e1011 100644
--- a/dev-lang/go/go-1.9.2.ebuild
+++ b/dev-lang/go/go-1.10.1.ebuild
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
@@ -64,6 +64,7 @@ RDEPEND="!<dev-go/go-tools-0_pre20150902"
 # These test data objects have writable/executable stacks.
 QA_EXECSTACK="
 	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
 	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
 	"
diff --git a/dev-lang/go/go-1.9.1.ebuild b/dev-lang/go/go-1.9.1.ebuild
deleted file mode 100644
index 6b538a0be4e7..000000000000
--- a/dev-lang/go/go-1.9.1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_URI="
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
-ppc64? (
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
-x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-}
diff --git a/dev-lang/go/go-1.9.3.ebuild b/dev-lang/go/go-1.9.3.ebuild
deleted file mode 100644
index 480b7faabc23..000000000000
--- a/dev-lang/go/go-1.9.3.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_URI="
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
-ppc64? (
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
-x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
-"
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
-		# The upstream tests fail under portage but pass if the build is
-		# run according to their documentation [1].
-		# I am restricting the tests on released versions until this is
-		# solved.
-		# [1] https://golang.org/issues/18442
-		RESTRICT="test"
-		;;
-	esac
-esac
-SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="
-	usr/lib/go/src/debug/elf/testdata/*.obj
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
-	"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
-				sort -V | tail -n1)
-		[[ -x ${go_binary} ]] ||
-			die "go-$(gcc-major-version): command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	einstalldocs
-}
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index f77221185964..f3b6d56f2183 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,5 +1,5 @@
 DIST orc-0.4.27.tar.xz 465116 BLAKE2B 1289867c84371797350847e1ae71a002ec250abc56611fe6ec8d263ff64e17ed8d990f45adfbf6d1a0c7e98c2e6ec30c3135e433f00e9fa53cecce359f5b2d72 SHA512 5ca0b4553e370ea7c95acfc8248d9d568dafc9577041d47f52c7d0945456c534e18e0e80d28df9301d6deac1ea4f8ea6a51ca373b32927c8724846d8ec1f73e8
 DIST orc-0.4.28.tar.xz 469460 BLAKE2B 86fa2d10a33fbffbb2b96827adbddaa81d0baa8135fe21fba338cbcd25a1c1e853873ec1c4ef5c0a32d66ba95f855f1f16ddbc32f68a89e5a98c75b9b0261aa7 SHA512 2ae3100e7d0c03eba9a8a10a8924da4d729e1967b63e5dfdf88c4aee907d7ece82c782d74f4cb7e28a366dd74ce5e1ddc6e2b971e5a2f879b0501cc313b93410
 EBUILD orc-0.4.27.ebuild 1832 BLAKE2B e0e0f1df95102719f9f079efdb27760192acb8b3b27232a27984cef94bf03587d16424234d368583200f9e6e4183f7068cd322b55d3d9d559d57d87c5b00d438 SHA512 3a66189a789f995069dc8869fb33846306f4a0e5ff3419bae1e921c26b1187615e17ca6c6f4647eed8e4fc0ab4f5e03a6df0a3dfe762a9090aa409912cfe4497
-EBUILD orc-0.4.28-r1.ebuild 2169 BLAKE2B 505872a9a653319d8175359cae7f5e8fac02d42d5bca70413f7c163a49f502166e04780f8bea9037d207990ece7db3669155182a0bdf46a27866d88d11cd8850 SHA512 ada673be79f85e0bd49d731fbf8b04143f03c158af7164232c00181c6ce25a29b351be16ea3cb18c9731adc91178fc7f6364d2e27867ac3877d8ed8395817490
+EBUILD orc-0.4.28-r1.ebuild 2194 BLAKE2B f092b45b64594e9d896680c9a78368855ef395f0383d7042488eabd0a0418fd426b7379c2ff462245cf1d805ae44a0250de0144de0c50764c1f73c26fcdb7bd1 SHA512 5a809385529fc2ae03fe8a242f71785fc7eb84e1861af2432697f1707c33bf470a86bd4dd28bd613f0d17e1d19776b4f2c9856adf9d2579c1c1236e85b53c60c
 MISC metadata.xml 354 BLAKE2B b24bce431d7ad10e9231e89b522e67de16192ee4e48281b8a17f002692632449ab676cb9df6ff5a22563d6f9657ee6be11e452bac41f8a537c598822efab85d1 SHA512 4f17c4c3faa3f2c5feaefe4727b3500360f7cc5486c794e9a34608c3e437b4e2cc266bc9e0e2b3824952a8da62421fda59e9bc5140ee88898f8f7bdde402762f
diff --git a/dev-lang/orc/orc-0.4.28-r1.ebuild b/dev-lang/orc/orc-0.4.28-r1.ebuild
index ca76b4868f6d..7bc99c46d181 100644
--- a/dev-lang/orc/orc-0.4.28-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.28-r1.ebuild
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 "
 
+DOCS=( README RELEASE )
+
 src_prepare() {
 	default
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index bc8628d4065f..18fc286ee7f3 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -9,7 +9,7 @@ DIST perl-5.27.7-patches-1.tar.xz 16276 BLAKE2B 81d6d4eb2459abd80d9dbf9a0300af3d
 DIST perl-5.27.8.tar.xz 12103968 BLAKE2B d2145ddfb3be35bc23788616bc2a9133f6875db112d307f326e31a67345dc1abb0b11992d28974682f5a7831e2366b391ef1c84de76222d2a1780ec37fc965f6 SHA512 f710e89d36cbf24cfb78e6ae3a48f7dc0262504688d94fd6fbf6826444531f4843084b6b874759537968b926fa991e46462cd5c4d5199f6ebbbfc78f661cd1e9
 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
 DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
-EBUILD perl-5.24.3-r1.ebuild 17401 BLAKE2B b2c79f94db6e569fd60b99cdc65044d4dd715c213b870662204c805153b5902bf3c1aeeb5d93bfb52524f7c502197157a83dadb97790502789849ea1f4e4f8f6 SHA512 f83f904d425ad4ec24a25ce0b38a03565aede4351010b8d06c36ab4a147517db16c9f36a89f9d907e771fe6d61f7b67eae80b74cb58ecf623ee902e963b993bb
+EBUILD perl-5.24.3-r1.ebuild 17398 BLAKE2B 3f5445277891afb42f50d59b1b72479e956c8d0f8ee0077a5ba7d5b849b66f2189211f04cdc2d213c8969a9b5d4f2611d00f97ebd3406c21c72ea8424c874899 SHA512 0523e0d0637878612eaa6139101b75e396bfcc90b71395cf6f8116214486f159d5f4ac93f99c73b112ea72847e2391d63a345a7a22a8644d4638a0ff4923823c
 EBUILD perl-5.24.3.ebuild 17070 BLAKE2B 9e99b0f9064e85d7dbd935cc3ad72b91be4ea248cd1d74fcd2f4ec93ebcffeef3ad1c94a03c0b9a36ac9956496283891bd95421aa003eef0e1b22173deaa736a SHA512 150e72fbb0c05884b2c63e62cc76f42aa1f9f6e684f0d7bcb1169e80f970bef8aab5b3f9f82c6f81a54ad9232f72e2b3bff09927de57b60f1d6b835c012551e4
 EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
 EBUILD perl-5.26.1-r2.ebuild 19666 BLAKE2B d89c12581fdd3c3ba285118745335e61dc26077aaf4ade12b0f875363c217f0029ccf432616c7ec2be337d0bf09c2be26c13f75171682d3d1d84de597f2238b0 SHA512 43877a272bfd106111a81eb89a4de94dadcd76571208ce198854f9822dbd0575ed4262d0e90e31fe65b27a3579ec25d3c7ba06ab8481d0fd49c9238b5a83c3be
diff --git a/dev-lang/perl/perl-5.24.3-r1.ebuild b/dev-lang/perl/perl-5.24.3-r1.ebuild
index 01bc1f944616..97f0e36ae5d2 100644
--- a/dev-lang/perl/perl-5.24.3-r1.ebuild
+++ b/dev-lang/perl/perl-5.24.3-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d81fecc466d0..fc492d597d0b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -14,14 +14,14 @@ DIST php-7.1.15.tar.xz 12201380 BLAKE2B 4387382daf3883962eb0e47d86c983a65c293e89
 DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea
 DIST php-7.2.4.tar.xz 12031892 BLAKE2B f76b3ccbfed4d309639ac5e35a12aa70a194f8cecde98634d7bff9123eb45ff3a4f0b3297149a44357bbc3287a9a3c1393d86b12bd53f38ff844db9498ee3452 SHA512 d1d0720f0d4bb28f7ce0ec7c859b14c1e74e9d0e7c73de6988d5ce737d7ccb7308c0a7a2651ee012c630be2cd53e6531505df0a03f0efbb6359176b446982244
 EBUILD php-5.6.33.ebuild 22554 BLAKE2B 0ab011b206772d7d83ee135cadcf0a9d304f29d6ce78fa0bbe7779d13cc1205287033878870810240996de89c519b805da989babcab926a2285e16e33d0352a7 SHA512 27eef42a39637986fe63823cb387e5d6ec481776baaa15ee51009f265d0fdc4ea0d8120349858f290f9c743091e679f309a190318bd02baf0b87931d0567dc24
-EBUILD php-5.6.34.ebuild 22658 BLAKE2B b217027c1eb96753c384370b5b4eec23b818a853cd1fa0d8d0b504168c2edddc69796daa2e155f0aefef44c265dec7bc853f5d6b1e5b1e6919234f7cf020ad4b SHA512 84283997c2b2871b4a8f156da7505230c2eef7f938eef66dd93b8dbbcce6c1f3b1b8824926b018c96981a7b15690196db22dd58143dc1c228a20be4a0b532a46
+EBUILD php-5.6.34.ebuild 22657 BLAKE2B bdb8c324350730b55b2c9f77b9dd0b9dda01868ff30381d81a8b94562606cd8d9fa3c3eebce9b737ed2a8e02924ce44664f6d0da764ef20caeb9dae1a9321120 SHA512 eef581ed22de47aeaf02662e27422e8fe9bdf971eb99492de82b51906242704b8a119f950a1b468798bee1940b7824caa1ff37dd29752860d529d8742304539c
 EBUILD php-5.6.35.ebuild 22663 BLAKE2B 78398e49c4f999051a67fd34c270a2efd0fb1021da453750a9704e4299552d06fe9d82014d294cba2abf98b394eec1c8682b6d62d0adef481825580951a77b7b SHA512 edd441ed1fdb1d3f45e4f673053c22b70a231ea40e8f7fb4c873b1a5ad91cc40517d333d3e438aa7c40db0340372b9c17e754d388f1e8b46eccde0062d1c31d6
 EBUILD php-7.0.27.ebuild 21616 BLAKE2B 77a83b763bd9f4b6025efcd6463f7147a600b0b5a649dc3c877ac027392e5561485c9d6251f7d5efd9da8fd297cd658d6dce3d66e547c076cc243625e7bebbb4 SHA512 274b6ad641240d21df903f37193591e4461e0f2942c068298228ab4bb9ef35909ffc7be7cf6e82f348ede30cd97dc4ceab72d78934728f3b79a1bff66b06f5ef
-EBUILD php-7.0.28.ebuild 21720 BLAKE2B bf9c9c6e3d28c2f3fca8c28bfaf22147971525db2ae27cadbba2e671ca968b72b9d9d3892a9b02a5ebf84e099f42e9b0229a0502bafd19f7fe2cd86d71d9d7b7 SHA512 1912284d4a70e34dc2efa235e8d69f3a5f59f3c0f5d6b236b5a25052af6f80e09f7cdb4e0d1ae817402adcdda4f3638f5ebf538f483376193bd0a03cc7fb59fd
+EBUILD php-7.0.28.ebuild 21719 BLAKE2B 1fcbf1041d98c433ea9315d664877f86595db3b7c60445319ff25b6960e9272ad85baabb7288a91b09befed49346346f7ec20af5a0646330dcd95ba7db9d2ebd SHA512 f0bcc0b53ea041a266b6779f620aa1d30ccc0f41137e33484965867212baa831972a123d39a04f5867e0f9db06093197f2ce237add3bfb2bb52b3265d0254089
 EBUILD php-7.0.29.ebuild 21725 BLAKE2B 5af80b163b96a9becfae5ae3fa4d71de4c29aa37fea678cff76f758c9d3b5bbea8a7e6c48ca7dbe0adcdea84156980d4f6b204085c1aa8df6b78aa3e4ea9c313 SHA512 3950d0bc16552a1089ab819b36102e1bbf97a47b69f95519947639bdc2f65999ae127c5b139a20449087ef89d3f10d716f2126576c96e3ade82a1a047809189b
 EBUILD php-7.1.13.ebuild 21482 BLAKE2B a5c1e77bea3cfc4e7020a858c19768073c51a2ebf6d1e3e7a43ad2db87ba317e9dd0f51d88c34cd7a3eb9eae0dd830cd4e347a615b58fc2aba5eaf9163d9a84a SHA512 890a25fc5475d67012dfa757532aa691676dc8e6a98b9d648cbfcabfef4dedb98ca96048ba183945e5f0e91942714191c18aa3120c8917159197a501aa05f378
 EBUILD php-7.1.14.ebuild 21513 BLAKE2B b04b090731e9e50b8cfe26b0763135405e8e1b0a89c89093e5ad78db4b5e3524cf0fd088cbc84be10ccee44436e49172291c17ce63703e952124bfb45cf3bf8f SHA512 0b2ab1f819f794519f46cc8c5897c8cafaec2a557c19fd674bb6828691993726468bbb0baa0ef5e978d3f0d4c8b6d7db83968838d72a28484788e56e5260f559
-EBUILD php-7.1.15.ebuild 21608 BLAKE2B 540a09d8206cfe7aba2b954771c139964c6f5623279aad9e578f7b0968802a827fdbe3065fa04000bf8fe72a849c96dba57d54c4e86eeb16a10c9d83602cdf05 SHA512 172ce7a86fda1cab8f3d9ee86c5eb545cbb0f4bdc9c5e8fcc4feefe59c399800033de0aa1e5a48545f6468787426deb6f698ca6ee7ebd379c23b8ed94fa93c41
+EBUILD php-7.1.15.ebuild 21607 BLAKE2B 77eb6bdccb74a2ff441f12d5f8bc0fc52157f6244e8e9a6586f5d776d4c62261ab046570920b5f198e6ac39f2125506b5bd62dada8d19ff5cfa069ca004a2e67 SHA512 9aaa38c8610faa5acf202ba49e8803840b64e5c023135fb782cedb64436b4c5c10436b1aee765b9fb5a8122b9089e3e7df87cde61cc4f49c749059f1ea5ac563
 EBUILD php-7.1.16.ebuild 21613 BLAKE2B fd84672411f2697fd7352729fa032ba867320e7f7ad320875cab65638637ea96943a43a6076287e25cf80844623c6c402fb2cedf5a0e8e9172c3f76d5ca6b18e SHA512 6fce36db211839e81820084033db690d578d6428359081b390c38b0e0ca8b17e6b01930a0c8620f8d787d9284cedf5cc2aedba9a211e596ebf357c7f799c8574
 EBUILD php-7.2.4.ebuild 22144 BLAKE2B a1a4343e37b3cc7a3c3ab83f659335d44941f53681dfc436b8fbc0f0b6c83f44b93f9afc0517a2b34bbf03e7dec4804e2a04a51ca1d18fc3897d2de916f10755 SHA512 06156857b83d4f3744bef4e4d84b255c4d63e9e151507ac34b329982d0cfc1611ed22c24984e9b0c029d116601da15fc6f932842e91bf55e1809f40725032e67
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-5.6.34.ebuild b/dev-lang/php/php-5.6.34.ebuild
index 5ba57479d07c..d2c65b31f7af 100644
--- a/dev-lang/php/php-5.6.34.ebuild
+++ b/dev-lang/php/php-5.6.34.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-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"
+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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.0.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index b9e089b78280..889e707ffc32 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-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"
+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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.15.ebuild b/dev-lang/php/php-7.1.15.ebuild
index 1c4db60917aa..d3c61673621f 100644
--- a/dev-lang/php/php-7.1.15.ebuild
+++ b/dev-lang/php/php-7.1.15.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-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"
+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"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e17bad8c9bd3..9e0e68fb40df 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/http-fetcher/Manifest b/dev-libs/http-fetcher/Manifest
index 89d3548226ba..1b264d3eede8 100644
--- a/dev-libs/http-fetcher/Manifest
+++ b/dev-libs/http-fetcher/Manifest
@@ -1,4 +1,4 @@
 DIST http_fetcher-1.1.0.tar.gz 382470 BLAKE2B 6d2c7139d3e9435ff993fd5cd097c1b85b8900e048e6f93fc5e4f61f44f1eb47e0b9cd04c90985c15391ce862356a47acb56bfd8ff16050ca562095c80cb3f12 SHA512 136eceabc317bc4bf9956272ebbdae735ff589012ed0b17210fdb70051389bb7b3c1b43cdfc322a340e5538e9fd60b7b5216d3d46c439ac9df6af29e621bb1fa
-EBUILD http-fetcher-1.1.0-r1.ebuild 643 BLAKE2B 71d28369546d4ee8b1658ccdff854277881bcf83e6a487aac7a5e1f3fd3348a07f0c8b4e664b5d3d96302134e206d489cf71d34e86802c5d96c7935a5dab2a00 SHA512 fb0938ca79ca107313288213954ab62b20584a7f0ca3599fbffb99adb0bbdeb7768ea7ab3e0953d4dd9c496311e5e86e88b12d734a07a5c3f95d4ab20e4ef963
+EBUILD http-fetcher-1.1.0-r1.ebuild 642 BLAKE2B d0578513f3916e29d481152f0e3457392f3fc961299a26cba15811f16960db7ae325e34ea4b939599c82e8d2581aa2ffa13ededc18f098ea403ab98930b57f11 SHA512 6aa9890ad269f9a9cfb30042735eb36e2e55fae1abe4d101ae829196ae42652c9f9ba5770f3db0d6761aefb8b253a076668ef24b69577c753fc3ef264ae53b02
 EBUILD http-fetcher-1.1.0.ebuild 772 BLAKE2B 03a7679f460549f6cfb140eae2f09995bbb639efdf6f287f10166ce372fcd762549fcb63b09b6197c1312878387ebd8cbfe5c6536e4d65301092629a3440281e SHA512 8c0649790c8b0e67cb6148afe37a37d936de675e6d3df4bb2de5b7c04a8351855bbc7760d80a3721a7e526b3ccdba0902fe0b56cedd8cf93920434906d772f8c
 MISC metadata.xml 333 BLAKE2B af3916f84f1e47250b8a4abac78cd72b5b9deb2212a94de92030c1d5b6f754501e35e267112a51c907d3b97c4484fd5b1a952610dda668aa39ad84be042b99d0 SHA512 0be8b9414e23971abba7606c7332511588a0abadd68cf6f7026bd4a5b729e7bc9c7123af103c3dffa0c6cb04517a5302cbb015c4b6f20916eec87808bb8145f8
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index a9927cccc898..b55698fa999d 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~x86"
 IUSE="debug"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index a16e3d4477f4..ff30f7d6e9e5 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1373 BLAKE2B a32c6c4e50328118c8776423b6dda658be963edee2d95e49bdc6ae4b1b03783635edad81a6ca17a072a549edac7bc3ee040137d9ada594380093aa15d2595f5e SHA512 a4c52740211468a4f6711820f1c149e3e320e6fe2bc307801f9b3750b563f6ec7561df5e86624fd979581d41a06f9146fd9f242016f91a98b43f26c13eb404ca
+EBUILD jsoncpp-1.8.4.ebuild 1372 BLAKE2B b305a3b086dbc34357abec546bdbb6cebcb4c282dc925d9874dc827409f7d5f4d33c425ae7c0ed45448295ad2b2dbfeb4fdb38f2c1130aae6d4a24e6bec1cf28 SHA512 39398289a7b283c2d6b6fdec8d5700fb3febfa8077b7681041ccddbe0e92a2e57f66fd1861de33669541419b405fcf6b5d6f7f202534ff3b4ae405375eacf94e
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index dcc05896de96..24d2a30d9fc9 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 1a53a33cfd5c..2b5b967d989f 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,5 +2,5 @@ AUX libtasn1-4.12-CVE-2017-10790.patch 2268 BLAKE2B d3261e687f14596ae091951de1b7
 DIST libtasn1-4.12.tar.gz 1888450 BLAKE2B ccd3d5c7bbc9d00fd5be125a60b1705833bee4dff8bd0147cc6a7ed67ed679210984dedcf5d76f701ab53b8d7c127580ddb3162876aea9e1142f518271d12252 SHA512 6c551670949881193e39122f72948e4999ff1ba377f9ee5963d0a4ad1b84256e4fe42e9f6d6a2aa9f7d4ef7acc0e5174fb5cc3df5298524cdeda92f4b8c104f7
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 EBUILD libtasn1-4.12-r1.ebuild 1361 BLAKE2B 242d6f13825143cd912cc33e684c4026c56fbb534631463e6f9f125920e21cc1f1769d392bb3e9b33158c0111c66bcbf2851cdf8e08543ac486bb53d5314fa40 SHA512 be735c1c8b9b4113adfbe133ebe90d191bd11f32e3b108e55876b48252c5b83a2b0503bfe08b818edc5fa47bc63ffafd60dd40453ce03fa52fc23229155361bd
-EBUILD libtasn1-4.13.ebuild 1312 BLAKE2B 9f30ef4d845945209b45fe4a58e4e6c531892b76a2e17deb26acbb8c29835895f4eb690a6cbf360f619ffe2955aafdf7fc28a65c9ff9e6b6ed1fe55384d3b824 SHA512 1e6ef6ad8f565864143a1a027f58c70321ef532465d6565be11ac0900bac5f0c3f4455b9fb3737ccab21c92b147f0ba3e19c3c541b5653791b3f388ee28a2fad
+EBUILD libtasn1-4.13.ebuild 1311 BLAKE2B cfd6eadb39484adc5ddfb15b11275a5308aa17e5c05126ca6d655835feacf4620c3bd9a0275ed55c6f55dfd8837a6a3c5e144b3b0957460ad8ca2582e9f6a83f SHA512 4759c6450eac07233c31548ec39934c43c26257c169048677a0cf4fdc6b80fdbc09077b31c40acf9a5a5c01ec938dd3a70cdae4496685203ea9d14993d1cd06e
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index ab1bcff0d179..51d99a5e1960 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index e98f0eed2f74..2f682669ecb9 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,3 +1,3 @@
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
-EBUILD qtkeychain-0.8.0.ebuild 764 BLAKE2B 923f91cba8264889ad97a19fe3521708421609d9b984e04dfdffd54ff483d17bb77d706b3b49e22b92f2acb2bd0b6315bc7d2005ad3fafc3c0d84d22fbdb31b2 SHA512 236b96bc7cbfecd005eba28d430f0ad172b01a2616e2766cbb924673a1c0ba3201274fe8c78e45653644e09344f380dac0c63d95fc7db11fb5dc9e77a6ab040f
+EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index 162b6fb21bc7..3c29800f75b1 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gnome-keyring"
 
 RDEPEND="
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
index 1307286e983d..4aaa51764c32 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~kentnl/distfiles/${PN}-${PATCH_TAG}.tar.xz
 "
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 
 # NB: Get min sqlite version from sqlite3.c
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 383e088d4f68..a7a0b6c47196 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -3,6 +3,6 @@ DIST DBD-SQLite-1.54-patches-1.tar.xz 8376 BLAKE2B 95df8ada4a1d1b2e730414a6a5b5f
 DIST DBD-SQLite-1.54.tar.gz 2136219 BLAKE2B 76700a1c695036951ed2ccd36319d509be6292554b7b7aa49da4ec07f1c15a75ae84886bddae96b536351a381b0cf52350d48ded836e1c4627c57d4dd9fc2bdd SHA512 a8daff59679973467dff80c013b6ff9d7229a505b62c0312bdf7f9288af64dcd2e99f889b66eb98103b0e6ac7a9b0fa7c9c517c5c2673ee7f84b3b6b5d26173e
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
 EBUILD DBD-SQLite-1.500.0.ebuild 1194 BLAKE2B 43ab9a47864bf04e7674caf842c0dc3b9f39a0249918a3ff6f3645c2e84cb419556b1a853a416ce57a3ea6a0c81b539de5a6fc46d5c0f74bfb67583c2ea945a8 SHA512 19a2bf93c244af7eabe768629d2578e937e4531cdbee3b809eb16cc2ae70b6235ec1946bdb29a85b4fb2cae63def640e1146845da0d63131af5aedb01a6a74ff
-EBUILD DBD-SQLite-1.540.0-r1.ebuild 1525 BLAKE2B b03c2702ecb2ee48d32f2dcbc9289add4175d6ef9a1a34ef33c6f7c43ab5fa90406bb6bdb036e940ac9b58d0376a8c19d7ac17f50eae6c07d036dbf80c08051e SHA512 b0f6faa9eecbf933b5e913a3348095aedeaf1b0fb8ca14ac1b9ed17284d2910fc2492daed7dda52cda5c7fee34146cf196d9c47eb535d4bb2da0474be2d592f5
+EBUILD DBD-SQLite-1.540.0-r1.ebuild 1524 BLAKE2B 407ecb533d3b1a6768c90e63706e9daa03c5464f28c4cf7225cbc64e20a441004f06ddeb3465832da4604bc9f6b5876cd01dbda48bf3326ec18817ed0bced687 SHA512 ba86c41a3b60a68d5b7cf65d8ed6dc31e686b54c030ca438e0457636342bfa60e047faf5699c228a363b295c74fc9fd0d36d40de3acecbd34391aafdf771f360
 EBUILD DBD-SQLite-1.560.0.ebuild 1300 BLAKE2B 5d4fb9df3d4fb011096247b0ba6f435aaadb588818cf637f381b445ca1d745bebd1252a60f61bea2112a0c12c76cf4ca947b52ffc06d004da50b4f5e297fa3cd SHA512 2638845ffb4ee5540644d0e5a21f91f1a6e2f6d84a04f499a1c0175d4a36d8de0808cb19f2c84788cf965df6dc5b8dcd7207af45cb315cac9cf1111b8eda5894
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index f20dc153a7f2..a5257cc3179f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index b67f499c8de8..30f9beb7dd5a 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 2ba901e9f7ff..104fd864feb4 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -8,6 +8,6 @@ EBUILD pecl-mongodb-1.1.10.ebuild 1041 BLAKE2B 8d7f85ffb56105a779e73a180e4f84d37
 EBUILD pecl-mongodb-1.1.8.ebuild 977 BLAKE2B 9f914f49facf5709946fef5c21f7577a50e76422b76681a00227ac4fffbb9ac911b51b06d46e4fa14962fbc35c8b13a27cc51c021331446dbba91adc77544c0a SHA512 530ba95db69a7251560f8bcd25f247f51299fb4cc811a0acca6a85ee3dfb552f7958683d96830e71ddb2054552a42dba59de144124a3efecc9ef26a53ca18302
 EBUILD pecl-mongodb-1.2.11.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4dfdc2302fefd810004b50dfe351f42503747b3d936924ce2a21438cef5bb145b56972659d88c929946053ea72a7701 SHA512 871b2901718b5952acdfc66ddef7f009121c8354b0ff0ac8e434301bdf834e7e040db886c7e1055686ef047d29f5c3a39250f727446265d8b162986d3041d77a
 EBUILD pecl-mongodb-1.2.9.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4dfdc2302fefd810004b50dfe351f42503747b3d936924ce2a21438cef5bb145b56972659d88c929946053ea72a7701 SHA512 871b2901718b5952acdfc66ddef7f009121c8354b0ff0ac8e434301bdf834e7e040db886c7e1055686ef047d29f5c3a39250f727446265d8b162986d3041d77a
-EBUILD pecl-mongodb-1.3.3.ebuild 957 BLAKE2B 13f1ea5772c8345dbe647de52edf4d1e4c7e3994fad1f07852641fc18dfd1f317233ba89e67482bc29ad5cbe3960bb8ef53a175569d1850362a72f69563c1bc8 SHA512 58cb4a2a98916a65647f2fa72bb0a3d4d39ede0e8ed515f6c3c5a60aec713d4b0c01310078921c5df7fb8ae7dde14c76d822f55f75b4851b40ef2c137af804cb
+EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
 EBUILD pecl-mongodb-1.4.1.ebuild 1022 BLAKE2B 3b863c31f2450f7bfa96cd6ae5d6ea88b265cd655832816d46c528de6da1dfaffc90baf30d066eb33134b5040964feafc2c59eecdd3b625f0ac30a03969af916 SHA512 7880e5768287b0c3d6c3f0db7ee162b25efeef2b241827f741e8ce765e997cff9ea2927f019d7161fbb7968a752b5e36a15b8e78ef4aa5ebb85e1d074d62e19a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
index ec908abf720a..ad063c40f913 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="MongoDB database driver for PHP"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl sasl"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9e8c22096bcf..13c40a11296f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 4ef3f1a41b91..76a0ed1dfbfb 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -3,5 +3,5 @@ DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
 EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
-EBUILD cryptography-2.1.4.ebuild 1775 BLAKE2B d06cdee6a446cbb995b7a9b44dfc9ac46c2b8871e45874620d35e02c10dbd2fdccaf626c8a66b672a88675ae17b7c83d959ad7fd2b2ed1b7f216c510006b49b9 SHA512 2c676a3518056e4dbbabe15dd77248def8408163f57166dc76315bc3a7913a13e8c826364792170a4ba398ef6427c1d02012f2d328c10d881e63671bfb7181a9
+EBUILD cryptography-2.1.4.ebuild 2043 BLAKE2B 67f4cf052320fcd719840fcb9082d882ec1d5c229236a80a82e9d7c2e59668fc8545edf14c256ab9714ab4d30a5d0b5f4dd418227e3642487fed303db0e0ef60 SHA512 47615b57a1a4d94453f71843f5b5cf3481a90ad6b4283fcee14879bf1e117d65db769494b374049a309f457bfdffd463dae0c2440e15da31d74780f2f66ec2db
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
index 312a95c25ec5..293255548bcc 100644
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild
@@ -14,13 +14,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="libressl test"
 
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
-										=dev-libs/openssl-1.0.2l-r1:0
-										>=dev-libs/openssl-1.1.0g-r1:0 ) ) )
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.1.0g-r1:0
+			)
+		)
+	)
 	libressl? ( dev-libs/libressl )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 257d89ebbe45..e004d3a67cc3 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -2,6 +2,6 @@ DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e58789
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
 DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
 EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3dc366597b21d528c1642d251400710a9dcd45f0bac1cd7e1faafa4506b358bc4d723d5c87d1db05dddec74eede59fa3a SHA512 a7bd731d00b142fdd0dcc90c8c2b3e87ad4766ca4725cf10d2418b13de82e87df1931cb76fa40e1808fe0a8d1be3012e855e126f0b398f5aaa308118a67a9c0a
-EBUILD dbus-python-1.2.4.ebuild 2229 BLAKE2B 306760812025ff7684666d7d585b6c72391ac3f5bf0b3562784b0b90394950fba905033bfc12d68f09136aa98178c65a704e9e125df0491a0d2fc98fe90cb3e1 SHA512 591ea483d5f3ba0dcd818b04bd2f8a6282e98e84a83e7631f75b38b06249e6b4820d40affb4990940a6d5c968dd94bb155c232fca47e65ceb63545027d467b3f
+EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6.ebuild 2259 BLAKE2B 0a844ba8e2215dde83e8ea7286c619981aac5dbf43ce710c4832e8a99f691efc15e13c9587ce4f3166f7aa0e0916fbf199d556b87f62f063eb679b2032981c7b SHA512 65c46dae5970b6883897d8dc56ba6bd939abbb1af581dd7b9d93b9ee58ae4193ee01a294958c017a59bea6c182006220f7241e72df0455f41b39418834a7e1e5
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 317140e3e735..873326a7019d 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="doc examples test"
 # API docs generated with epydoc, which is python2-only
 REQUIRED_USE="
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 418815be5785..5b54f07f0a48 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,3 +1,3 @@
 DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef
-EBUILD nautilus-python-1.1-r2.ebuild 1249 BLAKE2B 9a5fa0d076c307c7c51eab97eca7bcbc2f25254416de836e3e51557fdf06178f891436913438e349649961d4abb294b731ff53075aa191710418717728c082c3 SHA512 af65749fb112c1c2c5c8d3a1a9317a14524a6159f56f8f55253597aa7ea56c2c9d48549f590e6d800e984ca592eb583ba4421eabfbcb086a355984e68c435d0a
+EBUILD nautilus-python-1.1-r2.ebuild 1256 BLAKE2B 85b87fecbbed7bf55cf7c8d53e2a8d5267037495698ef45646d43edf6658d2f71a1ae1c71c66860c0d36f49ba47a39248c6f6a9f8a272e048414d5a1ac08b642 SHA512 40b29c0099b7d5d5d6730918ef263e522cd503ea7e77111a80361cb496b74a65a1bdbb5fb879beb85c3806a0e8ec4a1aeb77ea3fc3bbd2344ce5292eb4fa8448
 MISC metadata.xml 256 BLAKE2B 328c05c417050a2312f4b9e62188c1bcf9a694a2136c4c9ed8f31e818c968398458459bc87784157677f0da7a648f5d07c2246563cb5ef534fd9d97232dee982 SHA512 efe3e668ae6d6c6e11e5783c9133fbc6378a4cf21d502aaf7ada64dec0418f457480754a907ac037bb9f7acc008410c6c2f9db57322b9b44256aec74b14ef63c
diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
index fddd91c95507..b47cb90fd450 100644
--- a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha amd64 ~arm64 x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 837828254850..839bfd688aad 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
-EBUILD olefile-0.44.ebuild 650 BLAKE2B ce33cb55d4dd67ec8b45cfbaf9a0e5cb7059bab4da81ee701bd64d83021ed45b81b9139b4886db2181b6e12cec2285107583fc3fa8425c76f92a9b084c955e54 SHA512 91ad7ac20db39d36f0d9730da7cb6afa46255b4d94c18122bba88976c257009d5ff622cb52ebb7d3588e1a45f9f0f1ff90ebb7c1419fb8ce770f84ff05ebef92
+EBUILD olefile-0.44.ebuild 657 BLAKE2B 8b9ff06c3663fda8a54ff71532f2474735ad865932bdf8dcc3c845c4c83e3de5a6104392fa769b527a800a073b983f5025c9da0d9494a8232dd4863db6899237 SHA512 381e50fa88eeb074309b33359b1b24b863dc8aef1392bf7b8b69cf26dd2ebfc4a736ba6b2d219d11bcd230598ddb8ca5848efee92e03f9e03c7613a278fde862
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index 34624a0de347..05685dafb901 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0944879ca247..4dce03151f4d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,5 +2,5 @@ AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10b
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 EBUILD pillow-3.4.2-r1.ebuild 2501 BLAKE2B d8a28951afb94cddd6e599d6cc2f1fae6500e14743ead01b4b0e047240796a0a68069d1501be984b7180ec8af0815116e41626517ec93e43c97677543ba9a316 SHA512 73e98674e3faef57e55fd5ea3703ec5de7a6c20e1d359ea13582629c6af07cb3f051d60d3313c6661faa1a76ce194e680b1d4324313015a618813953b8e38c39
-EBUILD pillow-4.3.0.ebuild 1932 BLAKE2B 5ffc9d87619ab8d09ebbd89f82b256abb2ade756f5502a3d81ed243a985dc41250914bd7368053ce5531472ada06b8aed87ba2a5b124c330022be974b31e19d8 SHA512 d0f149bf96ad4ee1bb094d4e09d1c991d9786cdbafdc5b0016f8ebdc63988ba8f7741a5d7701ba1b93bd27d5a65e396547847df8f205f5e045ec7817d6e729fe
+EBUILD pillow-4.3.0.ebuild 1939 BLAKE2B 397625e55bdfd8200eb1d7c74636c5affdf6d22ae4b033998724265401d4389ee3d3951676916ff8bb2d459e85f7bca21db2ab45852229708eb09f5ef26ecb6a SHA512 dfa213a6d6d5a599b1321b194d39a427d54c98f3a69e99c0adacb7eb3e827c2833b14d906b29bda3c5371a39ff5b81cb889a1a0c8cfdf5919cc8f42008a0183c
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0.ebuild
index 785dfedc3b93..d1c476ffeb24 100644
--- a/dev-python/pillow/pillow-4.3.0.ebuild
+++ b/dev-python/pillow/pillow-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( tiff )"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 0fcf13ce0c1d..72cd737d4e56 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -7,5 +7,5 @@ EBUILD pyopenssl-16.2.0.ebuild 1596 BLAKE2B 2fddd33669aa0bec3680851737fef5be19fd
 EBUILD pyopenssl-17.0.0.ebuild 1606 BLAKE2B 170a0d141beab15e063bf6137e7ffb052265676e9ab9134748f9cd608a1af8c1c30354e0b9f29ccb576a7449ba7f96bde4900b93a220ef04d7e9c31110e152bb SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f
 EBUILD pyopenssl-17.2.0.ebuild 1573 BLAKE2B 178c8cc77f28ad47c854f60689bdc25378c32dc3cedf8bf4ff1c1692545a8a49618f2b19235c8d60cb3c57520d0e183c2466a85b594902d9cb9fcb8539e26120 SHA512 927ac59c13d8b688a27f49a56ca719656755930eee39de29ff84e3206af271e8b0bf30b3aa3a623aa9d14cbabd4cc03cf2724646161834d2d713d1c00e98b4a3
 EBUILD pyopenssl-17.4.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
-EBUILD pyopenssl-17.5.0.ebuild 1609 BLAKE2B a8de3adeb8c91be310ed8f393844d85dc1105a139aa5faa641c453ecdb390d63f25a29eb269da42363dd7cdd04df329868da4259719d11cb98d6da721a899697 SHA512 fb990d1216404ac00c330348ede3113c721c6204e511f1f5a8b6dd6d4872532590d64c325483496a809b0f5d586b2a9561651d010aaa157e903fc01199ba599b
+EBUILD pyopenssl-17.5.0.ebuild 1635 BLAKE2B df850a4965112c0e9b9ff09ab43f49878187be6c0707e7ebe44ce965a716a3cd5ea2950278ad079fb23a94fc8acf54bd8cd6b3c5a62c4b980b17de7365b161a2 SHA512 1854f07bb905b29c64827b7f258d684cc963c13bfe542852e4eacf0e3a8ff69253e872231dd303268d172145d0f070c70a2744c591ff8dde8533594cb8d4ce96
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index bb8c629191cb..af0cd0c73bd8 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 2d4e71b21274..53e3b8e3c09f 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,5 +1,5 @@
 DIST rarfile-2.8.tar.gz 38204 BLAKE2B 27195b20b18e836f782477e71983e6600d1875d53aad99945e83e4fb5542912620f476ad07673341de13bcce2f8bf9282c6f08e5657a6f9ea348f40fc5fc399b SHA512 6d249b1be9f286185d37fc5eaeae01c4b7153bf6248e66285099f7b9f920419986c27b006fd5511ffe4ae6e3b5214956ccb37ce5be5fc2673880cd7b2af0f98a
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
 EBUILD rarfile-2.8.ebuild 448 BLAKE2B 16cec693d389a277ff6956b3f40b3b9685517400b14b5244f7b11c0082224bfe0405cc7bd4c1d9bbb171e5fbf9d1d6c3cbb8737b2b2bcb1b35be8b531316cfa6 SHA512 99c8a36364fec6f8f4824c678c4081cbb4fe4aa3424bda4c7583a5431e1ab72b882e5453fed33c24c666f0db0ded7a3e3f46fe3a930afedcdfa9852346c9fd95
-EBUILD rarfile-3.0.ebuild 454 BLAKE2B 437661df9acf74c604e9ac9cc271cd491168ad06aa7e3e8bc06480bbf8802ced9457b06543ba648fb1e84c1532b0a6c0c488fbead653cc069b9efbd4aee8894b SHA512 6ea42c5d633a3e3b6d60af1075008eb21b697c86c471b1c0bd7e0b48185f8328703d00242a0476719c5d9eff9d7df3d6153b36d6f2544dcaf3d0f6c306ff0c5c
+EBUILD rarfile-3.0.ebuild 453 BLAKE2B 936a7dab7b2a9baa338072846b2f7f060e325f009a519079707545dd69c1989bf701941b19a699f145b5074b1aa9db6773f9ccc9c1b3989bbf9bc6d1896ddc38 SHA512 3a504146d6e45426b01f5232874e53fa7ff76dacf931ab806941bbdd31765369dfda3b72742022160df823b0f42e3a0a2dc4dba798dbf17dcf433afca2aa3e7d
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
index 83767dd2a31a..bf3e89942d98 100644
--- a/dev-python/rarfile/rarfile-3.0.ebuild
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/r/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+compressed"
 
 RDEPEND="${DEPEND}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d767ff7b139c..2ebd87395b51 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 8c3b95a959a1..a536cbc1d2fe 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,13 +1,13 @@
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD actioncable-5.0.6.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
+EBUILD actioncable-5.0.7.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.1.1.ebuild 981 BLAKE2B dd908463932d01c3df29a302467f7b9ff6217ded16bfb0557618805d09ed842daee049775b63bec84566b6d5070e40c41439b881433a2094db05780a509050ae SHA512 a870ba042522b7d4f5e88c41dc6d92d9bff54f983d109fe3e03c186ec0fae0418fa59c3b6c56f17617227ac89face6adb46f677a3bd82a526c771011905b9241
-EBUILD actioncable-5.1.2.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
-EBUILD actioncable-5.1.3.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
 EBUILD actioncable-5.1.4.ebuild 993 BLAKE2B 3d32ab30014b97a719eb25a34e443f1d41f49eabf3f87c6f21772ae72423f3913d2b6d3283e8eca416aa2e8482019882bdaebb002360e0c36073d15b864366e3 SHA512 5941e8ac6f9311e5168f30a2bcb37f84e73b2ab601cb7a37f2646a194033c1c994ba6eed1c2c4db5be37bee389c04c03a96077aff263efa4b801809f98f00325
 EBUILD actioncable-5.1.5.ebuild 1000 BLAKE2B c5ff9fb4aa09f74fba83da260b9e136a096200b6d517904ccad399fc26d29a816f6201be72ce2037efbd0e3a24b56aed181fc4e969b18b1e683ce72155e315d2 SHA512 524f765727e7f879da16178df6bbda7cbbbbfdc49b4a042f08a861a4563b5c6936e3e9ea22636dff3d9539c647de77545ce452dc8ddf5f0c3c3dcf1454b8f537
+EBUILD actioncable-5.1.6.ebuild 1000 BLAKE2B c5ff9fb4aa09f74fba83da260b9e136a096200b6d517904ccad399fc26d29a816f6201be72ce2037efbd0e3a24b56aed181fc4e969b18b1e683ce72155e315d2 SHA512 524f765727e7f879da16178df6bbda7cbbbbfdc49b4a042f08a861a4563b5c6936e3e9ea22636dff3d9539c647de77545ce452dc8ddf5f0c3c3dcf1454b8f537
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.1.2.ebuild b/dev-ruby/actioncable/actioncable-5.0.7.ebuild
similarity index 89%
rename from dev-ruby/actioncable/actioncable-5.1.2.ebuild
rename to dev-ruby/actioncable/actioncable-5.0.7.ebuild
index 611bac0920fd..220bca44c465 100644
--- a/dev-ruby/actioncable/actioncable-5.1.2.ebuild
+++ b/dev-ruby/actioncable/actioncable-5.0.7.ebuild
@@ -11,10 +11,6 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
 inherit ruby-fakegem versionator
 
 DESCRIPTION="Integrated WebSockets for Rails"
@@ -23,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -33,7 +29,7 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
+	>=dev-ruby/nio4r-1.2:0
 	>=dev-ruby/websocket-driver-0.6.1:0 =dev-ruby/websocket-driver-0.6*
 "
 
diff --git a/dev-ruby/actioncable/actioncable-5.1.3.ebuild b/dev-ruby/actioncable/actioncable-5.1.6.ebuild
similarity index 96%
rename from dev-ruby/actioncable/actioncable-5.1.3.ebuild
rename to dev-ruby/actioncable/actioncable-5.1.6.ebuild
index 611bac0920fd..ad5616213887 100644
--- a/dev-ruby/actioncable/actioncable-5.1.3.ebuild
+++ b/dev-ruby/actioncable/actioncable-5.1.6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 44dc1bbbf196..09762a2d2050 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD actionmailer-4.2.10.ebuild 1623 BLAKE2B 4d0c3f0bda494ed811e449e1495e80dbd219655656af9f5660ad0ea52a17658e4db5a07054af00ad3c3948db9cf352e3cb3d0f84f1c3930d437eb5367c605f9c SHA512 ac0680ca62d49c5b7a3b5f3c99ded7bf6cee1388909d6533dff042790d3f117eaf5b2692a823b7e46ded85783f5c7bccfba0606b09563632a9844ea38b1ecc09
 EBUILD actionmailer-5.0.6.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
+EBUILD actionmailer-5.0.7.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
 EBUILD actionmailer-5.1.1.ebuild 1307 BLAKE2B 3a57abf2c24403a3e3e3aa8b218d037f5d10a1e251e6839e6fd070dcd5d1f3bd32059bf96c1c9b50c0635dfb658a818849fabd8713007b579ce47dade587bb5e SHA512 8dea2f655ac10ca30cd49487d43bfbd5eea2b2791ed7252fbea6877ede7a1f134db57eeb8949e8cee88ad0421ea6b320b64b4f66b5a0c3ef62d2d4c6496ad0a6
-EBUILD actionmailer-5.1.2.ebuild 1309 BLAKE2B 20c4261735aa39b813468d126f89cfba4f5c98e2c45535005e3a91ec569c0d042aa2f3b20438328f57829fce081e67a8a82391dbddaa4116194f874d1683b2e9 SHA512 264bc323149953ef8306f4fa862604cc940c28cb80d31fac7709b54641b27e07fa389da403b9d851bea79eb81708eef0672c2c0f68cdabc28835c0e8e303f601
-EBUILD actionmailer-5.1.3.ebuild 1309 BLAKE2B 20c4261735aa39b813468d126f89cfba4f5c98e2c45535005e3a91ec569c0d042aa2f3b20438328f57829fce081e67a8a82391dbddaa4116194f874d1683b2e9 SHA512 264bc323149953ef8306f4fa862604cc940c28cb80d31fac7709b54641b27e07fa389da403b9d851bea79eb81708eef0672c2c0f68cdabc28835c0e8e303f601
 EBUILD actionmailer-5.1.4.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 EBUILD actionmailer-5.1.5.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
+EBUILD actionmailer-5.1.6.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.3.ebuild b/dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
similarity index 87%
rename from dev-ruby/actionmailer/actionmailer-5.1.3.ebuild
rename to dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
index a221e5c4657e..54b101336651 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.3.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Set test environment to our hand.
 	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "actionpack", "~>5.0.0"; gem "activejob", "~>5.0.0"; gem "railties", "~>5.0.0"' test/abstract_unit.rb || die
 
 	# Avoid a test failing only on attachment ordering, since this is a
 	# security release.
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
similarity index 95%
rename from dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
rename to dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
index a221e5c4657e..eb97299a0c6f 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 3cf10d733614..0ac34b1a81a4 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD actionpack-4.2.10.ebuild 1813 BLAKE2B ea7e07d54d35fd6754cf574aa2f98ded244d8df6f8e86e4e639295b6651353c71461a6cdddde94062d820fca03746e49573e9ea4e134d0e37d254f99345db838 SHA512 41f1e17fd3f40e72d6c5ed659dae4281a7a94b5b2528f2931f0203f4ab778ad2eea16e4110aaa7c5e320073608667b5fc41c31d12d37c39eedd5f4b0c771bec8
 EBUILD actionpack-5.0.6.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
+EBUILD actionpack-5.0.7.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.1.1.ebuild 1971 BLAKE2B 03c27bf7d7c685639cd1fa15a1f9810d66f1f9a6caa188f24be94317fe9e48c2da3d8ad7e07caa1c20f9eec3fb7ac3ed68e00e222f101193568e8b2eac52dff0 SHA512 eaf9aaa533ac9697a2664a3c88c84646afdb3eec2846526bacff9e08b699d92199d4ac03f53307ac30fd03af666eed173e6f34b5269c315a4e39352f292c55f6
-EBUILD actionpack-5.1.2.ebuild 2021 BLAKE2B efbe5e27ee6b7ad0fb9b6bcce11f0d420db95e83853b252c363a52118f4619d70180f581b694518fbbd887f3e850ac3f8cf6397f9c03de5e50da2d0691a9e22a SHA512 56d85e4644c3ed1749ae4b9a3b7135dc9e9641afa90f2c23d01a427c9714ca0b8e3881622f4eb829ae4c4de74a0380ceab95f2ed22a7935e9d7bb9af2269e311
-EBUILD actionpack-5.1.3.ebuild 1659 BLAKE2B c4897ef9daf0b7bd4730e80bb4533343a993d63c81e8bc79929041f8def6930128f4c00595f3a58405b2176d026dcb512733cdf395a354689dfd0ef7f5be0f51 SHA512 263ebcd5d8993e29b3d2be7a5040ba7d5a1ff02012f0d0bdd25181faf4255877a7b4b9ee067de51128c42ed88198ad64568d20daf69679a4f6622ca449fe1d55
 EBUILD actionpack-5.1.4.ebuild 1670 BLAKE2B b2b115ec16dbee477649e0068b6407f5097fda63bc746e6451a5eb8d8a0cc3ac6e58a5d3ab761789b3acda4708e1bc0e822b8ba9334f26e29cabd0d3c53c40f9 SHA512 d757de769ecae219fc268fbcb98b046117a3d880116ac7a309278e778fff575d3d34f53d8bba98c306a678c94e6d7518fbae2aa00046701ea48921055891abe2
 EBUILD actionpack-5.1.5.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
+EBUILD actionpack-5.1.6.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.1.2.ebuild b/dev-ruby/actionpack/actionpack-5.0.7.ebuild
similarity index 90%
rename from dev-ruby/actionpack/actionpack-5.1.2.ebuild
rename to dev-ruby/actionpack/actionpack-5.0.7.ebuild
index 125ccbd91556..1bf769932432 100644
--- a/dev-ruby/actionpack/actionpack-5.1.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -39,15 +39,15 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/mocha:0.14
 		dev-ruby/bundler
-		>=dev-ruby/capybara-2.13:2
-		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		~dev-ruby/activerecord-${PV}
 		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
 	)"
 
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
+	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
 	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
diff --git a/dev-ruby/actionpack/actionpack-5.1.3.ebuild b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
similarity index 96%
rename from dev-ruby/actionpack/actionpack-5.1.3.ebuild
rename to dev-ruby/actionpack/actionpack-5.1.6.ebuild
index 3dc78fdeefe6..a6ccce8788de 100644
--- a/dev-ruby/actionpack/actionpack-5.1.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 7f6a82a04099..408883ee2572 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD actionview-4.2.10.ebuild 1540 BLAKE2B 0be7bac1a0113b5d07b8f5cf7632c1387177ef615a151b47519353ec6f498d8f7bf930fe841b03b1ef48e96cb3fcc6e2db6f4ea8b8869f2849a8551687d935ff SHA512 6a9cb78813408092737682398c6f909c7be13654f09c555c88293885c5a8f6e9f9e9d60968df27d2054ca18ff9de3009fd8eb884a4eea8cd36cb2fb06168015a
 EBUILD actionview-5.0.6.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
+EBUILD actionview-5.0.7.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.1.1.ebuild 1743 BLAKE2B 70b25dd16e79a8f9bc13197d1921c6d5f884b0d05be26f6f82667af509dac76fdd508ee2e44cfd9a0bd3e4f7b66b471e9f0a4558999f42ae47accf1e3402e61f SHA512 fcec147a89d1749123440699adee343b81533aa2ff37d39f195ced9a4662abd35845c49a1f781c527f64760b00993cf4db0aff1db6c1d1fc9e09bc9537695dc9
-EBUILD actionview-5.1.2.ebuild 1745 BLAKE2B ba67d1f27b76685bc5a42c1824d06a55faf339346fea21574474d79eba838e1f047a122cf2e494e0830e8c470c649ac88487d88057b36f8cd0932188b242040c SHA512 05603a60324dd3c46a3c8f0d7b33a0f6d1c75973c30be7edc1494a3bdceccf78a7be534819220ae6d74788abd7ac1217523544d91fd2bc3bbe7852581dffbaaa
-EBUILD actionview-5.1.3.ebuild 1745 BLAKE2B ba67d1f27b76685bc5a42c1824d06a55faf339346fea21574474d79eba838e1f047a122cf2e494e0830e8c470c649ac88487d88057b36f8cd0932188b242040c SHA512 05603a60324dd3c46a3c8f0d7b33a0f6d1c75973c30be7edc1494a3bdceccf78a7be534819220ae6d74788abd7ac1217523544d91fd2bc3bbe7852581dffbaaa
 EBUILD actionview-5.1.4.ebuild 1756 BLAKE2B c154d68ac1efe85f9fe58d4605915ac457d23201447284c070e4e376c8161d81c7f7cde71b8090b88c19efe14d619cce54985ad42374da9ae2f6301a0737c4dc SHA512 7d21a6d903260203b96f7ea725bb2d9a72a25ae90a4ff84d7a5d302f349a4f85c6735bdad874fafa39f7988ce15100cbca634ea73bb7ec80845ea90b7ce7a084
 EBUILD actionview-5.1.5.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
+EBUILD actionview-5.1.6.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.1.3.ebuild b/dev-ruby/actionview/actionview-5.0.7.ebuild
similarity index 87%
rename from dev-ruby/actionview/actionview-5.1.3.ebuild
rename to dev-ruby/actionview/actionview-5.0.7.ebuild
index 8e839d21ef28..671fde0cad4a 100644
--- a/dev-ruby/actionview/actionview-5.1.3.ebuild
+++ b/dev-ruby/actionview/actionview-5.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/rails-html-sanitizer-1.0.3:1
 	dev-ruby/rails-dom-testing:2
 "
@@ -37,13 +37,14 @@ ruby_add_rdepend "
 ruby_add_bdepend "
 	test? (
 		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		~dev-ruby/activerecord-${PV}
 	)"
 
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
+	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
 	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
diff --git a/dev-ruby/actionview/actionview-5.1.2.ebuild b/dev-ruby/actionview/actionview-5.1.6.ebuild
similarity index 96%
rename from dev-ruby/actionview/actionview-5.1.2.ebuild
rename to dev-ruby/actionview/actionview-5.1.6.ebuild
index 8e839d21ef28..a8a2e7bf010c 100644
--- a/dev-ruby/actionview/actionview-5.1.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 481fd260fa9a..17623cf3b7d4 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD activejob-4.2.10.ebuild 1080 BLAKE2B 4c8c1019fe13365a0c3ffa221319c5816ab25cf1d5b8802e6b5236768dcfc6394ce6eeef42a20c24b8619cd6b7c3d26844eb6535063dc59c81c0f91fa3e1161f SHA512 fce94a7ddfa303fdb02233985944c11ddbfea867f5d9de2c893be34f43941b74073f2c66ec0d3b3e1c9f84ee7fe4ca286d1fd6bac24bbbb30040a8853dbd79ea
 EBUILD activejob-5.0.6.ebuild 1059 BLAKE2B be868a59498580fde255d69be0810c016779918c144f4ed24955120148b923b82c1a65db530cbd118d7df1a36c2bb8809155d97d86da385a1fe215179e03f22d SHA512 1a1d094f838f5a2becf84f227a1d62f6a0caf54843b78b757e12756a0f7457c264a3286234f5a32ce0e23883376573ab39be580b28c6c4434204ed4bfa00a092
+EBUILD activejob-5.0.7.ebuild 1129 BLAKE2B d5cc088a44ce42427940b892e0f8a560ef2b587ee12ee5f3d07cef82369025d921bf2d1e0a2ac091e95c2f251bf0f7788d61a13c5b51b0db2052c3afc7d7dea2 SHA512 9c19395298377b1653cdfc2cfafdbcccf396b77787a8bb0dffe12564aa26c1ccf7f3bc447edc21f1eecb128ccef550143edbc1f4f482c966ebaa8384e58d2d52
 EBUILD activejob-5.1.1.ebuild 1088 BLAKE2B ae03713d8c31b61d86e422bd7a2c848033f6da1befaab69cafe81ce2726d6cb2dc8094414e1d5d46042698535ec268a891c5f0b1626fe5c4a883327782c8bfb2 SHA512 1122a697c93229593c07e2cf91598e9884af9acb5ac53ea332e4d18e4c84b639ea08a9684adde09fa22d7057fc8f76b8e4eeb215f8a1087d3ea406ad8468cd0d
-EBUILD activejob-5.1.2.ebuild 1090 BLAKE2B 7ee757bd7a4fd85fe1d53822abe9a4f8978a422ce23a7ce63bc679e4ab6daffb6d0df9e3091db274e3727577370d99d248d904ff880f5995035a5464172b622f SHA512 c4f4ebadcb98af76a54c88a25c5cd16851760a7ee6134369b8608392375c8aa03cdfdb84092c3797a87abc66eb19bbd01a17bdf238ef57d4b3bcf10faed4d913
-EBUILD activejob-5.1.3.ebuild 1090 BLAKE2B 7ee757bd7a4fd85fe1d53822abe9a4f8978a422ce23a7ce63bc679e4ab6daffb6d0df9e3091db274e3727577370d99d248d904ff880f5995035a5464172b622f SHA512 c4f4ebadcb98af76a54c88a25c5cd16851760a7ee6134369b8608392375c8aa03cdfdb84092c3797a87abc66eb19bbd01a17bdf238ef57d4b3bcf10faed4d913
 EBUILD activejob-5.1.4.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 EBUILD activejob-5.1.5.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
+EBUILD activejob-5.1.6.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.1.3.ebuild b/dev-ruby/activejob/activejob-5.0.7.ebuild
similarity index 73%
rename from dev-ruby/activejob/activejob-5.1.3.ebuild
rename to dev-ruby/activejob/activejob-5.0.7.ebuild
index 355426d5f0f2..0e0f7623e0d0 100644
--- a/dev-ruby/activejob/activejob-5.1.3.ebuild
+++ b/dev-ruby/activejob/activejob-5.0.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=5
 
 USE_RUBY="ruby22 ruby23 ruby24"
 
@@ -9,8 +9,6 @@ RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
-RUBY_FAKEGEM_BINWRAP=""
-
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 inherit ruby-fakegem versionator
@@ -21,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -38,8 +36,12 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "activesupport", "~>5.0.0"' test/helper.rb || die
 
 	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+	sed -i -e 's/delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
 }
diff --git a/dev-ruby/activejob/activejob-5.1.2.ebuild b/dev-ruby/activejob/activejob-5.1.6.ebuild
similarity index 94%
rename from dev-ruby/activejob/activejob-5.1.2.ebuild
rename to dev-ruby/activejob/activejob-5.1.6.ebuild
index 355426d5f0f2..16102b24c9da 100644
--- a/dev-ruby/activejob/activejob-5.1.2.ebuild
+++ b/dev-ruby/activejob/activejob-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 29beeea24588..71259027dd98 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD activemodel-4.2.10.ebuild 1499 BLAKE2B 7cc5ec14bca05ddbe528396c7f721f28015d711dcefdaa2e45addb1887473cc4b9ca2f34859ef22f8b40c8dcb697588531e6dbdcb719d9a9a8c5d19ee9640ed7 SHA512 8b01a0317dd860a4196a70d44630924a02caecc09c8fbaa787a66f4f794975e2722cf886d107d42e4060e4d71cff133512cebc3d1e211ec035a5740578b297b8
 EBUILD activemodel-5.0.6.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
+EBUILD activemodel-5.0.7.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.1.1.ebuild 1059 BLAKE2B f6249bca0f66375c3e40910840d2c6de6965f7210eaa570168d7b7e581d14ef392330b498f770a19ef9d2b95bf9d53c69b949e84e1cb6550e3b5e007b04c901d SHA512 d0e657358dd3b88b5b5a305cc0b1f0db07b5bf6b40abadd035142806d31c8075996fba1aae733b896ee124f5bf6d75897eb8d2775ed76e3e6d15cf651e8c5055
-EBUILD activemodel-5.1.2.ebuild 1061 BLAKE2B 46b8b07e4d0da5276b99c64099f7abc97d7434d2821b035010775b109c5288aeec7110c18697adc8b2b5f269c2c735f19802e3fc9bb24289f0e4b57abacaef18 SHA512 884f853f22b7cf3da810eb682a5b81cf807c5559abbbb344bfc4e70530604fd900654039fb54d16556109fa3d14372524d79c1c3512e0f56df24cd2db0011c7f
-EBUILD activemodel-5.1.3.ebuild 1061 BLAKE2B 46b8b07e4d0da5276b99c64099f7abc97d7434d2821b035010775b109c5288aeec7110c18697adc8b2b5f269c2c735f19802e3fc9bb24289f0e4b57abacaef18 SHA512 884f853f22b7cf3da810eb682a5b81cf807c5559abbbb344bfc4e70530604fd900654039fb54d16556109fa3d14372524d79c1c3512e0f56df24cd2db0011c7f
 EBUILD activemodel-5.1.4.ebuild 1072 BLAKE2B dee7ef7b1c90455a737cde502105ec1a9b5b4b6362dc115d4f5fa2f4057bd19bf2ba2c79ccd1ce81cf5fe74a3399efd9e511a3e60034bc20f8d04321a7392080 SHA512 d39122a4323f0ad9ac1ddbebfd5c7c579c216682e7676f5f3025ab11a44d8a9366671c2c7f860bef1ed721a630a36a37fb0649897c6b7e9935eb61707151490b
 EBUILD activemodel-5.1.5.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
+EBUILD activemodel-5.1.6.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.1.3.ebuild b/dev-ruby/activemodel/activemodel-5.0.7.ebuild
similarity index 80%
rename from dev-ruby/activemodel/activemodel-5.1.3.ebuild
rename to dev-ruby/activemodel/activemodel-5.0.7.ebuild
index 1f141ad852ce..a7adb554db31 100644
--- a/dev-ruby/activemodel/activemodel-5.1.3.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -32,13 +32,13 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "
 	test? (
-		~dev-ruby/railties-${PV}
+		dev-ruby/railties:5.0
 		dev-ruby/test-unit:2
 		>=dev-ruby/mocha-0.14.0:0.14
 		>=dev-ruby/bcrypt-ruby-3.1.7
+		dev-ruby/bundler
 	)"
 
 all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "activesupport", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
 }
diff --git a/dev-ruby/activemodel/activemodel-5.1.2.ebuild b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
similarity index 93%
rename from dev-ruby/activemodel/activemodel-5.1.2.ebuild
rename to dev-ruby/activemodel/activemodel-5.1.6.ebuild
index 1f141ad852ce..a0b573ba9df5 100644
--- a/dev-ruby/activemodel/activemodel-5.1.2.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 4a2ba9929547..446babcf6a46 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD activerecord-4.2.10.ebuild 2433 BLAKE2B 606c1cd593165b80487fa6e9b20dc437d785dc283910003db2802d274175170cb906412239afedf4955db3535b689eb8f1812a81011d6d7f9309c10e6de19ff7 SHA512 bf9b3edea74d5c2a2e62772afe4558752b392152e60af194e5772b23aa889c9ad58bf0c676ed103235127ef5d7b2362e9ebb66ed2381c004c16f17d9392387ea
 EBUILD activerecord-5.0.6.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
+EBUILD activerecord-5.0.7.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
 EBUILD activerecord-5.1.1.ebuild 2636 BLAKE2B d02f4fcfd4af2137c8cf0aaa0b683b6148f2ba24c3cdbcc17e88e64d00701a0ecc0584dd0028b2a2819319451a03cb63418cc39de102102ef00a57ec6bd478d5 SHA512 72f933331e4c0e638952922014ec44f5a30e32fce02fc9d8cbc533f358d459f573a70885dc98c443a1e6fc0cdc43d38fc81d6070a5972cf1c01f65623743b3c6
-EBUILD activerecord-5.1.2.ebuild 2640 BLAKE2B 15095dcfd316ba40f377eae9a4302dc822fb6b8767fc0563496d6865e9ab279084a655265f485cbeb02d4d360237bd7414666c3c432a3bf679d6d1ebbca17054 SHA512 8420dd54cbe4475924eaeb51b1f14b5ff27b0a26895d43ab9ca3e2e70bd3697a4961dc64cee5839e6910c28084ca7bc68aa409358ea1f7f0534bd539a068535e
-EBUILD activerecord-5.1.3.ebuild 2640 BLAKE2B 15095dcfd316ba40f377eae9a4302dc822fb6b8767fc0563496d6865e9ab279084a655265f485cbeb02d4d360237bd7414666c3c432a3bf679d6d1ebbca17054 SHA512 8420dd54cbe4475924eaeb51b1f14b5ff27b0a26895d43ab9ca3e2e70bd3697a4961dc64cee5839e6910c28084ca7bc68aa409358ea1f7f0534bd539a068535e
 EBUILD activerecord-5.1.4.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 EBUILD activerecord-5.1.5.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
+EBUILD activerecord-5.1.6.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.1.2.ebuild b/dev-ruby/activerecord/activerecord-5.0.7.ebuild
similarity index 93%
rename from dev-ruby/activerecord/activerecord-5.1.2.ebuild
rename to dev-ruby/activerecord/activerecord-5.0.7.ebuild
index 46c6674de435..399aa51c243d 100644
--- a/dev-ruby/activerecord/activerecord-5.1.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.0.7.ebuild
@@ -22,14 +22,14 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:8.0
+	dev-ruby/arel:7.0
 	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
 	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
 	postgres? ( >=dev-ruby/pg-0.18.0 )"
@@ -49,6 +49,7 @@ DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
+	sed -i -e '1igem "activemodel", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
 	rm ../Gemfile.lock || die
 	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
diff --git a/dev-ruby/activerecord/activerecord-5.1.3.ebuild b/dev-ruby/activerecord/activerecord-5.1.6.ebuild
similarity index 97%
rename from dev-ruby/activerecord/activerecord-5.1.3.ebuild
rename to dev-ruby/activerecord/activerecord-5.1.6.ebuild
index 46c6674de435..cf6edd4bce89 100644
--- a/dev-ruby/activerecord/activerecord-5.1.3.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.1.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 5ca51f61b32e..ba4a1344ae10 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
 EBUILD activesupport-5.0.6.ebuild 2566 BLAKE2B e86c5bcc677978762bbc2e8cf988582525abe765878ff1f41f2ddb80d1cc5c7fe664caf9d7ea048dfd069e20778abb09c9a642656783c2e12e126934c538f96c SHA512 f9294fe58b9a9a2a6edb0962004016b0f4bfe8aaebeb2f45bf7c67b6acb3a3b6286605069fd8ad2f4da260e2d4805b138f829326df5ccfeaf67131cce19add6a
+EBUILD activesupport-5.0.7.ebuild 2647 BLAKE2B 44a801239a05899172555f3968624684fe6c0dd210d9c73f280b2cfff7fbabbcbca0f9d40f1002a357336673bc14be4c61317f783fe2df80bd12e67a05247724 SHA512 d53aaeb613e82e4563a78b114e8f3cb8dda86e9b563a1696024f6e320251133174972fe9da3ab1fcde2922a27c5f6b9edb0519b2cf3a543b2172ee7f3d974ff7
 EBUILD activesupport-5.1.1.ebuild 2202 BLAKE2B 77ef796d8afc9ca3d94f10a55dbaa74a55b20976b566396a4b5f91cdb09b898569b36bd9f8520c625254e5c9a12c27f53e2d3a586ec5bf0adc134dc4d40c0a35 SHA512 cf29ff2bc2ca3328e0c94c5ab6569b6effc4a17ce3e7f82e6455bdd1b605a8915a66f9e0c737cc00a1e0f86ac0676d300f580a5b6ddc73c492c21d8d22604c5e
-EBUILD activesupport-5.1.2.ebuild 2197 BLAKE2B 12708195a41fc95dd921d8c08dbce1307ebec15e771011ccd47fd61ad919b9e57f7148dc9a3e70c48155df9c69863d942759dcea4a40a1db52bca880e8c877ae SHA512 e548c5d968fc502b520e895c7e7bd44a404c670ca8e71f7acf806ff2da1d95eabc88ebb98aa34e648f64ab5014c45150a1e1c8c72ac11e7d38187458bf459573
-EBUILD activesupport-5.1.3.ebuild 2202 BLAKE2B 64704a3185d4a67b261afe7be1e3dadce281b67e0748a0f561e093d6187949adc0a675ccb527ab34f0aec884f95bc99257e5fd58fec56a115df13d56a9f3004d SHA512 2daf9e6d7280ddc6b8d0dedfd510efbe390d75caeb2de19b095d28befe1307c21435caaf052ebe2511912e095e78895a761c31f8e4147f604c571c08dffc2b99
 EBUILD activesupport-5.1.4.ebuild 2208 BLAKE2B 4234dd53400445c24d8f3cfa90871f7ca0948292d2a2199bca3fb20d5e1d04fb297d740b2d618f6656b1782b0748216e51477db2f0e02248e98e1e63f6b22eb5 SHA512 c193e61019894836c20ff9999b6576b4d72d6f85e6f7ccc53ccf3319f41138e2caf0b66a2ff5fe4bc058efc29c4547aac6dc63bc3c95233827158a66b31b9747
 EBUILD activesupport-5.1.5.ebuild 2209 BLAKE2B 1d361b7f696c164de120a4fb20627f2061a1eb2c9b60060f535daea82629340bae081c2d55e3ecee42e57278ddc01f74c69f74f4f04a1250278095ffe35c04f6 SHA512 4936aec39921e2fba86d91d4382efb94a9687ea72423fb6eddec9115e3addca308acd07cf21fa4d852555c5d08f080a2f04c191669bf5ededa68cc4709a9007f
+EBUILD activesupport-5.1.6.ebuild 2345 BLAKE2B fd73d15b52fad59d05a42c66c1f59c8e495985715f06f6b32395ff669b4964cd8da98b9283d81626352c4fc7d183e4fbae8eb984823149957237fdcc03a21008 SHA512 7592505b5ede2ac22a2b7bda5951b71dc7bd560097ed483cb053aa4fc5f947603bb7bdea00f7d3b37a28f030268a5b0851776680090d69d3f55bc69b7796bbbf
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.1.3.ebuild b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
similarity index 68%
rename from dev-ruby/activesupport/activesupport-5.1.3.ebuild
rename to dev-ruby/activesupport/activesupport-5.0.7.ebuild
index b808fd131e8f..23d02efa9e08 100644
--- a/dev-ruby/activesupport/activesupport-5.1.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
@@ -21,14 +21,14 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-0.7:* =dev-ruby/i18n-0*:*
+	>=dev-ruby/i18n-0.7:* <dev-ruby/i18n-1:*
 	>=dev-ruby/tzinfo-1.1:1
 	>=dev-ruby/minitest-5.1:5"
 
@@ -57,9 +57,18 @@ all_ruby_prepare() {
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+	# Avoid test not working within portage
+	sed -i -e '/test_messing_with_either_encrypted_values_causes_failure/askip "gentoo"' test/message_encryptor_test.rb || die
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/caching_test.rb || die
 
-	# Avoid tests that seem to trigger race conditions.
+	# Avoid tests failing since test_order cattr is also seen as a test
+	# method
+	rm -f test/xml_mini/libxml{,sax}_engine_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions. This might be
+	# fixed upstream in 7bd41994480c17db71fdc07e3447ade929eaa386
 	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid tests which make network connections
+	rm -f test/multibyte_{grapheme_break,normalization}_conformance_test.rb || die
 }
diff --git a/dev-ruby/activesupport/activesupport-5.1.2.ebuild b/dev-ruby/activesupport/activesupport-5.1.6.ebuild
similarity index 87%
rename from dev-ruby/activesupport/activesupport-5.1.2.ebuild
rename to dev-ruby/activesupport/activesupport-5.1.6.ebuild
index f164d4cb88cd..61edd3151418 100644
--- a/dev-ruby/activesupport/activesupport-5.1.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -62,4 +62,7 @@ all_ruby_prepare() {
 
 	# Avoid tests that seem to trigger race conditions.
 	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/caching_test.rb || die
 }
diff --git a/dev-ruby/ddplugin/Manifest b/dev-ruby/ddplugin/Manifest
index e5e584d0f0d3..3d9c298d92b0 100644
--- a/dev-ruby/ddplugin/Manifest
+++ b/dev-ruby/ddplugin/Manifest
@@ -1,3 +1,5 @@
 DIST ddplugin-1.0.1.gem 9216 BLAKE2B ec1035b66b5167f26a9f89bc02dd1e4429bbb8d22e0bcd98b4e37a20443afc61ee32b65e00a6d46265303ec8cca6090edaa646615e0d00785222c1450c62f8ba SHA512 6332fb5292f7796e99a78131fd0e4c38cabed66e0d05220960e1cf08b717505e3790b99949d1a6098b80999d973ade442d07a5d19975328174810ef8f44ac276
+DIST ddplugin-1.0.2.gem 9728 BLAKE2B eded641a734d4c7182184b9b9cf4a6007b33b25ffde97e1c9efea71d425ee034693e05b8f569d8e9be29f4a315d5306d8a3180b19e835157d49d9d1c82f0d436 SHA512 bc36cd7e5490e3748e65994dc1e2b1cff9aeefcd0b44ad547368491c83509baf2934cc38f9db4035069394b8c2fa9bbea6b35cf96b80ac4126df348e49a93420
 EBUILD ddplugin-1.0.1.ebuild 589 BLAKE2B dde97ac493236470bd004b48207688653810aa083848e69425a174a8f3efb920145cf4c8d34e2eecfbc6a5ee9aa08e819ee7920fc11e4d43458c6950c56dc7a0 SHA512 36e48ce74683c107009418ae7ae26d9462af40bc35f9714bc15141b86cf58c971c7e607fb7d824f87fc27263de29ab304d61e694931c1c1888f71f72b04e1aa6
+EBUILD ddplugin-1.0.2.ebuild 589 BLAKE2B 2424584ff6892c4cda02a1448df67d5d49071a42ec479e16bf5828079cff37a3058f91a03b3ca829176d3310e0a6b306768cd07788dbf140193723337335fc77 SHA512 b039cea0cd525fd4ed7f87609039344ffb1d2d567cb6a18a971f92b09e570aab06e64ac480519cc0323297a22f1230f6c90ccf348d913c12a6bd73f4a6e4c407
 MISC metadata.xml 343 BLAKE2B 746f50a23d4f0d6bb51139641b0170f42f0317ced63c8aafbcd0792a7e2bb52c16980087602df8ba56921465e045b42681f15e80193c6abfe3f2ab4f6a6367d2 SHA512 14ce3a5ff346c7da07c1d5c4eb91b7a02ad8b77c97921c40ec29cf7ef48e365c6c1c6265164658498ec07ab5a4ab84eb06930d4db0d4af0a40a50f258993f1b3
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.2.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.2.ebuild
new file mode 100644
index 000000000000..f5030d83d56e
--- /dev/null
+++ b/dev-ruby/ddplugin/ddplugin-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides plugin management for Ruby projects"
+HOMEPAGE="https://github.com/ddfreyne/ddplugin/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 44238a529c31..d5a907b4bfa3 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,9 +1,5 @@
-DIST nokogiri-1.6.8.1-git.tgz 5708322 BLAKE2B 54a97ac8a4bc964f9ad2a1c2eabf23864d1930e45148fb9f2bfa6edddc19670acf1066f12d01cba5654489dcd84b3021c66f942bb1fd51aa9164a2cf9053f5cd SHA512 a4546917e5979810ad4fe0f693f11f00fc719379fecefa68e36e512b128db1de083add4e80dfe3fa0546294ec68aa0f3f890575812b851e884bcbf2165f944d7
-DIST nokogiri-1.7.1-git.tgz 5712371 BLAKE2B cd90c8a48a25a81f65a485ddd6a1df6667f49b2d4242c71750c76ae3d41f439f549a82ae72d87dd3f8022fca9fa917efc91ad3f097f07783666a3712c72ee241 SHA512 82a10eff835d562a215f8a38e660f43f5d05f54fae6c6ec21cb5e4797b747be6a8eeb2e42f3c2b5710294073be8d1a987d881f7845526f0ea3ca52a0feb508d8
 DIST nokogiri-1.8.1-git.tgz 5747155 BLAKE2B 40eaa7506f646e47caced25e87c125f2650d69e7194491061f734de9d4b58ee3efcab202e528c8d416683bf1642b0f1e7cbeb7268e1fa32549ae2a427d55227d SHA512 fbd5e9c3edb0f7099ed7923ccb8922e778859ee1fb226c756f515f69c5f16cc4103644d4a569e16aa05374c6e94c691572255ea82af0002f95879ed396ccdc4a
 DIST nokogiri-1.8.2-git.tgz 5749541 BLAKE2B bb3baa299fd27caf43890a752f93cfc1aafd5897f19783cbc6732ce2924bf9c86639ccabad9f26506cf228f5c179afae4cde57150769780c30d9dfc3403359b0 SHA512 5f34f8a055844cd034682b11e4408fb12b60640e52ea64886a13cb5504d94904eace2a85d5047b21f946f1a296ee562ab3677791d53093123ac136062167294d
-EBUILD nokogiri-1.6.8.1.ebuild 2695 BLAKE2B 7d1d7a6b1e024257d55f67cf278e75809df464b1cbe9510cf2de31142cc72049d544bab71ade13cf5517db83308a13dacc2b7e1951611f9fdfdd85c9217614ef SHA512 a850c065ac183ad06b7c1cf49c0b71df29d328f48351ea28eb30027b383ce49ed873919b9c204e8514f09773dbfb93807d602aa64e239c6c626162a7b375ded1
-EBUILD nokogiri-1.7.1.ebuild 2706 BLAKE2B cb2f1e7b104b260fbba298eb6d5318add9ad12fce32a0c3dbd843e41dc25324d6097f5289fc34da0fd9bf223e3752eb2fceef63a353fc47d208258ca44ea44b0 SHA512 1bf1eaed9afac4d8b8b32441a3b4ab5f7db20577b4045a08e194fd78ff30e1574dc7a12bed36425f05c8eb23628d1310ca9847c8e6fba16beeccee577139b9ce
 EBUILD nokogiri-1.8.1.ebuild 2723 BLAKE2B fcbf50d99b8f9d291f06a54c81769f204ae40c0ddc12ffbd2fae56492ccbbc6e9d418cab04d397b37192f981bd3668ba72cc5a99e62ad486b1db7916c3db7794 SHA512 0b9afd7dfc9accefc1d426b14776ba56675d8272e1ece8ca4acb63866672a5a5613630f488e1d87a9ef04e73fa418ea30865202a5f27c1e124f83baa3a98191a
 EBUILD nokogiri-1.8.2.ebuild 2732 BLAKE2B c9daa660aca193ad32773a78dfe58bf43c40d04f64fb79909d58e81515eb50e2f2a8cb85040204512e6a5f85f6f101cb8cf9e3a30d3041c1354e30a1bdbb81ba SHA512 c95f2468c3ebf8d07dcc8daf485a070b8179312926bee6ed6a6b47494b1125228f96a9359b5707d979752a3f463cf713d63f119f0716209717279da5e971d843
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
deleted file mode 100644
index 5bf14bcacf00..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	dev-ruby/hoe
-	>=dev-ruby/pkg-config-1.1.7
-	dev-ruby/rexical
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild
deleted file mode 100644
index 3c1d7383e1b1..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	dev-ruby/hoe
-	>=dev-ruby/pkg-config-1.1.7
-	dev-ruby/rexical
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index f9b30e10b06a..52badd5533d9 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.gem 1476096 BLAKE2B 6da658d4bf1b64574a3d7652aaa938e45e01db11f68f5fdf76ca70d84dae927828ea52262ee0777deff2408f4325d87a6d86f545c714a1180f1efef0099fa749 SHA512 04fd6e27974d4f0432be8a881abf0f00c8db448748118105c26a0dd0303e3914e469b7fc302a73ca4956d00a84e3d8fc16a179aad2f1f3ebdd11cae3a6c90717
 DIST rails-5.0.6.gem 6144 BLAKE2B e9af96cd669b44fd3aa0b8ba744b522be93579ebb3532e71494cf9d973ea08eae8d0d9dfe9eb2ffbea73e0b5443f786784b16fb8510f9568bce4ad1182c4927b SHA512 7c30767c92e52e0ada10b779204ac814e7425bf3d6b417c1976f33f4815caac8cd634ed9e24cc2c0bbea51ddabde1ff708c4f1391ed2763107be3ebb26f2e293
+DIST rails-5.0.7.gem 6144 BLAKE2B 7fa6cd84e6ce8714ea051991403c098291cf6fb946e09cdb520cdf0fd38541b9e0720e28cf4d19ff5191ed7199d3ce68da6c1ca0640b5776ed7b8f0132e53a38 SHA512 3480d8e5aee024a22819fb40610d78a41c56b89195f432d35c086f519d7530655a2a77ea09a40eeba19764adf2a06401749e7f763f945ee87321d95dd94df67f
 DIST rails-5.1.1.gem 6656 BLAKE2B af350844951e92ac240585cc0e78217ca877573c50195725b21e9ed3e82cc182b99f975deb485fa70a026e5a8b8766495b3f88f07efef08c917f04be3f6e616c SHA512 c2d65b293710f5de8e114b2b5825c281c81586d6df39fc6f25ac8382baf8a77088d6d7d57b89d19b9882002a065fb0951b0c052104df2fea224abc2a91fe961b
-DIST rails-5.1.2.gem 6656 BLAKE2B 38400b89019517ed1cddf92dd11f221d1316aa1677e33a47a389cc7321d977d2c032e847395bc2c6f3a48b3a72bcb8b6ec99fe54025c635b1d3494d60d3f0855 SHA512 d79942aaa7f8cc717323955ea870e1a297d0b0190902071bba02eede36faaa6f70e36951f7b6afc8796fec825d505577e04c46aa409925511b40d441c76a1175
-DIST rails-5.1.3.gem 6656 BLAKE2B 541566cdcfac40ea80130a2a126df5c0c9d7ef3d9534d1e496c1c84ba74d94bb2682b994bb7362a183dd86f29d54bce4a4d4148c416c2ec7b59aa908f0742a21 SHA512 6d2f61acdc217cfa4fcdf79e51ba647e6a9737af83f243d3e425ce57270ea5d6f5ec76db4b33c43e69743f310cd4f13f85a59655b5c823f9f387996d7218ce0d
 DIST rails-5.1.4.gem 6656 BLAKE2B 1a6d15a13eca0fdc3b78d359b0d1edc29c29ac4186f15f823af3410f1fd6e25c7fb42e707437c3344b9933e63e8a8061e3282e14083f11b7161b8e0af9f6c292 SHA512 a75927619afce0b4b29b99697040bf5039a856bceac033b63dd910b9ad99adb5f5078eab9be22468104be134ed72a861ec349cc5c59748c1fefd558a1e11d94a
 DIST rails-5.1.5.gem 6656 BLAKE2B a6d86d40c215ba343f4bfeb5bb11db15a3f3b0d5828df3a8179f678b8df313a49952bed21842bdfe71965d80da88ce08fb665a3a843ff5ab4115e49ca71f5a8e SHA512 33aa51d13261b2cc040a603f3a94a2a56d02e7e9f2591d46b43c72a00923b7869ec61ae288cb19a6d90789ff322c4a536f715ddf6d79eddf6ae8bc72f1b3332f
+DIST rails-5.1.6.gem 6656 BLAKE2B 9e5af755854f7096446f5f02cc93ea0f32d9699440cc925c397fa8a62337d01b3d8e04f74d40d1a409e789b55e3046e3ed565d87f5cfe8f8d8225335c7ed0734 SHA512 df201bdbdb720c4ec3045cab908d5e97c53e3a31e29d84224e7bf918f6f2cd108a47792ac39e091b9a0cdd9749f15adc8c5c703659610f5da11d9bd9a63c13b9
 EBUILD rails-4.2.10.ebuild 1117 BLAKE2B 4e31a087075b1e4ce236a372a4dda915467c1aa020a0de9d56ed01eae3a7011838f476da849faff693be03c13036a42802881d145e8cab62af87e0cf51d8ac6f SHA512 a7fcdd075d0cf39399307c017bbc4c04529ac30a2229c725e762a692a911e533574338444a885835aabc0c07dc69ff82f79f38c0a428475ccfa5965b26332967
 EBUILD rails-5.0.6.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
+EBUILD rails-5.0.7.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.1.ebuild 1059 BLAKE2B 451efdb97dcd756cfc4f154efe168a0cad074741190e2d81fdd10139d0042fdddfc00eb13b7aea37397c6ea8be500f8ccf82743482eeedc3255ac6bad619ba81 SHA512 087da95795fc9e9585903c3aaa6fc4164ef568f3551eab807c0048bc6d6351e4d5f8c5ba2969442682c4f0098f07fd558a384374ae2a6a9e7d521b68da8c9fa1
-EBUILD rails-5.1.2.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
-EBUILD rails-5.1.3.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
 EBUILD rails-5.1.4.ebuild 1071 BLAKE2B d135e4b6112ae71d2e9517d383751896b5571f747f2fef2c0c331a6ebdcdcea4bc6b0ac72cd0b4686acbb98e3933775775d6de64f012f7eb71f634b877c387ea SHA512 ee99ff8624133f1a83998e3af0e0473d790a8ad3a453eaed448e74741a4262f01e7ed6ee536360781649d800201f3f345adbea36e8758420a0c3fe7e1d34938c
 EBUILD rails-5.1.5.ebuild 1078 BLAKE2B 92b2e355b162f771cee82a983df74cd8063e27a29af0b6b637dfdd12ff64dc40804e5afc50a06849cfe05c69cd4c00dda20c75474308ba68eb4fc76c1504f07a SHA512 bae7bba25b9174d0641a9e34ebe65e91e4203a6942556287d094ef95b4a0b68625b1f9c7b064e3270d7a969cdfb722c7726f3950df586f894f09d208e4d0fd7d
+EBUILD rails-5.1.6.ebuild 1078 BLAKE2B 92b2e355b162f771cee82a983df74cd8063e27a29af0b6b637dfdd12ff64dc40804e5afc50a06849cfe05c69cd4c00dda20c75474308ba68eb4fc76c1504f07a SHA512 bae7bba25b9174d0641a9e34ebe65e91e4203a6942556287d094ef95b4a0b68625b1f9c7b064e3270d7a969cdfb722c7726f3950df586f894f09d208e4d0fd7d
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.1.2.ebuild b/dev-ruby/rails/rails-5.0.7.ebuild
similarity index 96%
rename from dev-ruby/rails/rails-5.1.2.ebuild
rename to dev-ruby/rails/rails-5.0.7.ebuild
index 288bdf5b1bf5..d9de98a24596 100644
--- a/dev-ruby/rails/rails-5.1.2.ebuild
+++ b/dev-ruby/rails/rails-5.0.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/rails/rails-5.1.3.ebuild b/dev-ruby/rails/rails-5.1.6.ebuild
similarity index 95%
rename from dev-ruby/rails/rails-5.1.3.ebuild
rename to dev-ruby/rails/rails-5.1.6.ebuild
index 288bdf5b1bf5..f400d600c953 100644
--- a/dev-ruby/rails/rails-5.1.3.ebuild
+++ b/dev-ruby/rails/rails-5.1.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index fcea87ca35bf..8759a6ffe56c 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD railties-4.2.10.ebuild 1717 BLAKE2B 3ff657f26f860f75d7c34be0410e06cf68f3a1ee79f6c3317af9cd75ac2f68d2ee43ace1c9ced96f7c8cd6c4339317dca56ae0808fb39c5600bb9c5802244287 SHA512 aecb917e4204cc2d7dd8948bcbebfcb9f4f01022d5c691f0aa4878e74b3ee3a7ee0044f54e0878db398a6af873e793b4c648d3d7a269b9f144288bb52bbeaf1d
 EBUILD railties-5.0.6.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
+EBUILD railties-5.0.7.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.1.1.ebuild 1657 BLAKE2B c2e9911388c7a86b44a338a6def27f1facfbfde67ce6ad9e441c1197b868196c34dc75e12bf5e8d46f8d8179963beeb8a7d98f68f1dfb9bef4ff8acde2a2ffc4 SHA512 12288eb333550596cc1ba9de9eabc2cfd1fdb0f032a59725e6e507b3053db53d0feb06adbc2e6c1eb64e7cd58ce68848263b66b3f3e592c8112836afaaaca79b
-EBUILD railties-5.1.2.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
-EBUILD railties-5.1.3.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
 EBUILD railties-5.1.4.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.1.5.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
+EBUILD railties-5.1.6.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.1.3.ebuild b/dev-ruby/railties/railties-5.0.7.ebuild
similarity index 83%
rename from dev-ruby/railties/railties-5.1.3.ebuild
rename to dev-ruby/railties/railties-5.0.7.ebuild
index 1d5fa5c75186..82547a65b623 100644
--- a/dev-ruby/railties/railties-5.1.3.ebuild
+++ b/dev-ruby/railties/railties-5.0.7.ebuild
@@ -10,8 +10,8 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
 
-RUBY_FAKEGEM_BINDIR="exe"
 RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
 
 inherit ruby-fakegem versionator
 
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.23"
+RDEPEND+=">=app-eselect/eselect-rails-0.22"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
@@ -51,6 +51,13 @@ all_ruby_prepare() {
 	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
 	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
 	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Also install rails in bin to let our binwrapper work
+	mkdir bin || die
+	cp -f exe/rails bin/ || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/railties/railties-5.1.2.ebuild b/dev-ruby/railties/railties-5.1.6.ebuild
similarity index 96%
rename from dev-ruby/railties/railties-5.1.2.ebuild
rename to dev-ruby/railties/railties-5.1.6.ebuild
index 1d5fa5c75186..45ce9539c7b0 100644
--- a/dev-ruby/railties/railties-5.1.2.ebuild
+++ b/dev-ruby/railties/railties-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index f55e9890e40f..3214fd7ea0e0 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,5 +6,5 @@ AUX init.d-gem_server2 503 BLAKE2B 7c602202ba101a5ed7e74a67bc4183085a98fdefb5528
 DIST rubygems-2.6.14.tgz 769418 BLAKE2B 13821b21c7ac4087667c45d7b7e515023e80552072e11bfaa98393f573f361c60bed07bf9aa69d31952deb66e75db3c9b616372203ee7d1fa98a7775eff4c1f5 SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf
 DIST rubygems-2.7.6.tgz 852486 BLAKE2B b2c7cf7f2ce5a27beff846d85a3ca2867a4bbadd5bc76af0df76e774c239979bc4b3fac406a65c45444c9f401f92cd1058b45c8b3750c1ee5477cd2b4b513709 SHA512 bc168afc40c974dbc7c37eb5678432ba2ed7469c3f007a159699467ff2cff5205c508237193ee8becaa6eb555b043969cc5f92b2aaa6bf7c958dd7c187e258a7
 EBUILD rubygems-2.6.14.ebuild 4063 BLAKE2B 1ec9da0c225d24faec7dabe1055ead71a31625c7c71981b034761d5cccf4fed8053cbb87312afcb8c439fb805b75af306b7ed5f19d921084ce2616f1a99fc45e SHA512 40ae44ce042618b30297e2495ac5524ad58ab6b3d0b8081bf073707079c819915325940da9ca6ca7163e101b359dc19fee9637a684ca22ed2bb0b1a00d7d01a3
-EBUILD rubygems-2.7.6.ebuild 4407 BLAKE2B 358f0f6b2f34869d878248f4df93697e2a7c03667fe36075abefdc6f6f16876f4025e46a0313d996cfefa9339003ddfcf0c2e862d2f4e21eed9757a935755be2 SHA512 80843bb4e791bf75093aa1d1813dede286b1561bfe3b2d234fa5bfabecf1eef1eedd06474798ad076d9fad97f0a0b2476fce126361c3c0a6568d180bebb83e41
+EBUILD rubygems-2.7.6.ebuild 4406 BLAKE2B 90018a48fd8d5645475d99357555c8b0fd444f641dba5f8af79ff747f9e217f911a4133a26497f5bf93cae018db35b5e4195833f2aa36ff0822821b4c509ae08 SHA512 c950527efb69e6d2c05291945ac00532e7f757acfd0daf7ec0e57303399774f577969cf58855c09e72adfa5dcfe9289b91bd257d6a2b9249490ae5eb19535274
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.6.ebuild b/dev-ruby/rubygems/rubygems-2.7.6.ebuild
index c24384f366f2..cf2c09d0aebe 100644
--- a/dev-ruby/rubygems/rubygems-2.7.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 0072ddd9b32c..97a72803e5b6 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,7 +1,9 @@
 DIST sanitize-2.1.0.gem 20992 BLAKE2B 726cca43e1c9bebb4e750acec43dd6f6a3a17659e1390718dafcce3f1813a8756d9f34320b8c27c52a054009f40639e2e933718577ab4c5620bd4b754742d188 SHA512 29a26e37342a75af2bc7795578edf2c5064263c58d38dfc36e18f1e111271616c026f7d808a05d63185c12f0e52384db84d62bdb796bf1b21d7e902ef0c1d096
 DIST sanitize-4.5.0.tar.gz 1347295 BLAKE2B f49f061c4213d62d01561fd0b5f9a3d0a955bb949e0667dd8ed64cfaff8daf77b1b9b7d089b3aadaea3a5045e5f18f334d3cc1cb6dbb48cc9a564a200517df09 SHA512 2be26bf42c83d7a181a57a9cb1cf63a2287866147590094d7ae4153c017ed997f2caf5a3cf4bfdd23c36706d416375267d4798bfb30d1d293572365cd8959226
 DIST sanitize-4.6.0.tar.gz 1347335 BLAKE2B 09b420c47c267729939b5eb927c746d86f2db99f7c569236b6a06a0a7e98b85f6a745e1e70ba7862f850cd7c051b5507556be83677a1912c6fae720f4d839792 SHA512 46bd3e825538d97227c9f4addd51aa673cc36992d30d97ed900c90764078b4b3eb0a7bb3802ec8e377af10e58f0f618c56ccda6ff6ad382eec2e200e526b169c
+DIST sanitize-4.6.4.tar.gz 1349418 BLAKE2B 2d1a56340e562d057c85edc0d5157508267a4089b0aeb59156d0c249c8a39adcc15a10c8c67d84be77a2b388aa779e9330b9b4b52f28f11d7666eb97fb41bd24 SHA512 d870d8cc5ce6043e3825cfbb50f31c00d348c9ca05823c0eda245b9c175ae0bb9d0941845112bb3721ded9013bc554c09bfc55a1bfad70fcccd1660142e4ca82
 EBUILD sanitize-2.1.0.ebuild 582 BLAKE2B cbbe2c5119c77254dea7f9dd1fc259ddca5fc77fa049addead296fea67dd0547259766a930f2d758363be2fb4da6c374d94416dc63ea0da54b9d35ae3d7c3ca0 SHA512 2296a21edb640074975c5f43a5505d4698b41c20e38975622d5c04f20e4cabc9880d5b81ba7e3928b2566d18d36e0ec01a3d178958f12636a97169b418f5cb97
 EBUILD sanitize-4.5.0.ebuild 882 BLAKE2B 874505ea7bb2c17299fb4487447a6ddf9984612c78d7083ee8ae9b3174672b01fab79fada0ec75a148c76040041690e89e5fc057ea74343db0477b2c22d1491d SHA512 fcb0b5a5a7b78ea05ed8f2f3f094c1aa725d6dbf204abcf242b5a717d732af1a929558e02b576b36daa01298ecbc55ee45645b27c5b0963372f2407d998ac935
 EBUILD sanitize-4.6.0.ebuild 882 BLAKE2B e1f9f23c3a7882d9d61dba0f9d3be210469346444ebad65646a927b501f46bc3016c0d6be5c1e9423ccc803a101f339462d53156fa5e4b03e63fc20b718f02aa SHA512 91f99fb26f0e6f44532fa2d6064fc0aa0693b08df27f56be394f8c7e6b56a826168e9d49df785afac23a375a3b7b21842cf5b10c4f0f81dd845ed70dc5639dc8
+EBUILD sanitize-4.6.4.ebuild 857 BLAKE2B 18acf1c04692f6f1f933610ab90773e340397169fdde2c1e368133ce4db31728d86c5de89606d5add7db5ea1b42a010cffe10b552ac977333310b281f1b98122 SHA512 14266355fa514dfaa3a20ef0099e0b7af446bd4e27040c31960945ece64f0867815b7db8cba015907fb865f0e895b46d301c0c04e13b2e11fe1b11247a2cbd52
 MISC metadata.xml 341 BLAKE2B 8081029c35d5a56ed5a3399ecb63510e737a664e97a4eb363108b85fe75860cb8b171e8da497d669cb0491199bdbe94408570cb811a8c86d6d38541a0f65cbe4 SHA512 870423593eeb0219f2fa0b6bbb55a4a19063f5cf3d19d9c0bb352aec5632b3e5f5e717e7c6004413497a981091042d54bc092e2c029a511aa0c37e95d435996a
diff --git a/dev-ruby/sanitize/sanitize-4.6.4.ebuild b/dev-ruby/sanitize/sanitize-4.6.4.ebuild
new file mode 100644
index 000000000000..9fd0e4f30ffe
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-4.6.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/nokogumbo-1.4:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 34aa8fee5a20..e8afd3154ef2 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index d619ceb60306..42eb62d3258f 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -3,5 +3,5 @@ DIST guile-lib-0.2.4.tar.gz 421960 BLAKE2B b1ce073d6deb1236209653dc65ec6667e33dd
 DIST guile-lib-0.2.5.1.tar.gz 424124 BLAKE2B 36aaf66f6a1550e24101547203865fb73f60ebe04d04e13a8244d81cd91510288f00f7c77636b86fd4a5c49f6157e187d623eb26d4ad361e7a284d9dd2f017f0 SHA512 500f0a5c973af1594402a4d564be8a6e559f575e10de35368cbda2d24d73c9b781b06b4a61433cf2609f91a7548903dc01718d70796e48a49c6d50988227946a
 EBUILD guile-lib-0.1.9.ebuild 571 BLAKE2B 3cc28cc2e41daf45f9c97e1cb577ba04536f85c6bc5a8cfde62e743c55d1fe8a52c6f8abb8ae0323401e68da7f979407e3cd9bba27fe1320cdcf0e14eb7c2437 SHA512 5e8a86a54f9e5ad3ea1cffc74ea901d1a9481181f9915e23fa539c7e6d6a5957a69ea82ce84b10d5a663df18279623750704aa89902f6aa8501b1f04ccd07fbf
 EBUILD guile-lib-0.2.4.ebuild 584 BLAKE2B 3f325c7f82b195bbb0f56a9de22accd58c639cdaaa6b9abbdfcf0e5a85b238f05cf17a0ce9bc2cb87efa8d5d31d55b3e72dd022953fd974f898fcae439d72bd0 SHA512 fe217f67edf6fe6c7e9442d65a3a310d3ac3ad9aff5fec5e23882248342c7ce7c25aa4be09e5a29da650bb6e9ba9295f61215dddd30b8ca9088f4323736c798e
-EBUILD guile-lib-0.2.5.1.ebuild 578 BLAKE2B 1bdaccc5c44431728a0713470bd71b88ad06980df886432d6a95583534770ba9ae31c3576b22e8641cedbe0ede2520507517425db80ce18a032aeced0feccd5e SHA512 bdd88a0856a28c51b6cfb780b0f47a05cfceee3a6a4a29ef8639636c4ce092ae36e68842d9c74b42bb8e3cb36ff56eeb3738f01466343fe7e3bca760b16bd1ad
+EBUILD guile-lib-0.2.5.1.ebuild 577 BLAKE2B 1769d6bc9e4e6001a5923c46dd5536b5059d3f9c13f1e7040cd1f31ee511bbd3e956c11d0a5391de9c823229928a28678c158c01753549a8c0b96a85f12a2182 SHA512 e3d83947a3a8222044f5978bd558e51ec53617479e563390bb5aef248fe7a150c72a48ba035a8dddf406951fdb66db7f2702e70cb700c4c8c285d0e45d39a1dc
 MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
index c514433cb5b0..2a330cfcbb8b 100644
--- a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 1ea82a10939a..99a5e7e537c4 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -18,6 +18,6 @@ DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
 EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
-EBUILD guile-2.0.14-r3.ebuild 2249 BLAKE2B 0b2444091e0612571c7daf437e1a994f1286a7d4914306a49829d576266d457977e03a5e78cb73cedbc04b16dfe45bd815d3905b815f79f84923d99df51fe0d7 SHA512 6cf9f002bc02cccdd0fa3ceee878319edfd7e891c254a9345b488755b67fe9c4334581410a27f8c8db8ec64c22bf86cf8267633372f9ad8054dfe630655abb3f
+EBUILD guile-2.0.14-r3.ebuild 2248 BLAKE2B 007df6973339b71f4a267cd437489ea59db77024b4c1844034ff40d1f56c7ade8833d41477a2889c526188f2ea2637382965ff3126e0762865dc61caea3ff999 SHA512 d291aaaa06c1f93172b490f60d97927dbfe433092d7238fe9811fea273a97abec03d0748ff789841ce12a57663391a6ccd9d7fcb86e44d6c3a9bf139e83904db
 EBUILD guile-2.2.3.ebuild 2054 BLAKE2B cd3af6f083dbd96eb50db8e65e1c6041bc18643207ef35fdbbd05f3ae9541672138f55c0c4001d9c4bf6567035c9c55dcaf8d2915adcb498c8c7d4aaf98dc30f SHA512 d3f1f1e2165e7c2faddd35e1b1e6e8bae693714c1f47cee9db0fc1bc726d56baab4612401e2f20784c7fea9043b252b0289463e3f754d920cc08266e797ab9f5
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index b1ea2e63f287..b438a3f3084b 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index adf9d35e038a..3f3dda491f50 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 540510dd8259..976e7d52c89a 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,5 +1,4 @@
 AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce028317c8cea9305b7643e540171693ef70bdd364b6f6ff72daabc0baf66f32bb8ea526dcb0406fb065 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48
-AUX tex4ht-texlive-updates.patch 16596 BLAKE2B e5fb2e6de96f9e32ba2293b26de9aa9782a94e3883ffc89510a132539b2d08a03b14ea55d6d7cf946a1b2eea3c9659245e5b67b86c37ea2148ba860afc21de8d SHA512 6de0be6adb3ad494cd8935d3744882fb646ae4db2caaf0d13fb712fb5445c233e7b78385f5da175d8f694047839d1496189fe5c4fc739eadc9ef05da351fc443
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963
 DIST tex4ht-texlive-2015-08-03.tar.xz 801488 BLAKE2B 56397450cc600141cbc541188e4a896727af4823982aae20a198d27b51fcb071794a1aa5a4037cf803f9b172c3183a927b7f446757df1520a596b5b6ee150a06 SHA512 a8a56e0d41406df8c76d72eea6f726f012d70a46665d9dfe99c7362790a2f0126f2c21e07c5de08aff7694e9837c47e162aa6790c256b4538f4780551f6e6191
 DIST tex4ht-texlive-2017-02-05.tar.xz 826816 BLAKE2B 8387c1fc7326cb4eb74ec82d15ed6a6f07bacd08788b00e3e6583bf993e0d0e0d387269650217a2a2f2e1f4b94cc8e154359d258bf3311820772b5fdc9aeec34 SHA512 c5a62a10b956d1108f288490e966e9c225555a74ace7744058a4464e4b166f3906d429ed8557d640ca0e9b4dbcc4278ef20298e869560a906c85c68ff832be52
diff --git a/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch b/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch
deleted file mode 100644
index dc0a15912155..000000000000
--- a/dev-tex/tex4ht/files/tex4ht-texlive-updates.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -ur texmf/tex/generic/tex4ht/biblatex.4ht texmf-dist/tex/generic/tex4ht/biblatex.4ht
---- texmf/tex/generic/tex4ht/biblatex.4ht	2009-06-11 11:20:16.000000000 -0300
-+++ texmf-dist/tex/generic/tex4ht/biblatex.4ht	2011-09-18 20:09:39.000000000 -0300
-@@ -1,6 +1,7 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--% biblatex.4ht                          2009-05-21-09:32 %
-+% biblatex.4ht                          2011-09-18-16:07 %
- % Copyright (C) 2007--2009       Eitan M. Gurari         %
-+%               2009--2011       TeX Users Group         %
- %                                                        %
- % This work may be distributed and/or modified under the %
- % conditions of the LaTeX Project Public License, either %
-@@ -14,24 +15,39 @@
- % This work has the LPPL maintenance status "maintained".%
- %                                                        %
- % This Current Maintainer of this work                   %
--% is Eitan M. Gurari.                                    %
-+% is the TeX4ht Project <tex4ht@tug.org>.                %
- %                                                        %
- % If you modify this program your changing its signature %
- % with a directive of the following form will be         %
- % appreciated.                                           %
- %            \message{signature}                         %
- %                                                        %
--%                             gurari@cse.ohio-state.edu  %
--%                 http://www.cse.ohio-state.edu/~gurari  %
-+%                                        tex4ht@tug.org  %
-+%                             http://www.tug.org/tex4ht  %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\immediate\write-1{version 2009-05-21-09:32}
--
-+\immediate\write-1{version 2011-09-18-16:07}
-+%
-+% This work may be distributed and/or modified under the
-+% conditions of the LaTeX Project Public License, either
-+% version 1.3c of this license or (at your option) any
-+% later version. The latest version of this license is in
-+%   http://www.latex-project.org/lppl.txt
-+% and version 1.3c or later is part of all distributions
-+% of LaTeX version 2005/12/01 or later.
-+%
-+% This work has the LPPL maintenance status "maintained".
-+%
-+% The Current Maintainer of this work
-+% is the TeX4ht Project <http://tug.org/tex4ht>.
-+%
-+% If you modify this program, changing the
-+% version identification would be appreciated.
-    \ifx \blx@startbib\:UnDef
-       \pend:def\blx@shorthands{%
-    \pend:def\blx@bibinit{%
-        \HAssign\shorthands:cnt=0
-        \NewConfigure{printfield-shorthand}{2}%
--       \Configure{printfield-shorthand}
-+       \Configure{printfield-shorthand}%
-          {\gHAdvance\shorthands:cnt by 1\relax
-           \ifnum \shorthands:cnt=1 \a:printshorthands
-           \else                    \c:printshorthands \fi
-@@ -50,10 +66,10 @@
-   \@nameuse {blx@rerun}}
- \pend:def\blx@bibliography{%
-   \pend:def\blx@bibinit{%
--     \ConfigureList{thebibliography}
--        {\a:thebibliography}
--        {\b:thebibliography}
--        {\c:thebibliography}
-+     \ConfigureList{thebibliography}%
-+        {\a:thebibliography}%
-+        {\b:thebibliography}%
-+        {\c:thebibliography}%
-         {\d:thebibliography}%
-      \csname onthebibliography:list\endcsname
-   }%
-@@ -75,8 +91,8 @@
-       \NewConfigure{printfield-#2}{2}%
-       \a:printfield{printfield-#2}%
-    \fi
--   \Configure{blx@unit}
--       {\csname a:printfield-#2\endcsname}
-+   \Configure{blx@unit}%
-+       {\csname a:printfield-#2\endcsname}%
-        {\csname b:printfield-#2\endcsname}%
-    \csname o:\string\blx@printfield:\endcsname[#1]{#2}%
- }
-@@ -92,8 +108,8 @@
-       \NewConfigure{bibstring-#2}{2}%
-       \a:printfield{bibstring-#2}%
-    \fi
--   \Configure{blx@unit}
--       {\csname a:bibstring-#2\endcsname}
-+   \Configure{blx@unit}%
-+       {\csname a:bibstring-#2\endcsname}%
-        {\csname b:bibstring-#2\endcsname}%
-    \csname o:\string\blx@bibstring:\endcsname[#1]{#2}%
- }
-@@ -103,8 +119,8 @@
-       \NewConfigure{bibcpstring-#2}{2}%
-       \a:printfield{bibcpstring-#2}%
-    \fi
--   \Configure{blx@unit}
--       {\csname a:bibcpstring-#2\endcsname}
-+   \Configure{blx@unit}%
-+       {\csname a:bibcpstring-#2\endcsname}%
-        {\csname b:bibcpstring-#2\endcsname}%
-    \csname o:\string\blx@bibcpstring:\endcsname[#1]{#2}%
- }
-@@ -114,8 +130,8 @@
-       \NewConfigure{biblcstring-#2}{2}%
-       \a:printfield{biblcstring-#2}%
-    \fi
--   \Configure{blx@unit}
--       {\csname a:biblcstring-#2\endcsname}
-+   \Configure{blx@unit}%
-+       {\csname a:biblcstring-#2\endcsname}%
-        {\csname b:biblcstring-#2\endcsname}%
-    \csname o:\string\blx@biblcstring:\endcsname[#1]{#2}%
- }
-@@ -125,13 +141,13 @@
-       \NewConfigure{bibucstring-#2}{2}%
-       \a:printfield{bibucstring-#2}%
-    \fi
--   \Configure{blx@unit}
--       {\csname a:bibucstring-#2\endcsname}
-+   \Configure{blx@unit}%
-+       {\csname a:bibucstring-#2\endcsname}%
-        {\csname b:bibucstring-#2\endcsname}%
-    \csname o:\string\blx@bibucstring:\endcsname[#1]{#2}%
- }
- \expandafter\HLet\csname\string\blx@bibucstring\endcsname\:tempc
--\NewConfigure{biblatex-style}[2]{
-+\NewConfigure{biblatex-style}[2]{%
-    \def\:temp{#1}%
-    \ifx \:temp\blx@cbxfile
-       #2%
-@@ -149,10 +165,19 @@
-   \blx:item[#1]%
-   \ifhmode \spacefactor\blx@sf@par\fi
- }
-+\newskip\blx@unitmark
-+\blx@unitmark=10pt plus 1pt minus 1pt
-+\let\abx@aux@page\@gobbletwo
-+\AtEndDocument{%
-+  \def\abx@aux@page#1#2{\blx@addpagesum{#1}{#2}}%
-+  \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}}
-+%
-+\let\blx@resetpuncthook\@empty
-+\let\blx@csq@ifkernmark\@empty
- \def\blx@begunit{%
-   \toggletrue{blx@tempa}%
--  \iftoggle{blx@insert}
--    {\iftoggle{blx@unit}
-+  \iftoggle{blx@insert}%
-+    {\iftoggle{blx@unit}%
-        {\begingroup
-           \let\blx@begunit\@empty
-           \let\blx@endunit\@empty
-@@ -161,25 +186,25 @@
-         \global\togglefalse{blx@unit}%
-         \togglefalse{blx@tempa}}
-        {\blx@postpunct}%
--     \iftoggle{blx@block}
-+     \iftoggle{blx@block}%
-        {\begingroup
-           \let\blx@begunit\@empty
-           \let\blx@endunit\@empty
-           \newblockpunct
-         \endgroup
-         \global\togglefalse{blx@block}%
--        \togglefalse{blx@tempa}}
--       {}}
-+        \togglefalse{blx@tempa}}%
-+       {}}%
-     {}%
-   \blx@postpunct
-   \blx@resetpuncthook
--  \iftoggle{blx@tempa}
--    {}
-+  \iftoggle{blx@tempa}%
-+    {}%
-     {\global\togglefalse{blx@insert}}%
-   \csname a:blx@unit\endcsname
-   \blx@leavevmode
-   \blx@csq@ifkernmark
--    {}
-+    {}%
-     {\penalty\@M
-      \hskip-\blx@unitmark\relax
-      \hskip\blx@unitmark\relax}%
-@@ -204,14 +229,15 @@
-       
-    \fi
-    \NewConfigure{thebibliography}{4}
--\append:def\blx@bibinit{\a:bibinit}
--\NewConfigure{bibinit}{1}
-+\append:def\blx@bibinit{\a:bibinit}%
-+\NewConfigure{bibinit}{1}%
- 
-    \let\blx@anchors\@empty
-+\let\bib@field@entrykey\@empty
- \protected\def\blx@anchor{%
-   \xifinlist{X\the\c@refsection -%@
--\bib@field@entrykey}{\blx@anchors}
--    {}
-+\bib@field@entrykey}{\blx@anchors}%
-+    {}%
-     {\listxadd\blx@anchors{X\the\c@refsection -%@
- \bib@field@entrykey}%
-      \hyper:natanchorstart{X\the\c@refsection -%@
-@@ -219,22 +245,22 @@
-      \hyper:natanchorend}}
- \protected\def\blx@bibhyperref{%
-    \@ifnextchar[%]
--     {\blx@bibhyperref@i}
-+     {\blx@bibhyperref@i}%
-      {\blx@bibhyperref@i[\bib@field@entrykey]}}%
- \long\def\blx@bibhyperref@i[#1]#2{%
-    \hyper:natlinkstart{X\the\c@refsection -%@
- #1}%
--   #2\hyper:natlinkend}
-+   #2\hyper:natlinkend}%
- \protected\long\def\blx@bibhyperlink#1#2{%
-    \hyper:natlinkstart{X\the\c@refsection --%:
- #1}%
--   #2\hyper:natlinkend}
-+   #2\hyper:natlinkend}%
- \protected\long\def\blx@bibhypertarget#1#2{%
-    \@bsphack
-    \hyper:natanchorstart{X\the\c@refsection --%:
- #1}%
-    \@esphack
--   #2\hyper:natanchorend}
-+   #2\hyper:natanchorend}%
- \let\blx@ifhyperref\@firstoftwo
- \def\hyper:natanchorstart#1{\Link{}{#1}\EndLink}
- \def\hyper:natanchorend{}
-@@ -244,9 +270,9 @@
-    \let\:temp\do
-   \def\do#1{%
-     \patchcmd#1%
--      {\color@begingroup}
--      {\color@begingroup\toggletrue{blx@footnote}}
--      {\togglefalse{blx@tempa}\listbreak}
-+      {\color@begingroup}%
-+      {\color@begingroup\toggletrue{blx@footnote}}%
-+      {\togglefalse{blx@tempa}\listbreak}%
-       {}}%
-   \docsvlist{%
-     \@footnotetext,%          latex
-diff -ur texmf/tex/generic/tex4ht/hyperref.4ht texmf-dist/tex/generic/tex4ht/hyperref.4ht
---- texmf/tex/generic/tex4ht/hyperref.4ht	2009-06-11 11:20:21.000000000 -0300
-+++ texmf-dist/tex/generic/tex4ht/hyperref.4ht	2011-02-02 13:45:16.000000000 -0200
-@@ -1,6 +1,7 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--% hyperref.4ht                          2009-05-21-09:32 %
-+% hyperref.4ht                          2011-01-30-16:01 %
- % Copyright (C) 1999--2009       Eitan M. Gurari         %
-+%               2009--2011       TeX Users Group         %
- %                                                        %
- % This work may be distributed and/or modified under the %
- % conditions of the LaTeX Project Public License, either %
-@@ -14,17 +15,17 @@
- % This work has the LPPL maintenance status "maintained".%
- %                                                        %
- % This Current Maintainer of this work                   %
--% is Eitan M. Gurari.                                    %
-+% is the TeX4ht Project <tex4ht@tug.org>.                %
- %                                                        %
- % If you modify this program your changing its signature %
- % with a directive of the following form will be         %
- % appreciated.                                           %
- %            \message{signature}                         %
- %                                                        %
--%                             gurari@cse.ohio-state.edu  %
--%                 http://www.cse.ohio-state.edu/~gurari  %
-+%                                        tex4ht@tug.org  %
-+%                             http://www.tug.org/tex4ht  %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\immediate\write-1{version 2009-05-21-09:32}
-+\immediate\write-1{version 2011-01-30-16:01}
- 
- \csname end:hyperref\endcsname
- \@ifpackageloaded{nameref}{}
-@@ -297,6 +298,26 @@
-        \expandafter\:tempa
-    \fi}
- 
-+\def\Hy@MakeCurrentHref#1{%
-+  \edef\HyperLocalCurrentHref{#1}%
-+  \@onelevel@sanitize\HyperLocalCurrentHref
-+  \global\let\HyperGlobalCurrentHref\HyperLocalCurrentHref
-+  \let\HyperLocalCurrentHref\HyperGlobalCurrentHref
-+  \ifHy@localanchorname
-+    \let\@currentHref\HyperLocalCurrentHref
-+  \else
-+    \global\let\@currentHref\HyperGlobalCurrentHref
-+  \fi
-+}
-+
-+\let\Hy@SectionAnchorHref\@gobble
-+\newlength\Hy@SectionHShift
-+
-+\def\Hy@MakeCurrentHrefAuto#1{%
-+  \Hy@GlobalStepCount\Hy@linkcounter
-+  \Hy@MakeCurrentHref{#1.\the\Hy@linkcounter}%
-+}
-+
- \def\hyper@makecurrent#1{%
-   \begingroup
-     \edef\Hy@param{#1}%
-diff -ur texmf/tex/generic/tex4ht/nameref.4ht texmf-dist/tex/generic/tex4ht/nameref.4ht
---- texmf/tex/generic/tex4ht/nameref.4ht	2009-06-11 11:20:24.000000000 -0300
-+++ texmf-dist/tex/generic/tex4ht/nameref.4ht	2010-09-26 19:41:25.000000000 -0300
-@@ -1,6 +1,6 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--% nameref.4ht                           2009-05-21-09:32 %
--% Copyright (C) 2005--2009       Eitan M. Gurari         %
-+% nameref.4ht                           2010-09-04-21:02 %
-+% Copyright (C) 2005--2010       Eitan M. Gurari         %
- %                                                        %
- % This work may be distributed and/or modified under the %
- % conditions of the LaTeX Project Public License, either %
-@@ -14,24 +14,27 @@
- % This work has the LPPL maintenance status "maintained".%
- %                                                        %
- % This Current Maintainer of this work                   %
--% is Eitan M. Gurari.                                    %
-+% is the TeX4ht Project <tex4ht@tug.org>.                %
- %                                                        %
- % If you modify this program your changing its signature %
- % with a directive of the following form will be         %
- % appreciated.                                           %
- %            \message{signature}                         %
- %                                                        %
--%                             gurari@cse.ohio-state.edu  %
--%                 http://www.cse.ohio-state.edu/~gurari  %
-+%                                        tex4ht@tug.org  %
-+%                             http://www.tug.org/tex4ht  %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\immediate\write-1{version 2009-05-21-09:32}
-+\immediate\write-1{version 2010-09-04-21:02}
- 
-    \let\ltx@label\label
- \def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
-                {\ifx \NR:Type\:UnDef \else \NR:Type .1\fi}{}}%
- \let\NR:StartSec\:StartSec
-+\let\NR:no@sect\no@sect
-+\def\no@sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
-+     \NR:no@sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8}}
- \def\:StartSec#1#2#3{%
--   \gdef\NR:Title{\a:newlabel{#3}}%
-+%   \gdef\NR:Title{\a:newlabel{#3}}%
-    \gdef\NR:Type{#1}%
-    \NR:StartSec{#1}{#2}{#3}%
-    \gdef\@currentlabelname{#1}%
-diff -ur texmf/tex/generic/tex4ht/unicode.4ht texmf-dist/tex/generic/tex4ht/unicode.4ht
---- texmf/tex/generic/tex4ht/unicode.4ht	2009-06-11 11:20:28.000000000 -0300
-+++ texmf-dist/tex/generic/tex4ht/unicode.4ht	2011-09-18 20:09:39.000000000 -0300
-@@ -1,30 +1,22 @@
--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--% unicode.4ht                           2009-02-23-20:45 %
--% Copyright (C) 1998--2009       Eitan M. Gurari         %
--%                                                        %
--% This work may be distributed and/or modified under the %
--% conditions of the LaTeX Project Public License, either %
--% version 1.3 of this license or (at your option) any    %
--% later version. The latest version of this license is   %
--% in                                                     %
--%   http://www.latex-project.org/lppl.txt                %
--% and version 1.3 or later is part of all distributions  %
--% of LaTeX version 2003/12/01 or later.                  %
--%                                                        %
--% This work has the LPPL maintenance status "maintained".%
--%                                                        %
--% This Current Maintainer of this work                   %
--% is Eitan M. Gurari.                                    %
--%                                                        %
--% If you modify this program your changing its signature %
--% with a directive of the following form will be         %
--% appreciated.                                           %
--%            \message{signature}                         %
--%                                                        %
--%                             gurari@cse.ohio-state.edu  %
--%                 http://www.cse.ohio-state.edu/~gurari  %
--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--\immediate\write-1{version 2009-02-23-20:45}
-+% unicode.4ht (2010-12-18-17:40), generated from tex4ht-unicode.tex
-+% Copyright (C) 1998-2009 Eitan M. Gurari
-+%
-+% This work may be distributed and/or modified under the
-+% conditions of the LaTeX Project Public License, either
-+% version 1.3c of this license or (at your option) any
-+% later version. The latest version of this license is in
-+%   http://www.latex-project.org/lppl.txt
-+% and version 1.3c or later is part of all distributions
-+% of LaTeX version 2005/12/01 or later.
-+%
-+% This work has the LPPL maintenance status "maintained".
-+%
-+% The Current Maintainer of this work
-+% is the TeX4ht Project <http://tug.org/tex4ht>.
-+%
-+% If you modify this program, changing the
-+% version identification would be appreciated.
-+\immediate\write-1{version 2010-12-18-17:40}
- 
- \exit:ifnot{8859-6,% 
- SIunits,% 
-@@ -1282,6 +1274,11 @@
- 
- 
- 
-+
-+
-+
-+
-+
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-                 \ConfigureHinput{eurosym}
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-@@ -1678,7 +1675,7 @@
-    {\a:accents{}{#1}}     {\b:accents{udot}{#1}{#2}}
- \expand:after{\expand:after{\Configure{accent}}%
-    \csname OT1\string\H\endcsname}%
--   \csname OT1\string\H\endcsname{o{0151}O{0151}U{0170}u{0171}%
-+   \csname OT1\string\H\endcsname{o{0151}O{0150}U{0170}u{0171}%
- {}{}}
-    {\a:accents{}{#1}}  {\b:accents{Huml}{#1}{#2}}
- \Configure{accent}\dot\dot{C{010A}c{010B}E{0116}e{0117}G{0120}g{0121}%
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index db6c0030567f..91b16eacec77 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index bb3138fe0cba..5b4fceb6014e 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
+EBUILD bitcoin-tx-0.16.0.ebuild 2432 BLAKE2B ed1721e555bcfa9490b7291e9d9dd0e901ec713ecf7a1316a930c13f337076ca27a0757afd562776a124a2553e3690a383884e850aa1156e2f457681ef4f60df SHA512 fb46d29926d4c7a1058a5452f36087c27d916608e853beb25ae79e13ea38bbd70842467a22a2170a1c73c0f1b1edc40c9f93e5e1643d5c96db9571a07973eee3
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
new file mode 100644
index 000000000000..e0f97bebbc18
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	dev-libs/univalue:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 2304e9a7dbba..ce8245568f3a 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,7 +1,5 @@
-DIST hadolint-1.3.0.tar.gz 27014 BLAKE2B 9142319c8c275e78890ebaa002817a6d9b6beb5df0caf48000276d4f4fc6df780f6474790dae83c2d45074d5752b9dd482cc9b3266e4f404256144b53719db72 SHA512 6ac01e354849336375efba67870ba655e14424919d6c8d3c40ee246c7ddf1b2946a5d8a74d8bbaba45a2827895f9a18f6dbc042e41b2c44f97be3c615546f27c
-DIST hadolint-1.4.0.tar.gz 28384 BLAKE2B ee5fb556d99375b0628dd8eade076e98899301a122cec9cda1b1198da150b7a5ea1bae84e6550ab05efe0d079e926a7e16f76d873203be3e03ca428f1201a6d9 SHA512 a91c72bf08f98696ac7267268f10293837da402d3d71e042d9bde69affdbc7d0c42bcbd30756a84bbb021d100f1a200362c9fc28c5fbba87903b4cbf695931d2
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-EBUILD hadolint-1.3.0.ebuild 972 BLAKE2B f8e845180b0284f5b48a990fa425cfed9c6f8cac0200e90b068d48d37f01edced97555d907aaa9443e5145d58c94769b00891f027e6de6600e336d42eec25068 SHA512 59e7a23c7210275a86a6aec7a550958ed14830a7bf5329ceee4cafdbf2a834dae26165f5d6e36fc34ae7f3259e85badb60a4d62b819a875f10a780cd964525c2
-EBUILD hadolint-1.4.0.ebuild 972 BLAKE2B f8e845180b0284f5b48a990fa425cfed9c6f8cac0200e90b068d48d37f01edced97555d907aaa9443e5145d58c94769b00891f027e6de6600e336d42eec25068 SHA512 59e7a23c7210275a86a6aec7a550958ed14830a7bf5329ceee4cafdbf2a834dae26165f5d6e36fc34ae7f3259e85badb60a4d62b819a875f10a780cd964525c2
+DIST hadolint-1.6.1.tar.gz 32674 BLAKE2B b7b3bc664848806d2316053724a91d0276e8af8c0324b31c2b3c2ae48b247e2092473170bc0f8ffcd76cf3b91e3c17e0e9b7b5f47c1eb416d23d01b29b454182 SHA512 ed79861d0938327ebeac8a8162d3a76257a22829d6188512bb43d5312327e39f31ff960d85e7d5c367a377c0a21e7df637e6d40448415752f132cf385ab8bfa2
 EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
+EBUILD hadolint-1.6.1.ebuild 1053 BLAKE2B 80699fb7ccbb094072eb3ba83cb0ee6e591e3092310cfd3e03d504eb63ffefdb4102eb0cff0ba83a61af4ea5ff4734e3a55e50d2cb483d283a7968092ddd415c SHA512 4c3b68251cabb19fa184828824e2c6dc9861dc84cdd3300f689583cb4f19dad3b5a24e31df55e81163d551189485b8d1edec4480827692c0db932e4207059cd7
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.4.0.ebuild b/dev-util/hadolint/hadolint-1.4.0.ebuild
deleted file mode 100644
index 2f335d90eea9..000000000000
--- a/dev-util/hadolint/hadolint-1.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hadolint/hadolint-1.3.0.ebuild b/dev-util/hadolint/hadolint-1.6.1.ebuild
similarity index 74%
rename from dev-util/hadolint/hadolint-1.3.0.ebuild
rename to dev-util/hadolint/hadolint-1.6.1.ebuild
index 2f335d90eea9..9a011ff9f34e 100644
--- a/dev-util/hadolint/hadolint-1.3.0.ebuild
+++ b/dev-util/hadolint/hadolint-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-# ebuild generated by hackport 0.5.4
+# ebuild generated by hackport 0.5.5
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -17,11 +17,14 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-2.0.0:=[profile?]
-	<=dev-haskell/optparse-applicative-0.14.0.0:=[profile?]
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/dlist:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-3.0.0:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
 	dev-haskell/yaml:=[profile?]
 	>=dev-lang/ghc-8.0.2:=
 	>=dev-util/shellcheck-0.4.7:=[profile?]
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 7fee0f232e84..b635fe11ec10 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2017.3.3.tar.gz 279677180 BLAKE2B 373276332c918a325290e9ca0fa37ac7512025e0c0ee8149c3c08321b0477a0a5263fc24dece443c471f2a96a1b147153b0952466e374acf62389e1c49a1f114 SHA512 d4e9dffa7d2abef825fdbe7ce2665e2d249b18d81f7dab5051a0a2fda7896e5df7cce16e19518225dd23205c346df8fc5c5b3cb39280886004340cba60aeacd4
 DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
 DIST pycharm-community-2017.3.tar.gz 282451011 BLAKE2B 250265d7cb0cb3ba94733c9404f6bc1c6e4f62207721011e9eec65780f9e4c92148626065051a1e875124d013cff488c8d7ab9861c094bf4a33c0b8596e717e9 SHA512 4e835f671971171966f52a4219f47fda2675b2fcf38f0f91ff90b1aa00508ed3b5445a488750c6e9d82515780e9f190201da918230c0b80d869d6b16ab352cc6
-EBUILD pycharm-community-2017.3.3.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
+DIST pycharm-community-2018.1.tar.gz 264891672 BLAKE2B 4fc85276f1e214ac4f03c11593dfa4e9d50bdca043192816c5bd4f768df436c83ec723683315e8b3558a7129542e371c47945e531d977567e8d87f78b412add4 SHA512 41090a3973a19a53440b68625a1dd448e5c92b07813ab8497478867a06d0b847668db2e9bb179caa967fdaac914073a43fa6db5ec371cc17c491f9614a2ce600
+EBUILD pycharm-community-2017.3.3.ebuild 1047 BLAKE2B 9500085aa99163f585d1e2df67719c37195db77ff3adec2b01941d113b9f21149313bd5a3ecc55b963077fe03a60bae49d726030ca8bc0e527c20782a5bafcdf SHA512 c548ab7f7b2f6cfa86cabf294da532c51c1acf5a942f4421223dcd224ee5e696ead0c2775c3c9f84325d07169d67773ba4ce2e5a47b7ee06f7c22cf7bf649186
 EBUILD pycharm-community-2017.3.4.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
 EBUILD pycharm-community-2017.3.ebuild 1094 BLAKE2B 251c4ba36753fc2cf04b36835e99d8f1ad190693377701d673e3ca4189d58802e7781d7d905800964310f0b269d9d63fdd90201c50269e87223af5330cec6b1c SHA512 20468f06fac62a49a9a950276aaed0105ad839d405230d1040f9bea6ec0ce5f68d53eb7b0d291a340bac008d4778be87287c36e270612ef6e42fd2b5e8a43f6f
+EBUILD pycharm-community-2018.1.ebuild 1048 BLAKE2B 3c4cffd33ec2c9251d572b22770dd0e6e166373546d5b3712fe98bb9d86aa5200711fee48eaf49e877d2e3bfb94f264c7a02a9a7c388de271717132ccfa86f84 SHA512 1fbdf07d28786955d015e1005c5652c6de63e9d4f548fcf37cd6f18f18cbd0690e7e590003db7fd073595dbcdf2121f92a2b3e7563428b6f8bd14e480891171f
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
index 4cba69da5984..4790ccf65f20 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 
diff --git a/dev-util/pycharm-community/pycharm-community-2018.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
new file mode 100644
index 000000000000..4cba69da5984
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 2dc5587c5c5b..2c58fede46f1 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2017.3.3.tar.gz 356063034 BLAKE2B afe45081582983c05590602ed10b66ee687bd3ef4995bb0ae0404dddefe795ff8e93af2ac384ffa37600f2eebc882fa1bc6de8b6831341957ea69bda4e4632c3 SHA512 1e6d9fc1de13ecea5f4a2cf5bd9f2d7116a40802c24cf21ac731183d4b20aab480e34e039f1ca2fa36b4d873c85204febea975392d73da5a32f239037c7bd59e
 DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
 DIST pycharm-professional-2017.3.tar.gz 358504339 BLAKE2B 4ac1eb3feed289326a0122e3e4f869d7be740db1fd8d1c5f5c80400a8d8aa2daa444d4fa279c33865aecec4af4a28999e10b100714a44aa1d772d7f598ac05f4 SHA512 b7a085eda5d3e4ca8a918009f80cd7d90a281f2e522718211b4813f199a9c3a8f38f9742600336c09db479691c789d852ddc1d99e9ee2b11876e85728ae51b44
-EBUILD pycharm-professional-2017.3.3.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+DIST pycharm-professional-2018.1.tar.gz 343431274 BLAKE2B b88ccc821a2e7d35bc2d19582c69493f23bd766c338c2b2964cc0c4993d308783245daf9d6a09fae5206c0d0eee7e1048fb265968b51f614ca4dc9c55c58a2c7 SHA512 a32069fd846e328caa1c0acae3821f73ce98f5268ad934e276adca5ff39371b017f2ce1246e808692fdce8d174f8191fd7c12ef893d0976262059df25e58f3c6
+EBUILD pycharm-professional-2017.3.3.ebuild 1208 BLAKE2B 899161dba5d95d032bb92292cf7a79bb661b5e869f32b8a5bf5d902784d9537e83d4616201d2567961e3f646b513a16cb13307fc75738ac942d82ed2ea7b7308 SHA512 090f6c1fc3db9b8106c249f8b979c9dbc39940e1c998b00fc9d30c1091396d1caedd0a67051e9062b326eeb5875f2f103cf9b4324f6d7d82dab8d27e2625adec
 EBUILD pycharm-professional-2017.3.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 EBUILD pycharm-professional-2017.3.ebuild 1255 BLAKE2B 562fb3468298c372f2fd5d5492a8a882315d7159c7e743de76219b1e7f45989f186807495e07370c5b5d7e35f6c200eac5e73d567f5db754bab448c4dc57bd6f SHA512 908869fbce14f4d7c1b4dc44fc39f1c82eb11663d8a3164e684a2fff659c9eb15b87eb6e5e62befc5af73dc1a65f3fc0f5ea4a5baabfc5bf740f3fba91ad67ea
+EBUILD pycharm-professional-2018.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
index 5dc7e67e051f..b7c5d6db8f0e 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
new file mode 100644
index 000000000000..5dc7e67e051f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 48271534610d..cb04227b679b 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 4abd348bb8d1..3bff79c126a0 100644
--- a/eclass/golang-base.eclass
+++ b/eclass/golang-base.eclass
@@ -22,7 +22,7 @@ if [[ -z ${_GOLANG_BASE} ]]; then
 
 _GOLANG_BASE=1
 
-DEPEND=">=dev-lang/go-1.8"
+DEPEND=">=dev-lang/go-1.9"
 
 # Do not complain about CFLAGS etc since go projects do not use them.
 QA_FLAGS_IGNORED='.*'
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 65af93a21c4a..80b43f33bb03 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 5f753cee60e9..3bd464becf86 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -5,7 +5,7 @@ DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c
 DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
 DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
 EBUILD gucharmap-10.0.0.ebuild 1664 BLAKE2B 81d087632398b74ad6fb3eba9cfc1e8b663b054db3cfdf9611d2ceb34215e1ba80af4686def075b93b8e1b1d1255d57e586474475e83cd37778e05654b8140bb SHA512 0352bcd7dcbac69699c57c45080875821a4dfe07e6dcc8ae6ef24aa82042756c5409fd7e342d8e6244ca818a2abec8f2d80e7dffa1fbe24e4f24aac67180f417
-EBUILD gucharmap-10.0.3.ebuild 1661 BLAKE2B 36ed3d5527f500203957f1f8bb9319600c80ae1be6c042a09cefa7174e3bc261cd8b0f4e7aa5e39859f0709431f16a575137b3f8a64f64d3465de6d686893285 SHA512 63b7615d12407b53a47b97695878dd001123d11cf7845002a0e09004e215ac8782d6fd0be6ae48fa3e608356f5b0b2ea3f8b4ff98d5679b1d118ab395b9d7baa
+EBUILD gucharmap-10.0.3.ebuild 1659 BLAKE2B 1c41a48cb019ee63cb444c5ab5a7446fb6697edb2974f06c1ab7a76109f8d61b8057f084d1e4e03f825d63bd376211485b953f2cab26c629d191516fcb32ae9c SHA512 7854f85e42d6e3ca8b7a4d9505168390a42fcc422dc5cc7c34d85701fb582eb20d49a09b36ca79a8df971f7e037d132e6008e59020632d6435f4b79d158948ad
 EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
 EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
 EBUILD gucharmap-9.0.4.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
index d26c24deed89..f21650f5fb51 100644
--- a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index f9480da3ac87..0141173207b0 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 58ca9daeb728..8c4637d3c750 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,11 +1,9 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.3.tar.gz 4196100 BLAKE2B d6f21ce6fb8ae666601113757d50bc1253a0e849bb4a5ddad6337d98dfc6441c2d519fd650ebda5129db07fb60910a61bb4be0d9c37163edd8dfeddc3c99461f SHA512 74be92fbad37f4517c55fabb86cf3bef35929e835877bd59daabc21b292a1e999aa3761df935e595a2226f9d30e256d1b828c11845cae10c60b72dc81e19e7cb
 DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.3-patches-r0.tar.xz 113920 BLAKE2B 7ae47717d5f08192886de5c127d37c1014e69c22c65052fe58270377e947634b4be378ec91d8bb0aaf5c1e5eee98ad5e6f72192a8590fb437c23d1ddd047e24c SHA512 6166150f9d4f2a6e5ddd366a0276249d4a12fc499a24d31016508c94ae8d107bdfc44e43f081b8c803b98ab238650e2129ab3629608c479e5fb61651258a8242
+DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
-EBUILD mutt-1.9.3.ebuild 8854 BLAKE2B 553c7256d73ecb7d0703121793e2662ef285599010c846a33a0c9061923669ac136d4cd3207eef89c2dd3dbe537a630c8f2c3f1a122e4a22136338fb1932e2f0 SHA512 9f98d99e8ecf02f83e36c03165f5638af3044568669e72551a92f1c5129d0cebb766e25b2164c0aed4ca19c1d1889f72d3f30c9ee03dff0977887882a7fc889a
-EBUILD mutt-1.9.4.ebuild 8854 BLAKE2B 922895e2923986e6bc4b66c09a67f875af26f624e542077b54112bd730f0385b5cbf036b820a542f6bb5b6d041861714b0159f83f90627d4282a07380aedc4cc SHA512 430ce865e8f683d2741747cc4e9403d3cad825b95bff905750eb25a2e2f6af3d3656dbf2994ef2dc5f5d6894628057e536b8844677b023ab5f3493e720a30126
+EBUILD mutt-1.9.4-r1.ebuild 8854 BLAKE2B 5a6ac8ccb2ced801ecf3c935f5f6894a2f165294e257da878dc57a91f4df160fced58a4650265b573ff5f1dcca805f915925261a20bd0bb7c69bdd6f302977cc SHA512 2f6be5d70272dfecdf8328d69ae3625437fc68ecda44860b02ab44d38a41c7457aa4af134c19ebb145a132e87bbc2fcbc38f1a1d65fedcac853ba6bc325d4b80
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.9.3.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.3.ebuild
rename to mail-client/mutt/mutt-1.9.4-r1.ebuild
index 8e0ba27771fc..85ec9d834dce 100644
--- a/mail-client/mutt/mutt-1.9.3.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r0"
+PATCHREV="r1"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-1.9.4.ebuild b/mail-client/mutt/mutt-1.9.4.ebuild
deleted file mode 100644
index ba85cf1cf7a7..000000000000
--- a/mail-client/mutt/mutt-1.9.4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-1.9.3-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
-REQUIRED_USE="
-	hcache?           ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	nntp?             ( ssl )
-	smime?            ( ssl !gnutls )
-	smime_classic?    ( ssl !gnutls )
-	smtp?             ( ssl )
-	sasl?             ( || ( imap pop smtp nntp ) )
-	kerberos?         ( || ( imap pop smtp nntp ) )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
-	app-misc/mime-types
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn )
-	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	notmuch?       ( net-mail/notmuch:= )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	crypt? ( app-crypt/gnupg )
-	pgp_classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-1.9.3-patches
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.9
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		# clumpsy blocks for transition period of USE-flag renames
-		$(use crypt         && use_enable crypt pgp)
-		$(use pgp_classic   && use_enable pgp_classic pgp)
-		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
-
-		$(use smime         && use_enable smime)
-		$(use smime_classic && use_enable smime_classic smime)
-		$(use !smime && use !smime_classic && echo "--disable-smime")
-
-		$(use gpg           && use_enable gpg gpgme)
-		$(use gpgme         && use_enable gpgme)
-		$(use !gpg && use !gpgme && echo "--disable-gpgme")
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-		$(use_enable notmuch)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable nntp)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn)
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--with-regex"
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# REQUIRED_USE should have selected only one of these
-	local hcaches=(
-		"berkdb:bdb"
-		"gdbm"
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > mutt.1 || die
-		cp doc/muttrc.man muttrc.5 || die
-		doman mutt.1 muttrc.5
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-	if use crypt || use gpg || use smime ; then
-		ewarn "Please note that the crypto related USE-flags of mutt have changed."
-		ewarn "To remove some unclarity, the following USE-flags are renamed:"
-		ewarn "(see https://bugs.gentoo.org/637176)"
-		ewarn "  crypt -> pgp_classic"
-		ewarn "  gpg   -> gpgme"
-		ewarn "  smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release.  Please update your package.use"
-		if use gpg && ( use crypt || use smime ) ; then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-	if use gpgme ; then
-		ewarn "Note: in order for Mutt to actually use the gpgme backend"
-		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
-		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
-	fi
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b76a5a4950bc..b08093f3588c 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 850c3fdbb2dd..260a0c7f8c73 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -34,7 +34,7 @@ DIST exim-pdf-4.91_RC1.tar.xz 1967968 BLAKE2B 0caae1d8371dd2d90b24c84d4636c17215
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.89-r5.ebuild 12585 BLAKE2B 4ab8179cf41e847edcc23214e149e5af9270ebd9367cccf233c17ed3406299f810a195ccbb75368f8a2921a717814e2d4e33dcbe4525cba2d7ff76384138eda3 SHA512 fdd78249ade5e6d1d11a47a71283d47940709d8292b6129722d63f91d422067f4850c350edf28dfce88b7513785f0f0f764bf98a9155be62af404343153c144b
 EBUILD exim-4.89.1.ebuild 12309 BLAKE2B 03cb1d877ccc0057c3242efe64979621c6455aac6371f2ea5cb7eff13b71bc9858cd427d3335269543e03591b2d8b9cb128ede714ef58611b60cdb98e5036adb SHA512 03c237f71fd4d5ede14c02314f2ffce98ccc04337b49ea089d7abf1bceb457eef2baede38d047a75d43d76ec367c0e0f21adb524db0dd8429c6d23dc4f9dbe5e
-EBUILD exim-4.90.1.ebuild 12235 BLAKE2B a834f05d1e0db0ea130733e09060ff8dbb38cc79930793d996955642d80216be4a9373134774ed2e625885c63a503ddda8d6bb7bca253309964bab8b6bd20eaa SHA512 cb54ad5643b3ec642d8cd8eb7714346b720c55e93446ce6d751cbf281017af325b690141e747933b3a96c87ad0c2b0b098e0b5e4a36e146b2913f83152bda91c
+EBUILD exim-4.90.1.ebuild 12234 BLAKE2B 48edebc5d04cf9dafd88ab8eb02f2497f87e2710df5be1cf5f59698f1cabc47fbc0e02c9d10c8288cd24b5657edbc116ef36d6d92a9c970716fd8c058cf8e3b5 SHA512 32c2685932041fa678bd8fefbf6f0393a4b23eeaf22b99d19ce4604f04e1c758fe2039457fbd6704eae73927967667c85f200f233a85cb6c6ed2b7416acbee0d
 EBUILD exim-4.90.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
 EBUILD exim-4.91_rc1.ebuild 12451 BLAKE2B 08d93459c37c4eaa5e3270a3a981cabde59476cd898b78594404122f369a5a0f0373d45e605b575b08ea2bce9ac12a19c4aa2a06d20956ad097f5d451e387da3 SHA512 e6a0db7206181e58f1141e64f851b79d3cc70ae6ace0e6ced0656ccd897bd430fd6b2e489ceb530d31e235fdb5514269db0d390c3a8725301574fee84e6483fc
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index cdc93ac79e6f..cd09df930e66 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7ec5a7c684b8..5edca68e2402 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index cb3e9f67245a..239010898e59 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,8 +11,8 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.8.22-r1.ebuild 5179 BLAKE2B bbedc5492bc0eb4f25b50c174c0586012643288fc79a01b5c6aaf6edd3ac783769cad66ed038c021d35f99d62d3f86f7c8c0dec3adcbe12bd576ae2254032d9c SHA512 56cc49d5636c4bd75d1a0b04e2fe40a2c0dfa201ce1837217fa006ff7ed71208c2aef50e0f08b14ca43bb7a82714105807782037c98033a2a31f5a0a215dd446
+EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d
-EBUILD gimp-2.9.8-r1.ebuild 5771 BLAKE2B aa74cd5e32232a29079f86f2f6577e291adcd5692af7844d67089e5e81af64ad27f5f88c0d153f55970607d36ae745d88b1e54658faf79a89ffe9633eda966c8 SHA512 9317cdbf53a6784f54463e4950718cab918c6225855b7113c4e1f569b90cd255cc1767a4a9da782872b26292b29681f13ba13de4cc3f98717a4765a897919216
+EBUILD gimp-2.9.8-r1.ebuild 5778 BLAKE2B 98759f612229ee280a0c0ae29a5b131ff311930670f8ab6cd23f7644a934a21d54741bf07f056daf64c1e7afc06ec2a4816623dce733f2f4477588ea02f49d39 SHA512 9d8a678cf5a1a5c1bcd96baa9c46eb3b5c3ce29752323868607d134ebc7e0709099a7bd8f26707fcbb2ebf35c8aa99ca31209329a3164b56d8223cb35ea0185c
 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index d6bb54b19a9c..1a41cc78f453 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index d83d00807585..fc1d80723b35 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index b79f45ec9325..7b98012b8a79 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,5 +1,5 @@
 DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
-EBUILD libimagequant-2.11.7.ebuild 1168 BLAKE2B a285163a05f6291ad8987edf4ecfbcd3c9ba8963ae5688f3122afdc1e8b08529f23efce3525c0129df69d1122100873fcb79d408eeddb859de08b10209938af3 SHA512 4048a1d58055a0db23e75b843f5865feb903d47e02f4a0fcb20e4d9508174011e1e984cf136b20378137fe75c0e35385fda698f83084fafd614d134a90ebbf5d
+EBUILD libimagequant-2.11.7.ebuild 1175 BLAKE2B 75e2d3ec9994c0e9e644dbc1ddbc365add5f569591b9e8a68f1c30a395ba2aec18431472cd115282f0cf040073652550d1c5bd8d2db20ee3bd03b439a36866a5 SHA512 137eda25315e2e2e337127882db1bfaf4f54c0a47566ec0278f85eff0bc90588dfa83e9dd227a6bc36446cc444dee353a02c59b59e083db06a6656e26198d685
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 2d2db96f010b..1a83257c56cc 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 5ccaed2f6f99..00286547d8e0 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,5 +1,5 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
-EBUILD sane-frontends-1.0.14-r3.ebuild 1384 BLAKE2B 72e77d42ae9df9ca8f6d8208ff9fdfe144abbdf7af05fdbbc9bc8f5c884597a103bcf934d6eabf72b52f89649de82a8469db6e355e0c83de936b17850f79b6eb SHA512 2f3f8efb7ae76979b53116071095c74a339463b2bc00d77256d3420e518e91ca28268eeb538f489e8eeeffbb60d4c81ec08e6b20c9c7dce6d553679dc388a5a0
+EBUILD sane-frontends-1.0.14-r3.ebuild 1383 BLAKE2B 7d052cc6d4a264882a6c9911da71ee72cb95d3d3c721ebc6cf22fbdfc14707c30022bc7e68aaa1fb4c4eddfd96ccd64ea841e898d30cc02456d089a8f8645a5b SHA512 5eb78a706d3b41f60365e17fbc9f0c1ad619e8bc815c1e8615ea1cccd7050fa564e98dd33991f4f8cf2d9e862606d8351c3a17449d561e43a3f2b20ca3a98de7
 EBUILD sane-frontends-1.0.14.ebuild 1430 BLAKE2B 9f579d1cc997961f304479a4070f2630fb0e34cfb128b64671ad4278b1fe4fd52ab227cbdb51941a04eb10051a19b1dc9ece6233e452b62f19e177afe4d79ec7 SHA512 0f433d8f9915d2ba644b3d76e04e9b3bd208a8c9f3c62067203e0e5b571deab87f2577114f846143d3ca860ecfca9b383a8a3d0f470047009754ae0853ca4e30
 MISC metadata.xml 377 BLAKE2B 83b01e823ed6ad91413a2e23899b9fa78b3b3c6d84d52b0ee122976d1a2de2a21c5089ca0460aceb7a9d28f0cc854d3fc358e97c6f02f4116cc5b75a3ca802fd SHA512 57b14e3a91c20de45448332c24a3e681a48498a27244ac1a05e313a87081cb116f12f3fab170a18dca2b3fc55aca7785fc0713bccdad192ba7683982d83fda22
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
index 1521775203a2..7a660c37865b 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
 IUSE="gimp gtk"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cc7d9a7b4d59..a61fbd66ec5a 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 470d55828b45..6ee05dc51d27 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -19,6 +19,6 @@ EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa
 EBUILD babl-0.1.38.ebuild 1464 BLAKE2B 94b20009d5596aea1ca481a5ba6dfdb2c4488425a562da29914b4a2fd26508caa07e4cf31692b0edaeacd5b77fe3094206841d7de30d81b4b4dd20e2fb1822f6 SHA512 0a7f4b9f0cd0eff14cf2590ba88072fafef3cfc7e8e7b65dd31304fc4384ce2cfcf969b32b369cbc859a5fc790509f71c86283d2dcbf8b22d9f87f22d30f270c
 EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-0.1.42.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
-EBUILD babl-0.1.44.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
-EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
+EBUILD babl-0.1.44.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
+EBUILD babl-9999.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.44.ebuild b/media-libs/babl/babl-0.1.44.ebuild
index f5da34a496f1..8c2968e647f6 100644
--- a/media-libs/babl/babl-0.1.44.ebuild
+++ b/media-libs/babl/babl-0.1.44.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 2fbd15d67afb..8c2968e647f6 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 3896e42db23f..496ef80a9141 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -7,7 +7,7 @@ DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 4997 BLAKE2B 92d1c67e20847ed4ac260030a53b4fc5e4bc77a7096dbc9d17708d8a0932d7730bf6d0787b963d7c20c28a2087cbb8447f70e93c605cffd613cfcdca0712464e SHA512 3da4adf509a679034dc33e0e5dbe8c6c00b9515e6992995ac56e16d678dd89943f06d6a0790ffa27a95413227a5b2a84285bdaee5fe64eee66cac2146148dc1c
+EBUILD fontconfig-2.12.6.ebuild 4996 BLAKE2B 5ccfc1a869de0657190d80baadc84c78a7caffa0f99309bf2107958ecf81eab480898a26344b8e5c8eb8cf8c6aff441a50ddcf7366f9d61f609cad6dca8c2522 SHA512 05687a9f99ddbf731079d9a04108817a61c8db5c6e5d7acb527994669358f84395c39b768ed7620cab725a62c47d7ef129c912d1a72c926b2afc0afc13aa3fbf
 EBUILD fontconfig-2.13.0-r2.ebuild 4947 BLAKE2B 62b92c0841744a2528f30473d8afcbc2d355e9a3ff2e2bd2a17cd2400636d7e8bee386d436076f69ba308df873e2d8ac44b61fd4c335d6d9966ce9f6b8eb7f09 SHA512 8b92ab41698761dc735771dcdfe2d802f6221c374da04fe39019a84882eeaf7814a351b5e923dae381896fb64ed6dc8ca3180a8f4ca1d394c24a1b10a43b534f
 EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index f728ae0814c6..2b836b5e1ae4 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a3abfa4af352..e8745207896c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -16,17 +16,17 @@ DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa48
 DIST gegl-0.3.28.tar.bz2 6530569 BLAKE2B ac802c312a0fa44bec8ec4c41454fc9aabebdb1d968a8f532be7dfcff58480f778e3d21cb6557c221e1206860818618fcfe06f2bb25bfb2e08a76f013ea4f256 SHA512 a515108ea4a65fa1ecc60ed18cd288a85877a5b69e573b8c3de04a2c11a3b2b50cdb5897df3f28c84842e6bd553adbd81053502a1ac8ed1d356332a56c58ce1b
 DIST gegl-0.3.30.tar.bz2 6675564 BLAKE2B 177db85f8225f9cbb04774d270e0d71db598099be814157ad46ca7a9ceee2d60efde2e02ec2f81ef5c8bcc14e06c5d1d03718f6cc0005c576aa47a1f233a07c2 SHA512 4506eed9980e2a455b43b643d50b3a89d12b605ee4584fc7dd5c63be60acae64eda88f580ecb82891a4b0d69af10730a0d1525de7cc468afccdf2cf78f85b2eb
 DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
-EBUILD gegl-0.2.0-r2.ebuild 4780 BLAKE2B 5530236bd24e4bdc6b83ee0a9bd26611de9c77eb72e9329933d485d936fd60fbe95b6f40a4d2b781a15ac21740e3a91fe143b6248f343cedfff39abf0d1f5464 SHA512 9d48ad177c46d1f888bf3bf938dfc3045c04e9eed53c1c8882af5355dad1e99223e354c818d9d01367bc26f449700ab422543a4cd1ba57811e76aa62c6398467
-EBUILD gegl-0.2.0-r4.ebuild 4931 BLAKE2B ef55c72d9ef11f9f5bf4fd307838016ff829868c4c2e9c87af2ce16b0818f374960e98c1131d059af8da6e100bc071bb12467d8570d1303a3573e13c3dff7441 SHA512 dc2381dd56beccf318a9768e618d7a2e00603f7aa6d76dba70b855d782bcfd88678dd0c317e62b0d1e65ca8c62ce01046622ac639705c9eadd01ae992a85d0e5
-EBUILD gegl-0.2.0-r5.ebuild 5042 BLAKE2B ba585dc44ff09ab0a9d2cf24a9987ab218fcc92d300ea7332ad2c6086017cbe42f146d5bf5540534045bae1629c42b08c1696412950b427b901c3204afdd2998 SHA512 665ae8fd6bf18c9f8109655955afeb76dde76e060eace0a44cf423a7b0cb8625fdf447f5fdbd4768df0d612d739a5dec10dc63ef8d5a59319d8cdb49ace8459b
-EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f766bbc09083340f726b1ee573bcf54e812a16f13e99f3862d8e01a220d8559287bc750bfe3ee949be1fdaed01 SHA512 906977fdb46328feafe8fc58fd5246c134004f21ae2c0f14adb2456ebceec97a08b5795fc1f51921b1c1882ec3cd9f6e82c0c0ac97a81d8f00b8748e060c403d
-EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
-EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e
-EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d
-EBUILD gegl-0.3.26.ebuild 5221 BLAKE2B b74ffe555953f21194a17a67d200836b9b11dc6d6e45af04f38a13f8bd14a68a85c728e1dabf71a27bb9d3a6b848c5bc99891f6ec95e5cbcc7b2f51e316aeda4 SHA512 920ee19e516042dceb087dc31effbd754b3e630e6d2d246b96374220451eccd86b4d03b48098ce41862eee42fe691a8fb2d880b621b11967b3d211b828b13220
-EBUILD gegl-0.3.28.ebuild 5227 BLAKE2B 19b83061af95946cba286bc90df405da7f1c55c26512db21b88cc8f2b1c7251ae7a5bd7b4fcc59e414210c4d2d972fde0df76cd1f693662da8050460f88b5583 SHA512 fb92b236bd142618689711161b1c632544e9e43218cd83e7630c868ef54dba63a2ecd8a4064e7a10cd942080d6be6f92bf378119f167c6a588b883ccc61e0502
-EBUILD gegl-0.3.30.ebuild 5227 BLAKE2B d17751a4bf64da62feb50ece6bcbd8d58fc2092a6bba65f6d7a5ecb4b68bde32425c53085304d06210b3ddeb91b85820fb780ab769668dc54c4e516c7781613a SHA512 a65e4ea126620d8408bf273e7c0b8ce43417802d638648131301386e5c8ae40fa5ca0d57955aa1a5adabc9210e93935e399b776cbd980ee32b0be27524361d7c
+EBUILD gegl-0.2.0-r2.ebuild 4787 BLAKE2B 0ff214b8275e0cfb2c7cfe1aa5b9b8d663006cf858e3ba856a2b057c7268f15888082f3fe8363a47655435bce6583b9e701a1729dbc25ff617410c5d1f26e1e2 SHA512 7f0f22ae44c2a3529e22f9ffd09bfdd047486c8241c0a051997a8e2f674014d64a25fa763744a9092551fcda9721a92e430fb470ef364209de628368f6cecd83
+EBUILD gegl-0.2.0-r4.ebuild 4938 BLAKE2B 02651ef3a8c02bf2ab5e60d57890c0e8eb552817991e5a9be36341623dce836a5f8d85a736042624db3205a93ebf68a8559a4374e033cffddd968d81b28a9617 SHA512 e84ca9a32cb7e2c55537e9a094ea7eff0e714a8399b0b3d3d55ff5c29692a7bf82ed4fc07ba33e00432fbc2e1601f4b991b397f8283311f04ea8638636548eb8
+EBUILD gegl-0.2.0-r5.ebuild 5049 BLAKE2B 867da1d3b4cb0511bb7c03246d8aead3cd9099c707bf87220d7fd6d245780cf2978e7e6629ede8fb419a68146076695dc1825ba2396a68e02fa15bcbff4d751f SHA512 84e07dd2b5161ca4b24b5058abaac7979ae49898b2012a4f6a9a1cbac0272097f420073a3ac359db5083a63788a3b8fc6e76411e72a01369380e93bc5133c6cb
+EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
+EBUILD gegl-0.3.0.ebuild 5297 BLAKE2B 6f6ebfcee8dc76a7d9b5b9e7cf22b4f3e8ebee1cf2f2683d6960d6632ff7ed21b60dc9a92b6052c2cd89f2ebfa0d979aeee9d432c35ba532afa6825694d2b571 SHA512 17b071d9f98be37c8bb33cf5de11a64dd0d6a13bcf067172c6517b25b8ae633f94c3d5f116c68dec36c6e1340ad5a777cb3da21243b5eb59a2c9ed70b5a88c06
+EBUILD gegl-0.3.20.ebuild 5189 BLAKE2B 5b0a80a0f3ce5a202275eceb7362449dc546f8dc14c502c385151bdf124088e527c7a3220dc7b925988d16daa3ae2698180d9c3475cde09f8fc8de2a399d714e SHA512 32bec067a123ddac0780abac33cf78f9713e9dc9a8a614da43d4d32a8616fef90f83113a3f1090e81ce553a607fe7cfa88207fde27b56f583b8dc950448bc1b0
+EBUILD gegl-0.3.24.ebuild 5234 BLAKE2B 6b8993fb540777446151d6e2c97adaa9b2835dd4c202d8ea22e4762ff41d528b644d6fb6cffb789f6d1fcbc823317b42549e3610bc326ea7d54427f1c07f5f20 SHA512 fbe0d19a04a6ac627e6cc9d7c68962f46b8f98a5ea19ef41f4a49d34d03c59bc0ede2c94e9ac124315d3f48959e7b478afd4285d182c128102b265bb2aed8460
+EBUILD gegl-0.3.26.ebuild 5228 BLAKE2B 9dac0b022aee1a76cc5fbaed866a63f7b80fe997a0f9a8fb5c16d2074acf3f67cbd1406a76c14fd2a9d823ed40d114e7ec02bba4664f24b8e15566ec23a9e888 SHA512 d151ad57e962e5db68f964c17d838d38102532360e5ad5442026e94e8ac34f04bd520817bd321e8a357a55c3ddbf697e5d095dc7c10aed1e83a654b1754a4081
+EBUILD gegl-0.3.28.ebuild 5234 BLAKE2B e28749d83e522aeb521c67f94cb1bc42dcff3c0c2a9d0297635443cc6e1558f7d89f2cc03a8ce23b62f7b90cc58e5ade73a2bfa54578b3998b48efb4f4af87fa SHA512 08d25f2872c3e5672dfcb621d3d07900134164f86103ee54c8d824326db1ad1bc454f9f6ae8d7eef3affcf386b7d573bf4586f0635bab6e4bc9ca089b45d9314
+EBUILD gegl-0.3.30.ebuild 5234 BLAKE2B 1d7937f2791fb0ae1379cfe93aecda7cb9ad2cc61371fad81d127521dd9aafedc3cbfdaf8efa58acb199e1de66caff9b0a1dbc5b3d8f775a0146432127a4f96b SHA512 f6a0869bc2528d5327d8f6203137ce0140ee7d33e2bbfb8b7c42ab462e31e4fc838e274ef6110c9ce4ec40fbfdfbe485157569cde8f007c33a35bca1ef6beba6
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
-EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42
+EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B bdb69e806b1baa77fa605cd96f1805e93eefb066930a529e10baa5991456939bd398265cc2a96419f18a1901d526c3cf273193b8a5f3c1f513c17227118476f9 SHA512 5ad6972332c41cd232a868c930588240077663a4ec8cbd0f19a05852509c284a95b7fa78b6ccd5fa132b137ebeb6247ad7314ed87c617e804238a7b58ea81f2a
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index e9bca1963bc5..0796f97c4dc8 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild
index 0c197b26e5c9..ddb70a4e401d 100644
--- a/media-libs/gegl/gegl-0.2.0-r4.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index 75f6765ee174..717ad1841b63 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
index 5e6d76c94879..a0387477084d 100644
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index da5b53773316..171194fd6ab9 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.20.ebuild b/media-libs/gegl/gegl-0.3.20.ebuild
index 1c12a597ceef..6afa0cc4600d 100644
--- a/media-libs/gegl/gegl-0.3.20.ebuild
+++ b/media-libs/gegl/gegl-0.3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.24.ebuild b/media-libs/gegl/gegl-0.3.24.ebuild
index 971be1651a55..4dc1c3610076 100644
--- a/media-libs/gegl/gegl-0.3.24.ebuild
+++ b/media-libs/gegl/gegl-0.3.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index 53b6e7175277..7aa01eab364d 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.28.ebuild b/media-libs/gegl/gegl-0.3.28.ebuild
index e0b6585227b0..863f2e51ff1d 100644
--- a/media-libs/gegl/gegl-0.3.28.ebuild
+++ b/media-libs/gegl/gegl-0.3.28.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.30.ebuild b/media-libs/gegl/gegl-0.3.30.ebuild
index c3a3baade711..7ea4b3acef94 100644
--- a/media-libs/gegl/gegl-0.3.30.ebuild
+++ b/media-libs/gegl/gegl-0.3.30.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild
index c28282d272e7..92e02f5f4eb8 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 3c44dd2d2d73..23d23f2dc2fe 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -4,9 +4,9 @@ DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e78
 DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
 DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.3-r1.ebuild 1302 BLAKE2B 43e272b98068e32d329e71766eadde4dd3b3ae9da04fbc4ac6a06d5fdffa4a0daca322f898e80a52209c4510a6657eb07d6a2fded3b8d52f54ce6896f7c3b199 SHA512 0d1c228ed35c68803b4c6b93f263b00667e6affe60b1e1066290f4a095de558e8c88e049f1f7450feac5f6e6810c233367f4a88ed96b35ac5a8812d7f0b3df25
-EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
-EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
-EBUILD gexiv2-0.10.6.ebuild 1326 BLAKE2B 2a08ca7e489a0b8751a253c9e53ad2379b5d1d989afbdb450e2e0413c9e4bb609e24acbe9e6d83924e3894e8ac15793f39cdf0bf0fc9e632e58f2fb56ff67e5a SHA512 ee6ff6a1d9162d0c8e5001770b8f22c5b53699b49fb78628e92f0463d1fa441d35b87d6476094ff2f3670b1e797986573219e16ea9c538d859980b2987069afe
-EBUILD gexiv2-0.10.8.ebuild 1508 BLAKE2B 61b5163322648f1c8cdb5abebe246598175e49d97216a53e8b25d353be1790c3cc084fa0a1d6f141075ae64145300acf59de280c2b08843256772affc033431d SHA512 cd3172734d8c341aa93312d4a57622c154af45e8e5a7b0657e27f384b379823548050799fdb7999b8e307ef0b0d6a67762ee4bfd097555c316d54905d1f34189
+EBUILD gexiv2-0.10.3-r1.ebuild 1309 BLAKE2B e84c8556178cc05c47eebd511139abd9d1d23528e6072f24835ec80cd3c97d63f3ace18c9330601951ecad3abdf4443b3500631fb0ff527dd663073d33c23279 SHA512 e8a61d7206413874b4fb83bf96ed2459440e3c4718d21bda407d65d71f89201851ec60feeb7bb5c58cd9dbc5c11c9f4ef8c47fbb2714ac71a7577a4f5d7dca3d
+EBUILD gexiv2-0.10.3.ebuild 1270 BLAKE2B dc6f81c5599f6bbf9f51a632c37e141227527b20b1d0274911242b40867c65329e9ca4d513589e08dbdf596b5efce125784c408db2ea0fac1cc138b59284f3a5 SHA512 85dfd941c7ef4413ab277489e2e05eb9d5b55aba4a61fa56546200517fe7a4bf3e4f3ed66e9475d8137e9bcbef95c318b4e77044b201ab9f6504c25479162e18
+EBUILD gexiv2-0.10.5-r1.ebuild 1395 BLAKE2B 0cdfba0d2a67f586aac986c5aabbe66375868004c476ab700053e94f2cda1602974501645d360e0755168a3dc3a14a9b66aeac32dec343721e20a6fb33bd5200 SHA512 d4eaf6dad6c7ae160c0cff8b10a8c34dca7f88538ce70671e7cbd936b81a5139acf30703f515ca47280f00b8cecfd920866f57992c4ae7af2edd35697a80ede6
+EBUILD gexiv2-0.10.6.ebuild 1333 BLAKE2B cd2474b63ecbab4fc5ca47e836e3afbd82d85023cb0d3744967b269f05a4316c39cf59dd6774989d7532ee67cc6a0a7eecac2be55a4c9e8e0351796289670118 SHA512 377878817bf52c642b012af0f15433866eebb0c06974b26c23faa1865ea26beb7ac647181b1a6e4b98fefe0a5ed1efa9acd879bb9e90d46641d05681c636ca6f
+EBUILD gexiv2-0.10.8.ebuild 1514 BLAKE2B 82368be37fefa32ecb867748906aacb041da0d3fce104282b8cb31d7af4252083b62acb8de98e1aef55affb95876c24d111d1461ceaa575207062d3014c44803 SHA512 e86cbb778c860201d6150e10d4641ec839eba46f80107ceb9550281ee5fc906ed3f03eff846d736ec5aa47dc5280e7aec9a3c86aee8ba985893e3f4c3e622f9a
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
index fc6047cfb1f1..59f6c592a3c2 100644
--- a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="introspection python static-libs"
 
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
index 4efc11740ce3..5c8ce7cbeaf7 100644
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="introspection python static-libs"
 
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
index 888a67d1ee91..7c8bc4142efc 100644
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="introspection python static-libs test"
 
 REQUIRED_USE="
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
index 4adf9967d4d8..e1130127c854 100644
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="introspection python static-libs test"
 
 REQUIRED_USE="
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index 5a1e156b91c7..5ae34b22a46a 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index a42b492856c3..1c1774504f3f 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,12 +1,12 @@
 AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f
 AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f
-AUX giflib-5.1.4-reallocarray-export.patch 5770 BLAKE2B 6e4b4015a7e1d1a1f35644ecde4a3638243de562f8ffda755ccc56b878aa503771725e7cab348638b5a00b10de96e551ee6b7a0a0b50ee6269b3165b676f3c4d SHA512 4cde35f05b18229da3835742ca555dc73dc489e534913486b4752a1c4a02e3c0c31b221283f433cf55083c31b14ed67f54a47b8481d25f8855742f9251baf717
+AUX giflib-5.1.4-reallocarray-export.patch 5668 BLAKE2B c2dc8b1f9ffa5ba5e3f50bd71ecb098331a97737e20f71ae88fa2b3a0aa27c9d3a83d72654692ad71edb7eb03aac00f7af21088eded85c3a0126e6893a4f583c SHA512 3635efc2b10adc01bb0ac70a99e8ac7dbe3dc1b2f03060ea449777078da2a1eb731f17299a9e239afb55e25777cae54de6ca12d9d069e513b03a9eb6402a6658
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 EBUILD giflib-4.1.6-r2.ebuild 1381 BLAKE2B 53da805ac9c0e6641536fb57b772c9921c4e41441fddfd0e53a6b2d00e76eac38e0f6a53fbfa3a8b13058c5ae8885b5212d62b8a7eec5afef6c13b2c40048803 SHA512 51e54c7163c24477b664add2201347df4e41dc819f8e2b444810dc7c0b5cc6766f3e0176bd073188fc5ec953fd09b55b5066082ca307ac7552df164905dcecdd
 EBUILD giflib-4.1.6-r3.ebuild 1609 BLAKE2B fa19054072551719fc111d0ba1c8df029d5f47649500fd9859c328915a5335e36c098075c2d2c9954bd3f2a1c9435d0dee7308fc36499963d09d255170b40e54 SHA512 e138e276d2504904e3bed4e478cf492fdf663805a50fd4ae510b90c6160a6d3a591214eb738cc7ec545818fb88b7f36f7699ee0b6c5464af199e3a699b805fed
 EBUILD giflib-5.0.6.ebuild 1219 BLAKE2B b4fd9c6b45c9cba3b5ffbcacc4a378ce73dbb6d5bc15d7de8c43248ec997463bb8ee9637edc48f98ac541c9e7b152f40bfecbdeaded007f80c5acf1d88972546 SHA512 b46fd57c3ec565cb8f39c885d0f0eb7e4a3fd6a64779f1abea9be3dc8f56feb554b3546c5564081169d91ce8a1e18ef4ad644837df90085629d149866f1870b1
-EBUILD giflib-5.1.4-r1.ebuild 1609 BLAKE2B da2fe5ae5983d27cd42fb1ded6b2ded6715f78d9ee42c1502aaa0380078c1d40abf372c720c40b3c72b1395282ec6016722616838edccf6f7c59be2c0dc64948 SHA512 beded9c6943664b953fc05e934024b72d530c75f53097636a2be1d1ab2d0d8e1e62d32be98b4ea12a6e7c1671a44f1d2ba56795b7f98b42af123f85224975a4f
+EBUILD giflib-5.1.4-r2.ebuild 1609 BLAKE2B da2fe5ae5983d27cd42fb1ded6b2ded6715f78d9ee42c1502aaa0380078c1d40abf372c720c40b3c72b1395282ec6016722616838edccf6f7c59be2c0dc64948 SHA512 beded9c6943664b953fc05e934024b72d530c75f53097636a2be1d1ab2d0d8e1e62d32be98b4ea12a6e7c1671a44f1d2ba56795b7f98b42af123f85224975a4f
 EBUILD giflib-5.1.4.ebuild 1540 BLAKE2B deed4fe240a56b1cda63361947e3d1bead633d5ff7738e2fc5140e72d14cf86cd6c6fee119f221524779b2f7d771e8c8ac564c5cf4d6a27db9d2282188f2843f SHA512 84cde254f5de12d2d3b64d7f450490e32391d6f8c3d233c09ca14da8155ab606d28b4a1cdf6e2f98345d148ec500a16cc25bad0d47d4e02cf32182075a9f3d77
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
index 08d4f3d3d4ed..1c2a433c29c2 100644
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
@@ -1,4 +1,4 @@
-From 9805c76d4f76c77aad9f285e81f4090cdf661fac Mon Sep 17 00:00:00 2001
+From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
 From: Sebastian Pipping <sebastian@pipping.org>
 Date: Wed, 14 Mar 2018 21:18:14 +0100
 Subject: [PATCH] Address clash of export reallocarray with glibc
@@ -6,8 +6,8 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-.. by not exporting that internal symbol any more,
-and renaming the function in code and where it's used
+.. by renaming the exported symbol and the related
+function in code and where it's used.
 
 Bug: https://bugs.gentoo.org/637438
 
@@ -21,10 +21,10 @@ Compile error was:
  extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
 ---
  lib/dgif_lib.c             |  4 ++--
- lib/gif_lib.h              |  3 ---
+ lib/gif_lib.h              |  2 +-
  lib/gifalloc.c             | 10 +++++-----
  lib/openbsd-reallocarray.c |  2 +-
- 4 files changed, 8 insertions(+), 11 deletions(-)
+ 4 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
 index 66a1d6a..f0e0385 100644
@@ -49,19 +49,18 @@ index 66a1d6a..f0e0385 100644
  
                if (sp->RasterBits == NULL) {
 diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index 078930c..7914a69 100644
+index 078930c..cefc3bb 100644
 --- a/lib/gif_lib.h
 +++ b/lib/gif_lib.h
-@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
-                                      GifPixelType ColorTransIn2[]);
+@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
  extern int GifBitSize(int n);
  
--extern void *
+ extern void *
 -reallocarray(void *optr, size_t nmemb, size_t size);
--
++openbsd_reallocarray(void *optr, size_t nmemb, size_t size);
+ 
  /******************************************************************************
   Support for the in-core structures allocation (slurp mode).              
- ******************************************************************************/
 diff --git a/lib/gifalloc.c b/lib/gifalloc.c
 index 3b51868..1394cfa 100644
 --- a/lib/gifalloc.c
@@ -125,5 +124,5 @@ index aa70686..b922b01 100644
  	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
  	    nmemb > 0 && SIZE_MAX / nmemb < size) {
 -- 
-2.16.2
+2.17.0.rc2
 
diff --git a/media-libs/giflib/giflib-5.1.4-r1.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
similarity index 100%
rename from media-libs/giflib/giflib-5.1.4-r1.ebuild
rename to media-libs/giflib/giflib-5.1.4-r2.ebuild
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index b6122688d0de..0bebe7ea4783 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -9,5 +9,5 @@ EBUILD glew-1.10.0-r2.ebuild 2383 BLAKE2B bcee911ca94615c4f78e2108210b2451b6ee3c
 EBUILD glew-1.13.0.ebuild 2434 BLAKE2B f032991fe90dac59e789cd2fba1f08a42308c8e9230f7ec253b755ee8a7621e1a18634ff3324c3a08f9ea239404bee3ba176b750c3adca3cdd09433aa90d57e1 SHA512 e001a5bbc743a291292e22d588bdf754753dc258b32a7ae9e8bcdd9ae0d49055b6f6e2bd189f5c722c98e6d53ec009872e8eb56a9da88a1f29bb44a9b9f3cccc
 EBUILD glew-1.6.0-r100.ebuild 1918 BLAKE2B f4e0743ba9f5e76e6a9b1a19411b59a6fd08f71a01443c61e819bd4d2ba4528a1f635826ce5c7359ea31d0a1f6045888b36f4833c15b88ab0c5265ad9839ff25 SHA512 2b862eac1583f939d416570776e48675aa307762c7a437c44dd07d212c60fee33cc7671b4a3b659d9d86e5fa7938ab8d9a09fc340d412c10080827378c598bbb
 EBUILD glew-2.0.0.ebuild 2552 BLAKE2B 2b9e63c2b52f21ad3997345dc8293aadbec6993c611cdedb74f00026f182a3347ad4d68f695085dd0c0a5dfd18eb3756a0c82776873843de85719756c2efd8b4 SHA512 f22c0fac87d9b64fc8a2eb0e5228d9c8598d02ca04c054d3b1a65f3295e94e697c3db2c6ee25dac07d9f6fc767ecbc0ad846681aac2ccdc80ed3986338011c5a
-EBUILD glew-2.1.0.ebuild 2518 BLAKE2B 7432197ae17ea5641dcb090a5b275f09ffe6c1276efafd220a72b27ea428458fa6b8bd14c3a1b80d0c579446b9d8179222d9f4c4ac5b5d9b41d08e018ecd1a75 SHA512 414271891ea5176434a8990d404fa68632636461d64e2acc0aba1271faf24b469038542f1613cc22b5896157e529b7ff59db284b921d7aacb1d971bec564657b
+EBUILD glew-2.1.0.ebuild 2517 BLAKE2B 49c2ddfb6187002785f2a4318a66b0129790e26916b487dc085f763b1b192d125ebf68588a7f9a09a7fa91ba13da43dd50b79b46c832065e15d9306201bdb229 SHA512 7a174856b3069cdfe222cfa576964b48a73cf57740ec2fc782460c895b138a26bfd330ad222955adcb036eb0ad20fb7c5c4293007dce670104707549eb5c8428
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.1.0.ebuild b/media-libs/glew/glew-2.1.0.ebuild
index a941e95035cf..229a4f521303 100644
--- a/media-libs/glew/glew-2.1.0.ebuild
+++ b/media-libs/glew/glew-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 757e34a34c2d..3c82935970d7 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,6 +1,6 @@
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
-EBUILD libmypaint-1.3.0.ebuild 1301 BLAKE2B f5b6374055832e78d48df1495374d31a5302492c01109455dabc2422b63897e912b127b09cc10d56f8e8eed791c3157ef28a0ebc9753bcdd05ab92da1720da24 SHA512 03bd246f6f32606263cd35e98e2f55cd35b57ca8cd6500fbc24631c01527aed7564a2552c02c7c4328b1a0bb0347aef36fa113dfdf15b8e6d39b5bceee4b46cb
-EBUILD libmypaint-1.3.0_beta1.ebuild 1339 BLAKE2B e7a63b289b9d4ef68d562f0e5f81d7a5a9318e08f560152c6ebbac1b0159285b537bb570456562b25537503eba26046451441e4c3cf0230531877bffa7c4d050 SHA512 caa081fdb5d793e14676e38816bc53ead5561035a3d8c0ef2af4315f59d5e500b4a2f6dd0ecf23f7c78bb22193017a80f213e47509b82873ae2f4540c2fbf3ab
+EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
+EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
index 27e986e1183b..09ca008d3d59 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
index bb4fbd79d319..b56eba24562e 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index a1b1fad295b4..a35c2746ab8b 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -4,8 +4,8 @@ DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374fa
 DIST libopenraw-0.1.0.tar.bz2 525449 BLAKE2B b2ad6cbeb13bb2ece2c782e404c8ad75a3e0906a6ae7c6dfeee706c0b6adf1df7f0e094c6da129405f06837bfb61ec0d9ca0c4492fa1c876e661a646e46c5d70 SHA512 f3b867d831d03350e487a98f08cadf6a24d5e4296129a401c0066cfdf0e628663e821ed0b7e42613d1533513a9c36a1693d6c3cbbd918246dbdfbb111b5a470a
 DIST libopenraw-0.1.1.tar.bz2 561718 BLAKE2B 90ddf5f3d195954418291251aee52d04c7bb4011c8ed20599c5149c056a41f55df8022ed88d9da97aa4884da4114ee7bcc9226c85a5cda0194d42bc99056503c SHA512 ac8195fddc165d32337f518cc89297b91a8c2805132e380a261e9855f88ecbe074d6090f1f7b547c18fd2016b313a19e04e0428f9ba85b18928115b9dc0c1bc2
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
-EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 6548945f67fed5f9ed96341a1e6f37af9d3e61655a95f23dbe5fdc68fa35c92e913e2e5cb51c744e1ca8dccc7efed3e7cd7776f65e58056349f67fa8854fc755 SHA512 8ed478f8438c0d278b40aaed32831e0b70a591ff426d48fd82015838f1a3cb1bea5cc153d85c36d81d3605069e11812487821a9afb084c36b3f3c41235adc03d
-EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986
-EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
-EBUILD libopenraw-0.1.2.ebuild 1105 BLAKE2B c646f8831f263f21f6813f0d69a7f7c7b01913047b25d029043f5293ebefce07cf7fd053b7ee6688352062fb3f1597592c7641458fe950ed4b3146b8e1897815 SHA512 71e52a8d904587b73d41e8a80a50db9b5c4a7ea0cdfa952e2beabf4a50eb876a78f62b8d79e6c7cee613555704bde5274dba87155a81ee6f2230d361ba30a8b4
+EBUILD libopenraw-0.0.9.ebuild 1176 BLAKE2B b9fa4bbf8321a60b9e7ead13e84fcd5db9b4f857519c2af477faa512226904bcdaf41216158098d172d2bbc323e3c75df4f21ed92c55584cbcd751e769c41666 SHA512 29dbb8a80ca71dc8da754e60ef28a858237cf115d73d368acd8100106720fa5f8e12cde3f2a51c40873cb989e63ff3c0f9bb644922f29ce166abcc1dec4f1a43
+EBUILD libopenraw-0.1.0.ebuild 1228 BLAKE2B ca67ba91847658b3c342671b49c16d6980f23a9e000084fd62654d7d652cf17ed0514a817a8bb7688a8609e9d4fe1e848b9812537215edb8296dce29bbec8ffa SHA512 8fbc38c551dca7881bf55aa735c8ef6582cd2cc4eb1a0e122ddd547bed0e01505d59dadd9751f8e93bd3d7a34b69973123463e7d7f65db729d0c91ff4cea4aeb
+EBUILD libopenraw-0.1.1.ebuild 1120 BLAKE2B e26e96d57c6e619d51ce08403eaa14bc40d5b9fa297bdbec29e202ef7da5ddcfddf00191cf4ef711618866d6dc6097f7e8b8863bbe856ceb7897b5cd9c653ba7 SHA512 94a09d76deb2100a1f4d274f33c8e2da7eb7e080a7f57c19a2d354111c58e87eec285d67fbf309d99899439d76a4820e138552b830a5a56d2d6fa5dff715bc04
+EBUILD libopenraw-0.1.2.ebuild 1112 BLAKE2B 833dc253d10b448fe4e7fc7dd3d6c3466ea3515d807b7adf39bddf0d8c31bee216c3fcb3f956705d58457ffd1cfb698a8fac21e78b757861bfe879833882a920 SHA512 2d20280bdf6e80dcc146d91cb000c622f4b550e6f20c2d60b76a3e35417f4e7e22daa8c745aa69d31fecf9b86db61207a29fd312437f3912672ab0cec7f94b39
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index ca34be7debba..5c269828d8fa 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="virtual/jpeg:0
diff --git a/media-libs/libopenraw/libopenraw-0.1.0.ebuild b/media-libs/libopenraw/libopenraw-0.1.0.ebuild
index a866a60b27ef..0378ec2dc56f 100644
--- a/media-libs/libopenraw/libopenraw-0.1.0.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libopenraw/libopenraw-0.1.1.ebuild b/media-libs/libopenraw/libopenraw-0.1.1.ebuild
index 8e68d515706c..9306d7d2660d 100644
--- a/media-libs/libopenraw/libopenraw-0.1.1.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 737173d24aea..c2033d4fe9ae 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index b2e9f3f86560..35c43538848d 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -8,7 +8,7 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d8
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e290c088bdde9646ca94a7ecaf4997af5e2da4410ec70671d0e597c1748072266c241b7021b16344a8d8507ebc938ce03ab1f061630a6 SHA512 347a39d8326e4614b83c2721baa09414738416d405d7db516d155a867902dd85cf51d156705d1fd0bc933802cd3a01cfb1c9da43f4cdff15b7a7253674b91c4a
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.4.ebuild 1767 BLAKE2B 43fb2b1d139f58b2527ac44c8f7f12e279d034d99417a80320440a62d42a24719cb07c4a2ea1a98e096dcf0bbfd1676c7d4030e4b9cb1a5458e0a4531e20b0a3 SHA512 619eff65f7c99389b74e3c98aa28b5bd2857f05a1c55f6b5501cb532002dec21d5948f35b10210fc62c00fe710149e058b026e0adbe0fc3636f5f41a93da0ea3
-EBUILD libraw-0.18.7.ebuild 1782 BLAKE2B 6f80711ee4b698a9bf6d050af58038aeaeacc3f05dc51fe373236a4430790bcb64452ace8e58f5e69198b9f8d93e8d5bf04936a07a2408e7dbb379155c30c8cf SHA512 00b51f5d9c58902dec9db49cd2159d78e619e5e9b2a7cf328473b2a4b3bf8290b480b4697a00bf1c769e40f3899821717dc0e45a84fd90c13ced715c3be3225d
-EBUILD libraw-0.18.8.ebuild 1718 BLAKE2B 41890afbea87ee189090e9069dd6739074a46073a17eb3f4628acdc7d5247b8ad13ead9036728fd02a5463dfedfbab7eb2082a10ab53e238caa98d0bd96e9399 SHA512 bacaf79aa820d18ce4e6e87d96c0cca5ce6e7ca0f57e46b1119db8c3620a187a24a4119c81176e3d0f26f51c6b685d6831fd670253f0536f780d50930c3bb93e
+EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
+EBUILD libraw-0.18.7.ebuild 1789 BLAKE2B 40a23381efcec9f5e959981237ebacd1d4b0f550a6e3841c8dfd699017d0642e6d028b12574eccfaea145fb133289224fdd6c69aa1bb93e61af254feb76cee61 SHA512 f8a3e81a58eadfb1705380afc0bcb95b4f11281a5db2b4535237e579262de5c939e784a5d935c9c69ac001fdfd8ad3c0cac7620cce041b7eeae51a5a4e5e416f
+EBUILD libraw-0.18.8.ebuild 1725 BLAKE2B b67ccaa7a55371d2d916bf957aa1640f9120be8359c89c5e1a8197c203672c317fb7e6aef220055df66c73e1c0adaecbbc7b600ac3156b59a04393f0e1400298 SHA512 764556a163a7dc479060d481c25c9a2e1bba5da7238837799b4db781db6bb831f4793a04f0be126dfaf01bb93cd0572d399e3df2e9f27a0dee842e1fa7bf53f5
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.4.ebuild b/media-libs/libraw/libraw-0.18.4.ebuild
index 008993249887..3d180fb60a21 100644
--- a/media-libs/libraw/libraw-0.18.4.ebuild
+++ b/media-libs/libraw/libraw-0.18.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libraw/libraw-0.18.7.ebuild b/media-libs/libraw/libraw-0.18.7.ebuild
index 2db1f3447075..29deec7e93d7 100644
--- a/media-libs/libraw/libraw-0.18.7.ebuild
+++ b/media-libs/libraw/libraw-0.18.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libraw/libraw-0.18.8.ebuild b/media-libs/libraw/libraw-0.18.8.ebuild
index 789bce185b3c..a84cb2df9ae5 100644
--- a/media-libs/libraw/libraw-0.18.8.ebuild
+++ b/media-libs/libraw/libraw-0.18.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2766b242065f..384c5d26d685 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 904a2a2d441d..62a146d649ba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Mar 2018 14:38:17 +0000
+Sun, 01 Apr 2018 08:08:13 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f68e1506864d..f24b22792c55 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 419322 BLAKE2B bce39d2884945f8b0837f04b097288921742142eb6b55a87c2b57dd813da0393accc39cdbc36b1a820a911d1643768c6e20f5e777dfbb00ce5c5e8a8cccb59ae SHA512 dc4a29347ba058490aabba547065505da49564b81a43273cfc09b72c95a82ddf4139c1b5cee3c714a13e2094579946b7283bffeb6f766247a44733ca3d2e3109
-TIMESTAMP 2018-03-31T14:38:21Z
+TIMESTAMP 2018-04-01T08:08:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq/nV1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrAk3FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDAnA//Vb02MBpfmQAK6sCpH2aqmfYPD3+QfwLgawYoAc4KFqa0SKJTG9HDcAk1
-Ruo+U5xqkUcSgE5okuyXXZQ43tYvD8sM0N3uvx4la8zaZqnd8vCoJ3tRndYnSJQ5
-ZHyhI+hIVxh4rqoU35KhY2HYd7zgIsxCbFoAYiKolyylVaDwsVdUs9Dd7H3Xp2iR
-FIvv1R5yELC9ZwvuAvYJkmb5DwI/OMDi0eFayTs4YDgRx32PQLOGrAejrNKh3UyX
-RXvCoqYu2s/47UhEY7uJPosxDzr4pGIK1Tct1mnbxWwYyTdvAw8E3SN6NfaPWAYe
-taaS1rSjZvenWld/MoIyVBmnUWFb4W908VwO7TMjkvH038zLLhmeZrPRGTL6PKk/
-MmIlEVjiOuM4+6z7UAhPoG5t/HEJ+yh5KNRUPvh0QEFhHxFjcoNd69d83MOOXCfy
-p2U2k7yI2amBgwog2RvVmikX/i4apFEC1HZjal4bOAV1EZWSo7eNu/YtC04HtD8Y
-WefUxRh661ESfC+kB8NHJ2/TPSZL55f4lz9i9aRDLAVvHpVY7iOKHUPEyu3SD9si
-CqNyhDnDSYoJAP97r4JeyCZMFjlZVAEMN1AUW+UWl1nOceuli0Plk0aluUQHYDIM
-odBWh1pSTh7b9FN/1fdQhGb5FlRk5CCrwZeDGBZyUkPWCZsJxJc=
-=AN7L
+klCHRg//SfipRYXfa5c3vjc/QgDhp7RRI/Ga8CgW5eKWVss2jdRYSidj0paOGVPS
+/BJuDP2dgNYiaZnErjUssa+wTqzzM2UOF9hcORqeadDahIcM0hYTILJqueRgCnIu
+bpjJl87DyZr8cLtoXEUPPGw4CmYfuInD406zl0gA4j95tF/wrBgBQ7+4qG8V2GAI
+eHROuP3DY5nOt3gBrY275ijsFjfuLXqY70kyGnL1ya0VlnamiOcARZfm/T+YPfUr
+1vihL9sLg79BoPAzIwvaSUTtzkT2g1eePAaR5Uk0YgHgylS45dThn7XOjS7x2My1
+usFhReZ3DlPoNaORryuoNvj/jM9HR2/DYbwthCIcQ3WP5oJpfiwJWjnuRaKhS2XX
+NAE6qYjQFIfGnm/eLM3VpcZKv0a2Z5WyNjd4v80AIav8YXb/JzmkwL1ls0OoxY/+
+zgB8Q2ijV2od06hd7e7nQrUYtTTiDp1Uj4/YE2zRr+Phrb0XYS4qhXwYv1L7Rl/1
+rtfk1o/JShrEBS89OizlGrwAB8jXxoVKlTEPrcM2/rHjli2FoGUnHvC+v/pIAV+X
+5OJlw5ov91uwqdDg2gKL6DTJbzWOz/Yu0LtzoRodcLMvyYBwAe7ZFhFeku5drW2C
+tb+xkI7wkxteUUpDrpkBm5XCQQchwXSePDWXpzAL/XE+3oB+lgc=
+=HX0y
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 904a2a2d441d..62a146d649ba 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Mar 2018 14:38:17 +0000
+Sun, 01 Apr 2018 08:08:13 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0c24165c8288..b9b2d1f7c47c 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 19a7a6a2d752..f2cccac6be87 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/apache-tools-2.4.29 b/metadata/md5-cache/app-admin/apache-tools-2.4.29
index 9fdbe2a3323b..00285eaceea5 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.29
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.29
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=300931fd8265ce8f3c8e60a39b8b452d
+_md5_=2b839f8773ae6a931efe6bd7be7175fd
diff --git a/metadata/md5-cache/app-admin/cli53-0.8.12 b/metadata/md5-cache/app-admin/cli53-0.8.12
index 7964f1170f68..e1fcbb155fbe 100644
--- a/metadata/md5-cache/app-admin/cli53-0.8.12
+++ b/metadata/md5-cache/app-admin/cli53-0.8.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command line tool for Amazon Route 53
 EAPI=6
 HOMEPAGE=https://github.com/barnybug/cli53
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 e4657dfc0151..a51b82ff8d9d 100644
--- a/metadata/md5-cache/app-admin/cli53-0.8.9
+++ b/metadata/md5-cache/app-admin/cli53-0.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command line tool for Amazon Route 53
 EAPI=6
 HOMEPAGE=https://github.com/barnybug/cli53
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/metadata/md5-cache/app-admin/cli53-9999 b/metadata/md5-cache/app-admin/cli53-9999
index 7796a4a39cbe..3e4166695d1d 100644
--- a/metadata/md5-cache/app-admin/cli53-9999
+++ b/metadata/md5-cache/app-admin/cli53-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command line tool for Amazon Route 53
 EAPI=6
 HOMEPAGE=https://github.com/barnybug/cli53
 LICENSE=MIT
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b7e3100a7214716730162a9f7d815c9
diff --git a/metadata/md5-cache/app-admin/consul-0.9.3 b/metadata/md5-cache/app-admin/consul-0.9.3
index c31edcbc2fb4..544a93117a1c 100644
--- a/metadata/md5-cache/app-admin/consul-0.9.3
+++ b/metadata/md5-cache/app-admin/consul-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=6
 HOMEPAGE=http://www.consul.io
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v0.9.3.tar.gz -> consul-0.9.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6a1fd004bc7e3c581811ebbbe380e471
diff --git a/metadata/md5-cache/app-admin/consul-1.0.0 b/metadata/md5-cache/app-admin/consul-1.0.0
index 3bf105370001..ee0688cba368 100644
--- a/metadata/md5-cache/app-admin/consul-1.0.0
+++ b/metadata/md5-cache/app-admin/consul-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=6
 HOMEPAGE=http://www.consul.io
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.0.0.tar.gz -> consul-1.0.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6a1fd004bc7e3c581811ebbbe380e471
diff --git a/metadata/md5-cache/app-admin/consul-1.0.6 b/metadata/md5-cache/app-admin/consul-1.0.6
index fb4bc3f5917a..d8816f96cd4b 100644
--- a/metadata/md5-cache/app-admin/consul-1.0.6
+++ b/metadata/md5-cache/app-admin/consul-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=6
 HOMEPAGE=http://www.consul.io
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.0.6.tar.gz -> consul-1.0.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=350ff072aa8cc092f3685c179ade86ac
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 29dc51b130b6..993402d6e9c2 100644
--- a/metadata/md5-cache/app-admin/consul-replicate-0.2.0
+++ b/metadata/md5-cache/app-admin/consul-replicate-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.4:= >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.4:= >=dev-lang/go-1.9
 DESCRIPTION=Consul cross-DC KV replication daemon
 EAPI=5
 HOMEPAGE=http://github.com/hashicorp/consul-replicate
@@ -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	51a1f13e065f1cff4507685d9cc268c7
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f
 _md5_=6471541f65e48027f9e492ac6fc003f8
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 0c0dea161f27..0c764fa859ab 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.6:= >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.6:= >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Generic template rendering and notifications with Consul
 EAPI=6
 HOMEPAGE=http://github.com/hashicorp/consul-template
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=aa8d52ee2c635caca6a3d5058e914004
diff --git a/metadata/md5-cache/app-admin/docker-bench-0_p20171206 b/metadata/md5-cache/app-admin/docker-bench-0_p20171206
index 8d3fc4623d5f..419ac8f26dca 100644
--- a/metadata/md5-cache/app-admin/docker-bench-0_p20171206
+++ b/metadata/md5-cache/app-admin/docker-bench-0_p20171206
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker Bench for Security runs the CIS Docker Benchmark
 EAPI=6
 HOMEPAGE=https://github.com/aquasecurity/docker-bench
@@ -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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=af2a007e6403d85d3b131be474b60dcc
diff --git a/metadata/md5-cache/app-admin/helm-2.8.1 b/metadata/md5-cache/app-admin/helm-2.8.1
index b06eae7caf07..cd7598443a62 100644
--- a/metadata/md5-cache/app-admin/helm-2.8.1
+++ b/metadata/md5-cache/app-admin/helm-2.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Package Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.8.1.tar.gz -> helm-2.8.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/aws/aws-sdk-go/archive/760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz -> github.com-aws-aws-sdk-go-760741802ad40f49ae9fc4a69ef6706d2527d62e.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/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/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.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/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/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-ini/ini/archive/300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz -> github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.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/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.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/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/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/jmespath/go-jmespath/archive/0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.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/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.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/b217b9c388de2cacde4354c536e520c52c055563.tar.gz -> github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.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/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.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/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.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/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-gcfg/gcfg/archive/27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz -> github.com-go-gcfg-gcfg-27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-warnings/warnings/archive/8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz -> github.com-go-warnings-warnings-8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.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/39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz -> github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz https://github.com/kubernetes/kubernetes/archive/3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz -> github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=49859522e64eccc3a07b67b9bd0e6455
diff --git a/metadata/md5-cache/app-admin/helm-2.8.2 b/metadata/md5-cache/app-admin/helm-2.8.2
index f206bc071f67..6e0417374494 100644
--- a/metadata/md5-cache/app-admin/helm-2.8.2
+++ b/metadata/md5-cache/app-admin/helm-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Package Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/helm/archive/v2.8.2.tar.gz -> helm-2.8.2.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/aws/aws-sdk-go/archive/760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz -> github.com-aws-aws-sdk-go-760741802ad40f49ae9fc4a69ef6706d2527d62e.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/e14a70c556c8e0db173358d1a903dca345a8e75e.tar.gz -> github.com-Azure-go-autorest-e14a70c556c8e0db173358d1a903dca345a8e75e.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/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.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/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/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-ini/ini/archive/300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz -> github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.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/7abd5745472fff5eb3685386d5fb8bf38683154d.tar.gz -> github.com-go-openapi-spec-7abd5745472fff5eb3685386d5fb8bf38683154d.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/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/8183543f90d1aef267a5ecc209f2e0715b355acb.tar.gz -> github.com-gophercloud-gophercloud-8183543f90d1aef267a5ecc209f2e0715b355acb.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/jmespath/go-jmespath/archive/0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.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/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/b217b9c388de2cacde4354c536e520c52c055563.tar.gz -> github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.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/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.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/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.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/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-gcfg/gcfg/archive/27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz -> github.com-go-gcfg-gcfg-27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-warnings/warnings/archive/8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz -> github.com-go-warnings-warnings-8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2.tar.gz -> github.com-kubernetes-apimachinery-68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2.tar.gz https://github.com/kubernetes/apiserver/archive/2a1092aaa7202e8f9b188281ff9424a014ce61c2.tar.gz -> github.com-kubernetes-apiserver-2a1092aaa7202e8f9b188281ff9424a014ce61c2.tar.gz https://github.com/kubernetes/client-go/archive/78700dec6369ba22221b72770783300f143df150.tar.gz -> github.com-kubernetes-client-go-78700dec6369ba22221b72770783300f143df150.tar.gz https://github.com/kubernetes/kube-openapi/archive/39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz -> github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz https://github.com/kubernetes/kubernetes/archive/5fa2db2bd46ac79e5e00a4e6ed24191080aa463b.tar.gz -> github.com-kubernetes-kubernetes-5fa2db2bd46ac79e5e00a4e6ed24191080aa463b.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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=0bd638f49ef34c12e7887db6728dc65d
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.8.0 b/metadata/md5-cache/app-admin/ksonnet-0.8.0
index a6a89725d23d..69f6e8536c52 100644
--- a/metadata/md5-cache/app-admin/ksonnet-0.8.0
+++ b/metadata/md5-cache/app-admin/ksonnet-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
 EAPI=6
 HOMEPAGE=https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/
@@ -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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=de0c7b9182f84d4511d2d64c3ce0846a
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.11 b/metadata/md5-cache/app-admin/kube-bench-0.0.11
index 1eb2545cd58a..b9861590637e 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.11
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
 EAPI=6
 HOMEPAGE=https://github.com/aquasecurity/kube-bench
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.11.tar.gz -> kube-bench-0.0.11.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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=cbb6ab07c39aa906a4225af1367b7c11
diff --git a/metadata/md5-cache/app-admin/kubectx-0.4.1 b/metadata/md5-cache/app-admin/kubectx-0.4.1
new file mode 100644
index 000000000000..a08ab3c8cee8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kubectx-0.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Fast way to switch between clusters and namespaces in kubectl
+EAPI=6
+HOMEPAGE=https://github.com/ahmetb/kubectx
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sys-cluster/kubectl
+SLOT=0
+SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.4.1.tar.gz -> kubectx-0.4.1.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=7d3d6cc8bcab4613546c3f14cd9b5d37
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 9079e7028dc1..e7fc65228db1 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc4
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A tool for extracting metrics from application logs
 EAPI=6
 HOMEPAGE=https://github.com/google/mtail
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 46204c1696a3..ab6baf52d678 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A tool for extracting metrics from application logs
 EAPI=6
 HOMEPAGE=https://github.com/google/mtail
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 7abbad7d6088..6a24f03d7d50 100644
--- a/metadata/md5-cache/app-admin/serf-0.8.1-r1
+++ b/metadata/md5-cache/app-admin/serf-0.8.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.6:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.6:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Service orchestration and management tool
 EAPI=6
 HOMEPAGE=https://www.serfdom.io/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=019100a5cfecb8bdd5b8b5e4e1ff4a34
diff --git a/metadata/md5-cache/app-admin/vault-0.8.3 b/metadata/md5-cache/app-admin/vault-0.8.3
index 232a8e6036b3..ce71125f8230 100644
--- a/metadata/md5-cache/app-admin/vault-0.8.3
+++ b/metadata/md5-cache/app-admin/vault-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for managing secrets
 EAPI=6
 HOMEPAGE=https://vaultproject.io/
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.8.3.tar.gz -> vault-0.8.3.tar.gz
-_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=72a0646a63037e41d34ed6bc919b6c31
diff --git a/metadata/md5-cache/app-admin/vault-0.9.0 b/metadata/md5-cache/app-admin/vault-0.9.0
index 31093ec846d1..671a467580b3 100644
--- a/metadata/md5-cache/app-admin/vault-0.9.0
+++ b/metadata/md5-cache/app-admin/vault-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for managing secrets
 EAPI=6
 HOMEPAGE=https://vaultproject.io/
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.0.tar.gz -> vault-0.9.0.tar.gz
-_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=72a0646a63037e41d34ed6bc919b6c31
diff --git a/metadata/md5-cache/app-admin/vault-0.9.3 b/metadata/md5-cache/app-admin/vault-0.9.3
index db4bbe6f247e..80a16162af31 100644
--- a/metadata/md5-cache/app-admin/vault-0.9.3
+++ b/metadata/md5-cache/app-admin/vault-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A tool for managing secrets
 EAPI=6
 HOMEPAGE=https://vaultproject.io/
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.3.tar.gz -> vault-0.9.3.tar.gz
-_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index cbdfbea524ab..3a2746d9e6d2 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1 b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
index d87b44546a46..4a54966e703f 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=http://www.clamav.net/
 IUSE=bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libtommath >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.99.4.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13f8394bf12b43c0cc335f8107dbfce2
+_md5_=d64c254e3de4368bede78c5de53839aa
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ef7441ccc7bc..c9dee1b7acb9 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/file-roller-3.24.1 b/metadata/md5-cache/app-arch/file-roller-3.24.1
index 6fb81951be0c..4771e9b410d1 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.24.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Archive manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 IUSE=libnotify nautilus packagekit
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 sys-apps/file x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=189a5f28fb81631c75e7f31ab98bca7c
+_md5_=0f8444a135fd97fbe5a287e73d473b59
diff --git a/metadata/md5-cache/app-arch/unace-2.5-r5 b/metadata/md5-cache/app-arch/unace-2.5-r5
index 4a2a5a407df9..3ba27ddeeef0 100644
--- a/metadata/md5-cache/app-arch/unace-2.5-r5
+++ b/metadata/md5-cache/app-arch/unace-2.5-r5
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=ACE unarchiver
 EAPI=6
 HOMEPAGE=http://www.winace.com/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=freedist
 SLOT=1
 SRC_URI=mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5-9.debian.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=be6ec3fe27a13e16ef3c80c9eab324cb
+_md5_=ed0ecc1b02615908e7ad08c28f5a6c6d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 49012aebed2a..cf553c5215d7 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.7.3 b/metadata/md5-cache/app-backup/restic-0.7.3
index ade529c67187..f2fba84fe30c 100644
--- a/metadata/md5-cache/app-backup/restic-0.7.3
+++ b/metadata/md5-cache/app-backup/restic-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.8
+DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
 DESCRIPTION=A backup program that is fast, efficient and secure
 EAPI=6
 HOMEPAGE=https://restic.github.io/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.7.3.tar.gz -> restic-0.7.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=e77b8fda57dd89a0ee9841ed83a3864d
diff --git a/metadata/md5-cache/app-backup/restic-0.8.0 b/metadata/md5-cache/app-backup/restic-0.8.0
index 958048649906..381cace29661 100644
--- a/metadata/md5-cache/app-backup/restic-0.8.0
+++ b/metadata/md5-cache/app-backup/restic-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.8
+DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
 DESCRIPTION=A backup program that is fast, efficient and secure
 EAPI=6
 HOMEPAGE=https://restic.github.io/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.8.0.tar.gz -> restic-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=11bf7ee0191c9b94f80cfd75d1a61f36
diff --git a/metadata/md5-cache/app-backup/restic-0.8.1 b/metadata/md5-cache/app-backup/restic-0.8.1
index e6b8978f6323..b8fb3ecf086d 100644
--- a/metadata/md5-cache/app-backup/restic-0.8.1
+++ b/metadata/md5-cache/app-backup/restic-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.8
+DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
 DESCRIPTION=A backup program that is fast, efficient and secure
 EAPI=6
 HOMEPAGE=https://restic.github.io/
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/restic/restic/archive/v0.8.1.tar.gz -> restic-0.8.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=11bf7ee0191c9b94f80cfd75d1a61f36
diff --git a/metadata/md5-cache/app-backup/restic-0.8.3 b/metadata/md5-cache/app-backup/restic-0.8.3
index 1ca83ef2daf0..e75129d51166 100644
--- a/metadata/md5-cache/app-backup/restic-0.8.3
+++ b/metadata/md5-cache/app-backup/restic-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.8
+DEPEND=dev-lang/go test? ( sys-fs/fuse:0 ) >=dev-lang/go-1.9
 DESCRIPTION=A backup program that is fast, efficient and secure
 EAPI=6
 HOMEPAGE=https://restic.github.io/
@@ -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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=8f90d3cbe4acf8d6b79af79ebe595e0a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 7c955174d5a8..38591f0a1dd1 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.1 b/metadata/md5-cache/app-crypt/cfssl-1.3.1
index 459e8f0efab4..4c846fe734f3 100644
--- a/metadata/md5-cache/app-crypt/cfssl-1.3.1
+++ b/metadata/md5-cache/app-crypt/cfssl-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Cloudflare's PKI and TLS toolkit
 EAPI=6
 HOMEPAGE=https://github.com/cloudflare/cfssl
@@ -10,5 +10,5 @@ RDEPEND=!!dev-lang/mono
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cloudflare/cfssl/archive/1.3.1.tar.gz -> cfssl-1.3.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f07aea9d578db832f0deccb9c56ac19b
diff --git a/metadata/md5-cache/app-crypt/cfssl-1.3.2 b/metadata/md5-cache/app-crypt/cfssl-1.3.2
index c4f80c0b9c2e..edc21f39ea82 100644
--- a/metadata/md5-cache/app-crypt/cfssl-1.3.2
+++ b/metadata/md5-cache/app-crypt/cfssl-1.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Cloudflare's PKI and TLS toolkit
 EAPI=6
 HOMEPAGE=https://github.com/cloudflare/cfssl
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f07aea9d578db832f0deccb9c56ac19b
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d41668ec7c47..1bc2a7d75061 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/gummi-0.6.6-r1 b/metadata/md5-cache/app-editors/gummi-0.6.6-r1
index 5e4abf15e0f0..de45aee6a109 100644
--- a/metadata/md5-cache/app-editors/gummi-0.6.6-r1
+++ b/metadata/md5-cache/app-editors/gummi-0.6.6-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra
 DESCRIPTION=Simple LaTeX editor for GTK+ users
 EAPI=6
 HOMEPAGE=https://github.com/alexandervdm/gummi
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/alexandervdm/gummi/archive/0.6.6.tar.gz -> gummi-0.6.6.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a12092ea6a212fef0b167963e6549760
+_md5_=ee5b3637bee53cfeb652e7b459f16f44
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1645 b/metadata/md5-cache/app-editors/gvim-8.0.1645
index 2fa295a7e0bc..2d5d8b4086b8 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.1645
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1645
@@ -4,11 +4,11 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl 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
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.0.1645 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45181b5f5308c23ab05d7fe238082ab8
+_md5_=e08f058ea77a5ab119d898ed35e237fe
diff --git a/metadata/md5-cache/app-editors/scite-4.0.2 b/metadata/md5-cache/app-editors/scite-4.0.2
index 04d0f8a8788e..90e66080513f 100644
--- a/metadata/md5-cache/app-editors/scite-4.0.2
+++ b/metadata/md5-cache/app-editors/scite-4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=A very powerful, highly configurable, small editor with syntax color
 EAPI=6
 HOMEPAGE=http://www.scintilla.org/SciTE.html
 IUSE=lua
-KEYWORDS=~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=HPND lua? ( MIT )
 RDEPEND=dev-libs/glib:= x11-libs/cairo x11-libs/gtk+:3= x11-libs/gdk-pixbuf x11-libs/pango lua? ( >=dev-lang/lua-5:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/scintilla/scite402.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0ddfa4bbdb428f1e299cd179ed944ed
+_md5_=07e4c6d7f67e63d6d408a32afc0d4304
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 77a8fa58c212..f691120188a4 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.0 b/metadata/md5-cache/app-emacs/ghub-2.0.0
index d2af719f44f4..dc43eb882885 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.0
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=minuscule client library for the Github API
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/ghub
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v2.0.0.tar.gz -> ghub-2.0.0.tar.gz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=1d6d2eced04fee401c048704839d02dc
+_md5_=404e05b3097a1be5c0fe1338a08d1100
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 72646d21e8ae..736c1c687621 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/cadvisor-0.28.3-r1 b/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
index 0e5341e241c0..3b2d3cb314b8 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
 EAPI=6
 HOMEPAGE=https://github.com/google/cadvisor
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/cadvisor/archive/v0.28.3.tar.gz -> cadvisor-0.28.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=cabc577a715d0df1064cd9bf5206f1f6
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.29.1 b/metadata/md5-cache/app-emulation/cadvisor-0.29.1
index 67c9cfa43b85..f8eac65a2a17 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.29.1
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.29.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
 EAPI=6
 HOMEPAGE=https://github.com/google/cadvisor
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/cadvisor/archive/v0.29.1.tar.gz -> cadvisor-0.29.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b29ecb99877835c9614520f313bb8ade
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917 b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
index 26f6c2c181f8..c517dd7dcaaf 100644
--- a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
+++ b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/docker-runc-1.0.0_rc4_p20170917 seccomp? ( sys-libs/libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/06b9cb35161009dcb7123345749fef02f7cea8e0.tar.gz -> containerd-0.2.9_p20170917.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=31c6a7313bce6e809e77add490b02490
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.0 b/metadata/md5-cache/app-emulation/containerd-1.0.0
index e7a3780fd550..cd7d9210a86e 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.0
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.8
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.9
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
@@ -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.0.tar.gz -> containerd-1.0.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=5ba284fb8d7954af9cad6c44545c3757
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.1 b/metadata/md5-cache/app-emulation/containerd-1.0.1
index cd0ebbb8d345..d6381957ec60 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.1
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.8
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.9
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
@@ -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.1.tar.gz -> containerd-1.0.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=2df66518a9da1b31b49af6b6c9882cb3
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.2 b/metadata/md5-cache/app-emulation/containerd-1.0.2
index 6ba71b06a1ba..88789c90cfd9 100644
--- a/metadata/md5-cache/app-emulation/containerd-1.0.2
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.8
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.9
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
@@ -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.2.tar.gz -> containerd-1.0.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=3e4c46281f5175b04682746d06a812f0
diff --git a/metadata/md5-cache/app-emulation/containerd-9999 b/metadata/md5-cache/app-emulation/containerd-9999
index 06a0e3c4f880..63b7a191a097 100644
--- a/metadata/md5-cache/app-emulation/containerd-9999
+++ b/metadata/md5-cache/app-emulation/containerd-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
@@ -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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4a4aaea26f52796135f9e6249ba051d
diff --git a/metadata/md5-cache/app-emulation/docker-17.09.1 b/metadata/md5-cache/app-emulation/docker-17.09.1
index 8b4912353804..946e2c000c42 100644
--- a/metadata/md5-cache/app-emulation/docker-17.09.1
+++ b/metadata/md5-cache/app-emulation/docker-17.09.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=The core functions you need to create Docker images and run Docker containers
 EAPI=6
 HOMEPAGE=https://dockerproject.org
@@ -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/v17.09.1-ce.tar.gz -> docker-17.09.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=12b4c7de8b50acdd16ac97b3c1fc76e8
diff --git a/metadata/md5-cache/app-emulation/docker-17.12.1 b/metadata/md5-cache/app-emulation/docker-17.12.1
index 15b46f8ab3ca..1af44bb9a6af 100644
--- a/metadata/md5-cache/app-emulation/docker-17.12.1
+++ b/metadata/md5-cache/app-emulation/docker-17.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=The core functions you need to create Docker images and run Docker containers
 EAPI=6
 HOMEPAGE=https://dockerproject.org
@@ -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/v17.12.1-ce.tar.gz -> docker-17.12.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=77890c91493b0a5bd046994587010f7f
diff --git a/metadata/md5-cache/app-emulation/docker-18.02.0 b/metadata/md5-cache/app-emulation/docker-18.02.0
index e910edfff634..6db61315c191 100644
--- a/metadata/md5-cache/app-emulation/docker-18.02.0
+++ b/metadata/md5-cache/app-emulation/docker-18.02.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=The core functions you need to create Docker images and run Docker containers
 EAPI=6
 HOMEPAGE=https://dockerproject.org
@@ -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.02.0-ce.tar.gz -> docker-18.02.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=297e9a7859aad69d7f64ef5bc39208d5
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.0 b/metadata/md5-cache/app-emulation/docker-18.03.0
index c434bde664b0..97234d248651 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.0
+++ b/metadata/md5-cache/app-emulation/docker-18.03.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=The core functions you need to create Docker images and run Docker containers
 EAPI=6
 HOMEPAGE=https://dockerproject.org
@@ -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.0-ce.tar.gz -> docker-18.03.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7816ead5efc5d89a18e20c6d4f348514
diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999
index d47d3a0f55c4..4de546fe8f34 100644
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ b/metadata/md5-cache/app-emulation/docker-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-vcs/git-1.8.2.1 >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=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 ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-vcs/git-1.8.2.1 >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=The core functions you need to create Docker images and run Docker containers
 EAPI=6
 HOMEPAGE=https://dockerproject.org
@@ -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	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	25b08efef07cea6bcd45b8c6dcce2782	golang-base	51a1f13e065f1cff4507685d9cc268c7	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	25b08efef07cea6bcd45b8c6dcce2782	golang-base	928887539e385bb489681b292f6b862f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cc151b6d19b52d88ad4e868dc6fe18ec
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.20.1 b/metadata/md5-cache/app-emulation/docker-compose-1.20.1
new file mode 100644
index 000000000000..fd7c6407f776
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+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(-)] >=dev-python/cached-property-1.2.0[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/cached-property-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/dockerpty-0.4.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/dockerpty-0.5[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/docker-py-3.1.4[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/docker-py-4.0[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/docopt-0.6.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/docopt-0.7[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-2.5.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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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-3.10[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-4[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-2.11.0[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-2.19[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-2.6.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/six-1.3.0[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-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/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.0[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/websocket-client-1.0[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-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[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-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Multi-container orchestration for Docker
+EAPI=6
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=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(-)] >=dev-python/cached-property-1.2.0[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/cached-property-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/dockerpty-0.4.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/dockerpty-0.5[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/docker-py-3.1.4[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/docker-py-4.0[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/docopt-0.6.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/docopt-0.7[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-2.5.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/jsonschema-3[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/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-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-3.10[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-4[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-2.11.0[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-2.19[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-2.6.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/six-1.3.0[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-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/texttable-0.9[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/texttable-0.10[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/websocket-client-0.32.0[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/websocket-client-1.0[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-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=mirror://pypi/d/docker-compose/docker-compose-1.20.1.tar.gz -> docker-compose-1.20.1.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=883d11c2734997b23ce5ae256c76adda
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 a26fd827c18f..d3efdd7ad674 100644
--- a/metadata/md5-cache/app-emulation/docker-machine-0.12.2
+++ b/metadata/md5-cache/app-emulation/docker-machine-0.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Machine management for a container-centric world
 EAPI=6
 HOMEPAGE=https://docs.docker.com/machine/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 b1dfdac2c3cb..0a3b5ed919e4 100644
--- a/metadata/md5-cache/app-emulation/docker-machine-0.13.0
+++ b/metadata/md5-cache/app-emulation/docker-machine-0.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Machine management for a container-centric world
 EAPI=6
 HOMEPAGE=https://docs.docker.com/machine/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 95329d534f50..4264c445ce91 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.6:= app-emulation/libvirt:=[qemu,virt-network] >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.6:= app-emulation/libvirt:=[qemu,virt-network] >=dev-lang/go-1.9
 DESCRIPTION=KVM driver for docker-machine
 EAPI=6
 HOMEPAGE=http://github.com/dhiltgen/docker-machine-kvm
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=85db60205dd5e2efadf4cdcfb89b7e61
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
index 792d055889b0..b9cd07c558ce 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz -> docker-proxy-0.8.0_p20170917.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1741ec3fc5d44d00c602e32f114bd460
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112
index 7e52bcd5fe56..5dceb38d725e 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/fcf1c3b5e57833aaaa756ae3c4140ea54da00319.tar.gz -> docker-proxy-0.8.0_p20180112.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1fcaf98d05a7f3dcfd41e724c69919d8
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
index 7bd30a7d46e2..5690878352df 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
@@ -9,5 +9,5 @@ RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/1b91bc94094ecfdae41daa465cc0c8df37dfb3dd.tar.gz -> docker-proxy-0.8.0_p20180314.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6d7aba072a0a48014edb7a37f6fc16de
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-9999 b/metadata/md5-cache/app-emulation/docker-proxy-9999
index 9a0f5a0a0f74..a7499203a2c8 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-9999
+++ b/metadata/md5-cache/app-emulation/docker-proxy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 e89aea65bbb9..38a7312de30e 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Docker Registry 2.0
 EAPI=6
 HOMEPAGE=https://github.com/docker/distribution
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9b41233df88dcd19f1e26c79bde1bbde
diff --git a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917 b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
index 084dbc089e04..945321749207 100644
--- a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
+++ b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
@@ -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/3f2f8b84a77f73d38244dd690525642a72156c64.tar.gz -> docker-runc-1.0.0_rc4_p20170917.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=a01a21b5f2760a144fa1c5a80790ea01
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 67f6f0737a72..b10c9411b1bc 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 e33e9a965f45..988fce1f8850 100644
--- a/metadata/md5-cache/app-emulation/docker-swarm-1.2.0
+++ b/metadata/md5-cache/app-emulation/docker-swarm-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.6:= !!<app-admin/consul-0.6.3-r1 >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.6:= !!<app-admin/consul-0.6.3-r1 >=dev-lang/go-1.9
 DESCRIPTION=A Docker-native clustering system
 EAPI=5
 HOMEPAGE=https://docs.docker.com/swarm/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=d3709fd9584e8403ef3fe91ac02ce848
diff --git a/metadata/md5-cache/app-emulation/flannel-0.10.0 b/metadata/md5-cache/app-emulation/flannel-0.10.0
index 1abc11588463..b54fb4a56acd 100644
--- a/metadata/md5-cache/app-emulation/flannel-0.10.0
+++ b/metadata/md5-cache/app-emulation/flannel-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=An etcd backed network fabric for containers
 EAPI=6
 HOMEPAGE=https://github.com/coreos/flannel
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 4715f9db3ffd..7874937fde66 100644
--- a/metadata/md5-cache/app-emulation/go-secbench-0.1.0
+++ b/metadata/md5-cache/app-emulation/go-secbench-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go >=dev-lang/go-1.8
+DEPEND=dev-lang/go >=dev-lang/go-1.9
 DESCRIPTION=run and evaluate the docker security benchmark
 EAPI=6
 HOMEPAGE=https://github.com/qnib/go-secbench
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 0688b4dd5e18..b688e8a80188 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/go >=dev-lang/go-1.8
+DEPEND=dev-lang/go >=dev-lang/go-1.9
 DESCRIPTION=run and evaluate the docker security benchmark
 EAPI=6
 HOMEPAGE=https://github.com/qnib/go-secbench
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 f672f3119630..ca58617d7e19 100644
--- a/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
+++ b/metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen ) sys-fs/lvm2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen ) sys-fs/lvm2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Hypervisor-based Runtime for OCI
 EAPI=6
 HOMEPAGE=https://github.com/hyperhq/hyperd
@@ -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	4842e626555a9a4344f34cef2e190b67	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=4fbb40a84615d0d49d904a653f9e7d12
diff --git a/metadata/md5-cache/app-emulation/kompose-1.10.0 b/metadata/md5-cache/app-emulation/kompose-1.10.0
index c9bcc378e5ab..751af4d69a1f 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.10.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Tool to move from docker-compose to Kubernetes
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.10.0.tar.gz -> kompose-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=d804ea9f3ff3e41480ef31548cc43a65
diff --git a/metadata/md5-cache/app-emulation/kompose-1.11.0 b/metadata/md5-cache/app-emulation/kompose-1.11.0
index e4b01908e744..8291241bd944 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.11.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Tool to move from docker-compose to Kubernetes
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kompose/archive/v1.11.0.tar.gz -> kompose-1.11.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=0bc116f8c93fa1a2d7c720424ffb2918
diff --git a/metadata/md5-cache/app-emulation/lxd-2.14-r1 b/metadata/md5-cache/app-emulation/lxd-2.14-r1
index ce3a21b8da16..8b189ded99fe 100644
--- a/metadata/md5-cache/app-emulation/lxd-2.14-r1
+++ b/metadata/md5-cache/app-emulation/lxd-2.14-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Fast, dense and secure container management
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] net-dns/dnsmasq[dhcp,ipv6] net-misc/rsync[xattr] sys-apps/iproute2[ipv6] sys-fs/squashfs-tools virtual/acl )
 SLOT=0
 SRC_URI=https://github.com/lxc/lxd/archive/4c32a1ff7267d4934870e2444dc1394fea5a78e4.tar.gz -> lxd-2.14.tar.gz https://github.com/dustinkirkland/golang-petname/archive/1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz -> github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz https://github.com/golang/protobuf/archive/5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz -> github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz https://github.com/gorilla/mux/archive/18fca31550181693b3a834a15b74b564b3605876.tar.gz -> github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz https://github.com/gorilla/websocket/archive/a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz -> github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/jessevdk/go-flags/archive/5695738f733662da3e9afc2283bba6f3c879002d.tar.gz -> github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz https://github.com/mattn/go-colorable/archive/ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz -> github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-sqlite3/archive/83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz -> github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz https://github.com/olekukonko/tablewriter/archive/febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz -> github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz https://github.com/pborman/uuid/archive/1b00554d822231195d1babd97ff4a781231955c9.tar.gz -> github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz https://github.com/stretchr/testify/archive/f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz -> github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz https://github.com/syndtr/gocapability/archive/e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz -> github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz https://github.com/golang/crypto/archive/e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz -> github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz https://github.com/golang/net/archive/e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz -> github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz https://github.com/golang/sync/archive/f52d1811a62927559de87708c8913c1650ce4f26.tar.gz -> github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz https://github.com/golang/text/archive/ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz -> github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz https://github.com/golang/tools/archive/2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz -> github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/inconshreveable/log15/archive/b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz -> github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz https://github.com/lxc/go-lxc/archive/de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz -> github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.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/cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz -> github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=99b4bf508561ac2bf6dd98afd118e985
diff --git a/metadata/md5-cache/app-emulation/lxd-2.19 b/metadata/md5-cache/app-emulation/lxd-2.19
index acad93387bbb..47c96d69a530 100644
--- a/metadata/md5-cache/app-emulation/lxd-2.19
+++ b/metadata/md5-cache/app-emulation/lxd-2.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Fast, dense and secure container management
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl )
 SLOT=0
 SRC_URI=https://github.com/lxc/lxd/archive/lxd-2.19.tar.gz -> lxd-2.19.tar.gz https://github.com/dustinkirkland/golang-petname/archive/d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz -> github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/gorilla/mux/archive/7625a85c14e615274a4ee4bc8654f72310a563e4.tar.gz -> github.com-gorilla-mux-7625a85c14e615274a4ee4bc8654f72310a563e4.tar.gz https://github.com/gorilla/websocket/archive/71fa72d4842364bc5f74185f4161e0099ea3624a.tar.gz -> github.com-gorilla-websocket-71fa72d4842364bc5f74185f4161e0099ea3624a.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/jessevdk/go-flags/archive/f88afde2fa19a30cf50ba4b05b3d13bc6bae3079.tar.gz -> github.com-jessevdk-go-flags-f88afde2fa19a30cf50ba4b05b3d13bc6bae3079.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-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/mattn/go-sqlite3/archive/615c193e01d8d462eef7ee390171506f531a1c9a.tar.gz -> github.com-mattn-go-sqlite3-615c193e01d8d462eef7ee390171506f531a1c9a.tar.gz https://github.com/olekukonko/tablewriter/archive/a7a4c189eb47ed33ce7b35f2880070a0c82a67d4.tar.gz -> github.com-olekukonko-tablewriter-a7a4c189eb47ed33ce7b35f2880070a0c82a67d4.tar.gz https://github.com/pborman/uuid/archive/e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz -> github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz https://github.com/stretchr/testify/archive/2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz -> github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/go-stack/stack/archive/817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz -> github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz https://github.com/mattn/go-isatty/archive/a5cdd64afdee435007ee3e9f6ed4684af949d568.tar.gz -> github.com-mattn-go-isatty-a5cdd64afdee435007ee3e9f6ed4684af949d568.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/golang/crypto/archive/2509b142fb2b797aa7587dad548f113b2c0f20ce.tar.gz -> github.com-golang-crypto-2509b142fb2b797aa7587dad548f113b2c0f20ce.tar.gz https://github.com/golang/net/archive/c73622c77280266305273cb545f54516ced95b93.tar.gz -> github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz https://github.com/golang/sync/archive/8e0aa688b654ef28caa72506fa5ec8dba9fc7690.tar.gz -> github.com-golang-sync-8e0aa688b654ef28caa72506fa5ec8dba9fc7690.tar.gz https://github.com/golang/text/archive/6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz -> github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz https://github.com/golang/tools/archive/9b61fcc4c548d69663d915801fc4b42a43b6cd9c.tar.gz -> github.com-golang-tools-9b61fcc4c548d69663d915801fc4b42a43b6cd9c.tar.gz https://github.com/golang/sys/archive/661970f62f5897bc0cd5fdca7e087ba8a98a8fa1.tar.gz -> github.com-golang-sys-661970f62f5897bc0cd5fdca7e087ba8a98a8fa1.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/inconshreveable/log15/archive/0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3.tar.gz -> github.com-inconshreveable-log15-0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3.tar.gz https://github.com/lxc/go-lxc/archive/74fb852c18ea4341f85e49bb6f33635946aabda7.tar.gz -> github.com-lxc-go-lxc-74fb852c18ea4341f85e49bb6f33635946aabda7.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/eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz -> github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b6e0dc1470ff3001a1d09bcf5ee42f06
diff --git a/metadata/md5-cache/app-emulation/lxd-2.21 b/metadata/md5-cache/app-emulation/lxd-2.21
index 8b4e1aa31bf4..3caeb38a29ab 100644
--- a/metadata/md5-cache/app-emulation/lxd-2.21
+++ b/metadata/md5-cache/app-emulation/lxd-2.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.7.1 dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Fast, dense and secure container management
 EAPI=6
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/squashfs-tools virtual/acl )
 SLOT=0
 SRC_URI=https://github.com/lxc/lxd/archive/lxd-2.21.tar.gz -> lxd-2.21.tar.gz https://github.com/syndtr/gocapability/archive/db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz -> github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz https://github.com/dustinkirkland/golang-petname/archive/d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz -> github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz https://github.com/juju/gomaasapi/archive/663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz -> github.com-juju-gomaasapi-663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz https://github.com/juju/loggo/archive/8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz -> github.com-juju-loggo-8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz https://github.com/juju/persistent-cookiejar/archive/d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz -> github.com-juju-persistent-cookiejar-d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz https://github.com/juju/utils/archive/4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz -> github.com-juju-utils-4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz https://github.com/juju/idmclient/archive/15392b0e99abe5983297959c737b8d000e43b34c.tar.gz -> github.com-juju-idmclient-15392b0e99abe5983297959c737b8d000e43b34c.tar.gz https://github.com/juju/errors/archive/c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz -> github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz https://github.com/juju/go4/archive/40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz -> github.com-juju-go4-40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz https://github.com/juju/httprequest/archive/77d36ac4b71a6095506c0617d5881846478558cb.tar.gz -> github.com-juju-httprequest-77d36ac4b71a6095506c0617d5881846478558cb.tar.gz https://github.com/juju/version/archive/1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz -> github.com-juju-version-1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz https://github.com/juju/webbrowser/archive/54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz -> github.com-juju-webbrowser-54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz https://github.com/juju/schema/archive/e4e05803c9a103fdfa880476044100ac17e54830.tar.gz -> github.com-juju-schema-e4e05803c9a103fdfa880476044100ac17e54830.tar.gz https://github.com/gorilla/websocket/archive/cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz -> github.com-gorilla-websocket-cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz https://github.com/gorilla/mux/archive/5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz -> github.com-gorilla-mux-5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz https://github.com/mpvl/subtest/archive/f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz -> github.com-mpvl-subtest-f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz https://github.com/olekukonko/tablewriter/archive/65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz -> github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/julienschmidt/httprouter/archive/e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz -> github.com-julienschmidt-httprouter-e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz https://github.com/gosexy/gettext/archive/74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz -> github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz https://github.com/stretchr/testify/archive/2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz -> github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.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-colorable/archive/6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz -> github.com-mattn-go-colorable-6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz https://github.com/mattn/go-sqlite3/archive/d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz -> github.com-mattn-go-sqlite3-d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz https://github.com/rogpeppe/fastuuid/archive/6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz -> github.com-rogpeppe-fastuuid-6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz https://github.com/pborman/uuid/archive/e533369306653d193b93dae055f6083cbf8ba54f.tar.gz -> github.com-pborman-uuid-e533369306653d193b93dae055f6083cbf8ba54f.tar.gz https://github.com/lxc/lxd/archive/a324ad91230e5353fe746d06636dc59211122e6c.tar.gz -> github.com-lxc-lxd-a324ad91230e5353fe746d06636dc59211122e6c.tar.gz https://github.com/golang/crypto/archive/d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz -> github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz https://github.com/golang/net/archive/d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz -> github.com-golang-net-d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz https://github.com/golang/sys/archive/571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz -> github.com-golang-sys-571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz https://github.com/go-retry/retry/archive/01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz -> github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz https://github.com/go-macaroon/macaroon/archive/bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz -> github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz https://github.com/go-yaml/yaml/archive/287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz -> github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz https://github.com/juju/names/archive/54f00845ae470a362430a966fe17f35f8784ac92.tar.gz -> github.com-juju-names-54f00845ae470a362430a966fe17f35f8784ac92.tar.gz https://github.com/juju/environschema/archive/7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz -> github.com-juju-environschema-7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz https://github.com/go-macaroon-bakery/macaroon-bakery/archive/ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz -> github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz https://github.com/go-httprequest/httprequest/archive/fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz -> github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz https://github.com/flosch/pongo2/archive/5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz -> github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-errgo/errgo/archive/442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz -> github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz https://github.com/lxc/go-lxc/archive/a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz -> github.com-lxc-go-lxc-a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=dd949fab6834ad85c32356ddde554b2e
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc4 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
index a2f0d4bb285d..1dc6a9fd0e6f 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=runc container cli tools
 EAPI=6
 HOMEPAGE=http://runc.io
@@ -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-rc4.tar.gz -> runc-1.0.0_rc4.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6f29254e231a3f4af40dbbcf61acba9d
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5
index 9bebba35b984..d1194f683edf 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=runc container cli tools
 EAPI=6
 HOMEPAGE=http://runc.io
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=8cda35606f6b59711e63dce1378dc187
diff --git a/metadata/md5-cache/app-emulation/runv-0.7.0 b/metadata/md5-cache/app-emulation/runv-0.7.0
index 2da62bd270ff..1166e44dc478 100644
--- a/metadata/md5-cache/app-emulation/runv-0.7.0
+++ b/metadata/md5-cache/app-emulation/runv-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-lang/go-1.8
+DEPEND=libvirt? ( >=app-emulation/libvirt-1.2.2 ) xen? ( app-emulation/xen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-lang/go-1.9
 DESCRIPTION=Hypervisor-based Runtime for OCI
 EAPI=6
 HOMEPAGE=https://github.com/hyperhq/runv
@@ -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	4842e626555a9a4344f34cef2e190b67	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=41fcc31cef6bcb9d3232401e35b775f7
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.22 b/metadata/md5-cache/app-emulation/skopeo-0.1.22
index 61104da83e3c..bde6179ef347 100644
--- a/metadata/md5-cache/app-emulation/skopeo-0.1.22
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145 dev-go/go-md2man >=dev-lang/go-1.8
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145 dev-go/go-md2man >=dev-lang/go-1.9
 DESCRIPTION=Command line utility foroperations on container images and image repositories
 EAPI=6
 HOMEPAGE=https://github.com/projectatomic/skopeo
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=e014bbc1d8e9ba03a46a3ec84502c09d
diff --git a/metadata/md5-cache/app-emulation/umoci-0.2.1 b/metadata/md5-cache/app-emulation/umoci-0.2.1
index 680b2b22561f..86434a08ca5d 100644
--- a/metadata/md5-cache/app-emulation/umoci-0.2.1
+++ b/metadata/md5-cache/app-emulation/umoci-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-go/go-md2man >=dev-lang/go-1.8
+DEPEND=dev-go/go-md2man >=dev-lang/go-1.9
 DESCRIPTION=Manipulation tool for OCI images
 EAPI=6
 HOMEPAGE=https://github.com/openSUSE/umoci
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2dd7dd520fc400c1ac0c48e9bbd55bd4
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 24973cc72949..1f818f1163ea 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/unicode-data-10.0.0 b/metadata/md5-cache/app-i18n/unicode-data-10.0.0
index dbe12bca6dde..3f035aab3653 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-10.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-10.0.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Unicode data from unicode.org
 EAPI=6
 HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=http://www.unicode.org/Public/zipped/10.0.0/UCD.zip -> unicode-data-10.0.0-UCD.zip http://www.unicode.org/Public/zipped/10.0.0/Unihan.zip -> unicode-data-10.0.0-Unihan.zip
-_md5_=7f72730ac4a908f00732e645d3b116bf
+_md5_=5ab545ee2c703aecf6bbe8b7e03a264d
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 5929b812080a..22c1ca3e2f17 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 b158ac215bfe..8d263a17d4c2 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/alertmanager
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=539b0d081674f3b4e07081e0313355f7
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 d3d5547a5d4a..376d2b65245a 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for BIND
 EAPI=6
 HOMEPAGE=https://github.com/digitalocean/bind_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	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 d5fe96763981..529f2718bac7 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8
+DEPEND=dev-util/promu filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/blackbox_exporter
@@ -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	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=ed749681acece233372e6f715a161b89
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 065779b3df56..45df281b1d0d 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Elasticsearch stats exporter for Prometheus
 EAPI=6
 HOMEPAGE=https://github.com/justwatchcom/elasticsearch_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=560ff71adadbedfc9f47b9a36024ae09
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 2cd6bc4d73eb..53b671409145 100644
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
+++ b/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for MongoDB
 EAPI=6
 HOMEPAGE=https://github.com/percona/mongodb_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=255ff6ff2149b786bcf46ca14784f5eb
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 a1b514b95048..5d1e284da7d1 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
 EAPI=6
 HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	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 4b733fc23629..af42f422277f 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
 EAPI=6
 HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	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 d2643899ffd0..7d19cb426f8e 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.15.2
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.15.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for machine metrics
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/node_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1d45644441c372e5a411dd64dc4f7767
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 e96f50273ad7..6c0ea95f3829 100644
--- a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+++ b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=A tool to scrape a Prometheus client and dump the result as JSON
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/prom2json
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=699f93213d211f4afbfd735d1264a53d
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.2.1 b/metadata/md5-cache/app-metrics/prometheus-2.2.1
index 132d714241e1..5a39024e5ad8 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.2.1
+++ b/metadata/md5-cache/app-metrics/prometheus-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.10 dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus monitoring system and time series database
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/prometheus
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.2.1.tar.gz -> prometheus-2.2.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c4cea53aafd2ffdbdb66d4210b22b9a4
diff --git a/metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1 b/metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1
index e831f9edb65c..a05c8c1593c3 100644
--- a/metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1
+++ b/metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for MySQL server metrics
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/mysqld_exporter
@@ -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 -> prometheus-mysqld_exporter-0.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=6db75fad5554436a70f7ef3eb17ef894
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.4.0 b/metadata/md5-cache/app-metrics/pushgateway-0.4.0
index a106d0ca7df4..fda6a2fc1ab2 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.4.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=dev-util/promu >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Prometheus push acceptor for ephemeral and batch jobs
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/pushgateway
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=134bcdf0847f07efa0e58ce5da6e9059
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 2078478fde4c..baa1be81a0db 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-0.15.0
+++ b/metadata/md5-cache/app-metrics/redis_exporter-0.15.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x
 EAPI=6
 HOMEPAGE=https://github.com/oliver006/redis_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9146c0cd0d395ed0dd6bfda84ea6d218
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.9.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.9.0
index 9d3dc3ee957f..d2e5471d720f 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.9.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
+DEPEND=dev-util/promu >=dev-lang/go-1.9
 DESCRIPTION=Prometheus exporter for snmp metrics
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/snmp_exporter
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.9.0.tar.gz -> snmp_exporter-0.9.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9792cf8bf51a206964bd79cb64fdf669
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 8286d52d5387..16719251f640 100644
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+++ b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=dev-util/promu >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=uWSGI metrics exporter for prometheus.io
 EAPI=6
 HOMEPAGE=https://github.com/timonwong/uwsgi_exporter
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=78a4d6048c97e40fe634bb0ae8ef6f2d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fa0bb9997a8f..2574fc5fcb1e 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/away-0.9.5-r2 b/metadata/md5-cache/app-misc/away-0.9.5-r2
index 56eb463a14bf..40946b95b470 100644
--- a/metadata/md5-cache/app-misc/away-0.9.5-r2
+++ b/metadata/md5-cache/app-misc/away-0.9.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/pam-0.75
 DESCRIPTION=Terminal locking program with few additional features
 EAPI=6
 HOMEPAGE=http://unbeatenpath.net/software/away/
-KEYWORDS=amd64 ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=mirror://gentoo/away-0.9.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=72a21f0d815422e816bd3a62b1c60b01
+_md5_=3bfa4dab3bba1b95c5f4c0d51f1e3607
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1-r1 b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
index 4f7a8dbdcc72..aa85764b408b 100644
--- a/metadata/md5-cache/app-misc/calendar-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
 EAPI=6
 HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d759b9e2e633cc5e4d4753d356c84206
+_md5_=d93aaf187a4a3f2bbec6f17ef9b06694
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.14 b/metadata/md5-cache/app-misc/go-jira-1.0.14
index 6b4b17c13fb6..39dea1798b41 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.14
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A simple JIRA commandline client in Go
 EAPI=6
 HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.14.tar.gz -> go-jira-1.0.14.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=3892f0fe4447f3c3be8c5e11caeca322
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.15 b/metadata/md5-cache/app-misc/go-jira-1.0.15
index 7ca6a924e6cf..029aa1bf3917 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.15
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A simple JIRA commandline client in Go
 EAPI=6
 HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Netflix-Skunkworks/go-jira/archive/v1.0.15.tar.gz -> go-jira-1.0.15.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=427b271e39c11ea8e58b838dfdb1a71c
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
index 85c2c44181fc..bb6788896b76 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
 EAPI=6
 HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=alpha amd64 ~arm64 ia64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm64 ia64 ~ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7e7dad1725755c1b16b0db4e4719eb78
+_md5_=e94124ad67ee788265b14c056e665f3d
diff --git a/metadata/md5-cache/app-misc/pet-0.2.3 b/metadata/md5-cache/app-misc/pet-0.2.3
index a96e1cbaf799..4876b948750a 100644
--- a/metadata/md5-cache/app-misc/pet-0.2.3
+++ b/metadata/md5-cache/app-misc/pet-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.8
+DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
 DESCRIPTION=Simple command-line snippet manager
 EAPI=6
 HOMEPAGE=https://github.com/knqyf263/pet
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-go/glide 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.2.3.tar.gz -> pet-0.2.3.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.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/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.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/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=af41f51cda6e4a7aef854d748a0e1475
diff --git a/metadata/md5-cache/app-misc/pet-0.2.3-r1 b/metadata/md5-cache/app-misc/pet-0.2.3-r1
index e2269c15041c..8c0d6a212dad 100644
--- a/metadata/md5-cache/app-misc/pet-0.2.3-r1
+++ b/metadata/md5-cache/app-misc/pet-0.2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.8
+DEPEND=dev-go/glide dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
 DESCRIPTION=Simple command-line snippet manager
 EAPI=6
 HOMEPAGE=https://github.com/knqyf263/pet
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-go/glide 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.2.3.tar.gz -> pet-0.2.3.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.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/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.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/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6155741056ef02547250e8cb6f394cc7
diff --git a/metadata/md5-cache/app-misc/pet-0.2.4 b/metadata/md5-cache/app-misc/pet-0.2.4
index 4e22e9b38515..752d5eba970f 100644
--- a/metadata/md5-cache/app-misc/pet-0.2.4
+++ b/metadata/md5-cache/app-misc/pet-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.8
+DEPEND=dev-go/go-crypto dev-go/go-net dev-go/go-oauth2 dev-go/go-protobuf dev-go/go-sys >=dev-lang/go-1.9
 DESCRIPTION=Simple command-line snippet manager
 EAPI=6
 HOMEPAGE=https://github.com/knqyf263/pet
@@ -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.2.4.tar.gz -> pet-0.2.4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chzyer/readline/archive/41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz -> github.com-chzyer-readline-41eea22f717c616615e1e59aa06cf831f9901f35.tar.gz https://github.com/fatih/color/archive/9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz -> github.com-fatih-color-9131ab34cf20d2f6d83fdc67168a5430d1c7dc23.tar.gz https://github.com/google/go-github/archive/2966f2579cd93bc62410f55ba6830b3925e7629d.tar.gz -> github.com-google-go-github-2966f2579cd93bc62410f55ba6830b3925e7629d.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/ba396278de0a3c63658bbaba13d2d2fa392edb11.tar.gz -> github.com-jroimartin-gocui-ba396278de0a3c63658bbaba13d2d2fa392edb11.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/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/nsf/termbox-go/archive/b6acae516ace002cb8105a89024544a1480655a5.tar.gz -> github.com-nsf-termbox-go-b6acae516ace002cb8105a89024544a1480655a5.tar.gz https://github.com/spf13/cobra/archive/63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz -> github.com-spf13-cobra-63121c8814fc0b99184dbc1c8b7ef4fddae437c3.tar.gz https://github.com/spf13/pflag/archive/2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz -> github.com-spf13-pflag-2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51.tar.gz https://github.com/golang/appengine/archive/170382fa85b10b94728989dfcf6cc818b335c952.tar.gz -> github.com-golang-appengine-170382fa85b10b94728989dfcf6cc818b335c952.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=3e6fac7d60f716f2498588c687767e82
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 2699045679b3..42132fc2239c 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-9999 b/metadata/md5-cache/app-portage/golop-9999
index 1b7e84b308b0..fc6510efe2a9 100644
--- a/metadata/md5-cache/app-portage/golop-9999
+++ b/metadata/md5-cache/app-portage/golop-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A pure Go re-implementation of genlop
 EAPI=6
 HOMEPAGE=https://github.com/klausman/golop
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b7eeec429c598f671ec137ba2470af4
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index c67a744f027b..5f9504369764 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4e803d52de39cdd0334443fa04481c3f
+_md5_=a3c1cb75cebba933a003b25add0e7c95
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 25846f67e0db..e139477dbc29 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 dd5f0a70f06a..760ed7afa3d1 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.1
+++ b/metadata/md5-cache/app-shells/peco-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-go/glide dev-go/go-spew >=dev-lang/go-1.8
+DEPEND=dev-go/glide dev-go/go-spew >=dev-lang/go-1.9
 DESCRIPTION=Simplistic interactive filtering tool
 EAPI=6
 HOMEPAGE=https://github.com/peco/peco
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 787d2a7eca5f..778f191a1142 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.2
+++ b/metadata/md5-cache/app-shells/peco-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-go/glide dev-go/go-spew >=dev-lang/go-1.8
+DEPEND=dev-go/glide dev-go/go-spew >=dev-lang/go-1.9
 DESCRIPTION=Simplistic interactive filtering tool
 EAPI=6
 HOMEPAGE=https://github.com/peco/peco
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=9609a6a75112ad776771ce161c34e981
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7c0c899f3a50..a295412a3f1c 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index 827b20a7f860..7d57757e2664 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
 DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
 EAPI=6
 HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libtommath-0.36-r1
 SLOT=0
 SRC_URI=http://www.convertlit.com/clit18src.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1d03ed692e5bcc18b1d60d34a07514e3
+_md5_=8c8148e8c76bec1dde3ff7a0ef84cac9
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index fe0b5182928b..67af4af962e0 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.17 b/metadata/md5-cache/dev-db/etcd-3.2.17
index f45b823969ab..a1e8bdd72c5d 100644
--- a/metadata/md5-cache/dev-db/etcd-3.2.17
+++ b/metadata/md5-cache/dev-db/etcd-3.2.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Highly-available key value store for shared configuration and service discovery
 EAPI=6
 HOMEPAGE=https://github.com/coreos/etcd
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.2.17.tar.gz -> etcd-3.2.17.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.2 b/metadata/md5-cache/dev-db/etcd-3.3.2
index 4b41f0369bd4..389cc9307eda 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.2
+++ b/metadata/md5-cache/dev-db/etcd-3.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Highly-available key value store for shared configuration and service discovery
 EAPI=6
 HOMEPAGE=https://github.com/coreos/etcd
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.2.tar.gz -> etcd-3.3.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.3 b/metadata/md5-cache/dev-db/etcd-3.3.3
index 9f6f76c9f3b0..d0817ffa8623 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.3
+++ b/metadata/md5-cache/dev-db/etcd-3.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
 DESCRIPTION=Highly-available key value store for shared configuration and service discovery
 EAPI=6
 HOMEPAGE=https://github.com/coreos/etcd
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/etcdctl
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.3.tar.gz -> etcd-3.3.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 7847f892e8f6..f0f017e7de3e 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.5.1
+++ b/metadata/md5-cache/dev-db/influxdb-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=app-text/asciidoc-8.6.10 app-text/xmlto >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=app-text/asciidoc-8.6.10 app-text/xmlto >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Scalable datastore for metrics, events, and real-time analytics
 EAPI=6
 HOMEPAGE=https://www.influxdata.com
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=49ca3070470a789883481974997ca3c8
diff --git a/metadata/md5-cache/dev-db/mysqltuner-1.6.18 b/metadata/md5-cache/dev-db/mysqltuner-1.6.18
index 91c6ea22efc1..685770517c4a 100644
--- a/metadata/md5-cache/dev-db/mysqltuner-1.6.18
+++ b/metadata/md5-cache/dev-db/mysqltuner-1.6.18
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=MySQLTuner is a high-performance MySQL tuning script
 EAPI=6
 HOMEPAGE=http://www.mysqltuner.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/major/MySQLTuner-perl/archive/1.6.18.tar.gz -> mysqltuner-1.6.18.tar.gz
-_md5_=a38d79cd3234b16693e72ecf93517dfa
+_md5_=278206b31d720050446de33a156e838a
diff --git a/metadata/md5-cache/dev-db/rqlite-4.0.2 b/metadata/md5-cache/dev-db/rqlite-4.0.2
index b4500c0f9e91..94b2b68ff762 100644
--- a/metadata/md5-cache/dev-db/rqlite-4.0.2
+++ b/metadata/md5-cache/dev-db/rqlite-4.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Replicated SQLite using the Raft consensus protocol
 EAPI=6
 HOMEPAGE=https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/rqlite/rqlite/archive/v4.0.2.tar.gz -> rqlite-4.0.2.tar.gz https://github.com/Bowery/prompt/archive/eb8f7a6a197ce971ed0e9d4a739c628381d5f124.tar.gz -> github.com-Bowery-prompt-eb8f7a6a197ce971ed0e9d4a739c628381d5f124.tar.gz https://github.com/armon/go-metrics/archive/023a4bbe4bb9bfb23ee7e1afc8d0abad217641f3.tar.gz -> github.com-armon-go-metrics-023a4bbe4bb9bfb23ee7e1afc8d0abad217641f3.tar.gz https://github.com/boltdb/bolt/archive/2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz -> github.com-boltdb-bolt-2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.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/ac704075e75b8626023224c76c56be4d6958a5dc.tar.gz -> github.com-hashicorp-raft-ac704075e75b8626023224c76c56be4d6958a5dc.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/6c0fd4aa6ec5818d5e3ea9e03ae436972a6c5a9a.tar.gz -> github.com-mattn-go-colorable-6c0fd4aa6ec5818d5e3ea9e03ae436972a6c5a9a.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/6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz -> github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.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/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/sys/archive/b0e0dd72976dc482b6cb37c5640440f876ac1907.tar.gz -> github.com-golang-sys-b0e0dd72976dc482b6cb37c5640440f876ac1907.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=33b5b5fa4ca624e454bb33562c290bd9
diff --git a/metadata/md5-cache/dev-db/rqlite-4.1.0 b/metadata/md5-cache/dev-db/rqlite-4.1.0
index 31a54435cb37..0b9cd7bb5f75 100644
--- a/metadata/md5-cache/dev-db/rqlite-4.1.0
+++ b/metadata/md5-cache/dev-db/rqlite-4.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Replicated SQLite using the Raft consensus protocol
 EAPI=6
 HOMEPAGE=https://github.com/rqlite/rqlite http://www.philipotoole.com/tag/rqlite/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=b1006b2d34619dae1dc5c769edb43d5c
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 2ed6545f5e52..dd746d57164e 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 b7b66c121fcc..23d3e448dc90 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=>=dev-lang/go-1.9.2 >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9.2 >=dev-lang/go-1.9
 DESCRIPTION=A command line tool for compiling Arduino sketches
 EAPI=6
 HOMEPAGE=https://github.com/arduino/arduino-builder
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=3118c3cec4fa668f6a82354803185d84
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 08d226fb9c7b..8bf123b23f81 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 c657dc3bdc5a..e0447a1a736f 100644
--- a/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
+++ b/metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.8
+DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
 DESCRIPTION=a markdown processor implemented in Go
 EAPI=5
 HOMEPAGE=https://github.com/russross/blackfriday
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f79ccb72741de6ca18a6cb9acbe19b5f
diff --git a/metadata/md5-cache/dev-go/blackfriday-1.4 b/metadata/md5-cache/dev-go/blackfriday-1.4
index d24ce8e03968..894de66a1fb3 100644
--- a/metadata/md5-cache/dev-go/blackfriday-1.4
+++ b/metadata/md5-cache/dev-go/blackfriday-1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.8
+DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
 DESCRIPTION=a markdown processor implemented in Go
 EAPI=6
 HOMEPAGE=https://github.com/russross/blackfriday
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=68e8bfe1e2b5af728c118fad4429f9cc
diff --git a/metadata/md5-cache/dev-go/blackfriday-9999 b/metadata/md5-cache/dev-go/blackfriday-9999
index 1fa27f07eda4..fe7f78a4c982 100644
--- a/metadata/md5-cache/dev-go/blackfriday-9999
+++ b/metadata/md5-cache/dev-go/blackfriday-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.8
+DEPEND=dev-go/sanitized-anchor-name >=dev-lang/go-1.9
 DESCRIPTION=a markdown processor implemented in Go
 EAPI=5
 HOMEPAGE=https://github.com/russross/blackfriday
 LICENSE=BSD-2
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 2467fe726a89..b21a2d17634c 100644
--- a/metadata/md5-cache/dev-go/cli-0_pre20160306
+++ b/metadata/md5-cache/dev-go/cli-0_pre20160306
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A small package for building command line apps in Go
 EAPI=5
 HOMEPAGE=https://github.com/codegangsta/cli
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=d150131e115e0b94ed374b03ca9e38b6
diff --git a/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216 b/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
index a30807f7c0d9..2033ea6106d8 100644
--- a/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
+++ b/metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-tools:= >=dev-lang/go-1.9
 DESCRIPTION=Cover profile aggregator for golang
 EAPI=6
 HOMEPAGE=https://github.com/chouquette/coveraggregator
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=a05e2691fc9ceb464458759f850e10cf
diff --git a/metadata/md5-cache/dev-go/delve-0.12.2 b/metadata/md5-cache/dev-go/delve-0.12.2
index 854cb89820a1..dcf03c288d46 100644
--- a/metadata/md5-cache/dev-go/delve-0.12.2
+++ b/metadata/md5-cache/dev-go/delve-0.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A source-level debugger for the Go programming language
 EAPI=6
 HOMEPAGE=https://github.com/derekparker/delve
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 767ac31ed302..32f048281f98 100644
--- a/metadata/md5-cache/dev-go/delve-1.0.0
+++ b/metadata/md5-cache/dev-go/delve-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A source-level debugger for the Go programming language
 EAPI=6
 HOMEPAGE=https://github.com/derekparker/delve
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 8b3a56d39dc8..eb8a7c9207dc 100644
--- a/metadata/md5-cache/dev-go/delve-1.0.0_rc1
+++ b/metadata/md5-cache/dev-go/delve-1.0.0_rc1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A source-level debugger for the Go programming language
 EAPI=6
 HOMEPAGE=https://github.com/derekparker/delve
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=ec11bd41b00dcace0dbc565af867129a
diff --git a/metadata/md5-cache/dev-go/ed25519-0_pre20160420 b/metadata/md5-cache/dev-go/ed25519-0_pre20160420
index cfccc23dc274..ce10700e29ef 100644
--- a/metadata/md5-cache/dev-go/ed25519-0_pre20160420
+++ b/metadata/md5-cache/dev-go/ed25519-0_pre20160420
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=test? ( dev-go/go-crypto ) >=dev-lang/go-1.8
+DEPEND=test? ( dev-go/go-crypto ) >=dev-lang/go-1.9
 DESCRIPTION=ed25519 for Go
 EAPI=6
 HOMEPAGE=https://github.com/agl/ed25519/
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 e00366503776..fa5de01afa2b 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.3
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=test? ( dev-go/godebug-pretty ) >=dev-lang/go-1.8
+DEPEND=test? ( dev-go/godebug-pretty ) >=dev-lang/go-1.9
 DESCRIPTION=Go library that provides fuzzy string matching
 EAPI=6
 HOMEPAGE=https://github.com/sahilm/fuzzy
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=d2ca8212b4750188b7065f107200c90f
diff --git a/metadata/md5-cache/dev-go/glide-0.12.3 b/metadata/md5-cache/dev-go/glide-0.12.3
index 25a522f324d6..bc2343613e3a 100644
--- a/metadata/md5-cache/dev-go/glide-0.12.3
+++ b/metadata/md5-cache/dev-go/glide-0.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Vendor Package Managment for Golang
 EAPI=6
 HOMEPAGE=https://github.com/Masterminds/glide
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 17d1fe29be8f..2df5f2471cc8 100644
--- a/metadata/md5-cache/dev-go/glide-0.13.1
+++ b/metadata/md5-cache/dev-go/glide-0.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Vendor Package Managment for Golang
 EAPI=6
 HOMEPAGE=https://github.com/Masterminds/glide
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=332dcb60187ed7640ab155620a113d82
diff --git a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023 b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
index 972f864217a9..1edf3ec3299e 100644
--- a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+++ b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A small utility which generates Go code from any file
 EAPI=5
 HOMEPAGE=https://github.com/jteeuwen/go-bindata
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=dc973713e115fe7a023c8e5e5e6f9033
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 1e46e764ac9c..2e7bfc2b2f95 100644
--- a/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
+++ b/metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Serve embedded files from jteeuwen/go-bindata with net/http
 EAPI=5
 HOMEPAGE=https://github.com/elazarl/go-bindata-assetfs
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 8b9909a1ee1e..8523fcf83c31 100644
--- a/metadata/md5-cache/dev-go/go-colortext-0_pre20150720
+++ b/metadata/md5-cache/dev-go/go-colortext-0_pre20150720
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Change the console foreground and background colors
 EAPI=5
 HOMEPAGE=https://github.com/daviddengcn/go-colortext
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=cc46e3cd823119650b0d5a97b22ad4a6
diff --git a/metadata/md5-cache/dev-go/go-crypto-0_pre20150808 b/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
index d3831f61cc47..505c7e7a688a 100644
--- a/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
+++ b/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go supplementary cryptography libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/crypto
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150808
 SRC_URI=https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=562f0ddcd63288535e685abc7b2697f0
diff --git a/metadata/md5-cache/dev-go/go-crypto-0_pre20160126 b/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
index 4d4779716633..c198590d8a2d 100644
--- a/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
+++ b/metadata/md5-cache/dev-go/go-crypto-0_pre20160126
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go supplementary cryptography libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/crypto
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=4fb3ca0a9cbfcc7cfc011ec20e8009b8
diff --git a/metadata/md5-cache/dev-go/go-crypto-9999 b/metadata/md5-cache/dev-go/go-crypto-9999
index 559895a6a36d..9f0335c0131d 100644
--- a/metadata/md5-cache/dev-go/go-crypto-9999
+++ b/metadata/md5-cache/dev-go/go-crypto-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go supplementary cryptography libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/crypto
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88e885edcc585220d4c1f5c1aea24a82
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 3c84b5776bf9..13a787b368df 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Fast golang queue using ring-buffer
 EAPI=5
 HOMEPAGE=https://github.com/eapache/queue
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=fabe58dc873f593b85bfbbdc40d4244e
diff --git a/metadata/md5-cache/dev-go/go-eapache-queue-9999 b/metadata/md5-cache/dev-go/go-eapache-queue-9999
index fc4c9a6e98f6..d939f4af04b2 100644
--- a/metadata/md5-cache/dev-go/go-eapache-queue-9999
+++ b/metadata/md5-cache/dev-go/go-eapache-queue-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Fast golang queue using ring-buffer
 EAPI=5
 HOMEPAGE=https://github.com/eapache/queue
 LICENSE=MIT
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fabe58dc873f593b85bfbbdc40d4244e
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 0185dec9702f..8c1549a479da 100644
--- a/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
+++ b/metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A simple gitlab api client written in Go
 EAPI=5
 HOMEPAGE=https://github.com/plouc/go-gitlab-client
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 6549b8371336..ebfd617c6ed0 100644
--- a/metadata/md5-cache/dev-go/go-md2man-1.0.3
+++ b/metadata/md5-cache/dev-go/go-md2man-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/blackfriday >=dev-lang/go-1.8
+DEPEND=dev-go/blackfriday >=dev-lang/go-1.9
 DESCRIPTION=A utility to convert markdown to man pages
 EAPI=5
 HOMEPAGE=https://github.com/cpuguy83/go-md2man
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 9ff6aea29e4f..5da65441da2a 100644
--- a/metadata/md5-cache/dev-go/go-md2man-1.0.6
+++ b/metadata/md5-cache/dev-go/go-md2man-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/blackfriday >=dev-lang/go-1.8
+DEPEND=dev-go/blackfriday >=dev-lang/go-1.9
 DESCRIPTION=A utility to convert markdown to man pages
 EAPI=6
 HOMEPAGE=https://github.com/cpuguy83/go-md2man
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=01eb7e0b9f40cbf18c9aa0244eb66a28
diff --git a/metadata/md5-cache/dev-go/go-net-0_pre20150804 b/metadata/md5-cache/dev-go/go-net-0_pre20150804
index 50a89a0b9c00..37d1c213b4e1 100644
--- a/metadata/md5-cache/dev-go/go-net-0_pre20150804
+++ b/metadata/md5-cache/dev-go/go-net-0_pre20150804
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-text:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-text:= >=dev-lang/go-1.9
 DESCRIPTION=Go supplementary network libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/net
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150804
 SRC_URI=https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=a2680ee46000e7fcb5a7b536cb41df3b
diff --git a/metadata/md5-cache/dev-go/go-net-0_pre20160216 b/metadata/md5-cache/dev-go/go-net-0_pre20160216
index 9dbaf4b8a9ac..2ea163b12219 100644
--- a/metadata/md5-cache/dev-go/go-net-0_pre20160216
+++ b/metadata/md5-cache/dev-go/go-net-0_pre20160216
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.9
 DESCRIPTION=Go supplementary network libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/net
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1f3ff73dc2636633d90e2572fc1d4747
diff --git a/metadata/md5-cache/dev-go/go-net-9999 b/metadata/md5-cache/dev-go/go-net-9999
index 03f99c364230..2a7661f54821 100644
--- a/metadata/md5-cache/dev-go/go-net-9999
+++ b/metadata/md5-cache/dev-go/go-net-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-crypto:= dev-go/go-text:= >=dev-lang/go-1.9
 DESCRIPTION=Go supplementary network libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/net
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c680e8690bbf2b614d024418fe90f326
diff --git a/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701 b/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
index cd73ecbbf52e..10d122ea6b01 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
+++ b/metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.9
 DESCRIPTION=Go client implementation for OAuth 2.0 spec
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/oauth2
@@ -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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c600f2186ca65f286a2b7b4852a8b25
diff --git a/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222 b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
index dc2d350866c9..e09d804a4c16 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
+++ b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools >=dev-lang/go-1.8
+DEPEND=dev-go/go-tools >=dev-lang/go-1.9
 DESCRIPTION=Go client implementation for OAuth 2.0 spec
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/oauth2
@@ -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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=630daf2a8e882452faa55604714d0937
diff --git a/metadata/md5-cache/dev-go/go-oauth2-9999 b/metadata/md5-cache/dev-go/go-oauth2-9999
index 1a1d946449b9..442f3bd48c95 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-9999
+++ b/metadata/md5-cache/dev-go/go-oauth2-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= dev-go/go-tools:= >=dev-lang/go-1.9
 DESCRIPTION=Go client implementation for OAuth 2.0 spec
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/oauth2
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a84375e17e32ed081f4ffc60ce6ddca8
diff --git a/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809 b/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
index 6eed37d7c911..fe2cd7acfb48 100644
--- a/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
+++ b/metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go support for Google's protocol buffers
 EAPI=5
 HOMEPAGE=https://github.com/golang/protobuf
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150809
 SRC_URI=https://github.com/golang/protobuf/archive/68c687dc49948540b356a6b47931c9be4fcd0245.tar.gz -> go-protobuf-0_pre20150809.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2d643f216567c0c4490f4e55909d8a08
diff --git a/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216 b/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
index 58334d1fef41..1b1654bbc42d 100644
--- a/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
+++ b/metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go support for Google's protocol buffers
 EAPI=5
 HOMEPAGE=https://github.com/golang/protobuf
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=eadde2a53e4d50f57252b21e80a21905
diff --git a/metadata/md5-cache/dev-go/go-protobuf-9999 b/metadata/md5-cache/dev-go/go-protobuf-9999
index 7a25af1437d4..8c719b404837 100644
--- a/metadata/md5-cache/dev-go/go-protobuf-9999
+++ b/metadata/md5-cache/dev-go/go-protobuf-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go support for Google's protocol buffers
 EAPI=5
 HOMEPAGE=https://github.com/golang/protobuf
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa72023d9a5c6b1d2971422d3e5fd7d2
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 d26d327ecdea..57ca0c76cc7f 100644
--- a/metadata/md5-cache/dev-go/go-resiliency-1.0.0
+++ b/metadata/md5-cache/dev-go/go-resiliency-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Resiliency patterns for golang
 EAPI=5
 HOMEPAGE=https://github.com/eapache/go-resiliency
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=8d6d52e9bd2ccefa6b36e37e0727b8fb
diff --git a/metadata/md5-cache/dev-go/go-resiliency-9999 b/metadata/md5-cache/dev-go/go-resiliency-9999
index 087adb0c9e14..ac68f8a6e65d 100644
--- a/metadata/md5-cache/dev-go/go-resiliency-9999
+++ b/metadata/md5-cache/dev-go/go-resiliency-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Resiliency patterns for golang
 EAPI=5
 HOMEPAGE=https://github.com/eapache/go-resiliency
 LICENSE=MIT
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d6d52e9bd2ccefa6b36e37e0727b8fb
diff --git a/metadata/md5-cache/dev-go/go-snappy-0_pre20150729 b/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
index 5c3e8b235f79..7863b87d9ccd 100644
--- a/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
+++ b/metadata/md5-cache/dev-go/go-snappy-0_pre20150729
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=The Snappy compression format in the Go programming language.
 EAPI=5
 HOMEPAGE=https://github.com/golang/snappy
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=a63b091f203851d08c61897d8e4890f5
diff --git a/metadata/md5-cache/dev-go/go-snappy-0_pre20160213 b/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
index f7345895c13b..2c9bb42e0e2d 100644
--- a/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
+++ b/metadata/md5-cache/dev-go/go-snappy-0_pre20160213
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=The Snappy compression format in the Go programming language.
 EAPI=5
 HOMEPAGE=https://github.com/golang/snappy
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=3750be05cffaf61228b7f01f05e6429f
diff --git a/metadata/md5-cache/dev-go/go-snappy-9999 b/metadata/md5-cache/dev-go/go-snappy-9999
index ccea89b82c95..4b36d8f14a3f 100644
--- a/metadata/md5-cache/dev-go/go-snappy-9999
+++ b/metadata/md5-cache/dev-go/go-snappy-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=The Snappy compression format in the Go programming language.
 EAPI=5
 HOMEPAGE=https://github.com/golang/snappy
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a63b091f203851d08c61897d8e4890f5
diff --git a/metadata/md5-cache/dev-go/go-spew-0_pre20150619 b/metadata/md5-cache/dev-go/go-spew-0_pre20150619
index 3d0b904c0184..15cc6465e21c 100644
--- a/metadata/md5-cache/dev-go/go-spew-0_pre20150619
+++ b/metadata/md5-cache/dev-go/go-spew-0_pre20150619
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Implements a deep pretty printer for Go data structures to aid in debugging
 EAPI=5
 HOMEPAGE=https://github.com/davecgh/go-spew
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=326f8c94f5d8cdd1cc6301ba72752f57
diff --git a/metadata/md5-cache/dev-go/go-spew-9999 b/metadata/md5-cache/dev-go/go-spew-9999
index 0b3ed8cfb705..d75545b72651 100644
--- a/metadata/md5-cache/dev-go/go-spew-9999
+++ b/metadata/md5-cache/dev-go/go-spew-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Implements a deep pretty printer for Go data structures to aid in debugging
 EAPI=5
 HOMEPAGE=https://github.com/davecgh/go-spew
 LICENSE=ISC
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=326f8c94f5d8cdd1cc6301ba72752f57
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 a9c537cb6fea..1e62edce8145 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go sqlite3 driver using database/sql
 EAPI=5
 HOMEPAGE=https://github.com/mattn/go-sqlite3
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=007336e3152bf868bac83cb79055280c
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 3308106e399e..df87058c5a3b 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go sqlite3 driver using database/sql
 EAPI=5
 HOMEPAGE=https://github.com/mattn/go-sqlite3
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=b7bf6be301c88456466d919c2eb11119
diff --git a/metadata/md5-cache/dev-go/go-sys-0_pre20150729 b/metadata/md5-cache/dev-go/go-sys-0_pre20150729
index 7cc5163519df..7164be143f7d 100644
--- a/metadata/md5-cache/dev-go/go-sys-0_pre20150729
+++ b/metadata/md5-cache/dev-go/go-sys-0_pre20150729
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go packages for low-level interaction with the operating system
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/sys
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150729
 SRC_URI=https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=156432fa8ca4165281d5bc739d97ada0
diff --git a/metadata/md5-cache/dev-go/go-sys-0_pre20160204 b/metadata/md5-cache/dev-go/go-sys-0_pre20160204
index dbd52a2edfb1..496934e13e87 100644
--- a/metadata/md5-cache/dev-go/go-sys-0_pre20160204
+++ b/metadata/md5-cache/dev-go/go-sys-0_pre20160204
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go packages for low-level interaction with the operating system
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/sys
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=73cf286d97d973561517a68adb298a14
diff --git a/metadata/md5-cache/dev-go/go-sys-9999 b/metadata/md5-cache/dev-go/go-sys-9999
index 0f4b85683c82..d717eb0f9629 100644
--- a/metadata/md5-cache/dev-go/go-sys-9999
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go packages for low-level interaction with the operating system
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/sys
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=507419e7dbefda718938813402583228
diff --git a/metadata/md5-cache/dev-go/go-text-0_pre20150806 b/metadata/md5-cache/dev-go/go-text-0_pre20150806
index a5955f651c82..1e0bc0bdeba6 100644
--- a/metadata/md5-cache/dev-go/go-text-0_pre20150806
+++ b/metadata/md5-cache/dev-go/go-text-0_pre20150806
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go text processing support
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/text
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150806
 SRC_URI=https://github.com/golang/text/archive/1309a1875a4368c12688b9383c6bcac738c17c29.tar.gz -> go-text-0_pre20150806.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=e53dcc65cab0cfaadcf804fa94eb7230
diff --git a/metadata/md5-cache/dev-go/go-text-0_pre20160211 b/metadata/md5-cache/dev-go/go-text-0_pre20160211
index 2f37b49a9173..05350706d709 100644
--- a/metadata/md5-cache/dev-go/go-text-0_pre20160211
+++ b/metadata/md5-cache/dev-go/go-text-0_pre20160211
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go text processing support
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/text
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=35775eee1181dd397eb3fac57ce7c809
diff --git a/metadata/md5-cache/dev-go/go-text-9999 b/metadata/md5-cache/dev-go/go-text-9999
index 5979870840e4..043975de3374 100644
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go text processing support
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/text
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=364c1a89013c54d2cd82c15af4f38f17
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1 b/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
index c518fc1620e4..d3a21c9a6037 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.9
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0/0_pre20150823-r1
 SRC_URI=https://github.com/golang/tools/archive/6c9aff3.tar.gz -> go-tools-0_pre20150823.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=4e520299b959c7381bf9dfed58cc2908
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20150902 b/metadata/md5-cache/dev-go/go-tools-0_pre20150902
index ab4769c67a3a..338cf802b256 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20150902
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20150902
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<dev-lang/go-1.5
 SLOT=0/0_pre20150902
 SRC_URI=https://github.com/golang/tools/archive/1330b28.tar.gz -> go-tools-0_pre20150902.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=0d64ce87527df416f65e1b3da717aa25
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20160121 b/metadata/md5-cache/dev-go/go-tools-0_pre20160121
index c0ac52601977..22587cd85b6a 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20160121
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20160121
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<dev-lang/go-1.5
 SLOT=0/0_pre20160121
 SRC_URI=https://github.com/golang/tools/archive/f3a63969dd29f8cfa913fdaea22f30c1ed537cb3.tar.gz -> go-tools-0_pre20160121.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6a5aacac4203f095712f2da1b66ddb7a
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20160220 b/metadata/md5-cache/dev-go/go-tools-0_pre20160220
index b4aa704ddb84..a1cad01ba9d5 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20160220
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20160220
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.5 >=dev-lang/go-1.9
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<dev-lang/go-1.5
 SLOT=0/0_pre20160220
 SRC_URI=https://github.com/golang/tools/archive/ee8cb08bfe4453a27a4bd7c86a917800d339c5ac.tar.gz -> go-tools-0_pre20160220.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6aa9efe6b5d459a5c876d99d767ea66e
diff --git a/metadata/md5-cache/dev-go/go-tools-9999 b/metadata/md5-cache/dev-go/go-tools-9999
index 2195506518ed..7bdf0211663f 100644
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.9
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
 LICENSE=BSD
 SLOT=0/9999
 SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e520299b959c7381bf9dfed58cc2908
diff --git a/metadata/md5-cache/dev-go/go-tour-0_p20160209 b/metadata/md5-cache/dev-go/go-tour-0_p20160209
index 617ec45902f8..9bc776e0b7e5 100644
--- a/metadata/md5-cache/dev-go/go-tour-0_p20160209
+++ b/metadata/md5-cache/dev-go/go-tour-0_p20160209
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-tools:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-tools:= >=dev-lang/go-1.9
 DESCRIPTION=A Tour of Go
 EAPI=5
 HOMEPAGE=https://tour.golang.org
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/golang/tour/archive/6b2e5b35ce8ed092eaedc3d2a2294373a639f122.tar.gz -> go-tour-0_p20160209.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=dfc09b5c76105027506c0f8f35cb2e96
diff --git a/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819 b/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
index 430ade8bbf40..9fb4196cfc46 100644
--- a/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
+++ b/metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Pretty printing for Go
 EAPI=6
 HOMEPAGE=https://github.com/kylelemons/godebug
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=be63015f09f5d45c4eecf605af2da4ce
diff --git a/metadata/md5-cache/dev-go/godep-74 b/metadata/md5-cache/dev-go/godep-74
index c6bbae0577f1..fd26ce09b0e8 100644
--- a/metadata/md5-cache/dev-go/godep-74
+++ b/metadata/md5-cache/dev-go/godep-74
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=dependency tool for go
 EAPI=6
 HOMEPAGE=https://github.com/tools/godep
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=b14c461ff3de6201c7bd1dec917e15f9
diff --git a/metadata/md5-cache/dev-go/godep-9999 b/metadata/md5-cache/dev-go/godep-9999
index 1d7acdd30992..942761403714 100644
--- a/metadata/md5-cache/dev-go/godep-9999
+++ b/metadata/md5-cache/dev-go/godep-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=dependency tool for go
 EAPI=6
 HOMEPAGE=https://github.com/tools/godep
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 cdf5b69701bd..768881da04d8 100644
--- a/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
+++ b/metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Protocol Buffers for Go with Gadgets
 EAPI=6
 HOMEPAGE=https://github.com/gogo/protobuf
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1e8177eadd50e2572d19516f62667d03
diff --git a/metadata/md5-cache/dev-go/golint-0_pre20161114 b/metadata/md5-cache/dev-go/golint-0_pre20161114
index cda06dda8a60..ecf0a5704e1f 100644
--- a/metadata/md5-cache/dev-go/golint-0_pre20161114
+++ b/metadata/md5-cache/dev-go/golint-0_pre20161114
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.6 dev-go/go-tools >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.6 dev-go/go-tools >=dev-lang/go-1.9
 DESCRIPTION=a linter for Go
 EAPI=6
 HOMEPAGE=https://godoc.org/golang.org/x/tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<dev-lang/go-1.6 dev-go/go-tools:=
 SLOT=0/0_pre20161114
 SRC_URI=https://github.com/golang/lint/archive/206c0f0.tar.gz -> golint-0_pre20161114.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=020bb6115cf94a8897b33f3ad2b5915e
diff --git a/metadata/md5-cache/dev-go/gom-0_pre20151110 b/metadata/md5-cache/dev-go/gom-0_pre20151110
index 215a5ddd46f7..a7cb048a77c1 100644
--- a/metadata/md5-cache/dev-go/gom-0_pre20151110
+++ b/metadata/md5-cache/dev-go/gom-0_pre20151110
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-colortext:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-colortext:= >=dev-lang/go-1.9
 DESCRIPTION=Go Dependency management system similar to bundle for ruby
 EAPI=5
 HOMEPAGE=https://github.com/mattn/gom
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=70a65498eb2557cbe90fb3c81aff5d61
diff --git a/metadata/md5-cache/dev-go/goptlib-0.5 b/metadata/md5-cache/dev-go/goptlib-0.5
index c65caba11bbf..62784bc211c8 100644
--- a/metadata/md5-cache/dev-go/goptlib-0.5
+++ b/metadata/md5-cache/dev-go/goptlib-0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go Tor pluggable transports library
 EAPI=6
 HOMEPAGE=https://gitweb.torproject.org/pluggable-transports/goptlib.git
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/golang-goptlib/golang-goptlib_0.5.orig.tar.gz -> goptlib-0.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2a827d4aa72332eeec8d6a424ad4fa70
diff --git a/metadata/md5-cache/dev-go/goptlib-0.6 b/metadata/md5-cache/dev-go/goptlib-0.6
index 230f552d2da8..148e258a2881 100644
--- a/metadata/md5-cache/dev-go/goptlib-0.6
+++ b/metadata/md5-cache/dev-go/goptlib-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go Tor pluggable transports library
 EAPI=6
 HOMEPAGE=https://gitweb.torproject.org/pluggable-transports/goptlib.git
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=af3ce7a739b966bdfc831b650d369d36
diff --git a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180222 b/metadata/md5-cache/dev-go/goversion-1.0.0_p20180222
index b876cb3ee8ee..f80d8fd1c32a 100644
--- a/metadata/md5-cache/dev-go/goversion-1.0.0_p20180222
+++ b/metadata/md5-cache/dev-go/goversion-1.0.0_p20180222
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Print version used to build Go executables
 EAPI=6
 HOMEPAGE=https://github.com/rsc/goversion https://rsc.io/goversion
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/rsc/goversion/archive/04f0b81a96346cb33d48044cbffd24c8f57785ad.tar.gz -> goversion-1.0.0_p20180222.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=eb701ac6b15a4256b07ea1a72da9e035
diff --git a/metadata/md5-cache/dev-go/gox-0_pre20160725 b/metadata/md5-cache/dev-go/gox-0_pre20160725
index c5608159a709..61e03afcacc6 100644
--- a/metadata/md5-cache/dev-go/gox-0_pre20160725
+++ b/metadata/md5-cache/dev-go/gox-0_pre20160725
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A dead simple, no frills Go cross compile tool
 EAPI=5
 HOMEPAGE=https://github.com/mitchellh/gox
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=def994b0ffa7c138027a82b112075376
diff --git a/metadata/md5-cache/dev-go/qr-0_p20161121 b/metadata/md5-cache/dev-go/qr-0_p20161121
index 66700e0a1fc8..0af032c90c1b 100644
--- a/metadata/md5-cache/dev-go/qr-0_p20161121
+++ b/metadata/md5-cache/dev-go/qr-0_p20161121
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Basic QR code library for Go
 EAPI=6
 HOMEPAGE=https://github.com/rsc/qr
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 48585722bdbd..8e90ae520d49 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A Go function to provide sanitized anchor names
 EAPI=5
 HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 6fb0915e280b..9bfad5149bc4 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A Go function to provide sanitized anchor names
 EAPI=6
 HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 d3c64b15e503..31923d90cceb 100644
--- a/metadata/md5-cache/dev-go/sanitized-anchor-name-9999
+++ b/metadata/md5-cache/dev-go/sanitized-anchor-name-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A Go function to provide sanitized anchor names
 EAPI=6
 HOMEPAGE=https://github.com/shurcooL/sanitized_anchor_name
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 78edf4d0ab81..797ae6253748 100644
--- a/metadata/md5-cache/dev-go/sarama-1.4.3
+++ b/metadata/md5-cache/dev-go/sarama-1.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.8
+DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.9
 DESCRIPTION=Sarama is a Go library for Apache Kafka
 EAPI=5
 HOMEPAGE=https://github.com/Shopify/sarama
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
 _md5_=03f64fb9628b7b34ae2e8729a75be45e
diff --git a/metadata/md5-cache/dev-go/sarama-9999 b/metadata/md5-cache/dev-go/sarama-9999
index c0b16dda76a7..08c9ca18d2b2 100644
--- a/metadata/md5-cache/dev-go/sarama-9999
+++ b/metadata/md5-cache/dev-go/sarama-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.8
+DEPEND=dev-go/go-eapache-queue dev-go/go-resiliency dev-go/go-snappy test? ( dev-go/go-spew ) >=dev-lang/go-1.9
 DESCRIPTION=Sarama is a Go library for Apache Kafka
 EAPI=5
 HOMEPAGE=https://github.com/Shopify/sarama
 IUSE=test
 LICENSE=MIT
 SLOT=0/9999
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2fe7392058cbb70046a65c686613713e
diff --git a/metadata/md5-cache/dev-go/siphash-1.0.0 b/metadata/md5-cache/dev-go/siphash-1.0.0
index bf8115d3e11b..44b1292b33b1 100644
--- a/metadata/md5-cache/dev-go/siphash-1.0.0
+++ b/metadata/md5-cache/dev-go/siphash-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Go implementation of SipHash-2.4
 EAPI=6
 HOMEPAGE=https://github.com/dchest/siphash
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=bcab31819bc84f23946cdf95bbc7c330
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 7c01bfe21007..9e43d07a3de3 100644
--- a/metadata/md5-cache/dev-go/toml-0.2.0_p20160716
+++ b/metadata/md5-cache/dev-go/toml-0.2.0_p20160716
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=TOML parser for Golang with reflection
 EAPI=6
 HOMEPAGE=https://github.com/BurntSushi/toml
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=176cbf94d7cee7d920581183c968f035
diff --git a/metadata/md5-cache/dev-go/toml-9999 b/metadata/md5-cache/dev-go/toml-9999
index bcf98e93a6d8..b3a752380e37 100644
--- a/metadata/md5-cache/dev-go/toml-9999
+++ b/metadata/md5-cache/dev-go/toml-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=TOML parser for Golang with reflection
 EAPI=6
 HOMEPAGE=https://github.com/BurntSushi/toml
 LICENSE=WTFPL-2
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 785f10bbdb92..2c89ccf54230 100644
--- a/metadata/md5-cache/dev-go/twofactor-0_p20170917
+++ b/metadata/md5-cache/dev-go/twofactor-0_p20170917
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/qr:= >=dev-lang/go-1.8
+DEPEND=dev-go/qr:= >=dev-lang/go-1.9
 DESCRIPTION=Two-factor authentication library for Go
 EAPI=6
 HOMEPAGE=https://github.com/gokyle/twofactor
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=31db51c31f4c13e6867b17d4d452fa0d
diff --git a/metadata/md5-cache/dev-go/zglob-0_p20171230 b/metadata/md5-cache/dev-go/zglob-0_p20171230
index 9b84db23f74f..c28ccf1e1285 100644
--- a/metadata/md5-cache/dev-go/zglob-0_p20171230
+++ b/metadata/md5-cache/dev-go/zglob-0_p20171230
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Unix-optimized file globbing and directory walking for Go
 EAPI=6
 HOMEPAGE=https://github.com/mattn/go-zglob
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=ec2ccd1d7d49b24b039d2a9d297cc36f
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 640d8cc2f782..490a012aa519 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/language-docker-4.0.1 b/metadata/md5-cache/dev-haskell/language-docker-4.0.1
new file mode 100644
index 000000000000..d0029aab7a7a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-docker-4.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/free:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/language-docker#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/free:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/4.0.1
+SRC_URI=mirror://hackage/packages/archive/language-docker/4.0.1/language-docker-4.0.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b16a55467101ac8b690f44df897dc522
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4487d3bf0990..c8da308ed349 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
index ec7a889640b7..bfa1941b84f5 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
@@ -4,10 +4,10 @@ DESCRIPTION=OO database written in Java
 EAPI=6
 HOMEPAGE=http://www.cdegroot.com/software/db/
 IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ff0ad34c55009c58982b48d5cc99891f
+_md5_=731f517bc4815014c2bdd0632e7bae90
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
index 5e8e04c7c131..d34e2fbf02e4 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Sun's JavaBeans Activation Framework (JAF)
 EAPI=6
 HOMEPAGE=http://java.sun.com/products/javabeans/glasgow/jaf.html
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8e4149a5bf28ec4814dc4789c0d58ad9
+_md5_=b22d2e624f855bf303ccc88da7546f8c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 07c08547584c..313c79f76f09 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/go-1.10.1 b/metadata/md5-cache/dev-lang/go-1.10.1
new file mode 100644
index 000000000000..873466affcf6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install pretend test unpack
+DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=6
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.10.1
+SRC_URI=https://storage.googleapis.com/golang/go1.10.1.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f2ced59874e153bf6ed59e415c801e00
diff --git a/metadata/md5-cache/dev-lang/go-1.9.1 b/metadata/md5-cache/dev-lang/go-1.9.1
deleted file mode 100644
index 244cc9a56fcd..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install pretend test unpack
-DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=6
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.9.1
-SRC_URI=https://storage.googleapis.com/golang/go1.9.1.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e789b9a321d6ceb69b76ef96289a127f
diff --git a/metadata/md5-cache/dev-lang/go-1.9.2 b/metadata/md5-cache/dev-lang/go-1.9.2
deleted file mode 100644
index cc1bbdf5cb26..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install pretend test unpack
-DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=6
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.9.2
-SRC_URI=https://storage.googleapis.com/golang/go1.9.2.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=84b97e772f657146b0e673c3e5602875
diff --git a/metadata/md5-cache/dev-lang/go-1.9.3 b/metadata/md5-cache/dev-lang/go-1.9.3
deleted file mode 100644
index 5ca4d8102351..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install pretend test unpack
-DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=6
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.9.3
-SRC_URI=https://storage.googleapis.com/golang/go1.9.3.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e4dfdfc200b14f9a1bec33f3f347c0a7
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.28-r1 b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
index d17f8f5344c2..a16a55fb6f94 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.28-r1
+++ b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
@@ -9,4 +9,4 @@ LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.28.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99be00c4beca7577840743ad59f3fe4e
+_md5_=8021723ae37701af28f061466643111a
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.3-r1 b/metadata/md5-cache/dev-lang/perl-5.24.3-r1
index 043b48ed8382..1a220b741ff7 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.3-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.24.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-2/perl-5.24.3-patches-2.tar.xz mirror://gentoo/perl-5.24.3-patches-2.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-2.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9c2d26bf200648ac5f4d5ee5f470bb6
+_md5_=308d489476479246c091313c007ff3f4
diff --git a/metadata/md5-cache/dev-lang/php-5.6.34 b/metadata/md5-cache/dev-lang/php-5.6.34
index 5d1bccaabce7..30e761bad620 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.34
+++ b/metadata/md5-cache/dev-lang/php-5.6.34
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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
+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
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.34.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9be19b427f919f0938d76427fa863eb9
+_md5_=95703428b764aa12b942f0cdf46a4af2
diff --git a/metadata/md5-cache/dev-lang/php-7.0.28 b/metadata/md5-cache/dev-lang/php-7.0.28
index 108ad6d01aaf..61fa692a7c7c 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.28
+++ b/metadata/md5-cache/dev-lang/php-7.0.28
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
 SRC_URI=https://secure.php.net/distributions/php-7.0.28.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b6108957d0a8695896e8eecae132a4f
+_md5_=410d3c286f5c3111a6b8feb0d0f56d73
diff --git a/metadata/md5-cache/dev-lang/php-7.1.15 b/metadata/md5-cache/dev-lang/php-7.1.15
index c3db0eb6c2e1..9e59734e5e41 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.15
+++ b/metadata/md5-cache/dev-lang/php-7.1.15
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.15.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7b7b7f9c8df36bcfcb7b123bd5a7795
+_md5_=e800df0235aee9d3863a62ff3bb3946a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 533f1d296cf0..2dab29fa2218 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/http-fetcher-1.1.0-r1 b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
index 921dd998ec71..2bd018e190ff 100644
--- a/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
+++ b/metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for downloading files via HTTP using the GET method
 EAPI=6
 HOMEPAGE=http://http-fetcher.sourceforge.net
 IUSE=debug
-KEYWORDS=~alpha amd64 ~ppc ~x86
+KEYWORDS=alpha amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/http-fetcher/http_fetcher-1.1.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa4056dd8b14c7d5c207b479c985c74f
+_md5_=1e0a0206167dc8ddcb79cf46584a6e9b
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
index 48e2be9ed212..23cd0ceff52b 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=6
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.4.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72f93f9957407c1d4b3111bd32e3fd63
+_md5_=0a387cbf4a882fd21796220fc11a1ee7
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.13 b/metadata/md5-cache/dev-libs/libtasn1-4.13
index fae26977b42e..1dde8afcc4fc 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.13
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.13
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs valgrind 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 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=valgrind? ( dev-util/valgrind ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.13.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4b22bf0abe35af9596fb6f39eafc9254
+_md5_=ca4079d7b4bb20ee1857637750392533
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
index 21a90c56e041..9bd231f9ac50 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt API for storing passwords securely
 EAPI=6
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 IUSE=gnome-keyring
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.8.0.tar.gz -> qtkeychain-0.8.0.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fb650d5a96d209f95f1e7f55dd52d85
+_md5_=21129e4f4f553365349de89068a77c32
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
index 54f324ec1885..0986fc4189a7 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
 IUSE=test system-sqlite
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.13.0[extensions(+)] <dev-db/sqlite-3.21.0 ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.54.tar.gz https://github.com/kentnl-gentoo/DBD-SQLite/releases/download/1.54-patches-1/DBD-SQLite-1.54-patches-1.tar.xz mirror://gentoo/DBD-SQLite-1.54-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/DBD-SQLite-1.54-patches-1.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=53d0647eefc3a63b17223e8bc822b6f5
+_md5_=58b18e9d24dadd41ce9e7495e4d6e708
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 8bc5fb0a55d0..81f33f69da36 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index a33f55b3de9c..c277e77fe101 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-mongodb-1.3.3 b/metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
index 03d7f64553f3..6fe7ec63508b 100644
--- a/metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
+++ b/metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=MongoDB database driver for PHP
 EAPI=6
 HOMEPAGE=https://pecl.php.net/mongodb
 IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.8.2 >=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) 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 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mongodb-1.3.3.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4e74f28d79bbe288946247f2afb8f4a6
+_md5_=368f972094edec286959873027ae2568
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c09c9c4fbeb9..cfbc37de3ea5 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/cryptography-2.1.4 b/metadata/md5-cache/dev-python/cryptography-2.1.4
index 741be2384419..36717ecb338b 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.1.4
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] =dev-libs/openssl-1.0.2l-r1:0 >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-2.1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-2.1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] =dev-libs/openssl-1.0.2l-r1:0 >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.1.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e795858c18b7ba920e402564a97ee8ac
+_md5_=c69c0938ffeaef7af9be053e6a4ac7a5
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.4 b/metadata/md5-cache/dev-python/dbus-python-1.2.4
index b7367be9ea1e..d7508bef2fb4 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.4
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=MIT
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=sys-apps/dbus-1.6:= 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(+)] ) >=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 ) doc? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.4.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fd6b3bcd88be07ffe6aa3771d9148d7
+_md5_=75094ee7acd0e3da70cd754aee346085
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.1-r2 b/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
index 64048c622ad7..6b77843ab9ed 100644
--- a/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
+++ b/metadata/md5-cache/dev-python/nautilus-python-1.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Nautilus file manager
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/nautilus-python/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~alpha amd64 x86
+KEYWORDS=~alpha amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=gnome-base/nautilus-2.32[introspection] 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-python/1.1/nautilus-python-1.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e8795e997099b0a019ec483ed61ca6e
+_md5_=9de897a5b00ac84c36a0ce337cec5b57
diff --git a/metadata/md5-cache/dev-python/olefile-0.44 b/metadata/md5-cache/dev-python/olefile-0.44
index 8f4c059a0a70..8f5fb2495b13 100644
--- a/metadata/md5-cache/dev-python/olefile-0.44
+++ b/metadata/md5-cache/dev-python/olefile-0.44
@@ -4,11 +4,11 @@ DESCRIPTION=Python package to parse, read and write Microsoft OLE2 files
 EAPI=6
 HOMEPAGE=https://www.decalage.info/olefile
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=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://github.com/decalage2/olefile/releases/download/v0.44/olefile-0.44.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f18330e970c197dcde461c13feb9cbfb
+_md5_=ab8036dcc7b4338819545ff1368a7909
diff --git a/metadata/md5-cache/dev-python/pillow-4.3.0 b/metadata/md5-cache/dev-python/pillow-4.3.0
index c21da0490004..5dce44f1ab67 100644
--- a/metadata/md5-cache/dev-python/pillow-4.3.0
+++ b/metadata/md5-cache/dev-python/pillow-4.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=6
 HOMEPAGE=https://python-pillow.org/
 IUSE=doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/olefile[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(-)] imagequant? ( media-gfx/libimagequant:0 ) virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=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=test? ( tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-4.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf40715701d0ee855528c4a40324eabd
+_md5_=645e19c6fa84501beb23d302061b2c1e
diff --git a/metadata/md5-cache/dev-python/pyopenssl-17.5.0 b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
index dbb7e76b65af..f8b9dc007855 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-17.5.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the OpenSSL library
 EAPI=6
 HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-17.5.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89f16bb9622a176d40c7beb5f393a408
+_md5_=2d5853a6fdfe7cb880eff4907335c018
diff --git a/metadata/md5-cache/dev-python/rarfile-3.0 b/metadata/md5-cache/dev-python/rarfile-3.0
index e507fa4c84c8..1cde2aa8acd7 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.0
+++ b/metadata/md5-cache/dev-python/rarfile-3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Module for RAR archive reading
 EAPI=6
 HOMEPAGE=https://github.com/markokr/rarfile
 IUSE=+compressed python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=ISC
 RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) 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=mirror://pypi/r/rarfile/rarfile-3.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=14204258ffc29d7bd049e0281116212e
+_md5_=9c2ab150262063da7fbe2daba43a7207
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 81cc99674fbd..c26a71fe57bf 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.7 b/metadata/md5-cache/dev-ruby/actioncable-5.0.7
new file mode 100644
index 000000000000..afa08bbb146a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.0.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby23] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby24] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Integrated WebSockets for Rails
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby22] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby23] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby24] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9a4c0de1127931df6a6d78ce826224f0
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.3 b/metadata/md5-cache/dev-ruby/actioncable-5.1.3
deleted file mode 100644
index 7b0e3a157723..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.3:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7c8c07595b41e0be51cad124351167fb
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.1.2 b/metadata/md5-cache/dev-ruby/actioncable-5.1.6
similarity index 86%
rename from metadata/md5-cache/dev-ruby/actioncable-5.1.2
rename to metadata/md5-cache/dev-ruby/actioncable-5.1.6
index 575acc75a201..de56eab4db7d 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.1.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Integrated WebSockets for Rails
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.2:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby22] dev-ruby/nio4r:2[ruby_targets_ruby22] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby22] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby23] dev-ruby/nio4r:2[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.6:*[ruby_targets_ruby24] dev-ruby/nio4r:2[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7c8c07595b41e0be51cad124351167fb
+_md5_=5ae1df8a9d38997adcd154d6be5a2b01
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.7
similarity index 71%
rename from metadata/md5-cache/dev-ruby/actionmailer-5.1.2
rename to metadata/md5-cache/dev-ruby/actionmailer-5.0.7
index 9e3ef7e44826..e87eedfdd28e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e6d197f5915b3f8ba3d8fe0f87e782d2
+_md5_=472a9b54fac121779c962cb88dc094f4
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.3 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.6
similarity index 71%
rename from metadata/md5-cache/dev-ruby/actionmailer-5.1.3
rename to metadata/md5-cache/dev-ruby/actionmailer-5.1.6
index 9e836f602a84..4c8235acab24 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e6d197f5915b3f8ba3d8fe0f87e782d2
+_md5_=b687201c5561cbc418f35dc92c4263af
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.3 b/metadata/md5-cache/dev-ruby/actionpack-5.0.7
similarity index 56%
rename from metadata/md5-cache/dev-ruby/actionpack-5.1.3
rename to metadata/md5-cache/dev-ruby/actionpack-5.0.7
index f7879ffb3424..6e44c6a88799 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.3
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/railties-5.0.7[ruby_targets_ruby22] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bed061d7f7e984c646fff9484c0f80b1
+_md5_=71ff4b044a612fec0e468a4beecbb39c
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.2 b/metadata/md5-cache/dev-ruby/actionpack-5.1.6
similarity index 83%
rename from metadata/md5-cache/dev-ruby/actionpack-5.1.2
rename to metadata/md5-cache/dev-ruby/actionpack-5.1.6
index 9c4964d859ef..39a4b58f95ad 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/capybara-2.13:2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f7719e0b10b5f4a8e4b59ac60873f4a6
+_md5_=eb75a4ea2bd08ac7dd8029ad78d0e0cf
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.7 b/metadata/md5-cache/dev-ruby/actionview-5.0.7
new file mode 100644
index 000000000000..783cf4d4bcb2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-5.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/railties-5.0.7[ruby_targets_ruby22] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=33e6152bb4dfa01c1864241631797abd
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.3 b/metadata/md5-cache/dev-ruby/actionview-5.1.3
deleted file mode 100644
index 8b5f21a96437..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5c7c3a28549b091e1f4a5b7f8d294744
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.2 b/metadata/md5-cache/dev-ruby/actionview-5.1.6
similarity index 79%
rename from metadata/md5-cache/dev-ruby/actionview-5.1.2
rename to metadata/md5-cache/dev-ruby/actionview-5.1.6
index 7694a23d5164..f5456e37e1ec 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5c7c3a28549b091e1f4a5b7f8d294744
+_md5_=72cfa9ed8ed095096985d0289bae53c4
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.3 b/metadata/md5-cache/dev-ruby/activejob-5.0.7
similarity index 82%
rename from metadata/md5-cache/dev-ruby/activejob-5.1.3
rename to metadata/md5-cache/dev-ruby/activejob-5.0.7
index becb628f6360..c653d7701ab5 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activejob-5.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Job framework with pluggable queues
-EAPI=6
+EAPI=5
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3d3e186a12d5cc4adfd95a9b9d61a24a
+_md5_=3b0f6ddc17beedc593aa1353739e7ab3
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.1.2 b/metadata/md5-cache/dev-ruby/activejob-5.1.6
similarity index 82%
rename from metadata/md5-cache/dev-ruby/activejob-5.1.2
rename to metadata/md5-cache/dev-ruby/activejob-5.1.6
index 47de407a0819..fe35f577a46b 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activejob-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Job framework with pluggable queues
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3d3e186a12d5cc4adfd95a9b9d61a24a
+_md5_=fccfeef2c72dd4da0598ae8fd203b0b0
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.7 b/metadata/md5-cache/dev-ruby/activemodel-5.0.7
new file mode 100644
index 000000000000..d3b172c74812
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/railties:5.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/railties:5.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/railties:5.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=6dbea4c0a137c46a279a51ec994bd048
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.3 b/metadata/md5-cache/dev-ruby/activemodel-5.1.3
deleted file mode 100644
index dfbd249006c6..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/railties-5.1.3[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.1.3[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.1.3[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3968686599392970631f70bd25eceeed
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.2 b/metadata/md5-cache/dev-ruby/activemodel-5.1.6
similarity index 77%
rename from metadata/md5-cache/dev-ruby/activemodel-5.1.2
rename to metadata/md5-cache/dev-ruby/activemodel-5.1.6
index 21bf3b6e1b25..64b556cd9d3e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/railties-5.1.2[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.1.2[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.1.2[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/railties-5.1.6[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby22] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.1.6[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.1.6[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3968686599392970631f70bd25eceeed
+_md5_=5b678f15252f2f2986c83069661728ce
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.3 b/metadata/md5-cache/dev-ruby/activerecord-5.0.7
similarity index 72%
rename from metadata/md5-cache/dev-ruby/activerecord-5.1.3
rename to metadata/md5-cache/dev-ruby/activerecord-5.0.7
index f3fe0715065a..282064045f98 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby22] dev-ruby/arel:7.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] dev-ruby/arel:7.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] dev-ruby/arel:7.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby22] dev-ruby/arel:7.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] dev-ruby/arel:7.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] dev-ruby/arel:7.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a90d98fc29c4b9a0aa855a1aa2b065e0
+_md5_=6895c73e76306dba0af238b0b1c9e8da
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.2 b/metadata/md5-cache/dev-ruby/activerecord-5.1.6
similarity index 80%
rename from metadata/md5-cache/dev-ruby/activerecord-5.1.2
rename to metadata/md5-cache/dev-ruby/activerecord-5.1.6
index cf9afd564281..d6f475b57203 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a90d98fc29c4b9a0aa855a1aa2b065e0
+_md5_=770f870e81487a46840b23d5520ded7b
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.7 b/metadata/md5-cache/dev-ruby/activesupport-5.0.7
new file mode 100644
index 000000000000..c7131c964359
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] <dev-ruby/i18n-1:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] <dev-ruby/i18n-1:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] <dev-ruby/i18n-1:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] <dev-ruby/minitest-5.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] <dev-ruby/minitest-5.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] <dev-ruby/minitest-5.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=6
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] <dev-ruby/i18n-1:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] <dev-ruby/i18n-1:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] <dev-ruby/i18n-1:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4558c840ae8347da5e0c3d7ba3698b7f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.3 b/metadata/md5-cache/dev-ruby/activesupport-5.1.3
deleted file mode 100644
index caf4b328840f..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby22] >=dev-ruby/builder-3.1.0[ruby_targets_ruby22] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] <dev-ruby/minitest-5.4[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] <dev-ruby/minitest-5.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] <dev-ruby/minitest-5.4[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2b2d7dc9260afabca680fe995ff2fe79
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.2 b/metadata/md5-cache/dev-ruby/activesupport-5.1.6
similarity index 94%
rename from metadata/md5-cache/dev-ruby/activesupport-5.1.2
rename to metadata/md5-cache/dev-ruby/activesupport-5.1.6
index 03c035e0cabb..61a08b5b8ffd 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ccdb5a1c795b1be73afaccb758800fa9
+_md5_=0270d091506bde402e16fac6ee3389e7
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
new file mode 100644
index 000000000000..af567a6f1f57
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Provides plugin management for Ruby projects
+EAPI=6
+HOMEPAGE=https://github.com/ddfreyne/ddplugin/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1
+SRC_URI=mirror://rubygems/ddplugin-1.0.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a0fb4d306c8dfc0ea3437a3d45adb5e7
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
deleted file mode 100644
index 4dd148870aa7..000000000000
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
-EAPI=5
-HOMEPAGE=https://www.nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.8.1.tar.gz -> nokogiri-1.6.8.1-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=45fc7ad2a52978614a51360bfbff4119
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
deleted file mode 100644
index 5f5e33fd68ee..000000000000
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.2 dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby22] dev-ruby/rexical[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] dev-ruby/racc[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
-EAPI=5
-HOMEPAGE=https://www.nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.7.1.tar.gz -> nokogiri-1.7.1-git.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0aec44189e140f64cf138555f10b6e7c
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.2 b/metadata/md5-cache/dev-ruby/rails-5.0.7
similarity index 58%
rename from metadata/md5-cache/dev-ruby/rails-5.1.2
rename to metadata/md5-cache/dev-ruby/rails-5.0.7
index 350c539a3f13..7121d36b2d83 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-5.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/railties-5.1.2[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/railties-5.1.2[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/railties-5.1.2[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby22] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby22] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby22] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/railties-5.0.7[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=http://www.rubyonrails.org
 IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/railties-5.1.2[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/railties-5.1.2[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.2[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/railties-5.1.2[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby22] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby22] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby22] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/railties-5.0.7[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=5.1
-SRC_URI=mirror://rubygems/rails-5.1.2.gem
+SLOT=5.0
+SRC_URI=mirror://rubygems/rails-5.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b94666ac5949c051ccae0136bb745a2
+_md5_=8522b2c23ac1b76a0405a38e1ffbe66d
diff --git a/metadata/md5-cache/dev-ruby/rails-5.1.3 b/metadata/md5-cache/dev-ruby/rails-5.1.6
similarity index 59%
rename from metadata/md5-cache/dev-ruby/rails-5.1.3
rename to metadata/md5-cache/dev-ruby/rails-5.1.6
index 8a025470cc4b..d8c59a52dad1 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.1.3
+++ b/metadata/md5-cache/dev-ruby/rails-5.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/railties-5.1.3[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/railties-5.1.3[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/railties-5.1.3[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/railties-5.1.6[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/railties-5.1.6[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/railties-5.1.6[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=http://www.rubyonrails.org
 IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/railties-5.1.3[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/railties-5.1.3[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.3[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.3[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.3[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/railties-5.1.3[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby22] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby22] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/railties-5.1.6[ruby_targets_ruby22] >=dev-ruby/bundler-1.3[ruby_targets_ruby22] =dev-ruby/bundler-1*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby22] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby22] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby23] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby23] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/railties-5.1.6[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.6[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.6[ruby_targets_ruby24] ~dev-ruby/activerecord-5.1.6[ruby_targets_ruby24] ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/railties-5.1.6[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
-SRC_URI=mirror://rubygems/rails-5.1.3.gem
+SRC_URI=mirror://rubygems/rails-5.1.6.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b94666ac5949c051ccae0136bb745a2
+_md5_=1c3a12afb00b3f930f2708eba547e0c0
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.3 b/metadata/md5-cache/dev-ruby/railties-5.0.7
similarity index 72%
rename from metadata/md5-cache/dev-ruby/railties-5.1.3
rename to metadata/md5-cache/dev-ruby/railties-5.0.7
index f7baf87dd811..9b2f7a4590ba 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.3
+++ b/metadata/md5-cache/dev-ruby/railties-5.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-5.1.3[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.1.3[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.1.3[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-5.0.7[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.3[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.3[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=>=app-eselect/eselect-rails-0.22 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby22] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
-SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.3.tar.gz -> rails-5.1.3.tgz
+SLOT=5.0
+SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b078fe33e9f4120755afe5d7c5419b66
+_md5_=ce95a0a8c610f47bd1ebcc716d92e3ae
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.2 b/metadata/md5-cache/dev-ruby/railties-5.1.6
similarity index 77%
rename from metadata/md5-cache/dev-ruby/railties-5.1.2
rename to metadata/md5-cache/dev-ruby/railties-5.1.6
index a7102b433d97..b7f0639bad0a 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.2
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( ~dev-ruby/actionview-5.1.6[ruby_targets_ruby22] dev-ruby/mocha:0.14[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.1.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.1.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.6[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.6[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 RESTRICT=test
 SLOT=5.1
-SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
+SRC_URI=https://github.com/rails/rails/archive/v5.1.6.tar.gz -> rails-5.1.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b078fe33e9f4120755afe5d7c5419b66
+_md5_=7d951ee266ab0b7530cd7da07a920719
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.6 b/metadata/md5-cache/dev-ruby/rubygems-2.7.6
index 15222845efd8..0e1366e80ec7 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.6
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=6
 HOMEPAGE=https://rubygems.org/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ru
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=209ac58b3c243c350665ddd2726d36c5
+_md5_=2a7d3e8786201f7b0acfdb9c65d1bfb8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.6.4 b/metadata/md5-cache/dev-ruby/sanitize-4.6.4
new file mode 100644
index 000000000000..4282d3322f45
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby24] =dev-ruby/crass-1.0*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
+EAPI=6
+HOMEPAGE=https://github.com/rgrove/sanitize
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby22] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby24] =dev-ruby/crass-1.0*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] >=dev-ruby/nokogumbo-1.4:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=4
+SRC_URI=https://github.com/rgrove/sanitize/archive/v4.6.4.tar.gz -> sanitize-4.6.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2cffcb57892d6a0ef87f22e4c0e1ea54
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index eed2dd20b4e4..45381b067a13 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3 b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
index 6ee383094b40..deb7cf67bb82 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.14.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c6e3b6c5a5e11b4609acb031a00bdb1
+_md5_=bc31a6edfa2fc4292b8a2a9970c09152
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1 b/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
index 901a4cb8e2d4..15a2b0d34065 100644
--- a/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
+++ b/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated] !<dev-libs/g-wrap-1.9.8
 DESCRIPTION=An accumulation place for pure-scheme Guile modules
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/guile-lib/
-KEYWORDS=~alpha ~amd64 ~hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated]
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/guile-lib-0.2.5.1.tar.gz
-_md5_=d0ddb4af23239b6cadd164a1733915ed
+_md5_=9e1f540c1a79988cd28f7ab8d67f17c7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1405a55f3783..8dfc85238b51 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/bitcoin-tx-0.16.0 b/metadata/md5-cache/dev-util/bitcoin-tx-0.16.0
new file mode 100644
index 000000000000..7f64035a888c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Command-line Bitcoin transaction tool
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9b66491f9a76f7a59a344e1b213fa04a
diff --git a/metadata/md5-cache/dev-util/clair-2.0.1 b/metadata/md5-cache/dev-util/clair-2.0.1
index 990915253ba3..421075995266 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.1
+++ b/metadata/md5-cache/dev-util/clair-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Vulnerability Static Analysis for Containers
 EAPI=6
 HOMEPAGE=https://github.com/coreos/clair
@@ -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.1.tar.gz -> clair-2.0.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=570ddb7bc79ceb96c81580216891c4c3
diff --git a/metadata/md5-cache/dev-util/clair-2.0.2 b/metadata/md5-cache/dev-util/clair-2.0.2
index e09892651836..767e6c2c36fa 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.2
+++ b/metadata/md5-cache/dev-util/clair-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Vulnerability Static Analysis for Containers
 EAPI=6
 HOMEPAGE=https://github.com/coreos/clair
@@ -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.2.tar.gz -> clair-2.0.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=632fd048bdf51a4504473a64499dbaa3
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 9a5b50c4ba2b..adfcf98ec173 100644
--- a/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
+++ b/metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Clean all old container revisions from registry
 EAPI=6
 HOMEPAGE=https://gitlab.com/gitlab-org/docker-distribution-pruner
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 95127cecd2ff..4185770f5a9a 100644
--- a/metadata/md5-cache/dev-util/docker-ls-0.3.1
+++ b/metadata/md5-cache/dev-util/docker-ls-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Tools for browsing and manipulating docker registries
 EAPI=6
 HOMEPAGE=https://github.com/mayflower/docker-ls
@@ -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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _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 0d0c96e07061..39cc2ad49609 100644
--- a/metadata/md5-cache/dev-util/drone-0.7.3
+++ b/metadata/md5-cache/dev-util/drone-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
 DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a8b9c31b259bb01b1cc2cda281bfdf0d
diff --git a/metadata/md5-cache/dev-util/drone-0.8.4 b/metadata/md5-cache/dev-util/drone-0.8.4
index 5c2a04613485..08e1353d1d0f 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.4
+++ b/metadata/md5-cache/dev-util/drone-0.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
 DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/75150d4a429da6c95cb851bfecded03a50936675.tar.gz -> drone-0.8.4.tar.gz https://github.com/drone/drone-ui/archive/cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz -> github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz https://github.com/golang/protobuf/archive/925541529c1fa6821df4e44ce2723319eb2be768.tar.gz -> github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz https://github.com/golang/net/archive/0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz -> github.com-golang-net-0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=0de61f00118a93f6d19d4eff80fd698b
diff --git a/metadata/md5-cache/dev-util/drone-0.8.4_p20180216 b/metadata/md5-cache/dev-util/drone-0.8.4_p20180216
index 474e9d2eb487..ab53db5c0417 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.4_p20180216
+++ b/metadata/md5-cache/dev-util/drone-0.8.4_p20180216
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
 DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/ce3855812bb00dbf1993d8663b6100b272e104dd.tar.gz -> drone-0.8.4_p20180216.tar.gz https://github.com/drone/drone-ui/archive/cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz -> github.com-drone-drone-ui-cc079b1279f70e54f64cf0c14e1e531b6689232b.tar.gz https://github.com/golang/protobuf/archive/bbd03ef6da3a115852eaf24c8a1c46aeb39aa175.tar.gz -> github.com-golang-protobuf-bbd03ef6da3a115852eaf24c8a1c46aeb39aa175.tar.gz https://github.com/golang/net/archive/92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz -> github.com-golang-net-92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=52b85846a619965692b540c7cc26fb93
diff --git a/metadata/md5-cache/dev-util/drone-0.8.5 b/metadata/md5-cache/dev-util/drone-0.8.5
index d9420526908a..0f215dd90a09 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.5
+++ b/metadata/md5-cache/dev-util/drone-0.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs:= >=dev-lang/go-1.9
 DESCRIPTION=A Continuous Delivery platform built on Docker, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c6c62a6e507f35a30b3d92ef3e64f171
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 477fee797723..2e39f34e4ce2 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command-line interface for Drone
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=049e2d7b3a868a04cee607b5be8b11b8
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.3 b/metadata/md5-cache/dev-util/drone-cli-0.8.3
index 7b3976da28fd..41ecd5f3941d 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.3
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command-line interface for Drone
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
@@ -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.3.tar.gz -> drone-cli-0.8.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=de444807ba1ee5a058f8cf829e2fffa6
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.4 b/metadata/md5-cache/dev-util/drone-cli-0.8.4
index a1d9042907c0..ae9ea375d862 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.4
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command-line interface for Drone
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
@@ -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.4.tar.gz -> drone-cli-0.8.4.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=de444807ba1ee5a058f8cf829e2fffa6
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.5 b/metadata/md5-cache/dev-util/drone-cli-0.8.5
index 69b136e66ade..71861e05556e 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.5
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Command-line interface for Drone
 EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
@@ -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.5.tar.gz -> drone-cli-0.8.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1738f6448571ac9583dc5a0f7b28fe8d
diff --git a/metadata/md5-cache/dev-util/hadolint-1.3.0 b/metadata/md5-cache/dev-util/hadolint-1.3.0
deleted file mode 100644
index d5cdfdcc78e9..000000000000
--- a/metadata/md5-cache/dev-util/hadolint-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile Linter JavaScript API
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/hadolint
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?]
-SLOT=0/1.3.0
-SRC_URI=mirror://hackage/packages/archive/hadolint/1.3.0/hadolint-1.3.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fe3ff698bd49a18403f1c423c79e3b97
diff --git a/metadata/md5-cache/dev-util/hadolint-1.4.0 b/metadata/md5-cache/dev-util/hadolint-1.4.0
deleted file mode 100644
index 1b65cf2856b9..000000000000
--- a/metadata/md5-cache/dev-util/hadolint-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile Linter JavaScript API
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/hadolint
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-2.0.0:=[profile?] <=dev-haskell/optparse-applicative-0.14.0.0:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?]
-SLOT=0/1.4.0
-SRC_URI=mirror://hackage/packages/archive/hadolint/1.4.0/hadolint-1.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fe3ff698bd49a18403f1c423c79e3b97
diff --git a/metadata/md5-cache/dev-util/hadolint-1.6.1 b/metadata/md5-cache/dev-util/hadolint-1.6.1
new file mode 100644
index 000000000000..97d63e367b47
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hadolint-1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/dlist:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-3.0.0:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Dockerfile Linter JavaScript API
+EAPI=6
+HOMEPAGE=https://github.com/hadolint/hadolint
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/dlist:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-3.0.0:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.4.7:=[profile?]
+SLOT=0/1.6.1
+SRC_URI=mirror://hackage/packages/archive/hadolint/1.6.1/hadolint-1.6.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=27937e20f9bcbd156884af6a2c7a16af
diff --git a/metadata/md5-cache/dev-util/promu-0.1.0 b/metadata/md5-cache/dev-util/promu-0.1.0
index 6be48bfd9e59..a3844d1bc182 100644
--- a/metadata/md5-cache/dev-util/promu-0.1.0
+++ b/metadata/md5-cache/dev-util/promu-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Prometheus Utility Tool
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/promu
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 c150fbf4d82f..cd50b36a9c3b 100644
--- a/metadata/md5-cache/dev-util/promu-0.1.0_p20180227
+++ b/metadata/md5-cache/dev-util/promu-0.1.0_p20180227
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Prometheus Utility Tool
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/promu
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=e4fde6bdad2b8f6d46c99093fe92d4c2
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
index 5f20d4b54a20..ee2924ed87fb 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
+++ b/metadata/md5-cache/dev-util/pycharm-community-2017.3.3
@@ -3,11 +3,11 @@ DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
 RDEPEND=>=virtual/jre-1.8
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a781754ff9ec8098efa30e11565b00d
+_md5_=42afef125582f049f2b1709548137572
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.1 b/metadata/md5-cache/dev-util/pycharm-community-2018.1
new file mode 100644
index 000000000000..3b89d7164d39
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a781754ff9ec8098efa30e11565b00d
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3 b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
index c2439ebfd446..45df91e3d470 100644
--- a/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
@@ -3,11 +3,11 @@ DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
 EAPI=6
 HOMEPAGE=http://www.jetbrains.com/pycharm/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
 RDEPEND=>=virtual/jre-1.8 dev-python/pip
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb9e489ec7b18af895d6266774de887a
+_md5_=4bd6ba187c685606df1cdc6c1170a557
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.1 b/metadata/md5-cache/dev-util/pycharm-professional-2018.1
new file mode 100644
index 000000000000..8972f069ae3a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2018.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb9e489ec7b18af895d6266774de887a
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 7b38b7402f6f..dbea9aabe479 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-1.5.6 b/metadata/md5-cache/dev-vcs/git-lfs-1.5.6
index d40d1179b928..637d62507dd9 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-1.5.6
+++ b/metadata/md5-cache/dev-vcs/git-lfs-1.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=doc? ( app-text/ronn ) >=dev-lang/go-1.8
+DEPEND=doc? ( app-text/ronn ) >=dev-lang/go-1.9
 DESCRIPTION=command line extension and specification for managing large files with Git
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
@@ -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/v1.5.6.tar.gz -> git-lfs-1.5.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6135edc8dd995ea51f192d8222d48776
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.1.1 b/metadata/md5-cache/dev-vcs/git-lfs-2.1.1
index a64e34fd9553..10bc10bd1e5b 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.1.1
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.9
 DESCRIPTION=command line extension and specification for managing large files with Git
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
@@ -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.1.1.tar.gz -> git-lfs-2.1.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=0fdc807d24750ec4f07387f105af0fe3
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.2.1 b/metadata/md5-cache/dev-vcs/git-lfs-2.2.1
index 43bce9f9970c..d2aea8a9a1cc 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.2.1
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.9
 DESCRIPTION=command line extension and specification for managing large files with Git
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
@@ -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.2.1.tar.gz -> git-lfs-2.2.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=0fdc807d24750ec4f07387f105af0fe3
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.3.4 b/metadata/md5-cache/dev-vcs/git-lfs-2.3.4
index 2f5bf612b283..5bce21c5b03d 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.3.4
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.9
 DESCRIPTION=command line extension and specification for managing large files with Git
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
@@ -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.3.4.tar.gz -> git-lfs-2.3.4.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=73f0a2b76fabcdb5f1f298a08bb6e2f5
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-9999 b/metadata/md5-cache/dev-vcs/git-lfs-9999
index 438a45a509e9..80cadaf7ff0d 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-9999
+++ b/metadata/md5-cache/dev-vcs/git-lfs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.8.1:= doc? ( app-text/ronn ) >=dev-lang/go-1.9
 DESCRIPTION=command line extension and specification for managing large files with Git
 EAPI=6
 HOMEPAGE=https://git-lfs.github.com/
@@ -7,5 +7,5 @@ IUSE=+doc
 LICENSE=MIT BSD BSD-2 BSD-4 Apache-2.0
 RDEPEND=dev-vcs/git
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fdc807d24750ec4f07387f105af0fe3
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index d3ac44a5efd2..bfbf6591815e 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
index 1470947b24ff..38019536e23e 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37b19697ac27ddf4a39aec458fa06a70
+_md5_=61549dd214aaa6858f91127e516350d3
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 65a41062cc5b..2db7de33528d 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.3 b/metadata/md5-cache/mail-client/mutt-1.9.3
deleted file mode 100644
index 9f51bc9d1152..000000000000
--- a/metadata/md5-cache/mail-client/mutt-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=http://www.mutt.org/
-IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
-SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.3.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.3-patches-r0.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbfd6f5fe70e616089a69b79598a812f
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.4 b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
similarity index 96%
rename from metadata/md5-cache/mail-client/mutt-1.9.4
rename to metadata/md5-cache/mail-client/mutt-1.9.4-r1
index e25ab75a1d5b..11e29e81ffa9 100644
--- a/metadata/md5-cache/mail-client/mutt-1.9.4
+++ b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.3-patches-r0.tar.xz
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.4-patches-r1.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02c4b217ed6eec87e27c23805b3f9d3b
+_md5_=d5f65696d078bf8e4e07e0e14f43b853
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 0c6b2fbd0df2..112f3ad1b7e4 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 302f346b2af4..11b737c009ed 100644
--- a/metadata/md5-cache/mail-filter/postforward-1.1.0
+++ b/metadata/md5-cache/mail-filter/postforward-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/go:0 >=dev-lang/go-1.8
+DEPEND=dev-lang/go:0 >=dev-lang/go-1.9
 DESCRIPTION=Postfix Sender Rewriting Scheme forwarding agent
 EAPI=6
 HOMEPAGE=https://github.com/zoni/postforward
@@ -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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e5cbb34be973b88cf97793559e0dda9
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index fcef9174664c..1a844712dbb0 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/exim-4.90.1 b/metadata/md5-cache/mail-mta/exim-4.90.1
index 991a47e1ca78..a039b0ec7f76 100644
--- a/metadata/md5-cache/mail-mta/exim-4.90.1
+++ b/metadata/md5-cache/mail-mta/exim-4.90.1
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X elibc_glibc
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( ssl !gnutls ) dmarc? ( spf dkim ) pkcs11? ( ssl gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.90.1.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.90.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb8183754be0c7c6c8601f1585927569
+_md5_=e5dd223c95be29fed6b40adeefbaf0a2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index bc3fdf5af539..806acd73bee7 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/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
index 9d0b14aa8f5b..fce666c0a8f7 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=https://www.gimp.org/
 IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=daf9faa877c17559a2c1cfb2be55baed
+_md5_=0ec8c361666f7acb9d1cc159b9c73584
diff --git a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1 b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
index 72c02cd82f6e..887f408dad86 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
 IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( media-libs/jasper:= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.9/gimp-2.9.8.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7ab152faa898f1050324921ff26914f
+_md5_=74c132a635a09741ef8f77321f52e152
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.11.7 b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
index be134b2aeef3..c118e7e95ddf 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.11.7
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.11.7
@@ -3,9 +3,9 @@ DESCRIPTION=Palette quantization library that powers pngquant and other PNG opti
 EAPI=6
 HOMEPAGE=https://pngquant.org/lib/
 IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.11.7.tar.gz -> libimagequant-2.11.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2be785dfb6c1ed21142993c7c0a13a97
+_md5_=6c9108cc4a471615062a5d817b058f3a
diff --git a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3 b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
index a11270fa6127..6a223ebe66e5 100644
--- a/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
+++ b/metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Scanner Access Now Easy
 EAPI=6
 HOMEPAGE=http://www.sane-project.org
 IUSE=gimp gtk
-KEYWORDS=alpha amd64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/sane-backends gimp? ( media-gfx/gimp:2 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz
-_md5_=c52694e863dd62864a00b1fa2e64e2dc
+_md5_=7e125b9cfc2670281908c755045a6cbd
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index dab683078a1a..e995ebb3208f 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/babl-0.1.44 b/metadata/md5-cache/media-libs/babl-0.1.44
index 84b1897f4c5e..729f909a87fb 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.44
+++ b/metadata/md5-cache/media-libs/babl-0.1.44
@@ -4,9 +4,9 @@ DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=6
 HOMEPAGE=http://www.gegl.org/babl/
 IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.44.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7de4eeadd8e9a1f851854218f5102452
+_md5_=4ae05c0483a88bd7c7308809b1dc5c28
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index 23035747f395..7205741c9425 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -7,4 +7,4 @@ IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags
 LICENSE=LGPL-3
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	25b08efef07cea6bcd45b8c6dcce2782	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd2909262c11a048c27c22508483beb8
+_md5_=4ae05c0483a88bd7c7308809b1dc5c28
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index e9fa67e5c03c..0ebcd2ea3d0e 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.6
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=media-libs/freetype-2.7.1[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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a305c50be65df645ee492c88aa789f29
+_md5_=3aee0bf4536004e60f14c49baeba49b2
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r2 b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
index 3f3496c014d7..642f7d88d8f4 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r2
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d683d096afffde9b0bc675b9a7aa5eba
+_md5_=553ffcc137435f70499385d15bac271b
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r4 b/metadata/md5-cache/media-libs/gegl-0.2.0-r4
index c47913b72362..5926d29168a3 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r4
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dfb0de40bec34a9b372fd3037e7d2b1d
+_md5_=989501f1ee8453df64e1678549a225ba
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r5 b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
index 3436bc5444fa..1cd26faa5db0 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r5
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98768381e1801725d921589acc0df93e
+_md5_=7fb45695095129ad612e70a9812c5a41
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0 b/metadata/md5-cache/media-libs/gegl-0.3.0
index 50812ae759c1..e95e99326f08 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c09a8dcca13b9ce0c645aeabc45d8e9
+_md5_=fefc20da6ff540aa072c205fb19697e1
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0-r1 b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
index 7ee884cc598d..4f5d635b3d8d 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e9d8389938896d7b6ae105266852480
+_md5_=76c81028943541456c4cbd4a42168064
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.20 b/metadata/md5-cache/media-libs/gegl-0.3.20
index 2a77a23155c9..fb2a4a0cdfc4 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.20
+++ b/metadata/md5-cache/media-libs/gegl-0.3.20
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.30 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr:= ) media-libs/libpng:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.20.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e864afd8964d5a0ac2aaf044b6e51b50
+_md5_=e29c120995b78f38d1f141ce51082c08
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.24 b/metadata/md5-cache/media-libs/gegl-0.3.24
index 98d409b50bd3..40839dbb8021 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.24
+++ b/metadata/md5-cache/media-libs/gegl-0.3.24
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.24.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79d5d54a68d1fe21bc6b51b2c3029fb1
+_md5_=69d70905b752e66a928b7242db7009f2
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.26 b/metadata/md5-cache/media-libs/gegl-0.3.26
index a4d583532e7f..25fac32072ff 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.26
+++ b/metadata/md5-cache/media-libs/gegl-0.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a71a8791158f4dfd937f32d2f6c4202
+_md5_=b31a898e3b8ae5313f61f2280dffeaa6
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.28 b/metadata/md5-cache/media-libs/gegl-0.3.28
index 3492bf7d231f..9e11bc502131 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.28
+++ b/metadata/md5-cache/media-libs/gegl-0.3.28
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.42 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.28.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e8910c7e6378a5d63264dc2d2ae1b2c
+_md5_=c029b7ab148aed15f7c83e2bfc5d9e67
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.30 b/metadata/md5-cache/media-libs/gegl-0.3.30
index 41267b377675..cc924f28aaaf 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.30
+++ b/metadata/md5-cache/media-libs/gegl-0.3.30
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.44 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.30.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36dcede8fad63626b967634fdfde996d
+_md5_=8fd3176120754d8188aad230b6b9ce69
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.8 b/metadata/md5-cache/media-libs/gegl-0.3.8
index fe2763128d7b..b6ac1607130d 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.8
+++ b/metadata/md5-cache/media-libs/gegl-0.3.8
@@ -11,4 +11,4 @@ REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.8.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87e2796662d2785ccb12c1b71313eb44
+_md5_=1a93ca5bd4104c18fe189e71019c0193
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.3 b/metadata/md5-cache/media-libs/gexiv2-0.10.3
index a3c9cd096548..1853e9e2127f 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.3
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5c36e0e381e6e8c9c7b929994928dcd
+_md5_=248c55c770bd0fe2bb96b1c4e50f2f33
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
index 7413bcdc62f1..6fd54ede43cb 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0f9bc2a70f48028f4a8f69d92c99e5f
+_md5_=c19564108061606cdbea81828e2671df
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.5-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.5-r1
index 1568a9b55828..c185ea1ab911 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.5-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.5.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c91adb8ccdaabef4b4ec59f2784727e
+_md5_=aba2ec16226c889ce29ff53fa8df8fa6
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.6 b/metadata/md5-cache/media-libs/gexiv2-0.10.6
index 97c0d94f561a..c5ebd03e0725 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.6
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.6
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.6.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4c025f0277ec710ee19a3d24746b9f8
+_md5_=6a2fca85e215356c40cd9ac129faa3fb
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.8 b/metadata/md5-cache/media-libs/gexiv2-0.10.8
index 603d3e99529e..0cb8e096eabc 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.8
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.8
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ad055cf26fd9b9a43859eaebd77a077
+_md5_=0bc442efa49ad882f7e6fed2d56e7721
diff --git a/metadata/md5-cache/media-libs/giflib-5.1.4-r1 b/metadata/md5-cache/media-libs/giflib-5.1.4-r2
similarity index 100%
rename from metadata/md5-cache/media-libs/giflib-5.1.4-r1
rename to metadata/md5-cache/media-libs/giflib-5.1.4-r2
diff --git a/metadata/md5-cache/media-libs/glew-2.1.0 b/metadata/md5-cache/media-libs/glew-2.1.0
index 3cd0bec8a533..8d7cc71bfb19 100644
--- a/metadata/md5-cache/media-libs/glew-2.1.0
+++ b/metadata/md5-cache/media-libs/glew-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Extension Wrangler Library
 EAPI=6
 HOMEPAGE=http://glew.sourceforge.net/
 IUSE=doc static-libs 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXmu-1.1.1-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/2.1
 SRC_URI=mirror://sourceforge/glew/glew-2.1.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=230c29f776c80289a35a18fec50d2400
+_md5_=3aba70514b7821a07158c7ad7286a894
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.3.0 b/metadata/md5-cache/media-libs/libmypaint-1.3.0
index e6b847b99197..cd583f05ab86 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.3.0
+++ b/metadata/md5-cache/media-libs/libmypaint-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for making brushstrokes
 EAPI=6
 HOMEPAGE=https://github.com/mypaint/libmypaint
 IUSE=+gegl introspection nls openmp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl media-libs/gegl:0.3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( sys-devel/gcc:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
 SLOT=0/0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.3.0/libmypaint-1.3.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e0615c71c9123ee8f745f15cd91eff5
+_md5_=fa7e0f9caa39d04a258c64f4e892decd
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1 b/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
index 0a0f9577bf98..9a2241416770 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
+++ b/metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for making brushstrokes
 EAPI=6
 HOMEPAGE=https://github.com/mypaint/libmypaint
 IUSE=+gegl introspection nls openmp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl media-libs/gegl:0.3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( sys-devel/gcc:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.2
 SLOT=0/0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.3.0-beta.1/libmypaint-1.3.0-beta.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=959589200ad13db03ace3c1aca748402
+_md5_=f459c3bb884998f4bd035e0d0e6c787e
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.0.9 b/metadata/md5-cache/media-libs/libopenraw-0.0.9
index d3b73689beb4..700703fee154 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.0.9
+++ b/metadata/md5-cache/media-libs/libopenraw-0.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=5
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=virtual/jpeg:0 dev-libs/libxml2 gtk? ( >=dev-libs/glib-2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.0.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1d19b5cb70f42724ec68ae433570f67
+_md5_=e813fe30a99499d46fbd3b75e468178f
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.0 b/metadata/md5-cache/media-libs/libopenraw-0.1.0
index de6e4b2e3aaa..b3ef044e71a7 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.0
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=934557bdc5970aaa61908518d131fc78
+_md5_=2c9c05679b482680d4678bf4d72849cf
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.1 b/metadata/md5-cache/media-libs/libopenraw-0.1.1
index ba7170d5b9c3..8f82df66c7e4 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.1
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85a7df6454ee3cb92583f91f452b84b3
+_md5_=e4ee266aa111e618a06cdcdef237286a
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.2 b/metadata/md5-cache/media-libs/libopenraw-0.1.2
index c7bfae6e5e2b..38a20f3e628e 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.2
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=301744b90b569daa12a0de6ee79bc3e7
+_md5_=b659f578c3e2231bef6f9783cbf6953b
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.4 b/metadata/md5-cache/media-libs/libraw-0.18.4
index 590bc827fdf8..e1c8d49c4728 100644
--- a/metadata/md5-cache/media-libs/libraw-0.18.4
+++ b/metadata/md5-cache/media-libs/libraw-0.18.4
@@ -4,10 +4,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=6
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=demosaic examples jpeg jpeg2k +lcms openmp 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 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[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(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[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/16
 SRC_URI=https://www.libraw.org/data/LibRaw-0.18.4.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz )
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8c1b5b35d9e98eaad5bdf6b29d103590
+_md5_=6f55c883d1b9452b4abdb3cb2f1ec2a3
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.7 b/metadata/md5-cache/media-libs/libraw-0.18.7
index fded64280d5b..3a078771e68e 100644
--- a/metadata/md5-cache/media-libs/libraw-0.18.7
+++ b/metadata/md5-cache/media-libs/libraw-0.18.7
@@ -4,10 +4,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=6
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=demosaic examples jpeg jpeg2k +lcms openmp 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 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[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(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[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/16
 SRC_URI=https://www.libraw.org/data/LibRaw-0.18.7.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz )
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89028924974477f058206b88a8426a2f
+_md5_=3c86f58337673c4ee3c09351e2feb732
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.8 b/metadata/md5-cache/media-libs/libraw-0.18.8
index 64c2e052a172..15072d2458c4 100644
--- a/metadata/md5-cache/media-libs/libraw-0.18.8
+++ b/metadata/md5-cache/media-libs/libraw-0.18.8
@@ -4,10 +4,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=6
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=demosaic examples jpeg jpeg2k +lcms openmp 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 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[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(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[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/16
 SRC_URI=https://www.libraw.org/data/LibRaw-0.18.8.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz )
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d72fb952cd271369870ae533b7d191b
+_md5_=9b4bce6516273bb02293da3708b8a39a
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4c561b97c051..befc40db62c7 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/kapacitor-1.4.1-r1 b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
index b891f0551315..f2aa79a1a60f 100644
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Monitoring, processing and alerting on time series data
 EAPI=6
 HOMEPAGE=https://www.influxdata.com
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.5.3 b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
index 04cab58f5007..fdc36a3de711 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.5.3
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=The plugin-driven server agent for collecting & reporting metrics.
 EAPI=6
 HOMEPAGE=https://github.com/influxdata/telegraf
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b54b7f17f9595169a36370f714fdae7f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index bfd784d51ca9..787898f11a3d 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/coredns-0.9.9 b/metadata/md5-cache/net-dns/coredns-0.9.9
deleted file mode 100644
index fce803fbecb8..000000000000
--- a/metadata/md5-cache/net-dns/coredns-0.9.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A DNS server that chains middleware
-EAPI=6
-HOMEPAGE=https://github.com/coredns/coredns
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coredns/coredns/archive/v0.9.9.tar.gz -> coredns-0.9.9.tar.gz https://github.com/mholt/caddy/archive/c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz -> github.com-mholt-caddy-c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz https://github.com/miekg/dns/archive/822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz -> github.com-miekg-dns-822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz https://github.com/golang/net/archive/c73622c77280266305273cb545f54516ced95b93.tar.gz -> github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz https://github.com/golang/text/archive/6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz -> github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=375ca0f8446c341b09208246c80ca976
diff --git a/metadata/md5-cache/net-dns/coredns-1.0.5 b/metadata/md5-cache/net-dns/coredns-1.0.5
index acb2da00e3b5..8985747b34c7 100644
--- a/metadata/md5-cache/net-dns/coredns-1.0.5
+++ b/metadata/md5-cache/net-dns/coredns-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A DNS server that chains middleware
 EAPI=6
 HOMEPAGE=https://github.com/coredns/coredns
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=4df4e3662120c35fa0675792e4b5e99f
diff --git a/metadata/md5-cache/net-dns/coredns-1.1.1 b/metadata/md5-cache/net-dns/coredns-1.1.1
new file mode 100644
index 000000000000..05e078a3d191
--- /dev/null
+++ b/metadata/md5-cache/net-dns/coredns-1.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A DNS server that chains middleware
+EAPI=6
+HOMEPAGE=https://github.com/coredns/coredns
+KEYWORDS=~amd64
+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	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=9ccbc17666a0215f6c74c03b1c4d0e99
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7
index 0a9e9bf80bc4..5510e6fa7662 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test
-DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
 EAPI=6
 HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.7.tar.gz -> dnscrypt-proxy-2.0.7.tar.gz
-_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=f7d4c565e9f541fd36719252f86b25c5
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 7c538ca9250b..b3bf3d95de6f 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 636f11fd519e..675aa347151d 100644
--- a/metadata/md5-cache/net-fs/docker-volume-netshare-0.34
+++ b/metadata/md5-cache/net-fs/docker-volume-netshare-0.34
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Docker NFS, AWS EFS, Ceph & Samba/CIFS Volume Plugin
 EAPI=6
 HOMEPAGE=https://github.com/ContainX/docker-volume-netshare
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	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 9d2f9e19dced..d1ae976448a2 100644
--- a/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+++ b/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Docker NFS, AWS EFS, Ceph & Samba/CIFS Volume Plugin
 EAPI=6
 HOMEPAGE=https://github.com/ContainX/docker-volume-netshare
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=1b275fa2f7fa851d687a0f26ecac67dd
diff --git a/metadata/md5-cache/net-fs/mc-0_pre20180209 b/metadata/md5-cache/net-fs/mc-0_pre20180209
index 0d3cb5c4632f..4ce6f1764f29 100644
--- a/metadata/md5-cache/net-fs/mc-0_pre20180209
+++ b/metadata/md5-cache/net-fs/mc-0_pre20180209
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
 EAPI=6
 HOMEPAGE=https://github.com/minio/mc
@@ -9,5 +9,5 @@ RDEPEND=!!app-misc/mc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/3987f1405aa7a0faaff019cc3b55da4ded9ebbe5.tar.gz -> mc-0_pre20180209.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=5072c7971f9e5926f8f7df261a039add
diff --git a/metadata/md5-cache/net-fs/mc-0_pre20180325 b/metadata/md5-cache/net-fs/mc-0_pre20180325
index 163919b23431..fdba86fd0e45 100644
--- a/metadata/md5-cache/net-fs/mc-0_pre20180325
+++ b/metadata/md5-cache/net-fs/mc-0_pre20180325
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
 EAPI=6
 HOMEPAGE=https://github.com/minio/mc
@@ -9,5 +9,5 @@ RDEPEND=!!app-misc/mc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/mc/archive/da5c19848d1e82a24eddb453b01e83d4a0660de4.tar.gz -> mc-0_pre20180325.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=7095d72f04ab75f62422c52eaca1d0ec
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180209 b/metadata/md5-cache/net-fs/minio-0_pre20180209
index d4763723a6d8..31a0599e7568 100644
--- a/metadata/md5-cache/net-fs/minio-0_pre20180209
+++ b/metadata/md5-cache/net-fs/minio-0_pre20180209
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=An Amazon S3 compatible object storage server
 EAPI=6
 HOMEPAGE=https://github.com/minio/minio
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/289457568c2c812604484ae9b4efeca0f33aac2c.tar.gz -> minio-0_pre20180209.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=9cbe68f8ceb92e027afd9a055eceb39d
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180330 b/metadata/md5-cache/net-fs/minio-0_pre20180330
index 60dc840ee6f7..0e2c3e347d74 100644
--- a/metadata/md5-cache/net-fs/minio-0_pre20180330
+++ b/metadata/md5-cache/net-fs/minio-0_pre20180330
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=An Amazon S3 compatible object storage server
 EAPI=6
 HOMEPAGE=https://github.com/minio/minio
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/804a4f9c159ecef7093585a5b577e03a382af50e.tar.gz -> minio-0_pre20180330.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d535af8ed18a7ecd42e93d97b8313cb4
diff --git a/metadata/md5-cache/net-fs/sshfs-2.10-r1 b/metadata/md5-cache/net-fs/sshfs-2.10-r1
index fbd6003460db..0c08c2bd83fc 100644
--- a/metadata/md5-cache/net-fs/sshfs-2.10-r1
+++ b/metadata/md5-cache/net-fs/sshfs-2.10-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-fs/fuse-2.6.0_pre3:0 >=dev-libs/glib-2.4.2 virtual/pkgconfig
 DESCRIPTION=Fuse-filesystem utilizing the sftp service
 EAPI=6
 HOMEPAGE=https://github.com/libfuse/sshfs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-2.6.0_pre3:0 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-2.10/sshfs-2.10.tar.gz
-_md5_=dfb3a3395ceb7e1fc94e2d332200e6fb
+_md5_=bbf170c1503e5eb63b36e5c9fdb3ced0
diff --git a/metadata/md5-cache/net-fs/sshfs-3.3.1 b/metadata/md5-cache/net-fs/sshfs-3.3.1
index ae49cee826f4..a568960d5f50 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.3.1
+++ b/metadata/md5-cache/net-fs/sshfs-3.3.1
@@ -3,10 +3,10 @@ DEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 virtual/pkgconfig >=dev-util/
 DESCRIPTION=Fuse-filesystem utilizing the sftp service
 EAPI=6
 HOMEPAGE=https://github.com/libfuse/sshfs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.3.1/sshfs-3.3.1.tar.xz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b1ab4d06f18692493fee9ab3137d1170
+_md5_=ded32a94a2b7cc68d5326d6c3e2c4cec
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 9242d5dd36e9..c16c290a2a1d 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.7 b/metadata/md5-cache/net-irc/irssi-1.0.7
index 8de10fb14715..ef1f74016d31 100644
--- a/metadata/md5-cache/net-irc/irssi-1.0.7
+++ b/metadata/md5-cache/net-irc/irssi-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=+perl selinux socks5 +proxy libressl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~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 ~arm64 ~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=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.7/irssi-1.0.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=484d79800a3a0fac5d23b86ce2b39fb0
+_md5_=7e745777bb48c9bf29b0e874c31deff7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 248fc9a4d250..c8d32c81fe96 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/libbitcoinconsensus-0.16.0 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0
new file mode 100644
index 000000000000..ce666d4506ca
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Bitcoin Core consensus library
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f642a6712ebb29476e406ab96b630f49
diff --git a/metadata/md5-cache/net-libs/libident-0.32-r1 b/metadata/md5-cache/net-libs/libident-0.32-r1
index b76a8b67d418..260154aa9589 100644
--- a/metadata/md5-cache/net-libs/libident-0.32-r1
+++ b/metadata/md5-cache/net-libs/libident-0.32-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A small library to interface to the Ident protocol server
 EAPI=6
 HOMEPAGE=http://www.simphalempin.com/dev/libident/
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://people.via.ecp.fr/~rem/libident/libident-0.32.tar.bz2
-_md5_=9905f0d39c1737d8901723ccd68d80ea
+_md5_=cc3ca36e0db80332e0f0d0ef13fe5fb1
diff --git a/metadata/md5-cache/net-libs/libnatpmp-20150609 b/metadata/md5-cache/net-libs/libnatpmp-20150609
index 2b45ec7cc2f5..69d2db71ef5b 100644
--- a/metadata/md5-cache/net-libs/libnatpmp-20150609
+++ b/metadata/md5-cache/net-libs/libnatpmp-20150609
@@ -3,9 +3,9 @@ DESCRIPTION=An alternative protocol to UPnP IGD specification
 EAPI=5
 HOMEPAGE=http://miniupnp.free.fr/libnatpmp.html
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20150609.tar.gz -> libnatpmp-20150609.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=663d08567cf911858a54f579b86d8918
+_md5_=c754c8ac02d04e34fa6ab162d9728b66
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 6db27f5f273e..d92f97c8af25 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/aria2-1.33.1 b/metadata/md5-cache/net-misc/aria2-1.33.1
index abf9909b4cff..9105662522f6 100644
--- a/metadata/md5-cache/net-misc/aria2-1.33.1
+++ b/metadata/md5-cache/net-misc/aria2-1.33.1
@@ -4,7 +4,7 @@ DESCRIPTION=A download utility with segmented downloading with BitTorrent suppor
 EAPI=6
 HOMEPAGE=https://aria2.github.io/
 IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
 REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5a50a7048c5b74dd4ae6f72bc1eba7b4
+_md5_=3f64ddf7c5c22b3a86045b50c826100e
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0 b/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0
index 2eb4e1f8d021..9d1c8c320010 100644
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0
+++ b/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Calico Networking for CNI
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/cni-plugin
@@ -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.0.tar.gz -> calico-cni-plugin-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/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.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/bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz -> github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.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/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.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/c893efa28eb45626cdaa76c9f653b62488858837.tar.gz -> github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.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/c63959043fbfe61db5795781c7a6c848cf2cbe0d.tar.gz -> github.com-projectcalico-libcalico-go-c63959043fbfe61db5795781c7a6c848cf2cbe0d.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/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/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/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/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/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/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/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-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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=6c5492b14066ac66c3c510705eb22141
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 428a7ca9cccc..689981358618 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Calico Networking for CNI
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/cni-plugin
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=35499cccb402ad913d803c02c156336d
diff --git a/metadata/md5-cache/net-misc/calicoctl-1.5.0 b/metadata/md5-cache/net-misc/calicoctl-1.5.0
index 8575a0e0a260..9a28cf2ff7a9 100644
--- a/metadata/md5-cache/net-misc/calicoctl-1.5.0
+++ b/metadata/md5-cache/net-misc/calicoctl-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=CLI to manage Calico network and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/calicoctl
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 9332ec22f80e..ae21c2620d63 100644
--- a/metadata/md5-cache/net-misc/calicoctl-2.0.0
+++ b/metadata/md5-cache/net-misc/calicoctl-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=CLI to manage Calico network and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/calicoctl
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=bb41e587792a69963b2b37e2a1bb3e10
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.6.0 b/metadata/md5-cache/net-misc/cni-plugins-0.6.0
index 702b60d116e9..5a0b5b703ef5 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.6.0
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Standard networking plugins for container networking
 EAPI=6
 HOMEPAGE=https://github.com/containernetworking/plugins
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.6.0.tar.gz -> cni-plugins-0.6.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2d896ecbe63bf84f379043eade8c62c6
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.0 b/metadata/md5-cache/net-misc/cni-plugins-0.7.0
index 276473dcbcf8..896e19701937 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.0
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Standard networking plugins for container networking
 EAPI=6
 HOMEPAGE=https://github.com/containernetworking/plugins
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.0.tar.gz -> cni-plugins-0.7.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=b57e4d4159debe0d68ac2aec511f6363
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 a8d009e1b213..088c9c98fc05 100644
--- a/metadata/md5-cache/net-misc/drive-0.3.9.1
+++ b/metadata/md5-cache/net-misc/drive-0.3.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Google Drive client for the commandline
 EAPI=6
 HOMEPAGE=https://github.com/odeke-em/drive
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=7fd6ffb697fc26a24225e4e34c4f9ee7
diff --git a/metadata/md5-cache/net-misc/felix-2.5.1 b/metadata/md5-cache/net-misc/felix-2.5.1
index affd84161d87..cedc55e9de60 100644
--- a/metadata/md5-cache/net-misc/felix-2.5.1
+++ b/metadata/md5-cache/net-misc/felix-2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/felix
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2ac9d64ecc45c4262985027f9635e3ed
diff --git a/metadata/md5-cache/net-misc/felix-3.0.1 b/metadata/md5-cache/net-misc/felix-3.0.1
index 84d4c5c05f8f..9f1b6d0c95d6 100644
--- a/metadata/md5-cache/net-misc/felix-3.0.1
+++ b/metadata/md5-cache/net-misc/felix-3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/felix
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.0.1.tar.gz -> felix-3.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/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.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/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/32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz -> github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.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/48d644b006ba26f1793bffc46396e981801078e3.tar.gz -> github.com-ipfs-go-log-48d644b006ba26f1793bffc46396e981801078e3.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/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.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/f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz -> github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz https://github.com/onsi/gomega/archive/c893efa28eb45626cdaa76c9f653b62488858837.tar.gz -> github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.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/7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz -> github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz https://github.com/projectcalico/typha/archive/0bba94171368573d2a936e02454b1762ff7fba7f.tar.gz -> github.com-projectcalico-typha-0bba94171368573d2a936e02454b1762ff7fba7f.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/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/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/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/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz -> github.com-vishvananda-netlink-3ff4c2196115d804aa1c747781ad2b2a5c73e140.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.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/d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz -> github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz https://github.com/golang/net/archive/3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz -> github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz -> github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.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-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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=2d3ea63c7483e43e17dc195ee2e17c2d
diff --git a/metadata/md5-cache/net-misc/felix-3.0.2 b/metadata/md5-cache/net-misc/felix-3.0.2
index 2aa6f5b9cb2a..484b3338ded9 100644
--- a/metadata/md5-cache/net-misc/felix-3.0.2
+++ b/metadata/md5-cache/net-misc/felix-3.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
 EAPI=6
 HOMEPAGE=https://github.com/projectcalico/felix
@@ -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.0.2.tar.gz -> felix-3.0.2.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/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/32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.tar.gz -> github.com-go-ini-ini-32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a.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/0e2a17b81af445147a78d94a45d4398c4008c219.tar.gz -> github.com-ipfs-go-log-0e2a17b81af445147a78d94a45d4398c4008c219.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/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/f40a49d81e5c12e90400620b6242fb29a8e7c9d9.tar.gz -> github.com-onsi-ginkgo-f40a49d81e5c12e90400620b6242fb29a8e7c9d9.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/db37fa5964ade72399b2ac8201123b8623256d75.tar.gz -> github.com-opentracing-opentracing-go-db37fa5964ade72399b2ac8201123b8623256d75.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/a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz -> github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz https://github.com/projectcalico/typha/archive/4308ae102ebdfd52d38ac7a267b5494be1079d05.tar.gz -> github.com-projectcalico-typha-4308ae102ebdfd52d38ac7a267b5494be1079d05.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/6e453822d85ef5721799774b654d4d02fed62afb.tar.gz -> github.com-vishvananda-netlink-6e453822d85ef5721799774b654d4d02fed62afb.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/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/7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz -> github.com-golang-sys-7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.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/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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=227e311b97538eef96e7ed657faf90c3
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.2 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.2
new file mode 100644
index 000000000000..b4c7bf9bdeac
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenVPN plugin
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31ab6a331ed741592c8f38edbda7fb80
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.3.3 b/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
index 470e5d965fb9..a2fc7965a445 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Nextcloud themed desktop client
 EAPI=6
 HOMEPAGE=https://github.com/nextcloud/client_theming
 IUSE=doc dolphin nautilus samba +sftp shibboleth test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.3.3.tar.xz https://github.com/nextcloud/client_theming/archive/v2.3.3.tar.gz -> nextcloud-client-2.3.3.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbee075457cdb1902a0ae91363518054
+_md5_=482995943b31a33c1c3281552bc6b126
diff --git a/metadata/md5-cache/net-misc/rclone-1.39 b/metadata/md5-cache/net-misc/rclone-1.39
index 5acbeaf520fa..218f7ed273e0 100644
--- a/metadata/md5-cache/net-misc/rclone-1.39
+++ b/metadata/md5-cache/net-misc/rclone-1.39
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A program to sync files to and from various cloud storage providers
 EAPI=6
 HOMEPAGE=https://rclone.org/
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncw/rclone/archive/v1.39.tar.gz -> rclone-1.39.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-9999 b/metadata/md5-cache/net-misc/rclone-9999
index fb71a0b6aa34..cb5acb91616b 100644
--- a/metadata/md5-cache/net-misc/rclone-9999
+++ b/metadata/md5-cache/net-misc/rclone-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A program to sync files to and from various cloud storage providers
 EAPI=6
 HOMEPAGE=https://rclone.org/
 LICENSE=MIT
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.8.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.8.0-r2
index c5faa18752af..c2ab2e7d266a 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.8.0-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.8.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
 IUSE=+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.19* ) drm? ( x11-libs/libdrm ) ) xinerama? ( x11-libs/libXinerama ) dri3? ( x11-proto/dri3proto ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.8.0.tar.gz -> tigervnc-1.8.0.tar.gz https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 )
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ac0f3de5b941c9eca021392e06b433e
+_md5_=32244cf8449cef6969111aa117d3e941
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.03.20 b/metadata/md5-cache/net-misc/youtube-dl-2018.03.20
index 9481214ec894..6bbdaebfd8ef 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.03.20
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.03.20
@@ -4,11 +4,11 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=6
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=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(-)] 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://youtube-dl.org/downloads/2018.03.20/youtube-dl-2018.03.20.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c95d17b3ee9606122fbffdd9f9be4467
+_md5_=593df2462814f4338b1310bc50348d38
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 178f4ef9f502..9822ca52c137 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/bitcoin-cli-0.16.0 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0
new file mode 100644
index 000000000000..08f023a49b01
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitcoind
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= dev-libs/univalue:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=54778d6c8c916214b755ed5c8872ad1d
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
new file mode 100644
index 000000000000..99552d4a9194
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) dev-qt/linguist-tools:5 knots? ( gnome-base/librsvg media-gfx/imagemagick[png] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6291f0a203191163586bda83a86e0cee
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.16.0 b/metadata/md5-cache/net-p2p/bitcoind-0.16.0
new file mode 100644
index 000000000000..7fce3fdf63f1
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.16.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= virtual/bitcoin-leveldb !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=d89616bd9e05ff6ab6499df1306b9cc0
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6
new file mode 100644
index 000000000000..5ee023213af8
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=6
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.8.6.tar.gz -> cpuminer-opt-3.8.6.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ffb002741956a23c2873e063e6d2616b
diff --git a/metadata/md5-cache/net-p2p/go-ethereum-1.8.2 b/metadata/md5-cache/net-p2p/go-ethereum-1.8.2
index d8c3e736cdfb..7f448dd5fdd3 100644
--- a/metadata/md5-cache/net-p2p/go-ethereum-1.8.2
+++ b/metadata/md5-cache/net-p2p/go-ethereum-1.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/go:= opencl? ( virtual/opencl ) >=dev-lang/go-1.8
+DEPEND=dev-lang/go:= opencl? ( virtual/opencl ) >=dev-lang/go-1.9
 DESCRIPTION=Official golang implementation of the Ethereum protocol
 EAPI=6
 HOMEPAGE=https://github.com/ethereum/go-ethereum
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ LGPL-3+
 RDEPEND=dev-lang/go:= opencl? ( virtual/opencl )
 SLOT=0
 SRC_URI=https://github.com/ethereum/go-ethereum/archive/v1.8.2.tar.gz -> go-ethereum-1.8.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f
 _md5_=d3f2b5919b20d9e3f9efcdcaa5d14a1c
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.38 b/metadata/md5-cache/net-p2p/syncthing-0.14.38
index 4cfef0261c5e..100b692b6c97 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.38
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.38
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=6
 HOMEPAGE=https://syncthing.net
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1d0897b498037558ff9aeb45adf2cf43
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.40 b/metadata/md5-cache/net-p2p/syncthing-0.14.40
index 26a701f40d0f..feeddb8556ab 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.40
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.40
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=6
 HOMEPAGE=https://syncthing.net
@@ -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.40.tar.gz -> syncthing-0.14.40.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8a63acf65047fd7fcbfdeb30e76801f3
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.44 b/metadata/md5-cache/net-p2p/syncthing-0.14.44
index cc7c6ebde68d..221f04bcd5b4 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.44
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=6
 HOMEPAGE=https://syncthing.net
@@ -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.44.tar.gz -> syncthing-0.14.44.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=543b4941b763914a1307a86e3e2c8722
diff --git a/metadata/md5-cache/net-p2p/transmission-2.93 b/metadata/md5-cache/net-p2p/transmission-2.93
index 2e2828ad4cc1..0a3298c0f62b 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.93
+++ b/metadata/md5-cache/net-p2p/transmission-2.93
@@ -4,11 +4,11 @@ DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=6
 HOMEPAGE=http://www.transmissionbt.com/
 IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= )
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=818d8f94b560d25bebba42f17b40e5a2
+_md5_=1fcffb8290c31929bc1170fabbf61556
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 21cbbe70d49b..f4f504e017f1 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 b881fd1a38a4..f96b9c243a78 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.8
+DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.9
 DESCRIPTION=An obfuscating proxy supporting Tor's pluggable transport protocol obfs4
 EAPI=6
 HOMEPAGE=https://github.com/Yawning/obfs4
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 5ef870a0b951..0b069fd91752 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.8
+DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.9
 DESCRIPTION=An obfuscating proxy supporting Tor's pluggable transport protocol obfs4
 EAPI=6
 HOMEPAGE=https://github.com/Yawning/obfs4
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2f89ba1fff8ab6fe33c7266528582433
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-9999 b/metadata/md5-cache/net-proxy/obfs4proxy-9999
index c4fa89e63f4c..bacafaaa4565 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-9999
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.8
+DEPEND=dev-go/ed25519 dev-go/go-crypto dev-go/go-net dev-go/goptlib dev-go/siphash >=dev-lang/go-1.9
 DESCRIPTION=An obfuscating proxy supporting Tor's pluggable transport protocol obfs4
 EAPI=6
 HOMEPAGE=https://github.com/Yawning/obfs4
 LICENSE=BSD
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b20f0a3cb102a30d8deebed299573683
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 74185a6bbb3d..44708f8cea46 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/python-wifi-0.5.0-r3 b/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
index 5b28a2ca1ce6..6aa1b2b53bbd 100644
--- a/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
+++ b/metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[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=Provides r/w access to a wireless network card's capabilities using the Linux Wireless Extensions
+DESCRIPTION=Provides r/w access to a wireless network card's capabilities
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/python-wifi
 IUSE=examples python_targets_python2_7
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1 examples? ( GPL-2 )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/python-wifi.berlios/python-wifi-0.5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1187ec8d74d8594efe97d50405728b00
+_md5_=3775e13a8bbc345049d24690fe78746b
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index ab2c51fe132b..9ec02729d073 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
index 8b9528ccded1..ea84069a2a00 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and usable calculator for power users
 EAPI=6
 HOMEPAGE=http://speedcrunch.org/
 IUSE=doc l10n_ar l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_en-US l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_he l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sv l10n_tr l10n_uz l10n_vi l10n_zh-CN
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qthelp:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.0.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d654d13232bb858d525a91e92b7265f
+_md5_=62870e7931aed813a573ce345e490223
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 5706f6eba128..b39f609cbf78 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
index 4fb284ea0a11..e7dfa574087b 100644
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+++ b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Creates an "Electronics" desktop menu
 EAPI=5
 HOMEPAGE=http://www.gpleda.org/
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-macos
+KEYWORDS=amd64 ~arm64 ppc ppc64 sparc x86 ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d7c0b823c97a89995c978bfccbd5311
+_md5_=30577284512c7d0260175aad8ab1ce50
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7 b/metadata/md5-cache/sci-electronics/kicad-4.0.7
index 46f801ef8af0..a2884525a83c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-4.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Electronic Schematic and PCB design tools.
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
 IUSE=debug doc examples github i18n libressl minimal +python l10n_bg l10n_ca l10n_cs l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_ko l10n_nl l10n_pl l10n_pt l10n_ru l10n_sk l10n_sl l10n_sv l10n_zh-CN python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
 RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-libs/boost-1.61[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa sys-libs/zlib x11-libs/cairo sci-electronics/electronics-menu
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz !minimal? ( http://downloads.kicad-pcb.org/libraries/kicad-footprints-4.0.7.tar.gz http://downloads.kicad-pcb.org/libraries/kicad-library-4.0.7.tar.gz ) i18n? ( https://github.com/KiCad/kicad-i18n/archive/4.0.7.tar.gz -> kicad-4.0.7-i18n.tar.gz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a098bbdee6b35a8a2422e4790af1359f
+_md5_=6eed31d4dcedae624e0a41a39c9b3762
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2 b/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
index 5b9fe0751c1b..0c9ff2a286cd 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3 x11-proto/
 DESCRIPTION=general-purpose circuit simulation program
 EAPI=6
 HOMEPAGE=http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26c0b3a814494f720c49cb8c526b8352
+_md5_=fa8be8513697901fbb54385ebcb984b9
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index c62729ed9742..3e2987afb0e6 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r2 b/metadata/md5-cache/sci-libs/szip-2.1-r2
index 563b62409edd..7da8971ab5ca 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1-r2
+++ b/metadata/md5-cache/sci-libs/szip-2.1-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=6
 HOMEPAGE=http://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3dd73322f826f3f3d75caf66d096a98
+_md5_=d09f2ba773c1cc65563880958f79c90f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 70c3ea53ad64..ef407365937b 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.3 b/metadata/md5-cache/sys-apps/dstat-0.7.3
index 8bba5e4b8aec..397c63daae97 100644
--- a/metadata/md5-cache/sys-apps/dstat-0.7.3
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.3
@@ -3,11 +3,11 @@ DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat
 EAPI=6
 HOMEPAGE=http://dag.wieers.com/home-made/dstat/
 IUSE=wifi doc examples python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=wifi? ( 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(-)] net-wireless/python-wifi )
 REQUIRED_USE=wifi? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/dstat/archive/0.7.3.tar.gz -> dstat-0.7.3.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=37e57f93ea621f24b525ccfb1331e616
+_md5_=45581a4aa2befa2619893755e1ef2426
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.2 b/metadata/md5-cache/sys-apps/haveged-1.9.2
deleted file mode 100644
index bc153816b536..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=5
-HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dff0f9062cb6dbee5bc309824b1c12d
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
index 9cd46f126c39..42ff3b147402 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
 EAPI=6
 HOMEPAGE=http://www.issihosts.com/haveged/
-IUSE=selinux
+IUSE=selinux static-libs
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-3+
 RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b3b7808138e8c0f52fefb1bdde5d9d61
+_md5_=0e789d6e23dd0ac3c3df2bd8bffbe33a
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
index 16a2f2af361f..aa2fa31e38ce 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PCMCIA userspace utilities for Linux
 EAPI=6
 HOMEPAGE=https://packages.qa.debian.org/pcmciautils
 IUSE=debug staticsocket
-KEYWORDS=~amd64 ~arm ~ppc ~sh ~x86
+KEYWORDS=amd64 ~arm ~ppc ~sh ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/modutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0783416770daaaa08cc5d5405598010e
+_md5_=1673b01306cc14ac282cddbd5855d5d4
diff --git a/metadata/md5-cache/sys-apps/setserial-2.17-r5 b/metadata/md5-cache/sys-apps/setserial-2.17-r5
index 5141b2cf2eef..e70ea485b19e 100644
--- a/metadata/md5-cache/sys-apps/setserial-2.17-r5
+++ b/metadata/md5-cache/sys-apps/setserial-2.17-r5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Configure your serial ports with it
 EAPI=6
 HOMEPAGE=http://setserial.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://tsx-11.mit.edu/pub/linux/sources/sbin/setserial-2.17.tar.gz ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/setserial-2.17.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d888234031ed5e155141c4156412d9f8
+_md5_=c4b7403dbfa29f9d784acf52233a42f8
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.3 b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
index 936e15a6bd18..7062387d463f 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.3
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
@@ -3,10 +3,10 @@ DESCRIPTION=A timer-based entropy generator
 EAPI=5
 HOMEPAGE=http://www.vanheusden.com/te/
 IUSE=debug selinux
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45ea54546278014d13d48e68c65ca5df
+_md5_=0f6f89927e4eff68467aeb59f4899e4f
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index b22b2f6b8aef..1043259e9b15 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-r2 b/metadata/md5-cache/sys-auth/docker_auth-1.3-r2
index 9de0923fe291..bc5ea850dc65 100644
--- a/metadata/md5-cache/sys-auth/docker_auth-1.3-r2
+++ b/metadata/md5-cache/sys-auth/docker_auth-1.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker Registry 2 authentication server
 EAPI=6
 HOMEPAGE=https://github.com/cesanta/docker_auth
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cesanta/docker_auth/archive/1.3.tar.gz -> docker_auth-1.3.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/bbf380d59635bf267fc8a8df03d6d261c448ee3c.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-bbf380d59635bf267fc8a8df03d6d261c448ee3c.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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=28eede4160051c4d7a5e203cb1c778b7
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index bff517f6ca0c..15b4a1917880 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.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.0
index 0dc7035f2ce3..aaab61be368e 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes API server
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5
index 32ffd9b1ac67..463b6d0616d3 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes API server
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
index 192af582bfca..7e1300421096 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes API server
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0
index 932b4960186f..8836b27a1ea0 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Controller Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5
index 6e79fafad7b1..39bf89665c75 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Controller Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
index 0a916ad84d9a..c528a6a9dbad 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Controller Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.0
index dea96a99954a..14e59588aad4 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Proxy service
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.5
index 8cffab383346..c1e54912bb50 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Proxy service
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
index 9101f7eaace0..40eb1898812c 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Proxy service
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0
index 92abc89f3e56..6443ecb68a61 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Scheduler
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5
index a45973d2f802..a998ec4f5ab6 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Controller Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
index 5e52bbb4bb1b..9905562264dc 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Controller Manager
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.0 b/metadata/md5-cache/sys-cluster/kubectl-1.10.0
index ef908bdbda9b..71cfdec8a632 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.5 b/metadata/md5-cache/sys-cluster/kubectl-1.9.5
index 1f276c636687..2913380a7f11 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.6 b/metadata/md5-cache/sys-cluster/kubectl-1.9.6
index 6732c4a5e33a..eca38e6bc352 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.0 b/metadata/md5-cache/sys-cluster/kubelet-1.10.0
index 313f8ec8b614..a0553c66d9b1 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.10.0
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Node Agent
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.0.tar.gz -> kubernetes-1.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.5 b/metadata/md5-cache/sys-cluster/kubelet-1.9.5
index 4979af261dea..cdeba519f7e7 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.5
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Node Agent
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.5.tar.gz -> kubernetes-1.9.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.6 b/metadata/md5-cache/sys-cluster/kubelet-1.9.6
index 1b548067d685..d0c9f326bb12 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.6
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=Kubernetes Node Agent
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.6.tar.gz -> kubernetes-1.9.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.25.0 b/metadata/md5-cache/sys-cluster/minikube-0.25.0
index d7b51c187af2..a3ff264bcc4a 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.25.0
+++ b/metadata/md5-cache/sys-cluster/minikube-0.25.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( 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-lang/go-1.8
+DEPEND=dev-go/go-bindata || ( 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-lang/go-1.9
 DESCRIPTION=Single Node Kubernetes Cluster
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
@@ -10,5 +10,5 @@ RDEPEND=>=sys-cluster/kubectl-1.9.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v0.25.0.tar.gz -> minikube-0.25.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=ceff1ab5ac1f2dfc744172ce8b3dca91
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.25.2 b/metadata/md5-cache/sys-cluster/minikube-0.25.2
index 07e60f53a80f..3842d7c68773 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.25.2
+++ b/metadata/md5-cache/sys-cluster/minikube-0.25.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( 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-lang/go-1.8
+DEPEND=dev-go/go-bindata || ( 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-lang/go-1.9
 DESCRIPTION=Single Node Kubernetes Cluster
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
@@ -10,5 +10,5 @@ RDEPEND=>=sys-cluster/kubectl-1.9.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v0.25.2.tar.gz -> minikube-0.25.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=35130a72fcea133b05cf7dde622965aa
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.4.2 b/metadata/md5-cache/sys-cluster/teleport-2.4.2
index 71d55809f0b7..b88576a3ae90 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.4.2
+++ b/metadata/md5-cache/sys-cluster/teleport-2.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.8.3 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=app-arch/zip >=dev-lang/go-1.8.3 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
 EAPI=6
 HOMEPAGE=https://gravitational.com/teleport
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.4.2.tar.gz -> teleport-2.4.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d32056e406d894c816fa7d9b637a8c8f
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.4.5 b/metadata/md5-cache/sys-cluster/teleport-2.4.5
index 4e6e45f9ca18..148377760a0f 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.4.5
+++ b/metadata/md5-cache/sys-cluster/teleport-2.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.9.2 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=app-arch/zip >=dev-lang/go-1.9.2 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
 EAPI=6
 HOMEPAGE=https://gravitational.com/teleport
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.4.5.tar.gz -> teleport-2.4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f20926bd80b171f2357252da805d8a8a
diff --git a/metadata/md5-cache/sys-cluster/teleport-2.5.2 b/metadata/md5-cache/sys-cluster/teleport-2.5.2
index 8d3ca25cb4ca..5c69a4008585 100644
--- a/metadata/md5-cache/sys-cluster/teleport-2.5.2
+++ b/metadata/md5-cache/sys-cluster/teleport-2.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.9.2 >=dev-lang/go-1.8 virtual/pkgconfig
+DEPEND=app-arch/zip >=dev-lang/go-1.9.2 >=dev-lang/go-1.9 virtual/pkgconfig
 DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
 EAPI=6
 HOMEPAGE=https://gravitational.com/teleport
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/gravitational/teleport/archive/v2.5.2.tar.gz -> teleport-2.5.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ace4e4fa4abf6834b0be08bc4f6517f6
diff --git a/metadata/md5-cache/sys-cluster/teleport-9999 b/metadata/md5-cache/sys-cluster/teleport-9999
index 128f4eac05ae..96dca0b685ff 100644
--- a/metadata/md5-cache/sys-cluster/teleport-9999
+++ b/metadata/md5-cache/sys-cluster/teleport-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.7 >=dev-lang/go-1.8 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=app-arch/zip >=dev-lang/go-1.7 >=dev-lang/go-1.9 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern SSH server for teams managing distributed infrastructure
 EAPI=6
 HOMEPAGE=https://gravitational.com/teleport
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	25b08efef07cea6bcd45b8c6dcce2782	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	25b08efef07cea6bcd45b8c6dcce2782	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dbb8c36978f83f3d47b57562599223b8
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
index bedb0f5a7e05..b9917204e318 100644
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.4
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A ZooKeeper personality for etcd
 EAPI=6
 HOMEPAGE=https://github.com/coreos/zetcd
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=c3dd77f41b8f3fefaabf253ce9656d62
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e797a651942f..9617e562e6af 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 b158e6a0ccd9..cf9ada5b158b 100644
--- a/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
+++ b/metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip dev-db/go-etcd:= dev-libs/go-fuse:= >=dev-lang/go-1.8
+DEPEND=app-arch/unzip dev-db/go-etcd:= dev-libs/go-fuse:= >=dev-lang/go-1.9
 DESCRIPTION=Use etcd as a FUSE filesystem
 EAPI=5
 HOMEPAGE=https://github.com/xetorthio/etcd-fs
@@ -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	51a1f13e065f1cff4507685d9cc268c7
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f
 _md5_=8c37f1592cdfe09d8f0172871044a224
diff --git a/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517 b/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
index 2eee4c1e41f3..9f3e2abedb7d 100644
--- a/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
+++ b/metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-db/go-etcd:= dev-libs/go-fuse:= >=dev-lang/go-1.8
+DEPEND=dev-db/go-etcd:= dev-libs/go-fuse:= >=dev-lang/go-1.9
 DESCRIPTION=Use etcd as a FUSE filesystem
 EAPI=6
 HOMEPAGE=https://github.com/xetorthio/etcd-fs
@@ -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	51a1f13e065f1cff4507685d9cc268c7
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f
 _md5_=25de71962140ae9daf701f1be0012b2d
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.1 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
index 6550afd57249..320acb2bf0d1 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
@@ -4,9 +4,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=6
 HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rvoicilas/inotify-tools/archive/3.20.1.tar.gz -> inotify-tools-3.20.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3301b311e1777aaa7e8912e0dc38a745
+_md5_=9ccd3bd5e7da3618e1724d2b52a1348e
diff --git a/metadata/md5-cache/sys-fs/tmsu-0.6.1 b/metadata/md5-cache/sys-fs/tmsu-0.6.1
index 0d464a63a2f4..82a1402d7b58 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.6.1
+++ b/metadata/md5-cache/sys-fs/tmsu-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-sqlite3 dev-lang/go dev-libs/go-fuse >=dev-lang/go-1.8
+DEPEND=dev-go/go-sqlite3 dev-lang/go dev-libs/go-fuse >=dev-lang/go-1.9
 DESCRIPTION=Files tagger and virtual tag-based filesystem
 EAPI=6
 HOMEPAGE=https://github.com/oniony/TMSU/wiki
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
 _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 2f8e3e8dfdbe..b02d428f6fae 100644
--- a/metadata/md5-cache/sys-fs/tmsu-0.7.0
+++ b/metadata/md5-cache/sys-fs/tmsu-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-sqlite3 dev-lang/go dev-libs/go-fuse >=dev-lang/go-1.8
+DEPEND=dev-go/go-sqlite3 dev-lang/go dev-libs/go-fuse >=dev-lang/go-1.9
 DESCRIPTION=Files tagger and virtual tag-based filesystem
 EAPI=6
 HOMEPAGE=https://github.com/oniony/TMSU/wiki
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1
 _md5_=3ca20d7277f52566bb2eea2cf1fc89d3
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 9b05d5b10ac5..6a5f35654e93 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.32 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.32
new file mode 100644
index 000000000000..b134bed41e30
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.32
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-37.base.tar.xz mirror://gentoo/genpatches-4.14-37.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-37.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=5a0e2f32590794d8b6472a38378e5ee9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.15
new file mode 100644
index 000000000000..404b68fd2484
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.15 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-18.base.tar.xz mirror://gentoo/genpatches-4.15-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-18.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dd8a81ff9e7feae28e3214521f3c3a9d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.126 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.126
new file mode 100644
index 000000000000..db35d317e044
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.126
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.126
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-128.base.tar.xz mirror://gentoo/genpatches-4.4-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-128.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a9ebbb33c049e061de2b586ccf0272e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.92 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.92
new file mode 100644
index 000000000000..d8fb7f64da76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.92
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.92
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-95.base.tar.xz mirror://gentoo/genpatches-4.9-95.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-95.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=3160a8cb8c72d4bd7b3de3bae2aa2cb1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 351c916d8b1f..b98304da0cfc 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.91 b/metadata/md5-cache/sys-libs/libstatgrab-0.91
index 9abe3803bf44..fd29e42eaf96 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.91
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.91
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to provide access to statistics about the system on which it'
 EAPI=5
 HOMEPAGE=http://www.i-scream.org/libstatgrab/
 IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~x86
 LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.91.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8fe1b1c954b76dca52490d22ba46c9e0
+_md5_=774846f8252e73898567f8bccfc65509
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 15699dea5bfe..fe46a3625746 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.28 b/metadata/md5-cache/sys-power/acpid-2.0.28
index a3e4e42f43b1..2fcc4445f3e0 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.28
+++ b/metadata/md5-cache/sys-power/acpid-2.0.28
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for Advanced Configuration and Power Interface
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/acpid2
 IUSE=selinux
-KEYWORDS=amd64 ia64 x86
+KEYWORDS=amd64 ~arm64 ia64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.28.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6a52f2af589888985a85c3a09762597d
+_md5_=3b0339d818c27a64e86e61a62888f788
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r1 b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
index 4d69d25f6b24..b63ce9c95b0d 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8-r1
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
 EAPI=6
 HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a0cb0915cbb63720fbc92f43cd8e97bb
+_md5_=4feae6f13aacd183c0d17c9a58b7cd53
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 7d944d730bc5..bf68ffbfa8ee 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 3b6da3dd460c..fa56f351815e 100644
--- a/metadata/md5-cache/sys-process/ctop-0.5.1
+++ b/metadata/md5-cache/sys-process/ctop-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Top-like interface for container-metrics
 EAPI=6
 HOMEPAGE=https://ctop.sh https://github.com/bcicen/ctop
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=2dc35b92aadb4bd393dd5a55eae02f7a
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 3ff30b9727b8..0bac6b68b792 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.2.3 b/metadata/md5-cache/www-apps/gitea-1.2.3
index 3364cf860275..29387efd0f1e 100644
--- a/metadata/md5-cache/www-apps/gitea-1.2.3
+++ b/metadata/md5-cache/www-apps/gitea-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=A painless self-hosted Git service, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/go-gitea/gitea
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/archive/v1.2.3.tar.gz -> gitea-1.2.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=31699566e49a339e23303be8b82d2de1
diff --git a/metadata/md5-cache/www-apps/gitea-1.3.0 b/metadata/md5-cache/www-apps/gitea-1.3.0
index 5aa7953208b0..f2317f4ca3a5 100644
--- a/metadata/md5-cache/www-apps/gitea-1.3.0
+++ b/metadata/md5-cache/www-apps/gitea-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=A painless self-hosted Git service, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/go-gitea/gitea
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/archive/v1.3.0.tar.gz -> gitea-1.3.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=03704a9ba6fff247dbc7380b019e2dde
diff --git a/metadata/md5-cache/www-apps/gitea-1.3.1 b/metadata/md5-cache/www-apps/gitea-1.3.1
index 1dbd708be56c..327a6755e855 100644
--- a/metadata/md5-cache/www-apps/gitea-1.3.1
+++ b/metadata/md5-cache/www-apps/gitea-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
 DESCRIPTION=A painless self-hosted Git service, written in Go
 EAPI=6
 HOMEPAGE=https://github.com/go-gitea/gitea
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/archive/v1.3.1.tar.gz -> gitea-1.3.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=a76983bcd19a794adca4fd14a39d4297
diff --git a/metadata/md5-cache/www-apps/hugo-0.37.1 b/metadata/md5-cache/www-apps/hugo-0.37.1
index 5fdd355720c2..57e08448e5f0 100644
--- a/metadata/md5-cache/www-apps/hugo-0.37.1
+++ b/metadata/md5-cache/www-apps/hugo-0.37.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A Fast and Flexible Static Site Generator built with love in Go
 EAPI=6
 HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.37.1.tar.gz -> hugo-0.37.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/563aadc53c53292c4c1def1b0a547be498bba83e.tar.gz -> github.com-alecthomas-chroma-563aadc53c53292c4c1def1b0a547be498bba83e.tar.gz https://github.com/bep/gitmap/archive/de8030ebafb76c6e84d50ee6d143382637c00598.tar.gz -> github.com-bep-gitmap-de8030ebafb76c6e84d50ee6d143382637c00598.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/7dad53304f9614c1c365755c1176a8e876fee3e8.tar.gz -> github.com-fortytw2-leaktest-7dad53304f9614c1c365755c1176a8e876fee3e8.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/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/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/a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz -> github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz https://github.com/muesli/smartcrop/archive/1db484956b9ef929344e51701299a017beefdaaa.tar.gz -> github.com-muesli-smartcrop-1db484956b9ef929344e51701299a017beefdaaa.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/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz -> github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz -> github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.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/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.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/12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7.tar.gz -> github.com-golang-image-12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7.tar.gz https://github.com/golang/net/archive/136a25c244d3019482a795d728110278d6ba09a4.tar.gz -> github.com-golang-net-136a25c244d3019482a795d728110278d6ba09a4.tar.gz https://github.com/golang/sync/archive/fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz -> github.com-golang-sync-fd80eb99c8f653c847d294a001bdf2a3a6f768f5.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	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=b663fd8dad88fe3f82d1d25a01a28add
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.14 b/metadata/md5-cache/www-apps/nikola-7.8.14
new file mode 100644
index 000000000000..23177ea40179
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nikola-7.8.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/docutils-0.12[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=A static website and blog generator
+EAPI=6
+HOMEPAGE=https://getnikola.com/
+IUSE=assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
+RDEPEND=>=dev-python/docutils-0.12[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/blinker-1.3[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/doit-0.29.0[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/logbook-0.7.0[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/lxml-3.3.5[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/mako-1.0[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/markdown-2.4.0[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/natsort-3.5.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/piexif-1.0.3[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/pygments-1.6[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/PyRSS2Gen-1.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/python-dateutil-2.4[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/setuptools-20.3[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-2.2.0[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/unidecode-0.04.16[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/yapsy-1.11.223[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/pillow[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/cloudpickle[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(-)] assets? ( >=dev-python/webassets-0.10.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(-)] ) charts? ( >=dev-python/pygal-2.0.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(-)] ) ghpages? ( >=dev-python/ghp-import-0.4.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(-)] ) hyphenation? ( >=dev-python/pyphen-0.9.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(-)] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,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(-)] ) jinja? ( >=dev-python/jinja-2.7.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(-)] ) watchdog? ( ~dev-python/watchdog-0.8.3[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(-)] ) webmedia? ( >=dev-python/micawber-0.3.0[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(-)] ) websocket? ( ~dev-python/ws4py-0.3.4[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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.14.tar.gz
+_eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=257bac238b31e65d830b673af113e480
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index e13da14d9233..25a8de98e799 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.11 b/metadata/md5-cache/www-plugins/browserpass-2.0.11
index 5f1fcbae6a73..f29e6ac19371 100644
--- a/metadata/md5-cache/www-plugins/browserpass-2.0.11
+++ b/metadata/md5-cache/www-plugins/browserpass-2.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-crypt/gnupg dev-go/twofactor:= dev-go/zglob:= >=dev-lang/go-1.8
+DEPEND=app-crypt/gnupg dev-go/twofactor:= dev-go/zglob:= >=dev-lang/go-1.9
 DESCRIPTION=WebExtension host binary for pass, a UNIX password manager
 EAPI=6
 HOMEPAGE=https://github.com/dannyvankooten/browserpass
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-crypt/gnupg
 SLOT=0
 SRC_URI=https://github.com/dannyvankooten/browserpass/archive/2.0.11.tar.gz -> browserpass-2.0.11.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=1ca4fed78c0dd5a3f20194308a0b0358
diff --git a/metadata/md5-cache/www-plugins/browserpass-2.0.13 b/metadata/md5-cache/www-plugins/browserpass-2.0.13
index b759812200d2..2a75ef22d2ec 100644
--- a/metadata/md5-cache/www-plugins/browserpass-2.0.13
+++ b/metadata/md5-cache/www-plugins/browserpass-2.0.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-crypt/gnupg dev-go/fuzzy:= dev-go/twofactor:= dev-go/zglob:= >=dev-lang/go-1.8
+DEPEND=app-crypt/gnupg dev-go/fuzzy:= dev-go/twofactor:= dev-go/zglob:= >=dev-lang/go-1.9
 DESCRIPTION=WebExtension host binary for pass, a UNIX password manager
 EAPI=6
 HOMEPAGE=https://github.com/dannyvankooten/browserpass
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=0d1c92dd339946555cf9dd19e2b8284a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 96a889de35ff..8619af091b3a 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/apache-2.4.29-r1 b/metadata/md5-cache/www-servers/apache-2.4.29-r1
index c9b96467ef43..42e381a454da 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.29-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.29-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.29
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	bfd06aa4db9eed6348b30706fb400351	autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=15b73e5e250f0549e9da1ab2173ec433
+_md5_=af67a955446fa9d2f74d43732ef8d29e
diff --git a/metadata/md5-cache/www-servers/caddy-0.10.10 b/metadata/md5-cache/www-servers/caddy-0.10.10
index 5c627aeb7880..032142705d33 100644
--- a/metadata/md5-cache/www-servers/caddy-0.10.10
+++ b/metadata/md5-cache/www-servers/caddy-0.10.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
 EAPI=6
 HOMEPAGE=https://github.com/mholt/caddy
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _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 70dd85d545bd..74b50a0c018d 100644
--- a/metadata/md5-cache/www-servers/caddy-0.10.11
+++ b/metadata/md5-cache/www-servers/caddy-0.10.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
+DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
 EAPI=6
 HOMEPAGE=https://github.com/mholt/caddy
@@ -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	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=54e80c898faeb02889e12e218e3d9055
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 4276ab3789aa..e7c641808d34 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/dnd-1.1-r2 b/metadata/md5-cache/x11-libs/dnd-1.1-r2
index 5df98d947ded..f427f96e8cfb 100644
--- a/metadata/md5-cache/x11-libs/dnd-1.1-r2
+++ b/metadata/md5-cache/x11-libs/dnd-1.1-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXt x11-libs/libSM x11-libs/libX11 x11-libs/libXmu x11-libs/li
 DESCRIPTION=OffiX' Drag'n'drop library
 EAPI=6
 HOMEPAGE=http://leb.net/offix
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=x11-libs/libXt x11-libs/libSM x11-libs/libX11 x11-libs/libXmu x11-libs/libICE x11-libs/libXaw x11-proto/xproto
 SLOT=0
 SRC_URI=http://leb.net/offix/dnd.1.1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae606c5e082b8471d44879e4625c9530
+_md5_=adf4a10d3661e446769202e6616e95ce
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.4 b/metadata/md5-cache/x11-libs/fltk-1.3.4
index 8757ba026895..0d9ad8179f8a 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.4
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=6
 HOMEPAGE=http://www.fltk.org/
 IUSE=cairo debug doc examples games +opengl static-libs +threads +xft +xinerama 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=FLTK LGPL-2
 RDEPEND=>=media-libs/libpng-1.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libXcursor[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXfixes[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(-)?] x11-libs/libXt[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(-)?] cairo? ( x11-libs/cairo[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(-)?,X] ) opengl? ( virtual/glu[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(-)?] virtual/opengl[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(-)?] ) xft? ( x11-libs/libXft[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(-)?] ) xinerama? ( x11-libs/libXinerama[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=1
 SRC_URI=http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-source.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52970393d9a9a06edd03683677aa1e47
+_md5_=8bb9da43ec02ca8decb19c3bacd5de66
diff --git a/metadata/md5-cache/x11-libs/libast-0.7-r1 b/metadata/md5-cache/x11-libs/libast-0.7-r1
index 5e1829e78df4..b551884eec90 100644
--- a/metadata/md5-cache/x11-libs/libast-0.7-r1
+++ b/metadata/md5-cache/x11-libs/libast-0.7-r1
@@ -4,9 +4,9 @@ DESCRIPTION=LIBrary of Assorted Spiffy Things
 EAPI=6
 HOMEPAGE=http://www.eterm.org/download/
 IUSE=imlib cpu_flags_x86_mmx pcre
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!sci-astronomy/ast x11-libs/libXt x11-proto/xproto x11-libs/libICE x11-libs/libSM x11-libs/libX11 media-libs/freetype imlib? ( media-libs/imlib2 ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/libast-0.7.tar.gz
-_md5_=ea0e225f9fd55d1eeadcc12caeaf3f85
+_md5_=c0e0be6d1f5a0415a3d15e64f65595c3
diff --git a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
index 05e9ed14e5ce..52172232b1fa 100644
--- a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/
 DESCRIPTION=Athena Widgets with N*XTSTEP appearance
 EAPI=6
 HOMEPAGE=http://siag.nu/neXtaw/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm x11-proto/xextproto x11-proto/xproto !<x11-libs/neXtaw-0.15.1-r1
 SLOT=0
 SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
-_md5_=aaef7a0e97732515a26682eb29f88ed3
+_md5_=772e3062a8789dae3aa4947808fda115
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 3bb9191ca2f3..6b14ba7ce02c 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/redshift-1.11-r1 b/metadata/md5-cache/x11-misc/redshift-1.11-r1
index b5cb257f3688..8f6abd26ee96 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.11-r1
+++ b/metadata/md5-cache/x11-misc/redshift-1.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A screen color temperature adjusting software
 EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
 IUSE=appindicator geoclue gtk nls python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=gtk? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.11.tar.gz -> redshift-1.11.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ecb93b9127f28e877c6e6174b37c8dd
+_md5_=8be9fced4ba47ab8ba6be1885362d0e8
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index 82c8eec5684b..2df37e613934 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
 EAPI=6
 HOMEPAGE=http://www.semicomplete.com/projects/xdotool/
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2653caa38ed7afc447df238e5643ebe4
+_md5_=870e9315bfc9ac44ff509975d0c308b9
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index dcdc31ab06b2..056f73eb269d 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1 b/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
index ba43b9e53671..d79baf9784fd 100644
--- a/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
+++ b/metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
 EAPI=6
 HOMEPAGE=http://www.kde-look.org/content/show.php?content=5507
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.kde-look.org/content/files/5507-Golden-XCursors-3D-0.8.tar.bz2
-_md5_=3615def8260cbb78b302e05c4224f129
+_md5_=e802f9f6febbf333d7150f83ef49a0e5
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 1122709663c7..c35b0b19b461 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/lwm-1.2.4 b/metadata/md5-cache/x11-wm/lwm-1.2.4
index ea5b129707fa..54f005432053 100644
--- a/metadata/md5-cache/x11-wm/lwm-1.2.4
+++ b/metadata/md5-cache/x11-wm/lwm-1.2.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-misc/
 DESCRIPTION=The ultimate lightweight window manager
 EAPI=6
 HOMEPAGE=http://www.jfc.org.uk/software/lwm.html
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.jfc.org.uk/files/lwm/lwm-1.2.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=759e5b98bb8bca4f88d797bcc6bd4017
+_md5_=62b0a3b8e9fb417b2632060f9361eb3c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2139fc2d2cc2..5a81b249dcab 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19389 BLAKE2B 7284bb20afdbc54d8fd10daa6eb23af34e945b7de42dc8636dc389c9aed99f768d74320549dacb305de33c63f2c9137b1cf164cb6f2c633dfde66d4866cfdab2 SHA512 f51acb92afe4d097909da2fa27ac72f1ec0347e9d8b12fc0e002557278915c403b4870c0ddabbc2fad68799e6ad2cbd835fb9cc74577916255a94d1f3d50a682
-TIMESTAMP 2018-03-31T14:38:21Z
+TIMESTAMP 2018-04-01T08:08:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlq/nV1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrAk3FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDNSA/9GdHbfxgtmM7HQFOrC7VVbyBF+inPCBOzIVQ5nmTkMlGnO5GpiC0viyoK
-5biUBsbdFn4ToRbJ1+iCcg/yAxGcpE2xtqTm4fwCZcfOmuNTvrQL3Qob4wGvw3AF
-9fCCdyRXJCy4Y1s/YCRPyL9EulW3mv7Svod+5kkNhQMsmqXEkbJhkllLlKVT6nTK
-WmNl+EVt8IFcMHq3s7cICQD/PkhKVOKaoJQ9yb6ttVBRp5wuN/3n/MmhBiYutTLW
-7GA++gtJDthIUrBV7jRkRxDjb2T3/F2LCe4MHxTQdueBM+9vrnJxvlT+e7QrqzBm
-xvk7bN1Jnps1M2PSwTKnY39kDMNSROF99rZ55ZZZKY49TGJCRVS5ZnF1ZxbpP+tA
-j0+Lmqeprljd8q4vfueeazTCuR1/Pl6vrGGMo3GSw/FAwkfzBPb8lvGaDSw+mupK
-9SUBHIJcjsmM4oiK7BKtkATrU8hdr/Nr6ejxqDUMatZ4Ihkfj4BB46PnpKA1BjYv
-Af8TP1Hxncy/+ZnHnFVuVeP2uGyFX9FiU2p2byVsOaphl1+BgqvITLeEAWTZeV4n
-38gS+ygx/hIN2h0HWluZtJtuYyGI9EeAkyyAdEg1Ji6h7Q4zzGqZTJGTr/hUFy9e
-wOzpZpA5hutTLt+Z2sSfmcMcC8fcYEpJ4dUF2XWR3mx3cBg8N58=
-=E4qe
+klBGrA//Ykyk/QEB0Ix65OBSwf16XNJOC83JDnIcLUsUk7HQaiexn/y21alrvunG
+lcmDn0oLzFQKmXXPFYgC7TfYMN/dZc/hdwkjyptmOQbLA70X+UZ85JEOw1R+iaBg
+pV4FxTyXogiAUVr+RR1iO+Czs6RuyWWuphndI4rdNZgwM4zn1O21clwmBsyTr0tz
+fC0vhDI8THOwHOqFmMUp5S6rCZ+MOH/mhfk/zZAb/LyQoFteD597+XWoFAHQAEOZ
+BGZSgz0IjCENjRzBM+fD6Hm9OO/Hnu5/vg8BaXImpvzZ2BTSqaq6e+ykuPgbIaAb
+aocwHkcJUNGfocIx4nSpEK+T+yiHfNoAGs2lbZzS0jxrJL8PErba3UKjUWcJ0See
+prihFdhgE6Co29lny1A7fw4rPHGHoYy16pE12CYKbrXK8RDLOZaNeKLZKEkWRV4r
+FPSHhBiFHHXP3NGRFjNWsoGQmg1wwy+i6HQGzMrYEYef1DouHnWHpf3s7oKjCoMf
+wfekr47rCii3+7+MooOpLzx33xvMaEXVn+pggjwguPLPoGr5cDcFTKHoe4n7tqk2
+Y0Q6uPv0uGqjJj10NbYuWnumOP4m5GCNpDnvJxj0pRgb0eb1/ItexBZaNUL1r9i5
+ofBBsmFZxHuoyZ+GkmjOWfJXSjf9n9gw97k+WI+/nBbD1LljU1E=
+=mEPo
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 904a2a2d441d..62a146d649ba 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Mar 2018 14:38:17 +0000
+Sun, 01 Apr 2018 08:08:13 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f2023b80a7cd..670e45d32278 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar 31 14:38:17 UTC 2018
+Sun Apr  1 08:08:13 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 66338e9948fb..b72a7e96d880 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -277,11 +277,11 @@
 1702282250 ./dev-java/slf4j-ext/slf4j-ext-1.7.5.ebuild
 1702282250 ./dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
 1702282250 ./dev-java/xerial-core/xerial-core-2.0.1.ebuild
-1803201308 ./dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+1803312138 ./dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
 1803011208 ./dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
 1803011208 ./dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
 1702282250 ./dev-java/btf/btf-1.2.ebuild
-1803201308 ./dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+1803312138 ./dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
 1702282250 ./dev-java/cdegroot-db/cdegroot-db-0.08-r1.ebuild
 1709062352 ./dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
 1702282250 ./dev-java/echo2/echo2-2.1.1.ebuild
@@ -886,6 +886,7 @@
 1711071648 ./net-p2p/airdcpp-webclient/airdcpp-webclient-2.2.1.ebuild
 1703190650 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
 1803190338 ./net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
+1804010238 ./net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild
 1702282250 ./net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
 1702282250 ./net-p2p/pybitmessage/pybitmessage-0.4.2.ebuild
 1803092109 ./net-p2p/pybitmessage/pybitmessage-0.6.3.2-r1.ebuild
@@ -899,6 +900,7 @@
 1709182053 ./net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
 1709182053 ./net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
 1702282250 ./net-p2p/opendchub/opendchub-0.8.2.ebuild
+1804010238 ./net-p2p/bitcoind/bitcoind-0.16.0.ebuild
 1803282239 ./net-p2p/bitcoind/bitcoind-0.15.1.ebuild
 1702282250 ./net-p2p/ctcs/ctcs-1.4.1.ebuild
 1702282250 ./net-p2p/saku/saku-3.11.0-r2.ebuild
@@ -910,6 +912,7 @@
 1708011731 ./net-p2p/litecoind/litecoind-0.10.4.0.ebuild
 1803222339 ./net-p2p/cpuminer-opt/cpuminer-opt-3.8.4.1.ebuild
 1801291938 ./net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
+1803312138 ./net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.ebuild
 1803281708 ./net-p2p/cpuminer-opt/cpuminer-opt-3.8.5.ebuild
 1711251440 ./net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild
 1803100509 ./net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -922,6 +925,7 @@
 1703190203 ./net-p2p/tribler/tribler-6.3.3-r1.ebuild
 1702282250 ./net-p2p/smet2html/smet2html-0.1.ebuild
 1706221547 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.3.1.ebuild
+1804010238 ./net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
 1803282239 ./net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
 1702282250 ./net-p2p/nicotine+/nicotine+-1.2.16-r1.ebuild
 1803270108 ./net-p2p/xmr-stak/xmr-stak-9999.ebuild
@@ -955,7 +959,7 @@
 1702282250 ./net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
 1702282250 ./net-p2p/transmission/transmission-2.92-r2.ebuild
 1801140109 ./net-p2p/transmission/transmission-2.92-r3.ebuild
-1803290139 ./net-p2p/transmission/transmission-2.93.ebuild
+1803312208 ./net-p2p/transmission/transmission-2.93.ebuild
 1803111709 ./net-p2p/transmission/transmission-9999.ebuild
 1712151139 ./net-p2p/syncthing/syncthing-0.14.38.ebuild
 1711081044 ./net-p2p/syncthing/syncthing-0.14.40.ebuild
@@ -982,7 +986,7 @@
 1803280309 ./sys-libs/libblockdev/libblockdev-2.16.ebuild
 1803240108 ./sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
 1801222139 ./sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
-1706272056 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
+1804010308 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
 1702282250 ./sys-libs/libstatgrab/libstatgrab-0.17.ebuild
 1803052308 ./sys-libs/db/db-6.2.32.ebuild
 1803221838 ./sys-libs/db/db-5.3.28-r2.ebuild
@@ -1701,7 +1705,7 @@
 1702282250 ./sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild
 1801061640 ./sci-libs/neartree/neartree-5.1.1.ebuild
 1702282250 ./sci-libs/szip/szip-2.1.ebuild
-1803260909 ./sci-libs/szip/szip-2.1-r2.ebuild
+1803311908 ./sci-libs/szip/szip-2.1-r2.ebuild
 1707030244 ./sci-libs/h5hut/h5hut-1.99.13.ebuild
 1702282250 ./sci-libs/clashscore-db/clashscore-db-3.17.ebuild
 1702282250 ./sci-libs/coinor-clp/coinor-clp-1.15.6-r1.ebuild
@@ -1968,11 +1972,11 @@
 1803190938 ./dev-ruby/request_store/request_store-1.4.1.ebuild
 1801021010 ./dev-ruby/request_store/request_store-1.4.0.ebuild
 1708060921 ./dev-ruby/request_store/request_store-1.0.5.ebuild
+1803312138 ./dev-ruby/activejob/activejob-5.0.7.ebuild
 1803251608 ./dev-ruby/activejob/activejob-5.1.5.ebuild
 1803251608 ./dev-ruby/activejob/activejob-5.1.4.ebuild
 1803222338 ./dev-ruby/activejob/activejob-4.2.10.ebuild
-1803222338 ./dev-ruby/activejob/activejob-5.1.2.ebuild
-1803222338 ./dev-ruby/activejob/activejob-5.1.3.ebuild
+1804011008 ./dev-ruby/activejob/activejob-5.1.6.ebuild
 1803222338 ./dev-ruby/activejob/activejob-5.1.1.ebuild
 1803222338 ./dev-ruby/activejob/activejob-5.0.6.ebuild
 1802041408 ./dev-ruby/inflecto/inflecto-0.0.2.ebuild
@@ -2322,13 +2326,13 @@
 1803222338 ./dev-ruby/domain_name/domain_name-0.5.20170404.ebuild
 1803072038 ./dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
 1802022038 ./dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
-1803222338 ./dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
-1803222338 ./dev-ruby/actionmailer/actionmailer-5.1.3.ebuild
 1803251608 ./dev-ruby/actionmailer/actionmailer-5.1.4.ebuild
+1803312138 ./dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
 1803222338 ./dev-ruby/actionmailer/actionmailer-5.1.1.ebuild
 1803222338 ./dev-ruby/actionmailer/actionmailer-5.0.6.ebuild
 1803251608 ./dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
 1803222338 ./dev-ruby/actionmailer/actionmailer-4.2.10.ebuild
+1804011008 ./dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
 1710090817 ./dev-ruby/acts_as_list/acts_as_list-0.9.9.ebuild
 1803201012 ./dev-ruby/acts_as_list/acts_as_list-0.9.11.ebuild
 1711220909 ./dev-ruby/acts_as_list/acts_as_list-0.9.10.ebuild
@@ -2343,11 +2347,11 @@
 1711282340 ./dev-ruby/rex-arch/rex-arch-0.1.13.ebuild
 1705101759 ./dev-ruby/rex-arch/rex-arch-0.1.4.ebuild
 1803251608 ./dev-ruby/actionpack/actionpack-5.1.4.ebuild
-1803222338 ./dev-ruby/actionpack/actionpack-5.1.2.ebuild
-1803222338 ./dev-ruby/actionpack/actionpack-5.1.3.ebuild
+1803312138 ./dev-ruby/actionpack/actionpack-5.0.7.ebuild
 1803222338 ./dev-ruby/actionpack/actionpack-5.0.6.ebuild
 1803252308 ./dev-ruby/actionpack/actionpack-4.2.10.ebuild
 1803222338 ./dev-ruby/actionpack/actionpack-5.1.1.ebuild
+1804011008 ./dev-ruby/actionpack/actionpack-5.1.6.ebuild
 1803251608 ./dev-ruby/actionpack/actionpack-5.1.5.ebuild
 1712241209 ./dev-ruby/minitest/minitest-5.9.1.ebuild
 1708142015 ./dev-ruby/minitest/minitest-5.3.3-r1.ebuild
@@ -2359,12 +2363,12 @@
 1801071039 ./dev-ruby/minitest/minitest-5.11.1.ebuild
 1802032138 ./dev-ruby/fattr/fattr-2.3.0.ebuild
 1803040938 ./dev-ruby/fattr/fattr-2.4.0.ebuild
+1804011008 ./dev-ruby/activemodel/activemodel-5.1.6.ebuild
 1803251608 ./dev-ruby/activemodel/activemodel-5.1.4.ebuild
 1803222338 ./dev-ruby/activemodel/activemodel-5.1.1.ebuild
-1803222338 ./dev-ruby/activemodel/activemodel-5.1.2.ebuild
+1803312138 ./dev-ruby/activemodel/activemodel-5.0.7.ebuild
 1803252308 ./dev-ruby/activemodel/activemodel-4.2.10.ebuild
 1803222338 ./dev-ruby/activemodel/activemodel-5.0.6.ebuild
-1803222338 ./dev-ruby/activemodel/activemodel-5.1.3.ebuild
 1803251608 ./dev-ruby/activemodel/activemodel-5.1.5.ebuild
 1707170920 ./dev-ruby/dep_selector/dep_selector-1.0.5.ebuild
 1708160912 ./dev-ruby/bogus/bogus-0.1.6.ebuild
@@ -2429,18 +2433,19 @@
 1709240914 ./dev-ruby/jsobfu/jsobfu-0.3.0-r1.ebuild
 1803270908 ./dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
 1802031108 ./dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
+1804010838 ./dev-ruby/ddplugin/ddplugin-1.0.2.ebuild
 1702282250 ./dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.8.ebuild
 1703160414 ./dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.1.1.ebuild
 1712282339 ./dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
 1708240802 ./dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
 1707290842 ./dev-ruby/mixlib-shellout/mixlib-shellout-2.3.2.ebuild
 1803222338 ./dev-ruby/activerecord/activerecord-5.0.6.ebuild
-1803222338 ./dev-ruby/activerecord/activerecord-5.1.3.ebuild
+1804011008 ./dev-ruby/activerecord/activerecord-5.1.6.ebuild
 1803251608 ./dev-ruby/activerecord/activerecord-5.1.4.ebuild
 1803251608 ./dev-ruby/activerecord/activerecord-5.1.5.ebuild
 1803222338 ./dev-ruby/activerecord/activerecord-4.2.10.ebuild
-1803222338 ./dev-ruby/activerecord/activerecord-5.1.2.ebuild
 1803222338 ./dev-ruby/activerecord/activerecord-5.1.1.ebuild
+1803312138 ./dev-ruby/activerecord/activerecord-5.0.7.ebuild
 1803291008 ./dev-ruby/asciidoctor/asciidoctor-1.5.6.2.ebuild
 1803222338 ./dev-ruby/asciidoctor/asciidoctor-1.5.5-r1.ebuild
 1803222338 ./dev-ruby/asciidoctor/asciidoctor-1.5.6.ebuild
@@ -2538,12 +2543,12 @@
 1801230008 ./dev-ruby/simplecov/simplecov-0.14.1.ebuild
 1712252009 ./dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
 1703090239 ./dev-ruby/xmlrpc/xmlrpc-0.2.1.ebuild
+1803312138 ./dev-ruby/railties/railties-5.0.7.ebuild
 1803251608 ./dev-ruby/railties/railties-5.1.5.ebuild
 1803222338 ./dev-ruby/railties/railties-5.0.6.ebuild
 1803222338 ./dev-ruby/railties/railties-4.2.10.ebuild
-1803222338 ./dev-ruby/railties/railties-5.1.3.ebuild
 1803222338 ./dev-ruby/railties/railties-5.1.1.ebuild
-1803222338 ./dev-ruby/railties/railties-5.1.2.ebuild
+1804011008 ./dev-ruby/railties/railties-5.1.6.ebuild
 1803251608 ./dev-ruby/railties/railties-5.1.4.ebuild
 1803140208 ./dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
 1702282250 ./dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
@@ -2793,10 +2798,8 @@
 1705140826 ./dev-ruby/climate_control/climate_control-0.2.0.ebuild
 1706240921 ./dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
 1712261039 ./dev-ruby/coderay/coderay-1.1.2.ebuild
-1803280108 ./dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
 1803280108 ./dev-ruby/nokogiri/nokogiri-1.8.2.ebuild
 1803311738 ./dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
-1803280108 ./dev-ruby/nokogiri/nokogiri-1.7.1.ebuild
 1801232238 ./dev-ruby/locale/locale-2.1.2-r1.ebuild
 1802160108 ./dev-ruby/locale/locale-2.1.0-r2.ebuild
 1802080938 ./dev-ruby/polyglot/polyglot-0.3.5.ebuild
@@ -2808,11 +2811,11 @@
 1802211108 ./dev-ruby/uconv/uconv-0.6.1-r2.ebuild
 1802022008 ./dev-ruby/classifier/classifier-1.3.4.ebuild
 1712290209 ./dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild
-1802070908 ./dev-ruby/rails/rails-5.1.2.ebuild
-1802070908 ./dev-ruby/rails/rails-5.1.3.ebuild
+1804011008 ./dev-ruby/rails/rails-5.1.6.ebuild
 1802070908 ./dev-ruby/rails/rails-5.0.6.ebuild
 1802070908 ./dev-ruby/rails/rails-5.1.1.ebuild
 1803252108 ./dev-ruby/rails/rails-5.1.5.ebuild
+1803312138 ./dev-ruby/rails/rails-5.0.7.ebuild
 1802070908 ./dev-ruby/rails/rails-4.2.10.ebuild
 1803252108 ./dev-ruby/rails/rails-5.1.4.ebuild
 1801211008 ./dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -2827,7 +2830,7 @@
 1803241138 ./dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
 1712020209 ./dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
 1712160239 ./dev-ruby/rubygems/rubygems-2.6.14.ebuild
-1803311308 ./dev-ruby/rubygems/rubygems-2.7.6.ebuild
+1803311908 ./dev-ruby/rubygems/rubygems-2.7.6.ebuild
 1801101009 ./dev-ruby/ansi/ansi-1.5.0.ebuild
 1802031108 ./dev-ruby/date_validator/date_validator-0.9.0.ebuild
 1705170749 ./dev-ruby/activeldap/activeldap-5.1.0.ebuild
@@ -2859,10 +2862,10 @@
 1709220821 ./dev-ruby/test-unit/test-unit-3.2.6.ebuild
 1705230811 ./dev-ruby/test-unit/test-unit-3.2.4.ebuild
 1803052038 ./dev-ruby/wirble/wirble-0.1.3-r4.ebuild
-1803252308 ./dev-ruby/activesupport/activesupport-5.1.3.ebuild
-1803222338 ./dev-ruby/activesupport/activesupport-5.1.2.ebuild
 1803251608 ./dev-ruby/activesupport/activesupport-5.1.4.ebuild
 1707011644 ./dev-ruby/activesupport/activesupport-5.1.1.ebuild
+1803312138 ./dev-ruby/activesupport/activesupport-5.0.7.ebuild
+1804011008 ./dev-ruby/activesupport/activesupport-5.1.6.ebuild
 1803252308 ./dev-ruby/activesupport/activesupport-5.0.6.ebuild
 1709291719 ./dev-ruby/activesupport/activesupport-4.2.10.ebuild
 1803251608 ./dev-ruby/activesupport/activesupport-5.1.5.ebuild
@@ -2917,13 +2920,14 @@
 1801300838 ./dev-ruby/sanitize/sanitize-4.6.0.ebuild
 1702282250 ./dev-ruby/sanitize/sanitize-2.1.0.ebuild
 1706070804 ./dev-ruby/sanitize/sanitize-4.5.0.ebuild
+1804010838 ./dev-ruby/sanitize/sanitize-4.6.4.ebuild
 1706190819 ./dev-ruby/termcolor/termcolor-1.2.2.ebuild
 1803252308 ./dev-ruby/actionview/actionview-4.2.10.ebuild
 1803222338 ./dev-ruby/actionview/actionview-5.0.6.ebuild
-1803222338 ./dev-ruby/actionview/actionview-5.1.2.ebuild
-1803222338 ./dev-ruby/actionview/actionview-5.1.3.ebuild
+1804011008 ./dev-ruby/actionview/actionview-5.1.6.ebuild
 1803251608 ./dev-ruby/actionview/actionview-5.1.4.ebuild
 1803251608 ./dev-ruby/actionview/actionview-5.1.5.ebuild
+1803312138 ./dev-ruby/actionview/actionview-5.0.7.ebuild
 1803222338 ./dev-ruby/actionview/actionview-5.1.1.ebuild
 1702282250 ./dev-ruby/postgres_ext/postgres_ext-3.0.0.ebuild
 1803222338 ./dev-ruby/asciimath/asciimath-1.0.4.ebuild
@@ -3088,8 +3092,8 @@
 1803252108 ./dev-ruby/actioncable/actioncable-5.1.4.ebuild
 1802070908 ./dev-ruby/actioncable/actioncable-5.0.6.ebuild
 1802070908 ./dev-ruby/actioncable/actioncable-5.1.1.ebuild
-1802070908 ./dev-ruby/actioncable/actioncable-5.1.2.ebuild
-1802070908 ./dev-ruby/actioncable/actioncable-5.1.3.ebuild
+1803312138 ./dev-ruby/actioncable/actioncable-5.0.7.ebuild
+1804011008 ./dev-ruby/actioncable/actioncable-5.1.6.ebuild
 1709030949 ./dev-ruby/jwt/jwt-2.0.0.ebuild
 1708261126 ./dev-ruby/jwt/jwt-1.5.6.ebuild
 1802041838 ./dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
@@ -3609,7 +3613,7 @@
 1803281208 ./app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
 1802210008 ./app-emacs/remember/remember-2.0.ebuild
 1702282250 ./app-emacs/howm/howm-1.4.3.ebuild
-1803310938 ./app-emacs/ghub/ghub-2.0.0.ebuild
+1803312138 ./app-emacs/ghub/ghub-2.0.0.ebuild
 1707302338 ./app-emacs/erobot/erobot-2.1.0-r1.ebuild
 1702282250 ./app-emacs/dircolors/dircolors-1.0-r2.ebuild
 1702282250 ./app-emacs/session/session-2.3a.ebuild
@@ -4153,9 +4157,9 @@
 1702282250 ./net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
 1702282250 ./net-fs/nfstest/nfstest-1.0.2.ebuild
 1702282250 ./net-fs/nfstest/nfstest-2.1.2.ebuild
-1803191438 ./net-fs/sshfs/sshfs-3.3.1.ebuild
+1803312208 ./net-fs/sshfs/sshfs-3.3.1.ebuild
 1702282250 ./net-fs/sshfs/sshfs-2.8.ebuild
-1803191438 ./net-fs/sshfs/sshfs-2.10-r1.ebuild
+1803312208 ./net-fs/sshfs/sshfs-2.10-r1.ebuild
 1702282250 ./net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
 1803201012 ./net-fs/s3backer/s3backer-1.4.5.ebuild
 1702282250 ./app-crypt/pgpdump/pgpdump-0.31.ebuild
@@ -4798,7 +4802,7 @@
 1704232358 ./net-irc/irker/irker-2.12.ebuild
 1704232358 ./net-irc/irker/irker-2.13.ebuild
 1702282250 ./net-irc/rhapsody/rhapsody-0.28b.ebuild
-1803260209 ./net-irc/irssi/irssi-1.0.7.ebuild
+1803312308 ./net-irc/irssi/irssi-1.0.7.ebuild
 1709270128 ./net-irc/irssi/irssi-1.0.4.ebuild
 1803041138 ./net-irc/irssi/irssi-1.0.6.ebuild
 1802161338 ./net-irc/irssi/irssi-1.1.1.ebuild
@@ -5002,6 +5006,7 @@
 1702282250 ./net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.ebuild
 1702282250 ./net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
 1803281239 ./net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+1804010238 ./net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild
 1803190338 ./net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
 1708172003 ./net-libs/libmbim/libmbim-1.14.0.ebuild
 1708172003 ./net-libs/libmbim/libmbim-1.10.0.ebuild
@@ -5076,7 +5081,7 @@
 1712021509 ./net-libs/libnet/libnet-1.0.2a-r6.ebuild
 1702282250 ./net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
 1702282250 ./net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
-1702282250 ./net-libs/libnatpmp/libnatpmp-20150609.ebuild
+1803312208 ./net-libs/libnatpmp/libnatpmp-20150609.ebuild
 1702282250 ./net-libs/libnatpmp/libnatpmp-20130911.ebuild
 1705161100 ./net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
 1801021140 ./net-libs/libssh/libssh-9999.ebuild
@@ -5251,7 +5256,7 @@
 1708261307 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 1801222308 ./net-libs/signon-ui/signon-ui-0.15-r1.ebuild
 1702282250 ./net-libs/libident/libident-0.32.ebuild
-1803052038 ./net-libs/libident/libident-0.32-r1.ebuild
+1803312308 ./net-libs/libident/libident-0.32-r1.ebuild
 1707301304 ./net-libs/balde-markdown/balde-markdown-0.1.ebuild
 1702282250 ./net-libs/cvm/cvm-0.76.ebuild
 1702282250 ./net-libs/cvm/cvm-0.96.ebuild
@@ -6253,7 +6258,7 @@
 1802061938 ./x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
 1702282250 ./x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
 1702282250 ./x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild
-1705151706 ./x11-misc/redshift/redshift-1.11-r1.ebuild
+1803311938 ./x11-misc/redshift/redshift-1.11-r1.ebuild
 1711181433 ./x11-misc/fracplanet/fracplanet-0.5.1.ebuild
 1702282250 ./x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
 1702282250 ./x11-misc/xtrace/xtrace-1.3.0.ebuild
@@ -6481,7 +6486,7 @@
 1702282250 ./x11-misc/ktsuss/ktsuss-2.1.ebuild
 1712161139 ./x11-misc/spnavcfg/spnavcfg-0.3.ebuild
 1703221029 ./x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
-1803120939 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+1803312208 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
 1704211007 ./x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
 1705192005 ./x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
 1802231708 ./x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
@@ -7280,7 +7285,7 @@
 1708231548 ./dev-libs/pugixml/pugixml-1.8.ebuild
 1702282250 ./dev-libs/mimetic/mimetic-0.9.8.ebuild
 1702282250 ./dev-libs/libax25/libax25-0.0.12_rc4.ebuild
-1802221208 ./dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+1803312208 ./dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
 1801222138 ./dev-libs/libsigsegv/libsigsegv-2.11.ebuild
 1803082238 ./dev-libs/libsigsegv/libsigsegv-2.12.ebuild
 1712161339 ./dev-libs/ffcall/ffcall-2.0.ebuild
@@ -7535,7 +7540,7 @@
 1702282250 ./dev-libs/ntl/ntl-9.3.0.ebuild
 1702282250 ./dev-libs/ntl/ntl-9.6.4.ebuild
 1802021508 ./dev-libs/flatbuffers/flatbuffers-1.8.0-r1.ebuild
-1803201308 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+1803311908 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
 1705070119 ./dev-libs/http-fetcher/http-fetcher-1.1.0.ebuild
 1801201808 ./dev-libs/geoip/geoip-1.6.12.ebuild
 1704081148 ./dev-libs/geoip/geoip-1.6.9-r1.ebuild
@@ -7760,7 +7765,7 @@
 1702282250 ./dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
 1702282250 ./dev-libs/libtomfloat/libtomfloat-0.02.ebuild
 1706261008 ./dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild
-1803280138 ./dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+1804010308 ./dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
 1703011615 ./dev-libs/libnl/libnl-3.2.28.ebuild
 1712200339 ./dev-libs/libnl/libnl-99999999.ebuild
 1702282250 ./dev-libs/libnl/libnl-1.1.4.ebuild
@@ -7943,7 +7948,7 @@
 1705221643 ./dev-libs/grok/grok-0.9.2.ebuild
 1702282250 ./dev-libs/luise-bin/luise-bin-0.1.1.ebuild
 1708050004 ./dev-libs/libhtmlparse/libhtmlparse-0.1.13-r1.ebuild
-1803311408 ./dev-libs/libtasn1/libtasn1-4.13.ebuild
+1803311908 ./dev-libs/libtasn1/libtasn1-4.13.ebuild
 1803022338 ./dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
 1702282250 ./dev-libs/injeqt/injeqt-1.0.1.ebuild
 1803221538 ./dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -8925,7 +8930,7 @@
 1707141045 ./app-arch/fastjar/fastjar-0.98-r2.ebuild
 1706301419 ./app-arch/pdlzip/pdlzip-1.8.ebuild
 1702282250 ./app-arch/unace/unace-2.5-r3.ebuild
-1803311408 ./app-arch/unace/unace-2.5-r5.ebuild
+1803311908 ./app-arch/unace/unace-2.5-r5.ebuild
 1702282250 ./app-arch/unace/unace-2.5-r4.ebuild
 1801171309 ./app-arch/wimlib/wimlib-1.12.0.ebuild
 1702282250 ./app-arch/upx-ucl/upx-ucl-3.91.ebuild
@@ -8937,7 +8942,7 @@
 1702282250 ./app-arch/ncompress/ncompress-4.2.4.4.ebuild
 1803282239 ./app-arch/snappy/snappy-1.1.7.ebuild
 1711192344 ./app-arch/snappy/snappy-1.1.3-r1.ebuild
-1801270408 ./app-arch/file-roller/file-roller-3.24.1.ebuild
+1803312208 ./app-arch/file-roller/file-roller-3.24.1.ebuild
 1803171308 ./app-arch/rpm/rpm-4.12.0.1.ebuild
 1712101740 ./app-arch/rpm/rpm-4.11.0.1.ebuild
 1702282250 ./app-arch/arj/arj-3.10.22-r5.ebuild
@@ -9186,7 +9191,7 @@
 1703232351 ./dev-db/apgdiff/apgdiff-2.2.1.ebuild
 1702282250 ./dev-db/mysqltuner/mysqltuner-1.2.0.ebuild
 1702282250 ./dev-db/mysqltuner/mysqltuner-1.6.0.ebuild
-1703170255 ./dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
+1804010308 ./dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
 1711201845 ./dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
 1803301709 ./dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
 1702282250 ./dev-db/sqldeveloper/sqldeveloper-4.0.2.15.21.ebuild
@@ -9554,12 +9559,14 @@
 1801042109 ./sys-kernel/raspberrypi-sources/raspberrypi-sources-4.9.9999.ebuild
 1803221708 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.123.ebuild
 1803151438 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.27.ebuild
+1804010238 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.126.ebuild
 1803251738 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.124.ebuild
 1802252038 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.83.ebuild
 1803190338 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.85.ebuild
 1803100239 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.8.ebuild
 1712141639 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.69.ebuild
 1803151438 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.10.ebuild
+1804010208 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.15.ebuild
 1712161639 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.106.ebuild
 1801171539 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.77.ebuild
 1801312108 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.79.ebuild
@@ -9609,6 +9616,7 @@
 1803212038 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.29.ebuild
 1803251808 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.30.ebuild
 1802040308 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.80.ebuild
+1804010238 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.92.ebuild
 1803251738 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.13.ebuild
 1803282109 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.31.ebuild
 1801052009 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.75.ebuild
@@ -9623,6 +9631,7 @@
 1803211908 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.12.ebuild
 1803191608 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.28.ebuild
 1709151509 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.87-r1.ebuild
+1804010208 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.32.ebuild
 1802230308 ./sys-kernel/gentoo-sources/gentoo-sources-4.15.5.ebuild
 1803260409 ./sys-kernel/bliss-initramfs/bliss-initramfs-7.1.3.ebuild
 1711231833 ./sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -9777,10 +9786,10 @@
 1702282250 ./media-gfx/psftools/psftools-1.0.7.ebuild
 1704041518 ./media-gfx/greycstoration/greycstoration-2.9-r2.ebuild
 1702282250 ./media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
-1803220138 ./media-gfx/gimp/gimp-2.8.22-r1.ebuild
+1803312108 ./media-gfx/gimp/gimp-2.8.22-r1.ebuild
 1801061509 ./media-gfx/gimp/gimp-2.8.22.ebuild
 1801061509 ./media-gfx/gimp/gimp-9999.ebuild
-1803201038 ./media-gfx/gimp/gimp-2.9.8-r1.ebuild
+1803312108 ./media-gfx/gimp/gimp-2.9.8-r1.ebuild
 1801182240 ./media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
 1801080339 ./media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
 1712280239 ./media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -10038,7 +10047,7 @@
 1702282250 ./media-gfx/fblogo/fblogo-0.5.2.ebuild
 1702282250 ./media-gfx/photopc/photopc-3.07.ebuild
 1711290340 ./media-gfx/libimagequant/libimagequant-2.11.4.ebuild
-1803310808 ./media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+1803312238 ./media-gfx/libimagequant/libimagequant-2.11.7.ebuild
 1801270409 ./media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
 1803310838 ./media-gfx/inkscape/inkscape-0.92.3.ebuild
 1803120939 ./media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -10176,7 +10185,7 @@
 1702282250 ./media-gfx/iscan-data/iscan-data-1.36.0.1.ebuild
 1702282250 ./media-gfx/iscan-data/iscan-data-1.22.0.1.ebuild
 1702282250 ./media-gfx/sane-frontends/sane-frontends-1.0.14.ebuild
-1803052038 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+1803312138 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
 1801211408 ./media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
 1803190338 ./media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
 1710230041 ./media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -10717,7 +10726,7 @@
 1711261910 ./gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
 1711282310 ./gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
 1706201124 ./gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
-1803260208 ./gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+1804010108 ./gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
 1707310826 ./gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
 1712220039 ./gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
 1801010110 ./gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
@@ -11305,7 +11314,7 @@
 1707091624 ./app-editors/aee/aee-2.2.15b.ebuild
 1803052038 ./app-editors/leo/leo-5.6.ebuild
 1801051409 ./app-editors/gvim/gvim-8.0.1428.ebuild
-1803260208 ./app-editors/gvim/gvim-8.0.1645.ebuild
+1803312208 ./app-editors/gvim/gvim-8.0.1645.ebuild
 1803260208 ./app-editors/gvim/gvim-9999.ebuild
 1710261601 ./app-editors/gvim/gvim-8.0.1188.ebuild
 1703112004 ./app-editors/gvim/gvim-8.0.0386.ebuild
@@ -11317,7 +11326,7 @@
 1708030026 ./app-editors/elvis/elvis-2.2.0-r5.ebuild
 1712101740 ./app-editors/elvis/elvis-2.2.0-r4.ebuild
 1708231907 ./app-editors/scite/scite-3.6.5-r1.ebuild
-1803260208 ./app-editors/scite/scite-4.0.2.ebuild
+1804010108 ./app-editors/scite/scite-4.0.2.ebuild
 1711180426 ./app-editors/scite/scite-3.5.5.ebuild
 1712101740 ./app-editors/moe/moe-1.7.ebuild
 1712101740 ./app-editors/moe/moe-1.6.ebuild
@@ -11372,7 +11381,7 @@
 1712092309 ./app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
 1702282250 ./app-editors/cooledit/cooledit-3.17.17-r1.ebuild
 1709161358 ./app-editors/sublime-text/sublime-text-3_p3143.ebuild
-1801080239 ./app-editors/gummi/gummi-0.6.6-r1.ebuild
+1803312208 ./app-editors/gummi/gummi-0.6.6-r1.ebuild
 1711182327 ./games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
 1707090132 ./games-strategy/smac/smac-6.0a.ebuild
 1801140209 ./games-strategy/colobot/colobot-0.1.11.ebuild
@@ -11620,11 +11629,9 @@
 1711251740 ./dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild
 1711251740 ./dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild
 1711251740 ./dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild
-1710162114 ./dev-lang/go/go-1.9.1.ebuild
-1801182210 ./dev-lang/go/go-1.9.2.ebuild
 1803022338 ./dev-lang/go/go-9999.ebuild
 1803062308 ./dev-lang/go/go-1.9.4.ebuild
-1801230408 ./dev-lang/go/go-1.9.3.ebuild
+1803312138 ./dev-lang/go/go-1.10.1.ebuild
 1803260208 ./dev-lang/go/go-1.10.ebuild
 1708170139 ./dev-lang/lua/lua-5.2.3-r2.ebuild
 1703011342 ./dev-lang/lua/lua-5.1.5-r4.ebuild
@@ -11822,13 +11829,13 @@
 1711152307 ./dev-lang/execline/execline-2.3.0.3.ebuild
 1803012208 ./dev-lang/php/php-5.6.33.ebuild
 1803302009 ./dev-lang/php/php-7.1.16.ebuild
-1803301239 ./dev-lang/php/php-5.6.34.ebuild
+1803312108 ./dev-lang/php/php-5.6.34.ebuild
 1803012208 ./dev-lang/php/php-7.1.13.ebuild
 1803292238 ./dev-lang/php/php-7.2.4.ebuild
 1803012208 ./dev-lang/php/php-7.0.27.ebuild
 1803301209 ./dev-lang/php/php-5.6.35.ebuild
-1803301239 ./dev-lang/php/php-7.0.28.ebuild
-1803301239 ./dev-lang/php/php-7.1.15.ebuild
+1804010108 ./dev-lang/php/php-7.0.28.ebuild
+1804010108 ./dev-lang/php/php-7.1.15.ebuild
 1803301209 ./dev-lang/php/php-7.0.29.ebuild
 1803012208 ./dev-lang/php/php-7.1.14.ebuild
 1702282250 ./dev-lang/pcc/pcc-9999.ebuild
@@ -11881,7 +11888,7 @@
 1702282250 ./dev-lang/logtalk/logtalk-3.03.0.ebuild
 1702282250 ./dev-lang/logtalk/logtalk-3.00.0.ebuild
 1712251509 ./dev-lang/orc/orc-0.4.27.ebuild
-1803282239 ./dev-lang/orc/orc-0.4.28-r1.ebuild
+1804010008 ./dev-lang/orc/orc-0.4.28-r1.ebuild
 1702282250 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
 1712190039 ./dev-lang/tcc/tcc-0.9.27.ebuild
 1702282250 ./dev-lang/tcc/tcc-0.9.26-r3.ebuild
@@ -11894,7 +11901,7 @@
 1706031528 ./dev-lang/lfe/lfe-0.7.ebuild
 1801201108 ./dev-lang/perl/perl-5.28.9999.ebuild
 1801071339 ./dev-lang/perl/perl-5.26.1-r1.ebuild
-1803311308 ./dev-lang/perl/perl-5.24.3-r1.ebuild
+1804010738 ./dev-lang/perl/perl-5.24.3-r1.ebuild
 1803102238 ./dev-lang/perl/perl-5.26.1-r2.ebuild
 1801071339 ./dev-lang/perl/perl-5.26.9999.ebuild
 1801120740 ./dev-lang/perl/perl-5.24.3.ebuild
@@ -12780,7 +12787,7 @@
 1702282250 ./dev-python/cddb-py/cddb-py-1.4-r1.ebuild
 1705191636 ./dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
 1801232338 ./dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
-1803310808 ./dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+1803312208 ./dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
 1711272110 ./dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
 1705151247 ./dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
 1803280238 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild
@@ -12988,7 +12995,7 @@
 1803171408 ./dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
 1702282250 ./dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
 1803171408 ./dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
-1710222135 ./dev-python/pillow/pillow-4.3.0.ebuild
+1803312238 ./dev-python/pillow/pillow-4.3.0.ebuild
 1706251742 ./dev-python/pillow/pillow-3.4.2-r1.ebuild
 1709300231 ./dev-python/python-designateclient/python-designateclient-2.7.0.ebuild
 1803310508 ./dev-python/python-designateclient/python-designateclient-2.9.0.ebuild
@@ -13560,7 +13567,7 @@
 1702282250 ./dev-python/pygpu/pygpu-0.6.0.ebuild
 1702282250 ./dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
 1702282250 ./dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
-1702282250 ./dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
+1803312208 ./dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
 1803310408 ./dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
 1709300227 ./dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
 1702282250 ./dev-python/pyxml/pyxml-0.8.4-r3.ebuild
@@ -13879,7 +13886,7 @@
 1711240020 ./dev-python/pyjade/pyjade-4.0.0.ebuild
 1803310508 ./dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
 1709300230 ./dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
-1707280741 ./dev-python/dbus-python/dbus-python-1.2.4.ebuild
+1803312108 ./dev-python/dbus-python/dbus-python-1.2.4.ebuild
 1802150308 ./dev-python/dbus-python/dbus-python-1.2.6.ebuild
 1703102338 ./dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
 1803072308 ./dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -14019,7 +14026,7 @@
 1703010038 ./dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
 1803310408 ./dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
 1801232338 ./dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
-1705051757 ./dev-python/rarfile/rarfile-3.0.ebuild
+1804010308 ./dev-python/rarfile/rarfile-3.0.ebuild
 1702282250 ./dev-python/rarfile/rarfile-2.8.ebuild
 1702282250 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
 1608132139 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
@@ -14060,7 +14067,7 @@
 1703110310 ./dev-python/numexpr/numexpr-2.6.1.ebuild
 1706280700 ./dev-python/numexpr/numexpr-2.6.2.ebuild
 1801232338 ./dev-python/cryptography/cryptography-2.0.2-r1.ebuild
-1803310808 ./dev-python/cryptography/cryptography-2.1.4.ebuild
+1803312208 ./dev-python/cryptography/cryptography-2.1.4.ebuild
 1703010038 ./dev-python/cryptography/cryptography-1.7.1.ebuild
 1702282250 ./dev-python/mmh3/mmh3-2.3.1.ebuild
 1803171408 ./dev-python/pystatgrab/pystatgrab-0.7.ebuild
@@ -14782,7 +14789,7 @@
 1702282250 ./dev-python/pylirc/pylirc-0.0.5-r1.ebuild
 1704301037 ./dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
 1709300311 ./dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
-1707112320 ./dev-python/olefile/olefile-0.44.ebuild
+1803312238 ./dev-python/olefile/olefile-0.44.ebuild
 1702282250 ./dev-python/structlog/structlog-16.1.0.ebuild
 1803190338 ./dev-python/logbook/logbook-1.1.0.ebuild
 1803190338 ./dev-python/logbook/logbook-0.9.1.ebuild
@@ -16786,7 +16793,7 @@
 1702282250 ./x11-themes/skinenigmang-logos/skinenigmang-logos-20131008.ebuild
 1801270409 ./x11-themes/gnome-backgrounds/gnome-backgrounds-3.24.0.ebuild
 1702282250 ./x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
-1803260909 ./x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
+1804010108 ./x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
 1702282250 ./x11-themes/tactile3/tactile3-3.1.ebuild
 1702282250 ./x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild
 1702282250 ./x11-themes/zukitwo-shell/zukitwo-shell-2016.08.08.ebuild
@@ -17159,7 +17166,7 @@
 1702282250 ./app-misc/bgrep/bgrep-0_p20110121.ebuild
 1801270408 ./app-misc/gnote/gnote-3.24.1.ebuild
 1707091908 ./app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
-1803191238 ./app-misc/away/away-0.9.5-r2.ebuild
+1803312108 ./app-misc/away/away-0.9.5-r2.ebuild
 1702282250 ./app-misc/away/away-0.9.5-r1.ebuild
 1702282250 ./app-misc/nut/nut-20.1.ebuild
 1711091800 ./app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -17272,7 +17279,7 @@
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
 1702282250 ./app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
-1803052038 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+1803312108 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
 1702282250 ./app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
 1710031128 ./app-misc/khal/khal-0.9.7.ebuild
 1802151938 ./app-misc/khal/khal-0.9.8.ebuild
@@ -17317,7 +17324,7 @@
 1702282250 ./app-misc/tprint/tprint-1.1.0-r1.ebuild
 1801231609 ./app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
 1801231609 ./app-misc/c_rehash/c_rehash-1.7-r1.ebuild
-1803052038 ./app-misc/calendar/calendar-0.9.1-r1.ebuild
+1803312108 ./app-misc/calendar/calendar-0.9.1-r1.ebuild
 1702282250 ./app-misc/cw/cw-1.0.16-r3.ebuild
 1802060108 ./app-misc/vifm/vifm-0.9.1.ebuild
 1702282250 ./app-misc/vifm/vifm-0.7.2.ebuild
@@ -17422,7 +17429,7 @@
 1802070408 ./sci-calculators/qalculate-gtk/qalculate-gtk-2.2.0.ebuild
 1702282250 ./sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
 1702282250 ./sci-calculators/wcalc/wcalc-2.5.ebuild
-1801212339 ./sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+1803312208 ./sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
 1708240109 ./sci-calculators/datamash/datamash-1.2.ebuild
 1803201012 ./sci-calculators/datamash/datamash-1.3.ebuild
 1702282250 ./sci-calculators/calculator/calculator-1.7.54.ebuild
@@ -17900,7 +17907,7 @@
 1802192038 ./net-wireless/soapybladerf/soapybladerf-9999.ebuild
 1802192038 ./net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild
 1710211346 ./net-wireless/hostapd/hostapd-2.6-r1.ebuild
-1702282250 ./net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+1803312108 ./net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
 1702282250 ./net-wireless/wireless-regdb/wireless-regdb-20160610.ebuild
 1702282250 ./net-wireless/wireless-regdb/wireless-regdb-20160502.ebuild
 1801291308 ./net-wireless/wireless-regdb/wireless-regdb-20171223-r1.ebuild
@@ -18259,7 +18266,7 @@
 1702282250 ./dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
 1703080021 ./dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
 1702282250 ./dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r2.ebuild
-1803260208 ./dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
+1804010108 ./dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
 1705191629 ./dev-php/pecl-mongodb/pecl-mongodb-1.2.9.ebuild
 1702282250 ./dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild
 1710211028 ./dev-php/pecl-mongodb/pecl-mongodb-1.2.11.ebuild
@@ -18618,7 +18625,7 @@
 1702282250 ./app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
 1702282250 ./app-text/libodfgen/libodfgen-9999.ebuild
 1708271833 ./app-text/libodfgen/libodfgen-0.1.6.ebuild
-1802221208 ./app-text/convertlit/convertlit-1.8-r3.ebuild
+1803312138 ./app-text/convertlit/convertlit-1.8-r3.ebuild
 1702282250 ./app-text/convertlit/convertlit-1.8-r1.ebuild
 1712252239 ./app-text/unpaper/unpaper-9999.ebuild
 1712252239 ./app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -19164,7 +19171,7 @@
 1710232024 ./app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
 1711181305 ./app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
 1708161717 ./app-i18n/ibus-table-latin/ibus-table-latin-1.2.0.20100305.ebuild
-1803282239 ./app-i18n/unicode-data/unicode-data-10.0.0.ebuild
+1804010108 ./app-i18n/unicode-data/unicode-data-10.0.0.ebuild
 1706181624 ./app-i18n/unicode-data/unicode-data-9.0.0.ebuild
 1708231856 ./app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.32.ebuild
 1709272257 ./app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@@ -19234,6 +19241,7 @@
 1702282250 ./www-apps/phpwebsite/phpwebsite-0.10.2.ebuild
 1702282250 ./www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild
 1702282250 ./www-apps/phpsysinfo/phpsysinfo-3.2.2.ebuild
+1803311908 ./www-apps/nikola/nikola-7.8.14.ebuild
 1803172308 ./www-apps/nikola/nikola-7.8.12.ebuild
 1803211738 ./www-apps/nikola/nikola-7.8.13.ebuild
 1803100309 ./www-apps/nikola/nikola-7.8.11.ebuild
@@ -19748,7 +19756,8 @@
 1711100103 ./dev-util/dirdiff/dirdiff-2.1-r2.ebuild
 1711100103 ./dev-util/dirdiff/dirdiff-2.1-r3.ebuild
 1702282250 ./dev-util/obs-service-extract_file/obs-service-extract_file-20130318.ebuild
-1801270038 ./dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
+1804010138 ./dev-util/pycharm-professional/pycharm-professional-2018.1.ebuild
+1804010108 ./dev-util/pycharm-professional/pycharm-professional-2017.3.3.ebuild
 1712221339 ./dev-util/pycharm-professional/pycharm-professional-2017.3.ebuild
 1803261008 ./dev-util/pycharm-professional/pycharm-professional-2017.3.4.ebuild
 1801181139 ./dev-util/meld/meld-3.18.0.ebuild
@@ -19820,8 +19829,7 @@
 1702282250 ./dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
 1702282250 ./dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
 1709152122 ./dev-util/herdtools7/herdtools7-7.47.ebuild
-1802011508 ./dev-util/hadolint/hadolint-1.3.0.ebuild
-1802051908 ./dev-util/hadolint/hadolint-1.4.0.ebuild
+1803312208 ./dev-util/hadolint/hadolint-1.6.1.ebuild
 1802201708 ./dev-util/hadolint/hadolint-1.5.0.ebuild
 1712292110 ./dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
 1712292110 ./dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
@@ -19830,6 +19838,7 @@
 1712171839 ./dev-util/tmake/tmake-2.12-r1.ebuild
 1702282250 ./dev-util/shflags/shflags-1.0.3.ebuild
 1702282250 ./dev-util/obs-service-update_source/obs-service-update_source-20130802.ebuild
+1804010238 ./dev-util/bitcoin-tx/bitcoin-tx-0.16.0.ebuild
 1803190338 ./dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
 1802261738 ./dev-util/vint/vint-0.3.18.ebuild
 1802282108 ./dev-util/valgrind/valgrind-9999.ebuild
@@ -20053,8 +20062,9 @@
 1702282250 ./dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
 1702282250 ./dev-util/egypt/egypt-1.10.ebuild
 1803260938 ./dev-util/pycharm-community/pycharm-community-2017.3.4.ebuild
+1804010138 ./dev-util/pycharm-community/pycharm-community-2018.1.ebuild
 1712221339 ./dev-util/pycharm-community/pycharm-community-2017.3.ebuild
-1801270038 ./dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
+1804010108 ./dev-util/pycharm-community/pycharm-community-2017.3.3.ebuild
 1707121742 ./dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
 1711030019 ./dev-util/visualvm/visualvm-1.3.9.ebuild
 1706202355 ./dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
@@ -22377,13 +22387,14 @@
 1803211938 ./app-admin/puppetdb/puppetdb-5.2.1.ebuild
 1803061638 ./app-admin/puppetdb/puppetdb-5.1.4.ebuild
 1712140109 ./app-admin/puppetdb/puppetdb-5.1.3.ebuild
+1803312138 ./app-admin/kubectx/kubectx-0.4.1.ebuild
 1802202038 ./app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild
 1702282250 ./app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
 1803212138 ./app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
 1702282250 ./app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
 1702282250 ./app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
 1712232309 ./app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
-1803190338 ./app-admin/apache-tools/apache-tools-2.4.29.ebuild
+1803312108 ./app-admin/apache-tools/apache-tools-2.4.29.ebuild
 1803270108 ./app-admin/apache-tools/apache-tools-2.2.34.ebuild
 1803231938 ./app-admin/apache-tools/apache-tools-2.4.33.ebuild
 1801231609 ./app-admin/apache-tools/apache-tools-2.4.27.ebuild
@@ -22858,7 +22869,7 @@
 1802081308 ./mail-mta/exim/exim-4.90.ebuild
 1802081308 ./mail-mta/exim/exim-4.89.1.ebuild
 1802081308 ./mail-mta/exim/exim-4.89-r5.ebuild
-1803082308 ./mail-mta/exim/exim-4.90.1.ebuild
+1803312108 ./mail-mta/exim/exim-4.90.1.ebuild
 1706151341 ./mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild
 1702282250 ./mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
 1703042018 ./mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
@@ -23154,7 +23165,7 @@
 1702282250 ./sci-mathematics/4ti2/4ti2-1.6.2.ebuild
 1707312112 ./sci-mathematics/4ti2/4ti2-1.6.7.ebuild
 1803302208 ./app-portage/portage-utils/portage-utils-0.65.ebuild
-1803302208 ./app-portage/portage-utils/portage-utils-0.64.ebuild
+1803312238 ./app-portage/portage-utils/portage-utils-0.64.ebuild
 1801231609 ./app-portage/portage-utils/portage-utils-0.62.ebuild
 1803302208 ./app-portage/portage-utils/portage-utils-0.64-r1.ebuild
 1801231609 ./app-portage/portage-utils/portage-utils-0.63.ebuild
@@ -24228,7 +24239,7 @@
 1803211038 ./sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
 1803211038 ./sys-fs/e2fsprogs/e2fsprogs-1.43.3-r1.ebuild
 1803251509 ./sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
-1801091509 ./sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+1803312208 ./sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
 1702282250 ./sys-fs/inotify-tools/inotify-tools-3.14.ebuild
 1711140930 ./sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
 1702282250 ./sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
@@ -27113,7 +27124,7 @@
 1702282250 ./dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild
 1711221213 ./dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0-r1.ebuild
 1702282250 ./dev-perl/DBD-SQLite/DBD-SQLite-1.500.0.ebuild
-1803151938 ./dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
+1803312138 ./dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
 1802282338 ./dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild
 1709181547 ./dev-perl/Sub-Exporter-GlobExporter/Sub-Exporter-GlobExporter-0.5.0.ebuild
 1702282250 ./dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
@@ -27826,7 +27837,7 @@
 1801021940 ./x11-libs/libXxf86misc/libXxf86misc-1.0.3-r1.ebuild
 1702282250 ./x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
 1702282250 ./x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
-1803260909 ./x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
+1803311908 ./x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
 1706171410 ./x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
 1801161139 ./x11-libs/gtk+/gtk+-3.22.26.ebuild
 1712271139 ./x11-libs/gtk+/gtk+-3.22.19.ebuild
@@ -27888,7 +27899,7 @@
 1706300122 ./x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
 1706300122 ./x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
 1702282250 ./x11-libs/libXinerama/libXinerama-1.1.3.ebuild
-1803260909 ./x11-libs/dnd/dnd-1.1-r2.ebuild
+1803311908 ./x11-libs/dnd/dnd-1.1-r2.ebuild
 1702282250 ./x11-libs/dnd/dnd-1.1-r1.ebuild
 1702282250 ./x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
 1702282250 ./x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
@@ -27913,7 +27924,7 @@
 1803240238 ./x11-libs/fox/fox-1.7.54.ebuild
 1706151723 ./x11-libs/fox/fox-1.6.50.ebuild
 1803171608 ./x11-libs/fltk/fltk-1.4.9999.ebuild
-1705220039 ./x11-libs/fltk/fltk-1.3.4.ebuild
+1803312208 ./x11-libs/fltk/fltk-1.3.4.ebuild
 1702282250 ./x11-libs/fltk/fltk-1.3.3-r3.ebuild
 1803171608 ./x11-libs/fltk/fltk-1.3.9999.ebuild
 1702282250 ./x11-libs/fltk/fltk-1.3.3-r5.ebuild
@@ -27973,7 +27984,7 @@
 1702282250 ./x11-libs/libfontenc/libfontenc-1.1.2.ebuild
 1801111340 ./x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
 1702282250 ./x11-libs/libast/libast-9999.ebuild
-1803260909 ./x11-libs/libast/libast-0.7-r1.ebuild
+1803311908 ./x11-libs/libast/libast-0.7-r1.ebuild
 1702282250 ./x11-libs/libast/libast-0.7.ebuild
 1702282250 ./x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
 1711071518 ./x11-libs/libpciaccess/libpciaccess-0.14.ebuild
@@ -28210,7 +28221,7 @@
 1707112301 ./sci-electronics/kicad/kicad-4.0.6.ebuild
 1801062039 ./sci-electronics/kicad/kicad-4.0.4.ebuild
 1707112301 ./sci-electronics/kicad/kicad-4.0.5-r1.ebuild
-1711200353 ./sci-electronics/kicad/kicad-4.0.7.ebuild
+1803312238 ./sci-electronics/kicad/kicad-4.0.7.ebuild
 1702282250 ./sci-electronics/balsa/balsa-4.0-r1.ebuild
 1702282250 ./sci-electronics/xoscope/xoscope-2.0.ebuild
 1702282250 ./sci-electronics/xoscope/xoscope-2.1.ebuild
@@ -28242,7 +28253,7 @@
 1702282250 ./sci-electronics/voacapl/voacapl-0.6.7.ebuild
 1712240039 ./sci-electronics/geda-suite/geda-suite-20171223.ebuild
 1712240509 ./sci-electronics/geda-suite/geda-suite-20110427.ebuild
-1702282250 ./sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+1803312238 ./sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
 1801071509 ./sci-electronics/splat/splat-1.4.2.ebuild
 1702282250 ./sci-electronics/petrify/petrify-4.2-r1.ebuild
 1702282250 ./sci-electronics/plcedit/plcedit-2.2.1.ebuild
@@ -28274,7 +28285,7 @@
 1712111139 ./sci-electronics/geda/geda-1.9.2-r1.ebuild
 1702282250 ./sci-electronics/vbs/vbs-1.4.0.ebuild
 1702282250 ./sci-electronics/spice/spice-3.5.5-r1.ebuild
-1803260209 ./sci-electronics/spice/spice-3.5.5-r2.ebuild
+1804010108 ./sci-electronics/spice/spice-3.5.5-r2.ebuild
 1802221208 ./media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
 1702282250 ./media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
 1702282250 ./media-tv/shoutcast2vdr/shoutcast2vdr-0.0.8.ebuild
@@ -28427,7 +28438,7 @@
 1803190338 ./x11-wm/awesome/awesome-3.5.9-r2.ebuild
 1803260109 ./x11-wm/awesome/awesome-4.2-r2.ebuild
 1803190338 ./x11-wm/awesome/awesome-4.2-r1.ebuild
-1705101600 ./x11-wm/lwm/lwm-1.2.4.ebuild
+1804010308 ./x11-wm/lwm/lwm-1.2.4.ebuild
 1702282250 ./x11-wm/lwm/lwm-1.2.2.ebuild
 1702282250 ./x11-wm/lwm/lwm-1.2.3.ebuild
 1702282250 ./x11-wm/notion/notion-9999.ebuild
@@ -28874,7 +28885,7 @@
 1702282250 ./net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
 1801231609 ./net-dns/hesiod/hesiod-3.1.0.ebuild
 1802211808 ./net-dns/coredns/coredns-1.0.5.ebuild
-1710271436 ./net-dns/coredns/coredns-0.9.9.ebuild
+1804010438 ./net-dns/coredns/coredns-1.1.1.ebuild
 1702282250 ./net-dns/totd/totd-1.5.1.ebuild
 1712022109 ./net-dns/maradns/maradns-2.0.14.ebuild
 1704291802 ./net-dns/maradns/maradns-2.0.09-r2.ebuild
@@ -28889,11 +28900,11 @@
 1702282250 ./dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
 1801071809 ./dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
 1702282250 ./dev-scheme/guile-lib/guile-lib-0.1.9.ebuild
-1803310108 ./dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
+1803312108 ./dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
 1801151439 ./dev-scheme/guile/guile-2.2.3.ebuild
 1702282250 ./dev-scheme/guile/guile-1.8.8-r3.ebuild
 1801151439 ./dev-scheme/guile/guile-2.0.13-r2.ebuild
-1803310108 ./dev-scheme/guile/guile-2.0.14-r3.ebuild
+1803312108 ./dev-scheme/guile/guile-2.0.14-r3.ebuild
 1803191008 ./dev-scheme/slib/slib-3.2.5-r1.ebuild
 1702282250 ./dev-scheme/slib/slib-3.2.2.ebuild
 1702282250 ./dev-scheme/slib/slib-3.2.1.ebuild
@@ -29379,6 +29390,7 @@
 1702282250 ./dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
 1702282250 ./dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
 1801241908 ./dev-haskell/language-docker/language-docker-2.0.1.ebuild
+1803312138 ./dev-haskell/language-docker/language-docker-4.0.1.ebuild
 1702282250 ./dev-haskell/filestore/filestore-0.6.1.ebuild
 1702282250 ./dev-haskell/filestore/filestore-0.6.2.ebuild
 1702282250 ./dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
@@ -30917,7 +30929,7 @@
 1801032209 ./net-misc/openr2/openr2-1.3.0.ebuild
 1801051039 ./net-misc/proxychains/proxychains-4.12-r1.ebuild
 1703171656 ./net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
-1711171952 ./net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
+1803312208 ./net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
 1710191315 ./net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
 1702282250 ./net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
 1702282250 ./net-misc/sjphone/sjphone-1.60.2235.ebuild
@@ -30970,6 +30982,7 @@
 1702282250 ./net-misc/charm/charm-1.9.2-r1.ebuild
 1702282250 ./net-misc/icecast/icecast-2.4.3.ebuild
 1712042139 ./net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
+1803311808 ./net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild
 1705031509 ./net-misc/putty/putty-0.69.ebuild
 1704110141 ./net-misc/putty/putty-0.68.ebuild
 1704110141 ./net-misc/putty/putty-9999.ebuild
@@ -31045,7 +31058,7 @@
 1802281638 ./net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild
 1802272138 ./net-misc/ntpsec/ntpsec-9999.ebuild
 1711250139 ./net-misc/tigervnc/tigervnc-1.8.0.ebuild
-1712242039 ./net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
+1803312208 ./net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
 1712061539 ./net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
 1702282250 ./net-misc/ipcalc/ipcalc-0.41.ebuild
 1708011623 ./net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -31269,7 +31282,7 @@
 1801231609 ./net-misc/memcached/memcached-1.4.33.ebuild
 1803161908 ./net-misc/youtube-dl/youtube-dl-2018.03.14.ebuild
 1708241547 ./net-misc/youtube-dl/youtube-dl-99999999.ebuild
-1803231908 ./net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild
+1803312208 ./net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild
 1803201108 ./net-misc/youtube-dl/youtube-dl-2017.11.15.ebuild
 1702282250 ./net-misc/dhcping/dhcping-1.2.ebuild
 1709141505 ./net-misc/sgopherd/sgopherd-17.09.ebuild
@@ -31553,7 +31566,7 @@
 1702282250 ./net-misc/ndppd/ndppd-0.2.5.ebuild
 1702282250 ./net-misc/mrouted/mrouted-3.9.5-r1.ebuild
 1702282250 ./net-misc/aria2/aria2-1.30.0.ebuild
-1711091954 ./net-misc/aria2/aria2-1.33.1.ebuild
+1804010308 ./net-misc/aria2/aria2-1.33.1.ebuild
 1702282250 ./net-misc/hashcash/hashcash-1.22-r1.ebuild
 1710231547 ./net-misc/wicd/wicd-1.7.4-r3.ebuild
 1702282250 ./net-misc/clusterssh/clusterssh-9999.ebuild
@@ -31806,8 +31819,7 @@
 1803242038 ./mail-client/thunderbird-bin/thunderbird-bin-52.7.0.ebuild
 1801270409 ./mail-client/geary/geary-0.12.0.ebuild
 1707071200 ./mail-client/mutt/mutt-1.7.2.ebuild
-1803101808 ./mail-client/mutt/mutt-1.9.4.ebuild
-1802101838 ./mail-client/mutt/mutt-1.9.3.ebuild
+1804011038 ./mail-client/mutt/mutt-1.9.4-r1.ebuild
 1702282250 ./mail-client/mailx-support/mailx-support-20060102-r1.ebuild
 1702282250 ./mail-client/mailx-support/mailx-support-20060102-r2.ebuild
 1702282250 ./mail-client/hap/hap-3.7-r1.ebuild
@@ -31850,7 +31862,7 @@
 1708162216 ./sys-apps/qdirstat/qdirstat-1.4.ebuild
 1705261327 ./sys-apps/mouseemu/mouseemu-0.12.ebuild
 1705261327 ./sys-apps/mouseemu/mouseemu-0.15.ebuild
-1802062308 ./sys-apps/dstat/dstat-0.7.3.ebuild
+1803312108 ./sys-apps/dstat/dstat-0.7.3.ebuild
 1802031238 ./sys-apps/moreutils/moreutils-0.62.ebuild
 1709170038 ./sys-apps/moreutils/moreutils-0.61.ebuild
 1702282250 ./sys-apps/conspy/conspy-1.10.ebuild
@@ -32143,7 +32155,7 @@
 1702282250 ./sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
 1712021939 ./sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
 1702282250 ./sys-apps/setserial/setserial-2.17-r4.ebuild
-1803311408 ./sys-apps/setserial/setserial-2.17-r5.ebuild
+1803311908 ./sys-apps/setserial/setserial-2.17-r5.ebuild
 1801270409 ./sys-apps/baobab/baobab-3.24.0.ebuild
 1803190338 ./sys-apps/kbd/kbd-2.0.4.ebuild
 1801231338 ./sys-apps/kbd/kbd-9999.ebuild
@@ -32235,7 +32247,7 @@
 1711221901 ./sys-apps/pciutils/pciutils-3.5.6.ebuild
 1702282250 ./sys-apps/pciutils/pciutils-3.4.1.ebuild
 1707060046 ./sys-apps/pciutils/pciutils-3.5.5.ebuild
-1707031229 ./sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+1804010308 ./sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
 1707031229 ./sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild
 1702282250 ./sys-apps/netboot-base/netboot-base-20050110.ebuild
 1802210108 ./sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild
@@ -32377,8 +32389,7 @@
 1702282250 ./sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
 1710271857 ./sys-apps/pacman/pacman-5.0.2-r1.ebuild
 1708261429 ./sys-apps/haveged/haveged-1.9.1.ebuild
-1803311738 ./sys-apps/haveged/haveged-1.9.2.ebuild
-1803311738 ./sys-apps/haveged/haveged-1.9.2-r1.ebuild
+1803311808 ./sys-apps/haveged/haveged-1.9.2-r1.ebuild
 1702282250 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r2.ebuild
 1712020139 ./sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
 1712020139 ./sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
@@ -32421,7 +32432,7 @@
 1707151819 ./sys-apps/hwids/hwids-20170715.ebuild
 1710060102 ./sys-apps/hwids/hwids-99999999.ebuild
 1801120740 ./sys-apps/hwids/hwids-20170328.ebuild
-1709230946 ./sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+1804010308 ./sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
 1709230946 ./sys-apps/pcmciautils/pcmciautils-018_p8.ebuild
 1702282250 ./sys-apps/memtester/memtester-4.2.2.ebuild
 1702282250 ./sys-apps/memtester/memtester-4.3.0.ebuild
@@ -32514,7 +32525,7 @@
 1802021208 ./www-servers/adsf/adsf-1.4.0.ebuild
 1802051008 ./www-servers/adsf/adsf-1.4.1.ebuild
 1801231609 ./www-servers/apache/apache-2.4.27-r1.ebuild
-1803190338 ./www-servers/apache/apache-2.4.29-r1.ebuild
+1803312108 ./www-servers/apache/apache-2.4.29-r1.ebuild
 1803270108 ./www-servers/apache/apache-2.2.34.ebuild
 1803231938 ./www-servers/apache/apache-2.4.33.ebuild
 1702282250 ./www-servers/resin/resin-4.0.48.ebuild
@@ -32684,10 +32695,10 @@
 1802241308 ./media-libs/phonon/phonon-9999.ebuild
 1803132308 ./media-libs/phonon/phonon-4.10.0.ebuild
 1712191809 ./media-libs/phonon/phonon-4.9.1-r1.ebuild
-1702282250 ./media-libs/libopenraw/libopenraw-0.1.0.ebuild
-1803291008 ./media-libs/libopenraw/libopenraw-0.1.2.ebuild
-1802101608 ./media-libs/libopenraw/libopenraw-0.0.9.ebuild
-1704161842 ./media-libs/libopenraw/libopenraw-0.1.1.ebuild
+1803312108 ./media-libs/libopenraw/libopenraw-0.1.0.ebuild
+1803312108 ./media-libs/libopenraw/libopenraw-0.1.2.ebuild
+1803312108 ./media-libs/libopenraw/libopenraw-0.0.9.ebuild
+1803312108 ./media-libs/libopenraw/libopenraw-0.1.1.ebuild
 1702282250 ./media-libs/jpeg/jpeg-6b-r12.ebuild
 1801231609 ./media-libs/jpeg/jpeg-8d-r2.ebuild
 1801231609 ./media-libs/jpeg/jpeg-8d-r1.ebuild
@@ -32732,7 +32743,7 @@
 1706101805 ./media-libs/glew/glew-1.13.0.ebuild
 1702282250 ./media-libs/glew/glew-1.6.0-r100.ebuild
 1704020142 ./media-libs/glew/glew-2.0.0.ebuild
-1803190338 ./media-libs/glew/glew-2.1.0.ebuild
+1803312108 ./media-libs/glew/glew-2.1.0.ebuild
 1702282250 ./media-libs/glew/glew-1.10.0-r100.ebuild
 1802131408 ./media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
 1802131408 ./media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
@@ -32869,8 +32880,8 @@
 1801231609 ./media-libs/gd/gd-2.2.4.ebuild
 1702282250 ./media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
 1702282250 ./media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
-1712201709 ./media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
-1803201038 ./media-libs/libmypaint/libmypaint-1.3.0.ebuild
+1803312108 ./media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
+1803312108 ./media-libs/libmypaint/libmypaint-1.3.0.ebuild
 1702282250 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
 1702282250 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
 1803021308 ./media-libs/libepoxy/libepoxy-1.5.0.ebuild
@@ -32880,16 +32891,16 @@
 1803021308 ./media-libs/libepoxy/libepoxy-1.4.3.ebuild
 1803171638 ./media-libs/leptonica/leptonica-1.74.4.ebuild
 1802131808 ./media-libs/leptonica/leptonica-1.75.2.ebuild
-1802112238 ./media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
-1711070141 ./media-libs/gexiv2/gexiv2-0.10.3.ebuild
-1711070141 ./media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
-1802112238 ./media-libs/gexiv2/gexiv2-0.10.6.ebuild
-1803052038 ./media-libs/gexiv2/gexiv2-0.10.8.ebuild
+1803312108 ./media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
+1803312108 ./media-libs/gexiv2/gexiv2-0.10.3.ebuild
+1803312108 ./media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+1803312108 ./media-libs/gexiv2/gexiv2-0.10.6.ebuild
+1803312138 ./media-libs/gexiv2/gexiv2-0.10.8.ebuild
 1702282250 ./media-libs/aalib/aalib-1.4_rc5-r7.ebuild
 1707261346 ./media-libs/aalib/aalib-1.4_rc5-r8.ebuild
 1702282250 ./media-libs/aalib/aalib-1.4_rc5-r6.ebuild
 1801231609 ./media-libs/fontconfig/fontconfig-2.12.4.ebuild
-1803210008 ./media-libs/fontconfig/fontconfig-2.12.6.ebuild
+1803312308 ./media-libs/fontconfig/fontconfig-2.12.6.ebuild
 1803082138 ./media-libs/fontconfig/fontconfig-2.13.0.ebuild
 1803150838 ./media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild
 1708312037 ./media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -33024,11 +33035,11 @@
 1801172039 ./media-libs/babl/babl-0.1.40.ebuild
 1708240050 ./media-libs/babl/babl-0.1.30.ebuild
 1702282250 ./media-libs/babl/babl-0.1.20.ebuild
-1708240050 ./media-libs/babl/babl-9999.ebuild
+1803312108 ./media-libs/babl/babl-9999.ebuild
 1803220938 ./media-libs/babl/babl-0.1.38.ebuild
 1702282250 ./media-libs/babl/babl-0.1.12.ebuild
 1705142019 ./media-libs/babl/babl-0.1.26.ebuild
-1802242038 ./media-libs/babl/babl-0.1.44.ebuild
+1803312108 ./media-libs/babl/babl-0.1.44.ebuild
 1702282250 ./media-libs/babl/babl-0.1.22.ebuild
 1801312108 ./media-libs/babl/babl-0.1.42.ebuild
 1803252338 ./media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -33050,19 +33061,19 @@
 1706041430 ./media-libs/mutagen/mutagen-1.35.1.ebuild
 1802031238 ./media-libs/mutagen/mutagen-1.40.0.ebuild
 1711101617 ./media-libs/mutagen/mutagen-1.39.ebuild
-1702282250 ./media-libs/gegl/gegl-0.3.0.ebuild
-1801110210 ./media-libs/gegl/gegl-0.2.0-r2.ebuild
-1801312108 ./media-libs/gegl/gegl-0.3.28.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.0.ebuild
+1803312108 ./media-libs/gegl/gegl-0.2.0-r2.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.28.ebuild
 1708240050 ./media-libs/gegl/gegl-9999.ebuild
-1712132209 ./media-libs/gegl/gegl-0.3.24.ebuild
-1706071325 ./media-libs/gegl/gegl-0.3.8.ebuild
-1708240050 ./media-libs/gegl/gegl-0.3.20.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.24.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.8.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.20.ebuild
 1801110140 ./media-libs/gegl/gegl-0.3.8-r1.ebuild
-1803280139 ./media-libs/gegl/gegl-0.3.30.ebuild
-1801110140 ./media-libs/gegl/gegl-0.3.0-r1.ebuild
-1801110210 ./media-libs/gegl/gegl-0.2.0-r4.ebuild
-1803220938 ./media-libs/gegl/gegl-0.3.26.ebuild
-1802221238 ./media-libs/gegl/gegl-0.2.0-r5.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.30.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.0-r1.ebuild
+1803312108 ./media-libs/gegl/gegl-0.2.0-r4.ebuild
+1803312108 ./media-libs/gegl/gegl-0.3.26.ebuild
+1803312108 ./media-libs/gegl/gegl-0.2.0-r5.ebuild
 1702282250 ./media-libs/netpbm/netpbm-10.70.00.ebuild
 1702282250 ./media-libs/netpbm/netpbm-10.66.00.ebuild
 1611272133 ./media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -33228,8 +33239,8 @@
 1802240108 ./media-libs/plib/plib-1.8.5-r2.ebuild
 1802240108 ./media-libs/plib/plib-1.8.5-r1.ebuild
 1803290209 ./media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+1803311838 ./media-libs/giflib/giflib-5.1.4-r2.ebuild
 1704142149 ./media-libs/giflib/giflib-4.1.6-r3.ebuild
-1803240238 ./media-libs/giflib/giflib-5.1.4-r1.ebuild
 1704141927 ./media-libs/giflib/giflib-4.1.6-r2.ebuild
 1702282250 ./media-libs/giflib/giflib-5.0.6.ebuild
 1803300139 ./media-libs/giflib/giflib-5.1.4.ebuild
@@ -33337,9 +33348,9 @@
 1704281551 ./media-libs/sratom/sratom-0.6.0.ebuild
 1802221208 ./media-libs/sratom/sratom-0.6.0-r1.ebuild
 1702282250 ./media-libs/libggigcp/libggigcp-1.0.2.ebuild
-1803311738 ./media-libs/libraw/libraw-0.18.8.ebuild
-1802181308 ./media-libs/libraw/libraw-0.18.7.ebuild
-1802181308 ./media-libs/libraw/libraw-0.18.4.ebuild
+1803312108 ./media-libs/libraw/libraw-0.18.8.ebuild
+1803312108 ./media-libs/libraw/libraw-0.18.7.ebuild
+1803312108 ./media-libs/libraw/libraw-0.18.4.ebuild
 1702282250 ./media-libs/libirman/libirman-0.4.5.ebuild
 1801231609 ./media-libs/jasper/jasper-2.0.12.ebuild
 1801231609 ./media-libs/jasper/jasper-9999.ebuild
@@ -36559,7 +36570,7 @@
 1707301222 ./sys-power/acpi_call/acpi_call-9999.ebuild
 1707301222 ./sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
 1702282250 ./sys-power/acpitool/acpitool-0.5.1-r1.ebuild
-1702282250 ./sys-power/acpid/acpid-2.0.28.ebuild
+1803312208 ./sys-power/acpid/acpid-2.0.28.ebuild
 1702282250 ./sys-power/nvram-reboot/nvram-reboot-2004.10.03.ebuild
 1706270140 ./sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
 1712280139 ./sys-power/athcool/athcool-0.3.12.ebuild
@@ -36578,7 +36589,7 @@
 1803151938 ./sys-power/nut/nut-2.7.4-r1.ebuild
 1707242342 ./sys-power/bbswitch/bbswitch-9999.ebuild
 1702282250 ./sys-power/bbswitch/bbswitch-0.8.ebuild
-1707242342 ./sys-power/bbswitch/bbswitch-0.8-r1.ebuild
+1804010738 ./sys-power/bbswitch/bbswitch-0.8-r1.ebuild
 1802191838 ./sys-power/thermald/thermald-1.7.1.ebuild
 1712081639 ./sys-power/uhubctl/uhubctl-1.8-r1.ebuild
 1702282250 ./sys-power/suspend/suspend-1.0_p20150810.ebuild
@@ -36607,7 +36618,7 @@
 1803292038 ./app-antivirus/clamav/clamav-0.99.3-r2.ebuild
 1712250239 ./app-antivirus/clamav/clamav-0.99.2-r3.ebuild
 1803300338 ./app-antivirus/clamav/clamav-0.99.4.ebuild
-1803301539 ./app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+1803312108 ./app-antivirus/clamav/clamav-0.99.4-r1.ebuild
 1803042038 ./app-antivirus/clamav/clamav-0.99.3-r1.ebuild
 1702282250 ./app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild
 1703172246 ./app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild
@@ -37013,6 +37024,7 @@
 1702282250 ./app-emulation/cloud-init/cloud-init-9999.ebuild
 1710300143 ./app-emulation/rkt/rkt-1.29.0.ebuild
 1710210204 ./app-emulation/rkt/rkt-1.28.1.ebuild
+1804010138 ./app-emulation/docker-compose/docker-compose-1.20.1.ebuild
 1803302139 ./app-emulation/docker-compose/docker-compose-1.18.0.ebuild
 1802191608 ./app-emulation/docker-compose/docker-compose-1.19.0.ebuild
 1704191102 ./app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
@@ -37620,7 +37632,7 @@
 1803021159 metadata/md5-cache/dev-java/sun-jms-1.1-r2
 1803021159 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 1803021159 metadata/md5-cache/dev-java/commons-primitives-1.0-r3
-1803301709 metadata/md5-cache/dev-java/Manifest.gz
+1803312138 metadata/md5-cache/dev-java/Manifest.gz
 1803250109 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
 1803021159 metadata/md5-cache/dev-java/objenesis-1.3
 1803250109 metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
@@ -37632,7 +37644,7 @@
 1803290617 metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
 1803250109 metadata/md5-cache/dev-java/jfreesvg-2.1-r1
 1803250109 metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
-1803201308 metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
+1803312138 metadata/md5-cache/dev-java/sun-jaf-1.1.1-r1
 1803250109 metadata/md5-cache/dev-java/mimepull-1.8
 1803250109 metadata/md5-cache/dev-java/netbeans-javacard-8.2
 1803021159 metadata/md5-cache/dev-java/sbt-bin-0.13.6
@@ -37683,7 +37695,7 @@
 1803250109 metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
 1803250109 metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
 1803021159 metadata/md5-cache/dev-java/airline-0.7-r1
-1803250109 metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
+1803312138 metadata/md5-cache/dev-java/cdegroot-db-0.08-r2
 1803110109 metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162-r1
 1803250109 metadata/md5-cache/dev-java/rhino-1.7.7-r1
 1803250109 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -38039,7 +38051,7 @@
 1702282329 metadata/md5-cache/net-p2p/ctcs-1.4.1
 1803290617 metadata/md5-cache/net-p2p/datacoin-hp-9999
 1803021159 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
-1803272138 metadata/md5-cache/net-p2p/go-ethereum-1.8.2
+1803312238 metadata/md5-cache/net-p2p/go-ethereum-1.8.2
 1702282329 metadata/md5-cache/net-p2p/xnap-2.5-r3
 1803290617 metadata/md5-cache/net-p2p/qbittorrent-9999
 1803290617 metadata/md5-cache/net-p2p/xmr-stak-2.2.0
@@ -38048,7 +38060,7 @@
 1803260908 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
 1803290617 metadata/md5-cache/net-p2p/qbittorrent-3.3.16
 1803250109 metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
-1803290139 metadata/md5-cache/net-p2p/transmission-2.93
+1803312208 metadata/md5-cache/net-p2p/transmission-2.93
 1803150038 metadata/md5-cache/net-p2p/mktorrent-1.1
 1803290617 metadata/md5-cache/net-p2p/deluge-9999
 1803290617 metadata/md5-cache/net-p2p/fms-0.3.79
@@ -38075,21 +38087,22 @@
 1803190338 metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
 1802262111 metadata/md5-cache/net-p2p/syrep-0.9
 1802262111 metadata/md5-cache/net-p2p/automatic-0.8.3
-1802161308 metadata/md5-cache/net-p2p/syncthing-0.14.44
+1803312238 metadata/md5-cache/net-p2p/syncthing-0.14.44
 1803290617 metadata/md5-cache/net-p2p/retroshare-0.6.9999
 1702282329 metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
 1803021159 metadata/md5-cache/net-p2p/amule-2.3.2-r1
 1711260441 metadata/md5-cache/net-p2p/bitflu-1.52
-1801280009 metadata/md5-cache/net-p2p/syncthing-0.14.38
+1803312238 metadata/md5-cache/net-p2p/syncthing-0.14.38
 1803021159 metadata/md5-cache/net-p2p/retroshare-0.6.3
 1803240038 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.13-r1
 1801290538 metadata/md5-cache/net-p2p/resilio-sync-2.5.12
 1803282239 metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
 1803290617 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+1803312138 metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6
 1803021159 metadata/md5-cache/net-p2p/ppcoind-0.4.0-r1
-1801280009 metadata/md5-cache/net-p2p/syncthing-0.14.40
+1803312238 metadata/md5-cache/net-p2p/syncthing-0.14.40
 1711260441 metadata/md5-cache/net-p2p/bitflu-1.51
-1803291339 metadata/md5-cache/net-p2p/Manifest.gz
+1804010238 metadata/md5-cache/net-p2p/Manifest.gz
 1803021159 metadata/md5-cache/net-p2p/myster-8.0-r1
 1803290617 metadata/md5-cache/net-p2p/torrentinfo-1.8.6
 1803290617 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -38097,6 +38110,7 @@
 1803021159 metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1
 1803290617 metadata/md5-cache/net-p2p/qbittorrent-4.0.4
 1803290617 metadata/md5-cache/net-p2p/deluge-1.3.15-r2
+1804010238 metadata/md5-cache/net-p2p/bitcoin-cli-0.16.0
 1803250109 metadata/md5-cache/net-p2p/freenet-0.7.5_p1478
 1803250109 metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
 1803290617 metadata/md5-cache/net-p2p/bittornado-0.3.18-r4
@@ -38108,6 +38122,8 @@
 1803290617 metadata/md5-cache/net-p2p/airdcpp-webclient-2.2.1
 1803021159 metadata/md5-cache/net-p2p/litecoind-0.10.4.0
 1803021159 metadata/md5-cache/net-p2p/ppcoind-0.4.0
+1804010238 metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
+1804010238 metadata/md5-cache/net-p2p/bitcoind-0.16.0
 1803290617 metadata/md5-cache/net-p2p/deluge-1.3.9999
 1803291339 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.14
 1803250109 metadata/md5-cache/net-p2p/vuze-5.7.2.0
@@ -38234,7 +38250,7 @@
 1803021159 metadata/md5-cache/sys-libs/openipmi-2.0.24
 1801050119 metadata/md5-cache/sys-libs/talloc-2.1.10
 1803021159 metadata/md5-cache/sys-libs/pwdb-0.62-r1
-1803021159 metadata/md5-cache/sys-libs/libstatgrab-0.91
+1804010308 metadata/md5-cache/sys-libs/libstatgrab-0.91
 1803021159 metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
 1803052308 metadata/md5-cache/sys-libs/db-6.2.23-r1
 1801041840 metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6
@@ -38286,7 +38302,7 @@
 1803290617 metadata/md5-cache/sys-libs/compiler-rt-9999
 1803301509 metadata/md5-cache/sys-libs/glibc-2.19-r1
 1803021159 metadata/md5-cache/sys-libs/libservicelog-1.1.11
-1803311738 metadata/md5-cache/sys-libs/Manifest.gz
+1804010308 metadata/md5-cache/sys-libs/Manifest.gz
 1803040008 metadata/md5-cache/sys-libs/uclibc-ng-1.0.29
 1803021159 metadata/md5-cache/sys-libs/slang-2.3.0
 1803021159 metadata/md5-cache/sys-libs/readline-5.2_p14
@@ -38777,7 +38793,7 @@
 1803021159 metadata/md5-cache/sci-libs/mc-1.5
 1702282331 metadata/md5-cache/sci-libs/suitesparse-4.0.2
 1803290617 metadata/md5-cache/sci-libs/votca-tools-1.4
-1803260908 metadata/md5-cache/sci-libs/szip-2.1-r2
+1803311908 metadata/md5-cache/sci-libs/szip-2.1-r2
 1803021159 metadata/md5-cache/sci-libs/oc-2.0
 1803290617 metadata/md5-cache/sci-libs/itpp-4.3.1-r1
 1803021159 metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r300
@@ -38891,7 +38907,7 @@
 1803021159 metadata/md5-cache/sci-libs/libcerf-1.3
 1803021159 metadata/md5-cache/sci-libs/libticalcs2-1.1.8
 1803021159 metadata/md5-cache/sci-libs/mkl-10.0.5.025
-1803302139 metadata/md5-cache/sci-libs/Manifest.gz
+1803311908 metadata/md5-cache/sci-libs/Manifest.gz
 1801011404 metadata/md5-cache/sci-libs/lrslib-051
 1803021159 metadata/md5-cache/sci-libs/p4est-1.0
 1803290617 metadata/md5-cache/sci-libs/vtk-8.1.0-r1
@@ -39132,7 +39148,6 @@
 1803021159 metadata/md5-cache/dev-ruby/date_validator-0.9.0
 1803252308 metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
 1803252308 metadata/md5-cache/dev-ruby/oauth-0.5.4
-1803222339 metadata/md5-cache/dev-ruby/activemodel-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/dep_selector-1.0.5
 1803021159 metadata/md5-cache/dev-ruby/did_you_mean-1.1.2
 1803021159 metadata/md5-cache/dev-ruby/columnize-0.9.0
@@ -39215,6 +39230,7 @@
 1803021159 metadata/md5-cache/dev-ruby/bindex-0.5.0
 1803052238 metadata/md5-cache/dev-ruby/faraday-0.14.0
 1803021159 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.4.0
+1804011008 metadata/md5-cache/dev-ruby/activesupport-5.1.6
 1803021159 metadata/md5-cache/dev-ruby/i18n-0.9.1
 1803021159 metadata/md5-cache/dev-ruby/warden-1.2.7
 1803021159 metadata/md5-cache/dev-ruby/cri-2.10.1
@@ -39226,7 +39242,6 @@
 1803021159 metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
 1803021159 metadata/md5-cache/dev-ruby/rspectacular-0.70.7
 1803021159 metadata/md5-cache/dev-ruby/metasploit-model-2.0.3
-1803222339 metadata/md5-cache/dev-ruby/actionview-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/tilt-2.0.7
 1803021159 metadata/md5-cache/dev-ruby/stomp-1.4.3
@@ -39271,10 +39286,9 @@
 1803021159 metadata/md5-cache/dev-ruby/httparty-0.15.5
 1803021159 metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
 1803021159 metadata/md5-cache/dev-ruby/ascii85-1.0.3
-1803311308 metadata/md5-cache/dev-ruby/rubygems-2.7.6
+1803311908 metadata/md5-cache/dev-ruby/rubygems-2.7.6
 1803021159 metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5
 1803021159 metadata/md5-cache/dev-ruby/ruby-progressbar-1.9.0
-1803222339 metadata/md5-cache/dev-ruby/actionview-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
 1803021159 metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.7
 1803021159 metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
@@ -39330,7 +39344,6 @@
 1803021159 metadata/md5-cache/dev-ruby/simplecov-html-0.10.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/git-1.3.0
-1803222339 metadata/md5-cache/dev-ruby/railties-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/tins-1.15.1
 1803222339 metadata/md5-cache/dev-ruby/unf-0.1.4
 1803021159 metadata/md5-cache/dev-ruby/rex-encoder-0.1.3
@@ -39355,7 +39368,6 @@
 1803160038 metadata/md5-cache/dev-ruby/psych-3.0.1
 1803021159 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
 1803021159 metadata/md5-cache/dev-ruby/equalizer-0.0.11
-1803021159 metadata/md5-cache/dev-ruby/actioncable-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.100
 1803021159 metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
 1803031138 metadata/md5-cache/dev-ruby/capistrano-3.10.1
@@ -39369,6 +39381,7 @@
 1803251609 metadata/md5-cache/dev-ruby/actionmailer-5.1.5
 1803021159 metadata/md5-cache/dev-ruby/barby-0.6.5
 1803021159 metadata/md5-cache/dev-ruby/lumberjack-1.0.12
+1804011008 metadata/md5-cache/dev-ruby/activemodel-5.1.6
 1803222339 metadata/md5-cache/dev-ruby/mysql2-0.3.21
 1803021159 metadata/md5-cache/dev-ruby/facter-2.5.1
 1803021159 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.3.1
@@ -39378,12 +39391,12 @@
 1803222339 metadata/md5-cache/dev-ruby/rack-test-0.6.3
 1803052038 metadata/md5-cache/dev-ruby/parser-2.5.0.2
 1803021159 metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.8
-1803222339 metadata/md5-cache/dev-ruby/actionmailer-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/roadie-3.2.2
 1803021159 metadata/md5-cache/dev-ruby/minitest-5.10.3
 1803021159 metadata/md5-cache/dev-ruby/did_you_mean-1.2.0
 1803021159 metadata/md5-cache/dev-ruby/radius-0.7.4-r4
 1803021159 metadata/md5-cache/dev-ruby/json-2.1.0
+1803312138 metadata/md5-cache/dev-ruby/activemodel-5.0.7
 1803222339 metadata/md5-cache/dev-ruby/activejob-4.2.10
 1803021159 metadata/md5-cache/dev-ruby/combustion-0.8.0
 1803021159 metadata/md5-cache/dev-ruby/amqp-1.7.0
@@ -39401,7 +39414,6 @@
 1803241138 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
 1803021159 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
 1803021159 metadata/md5-cache/dev-ruby/faraday-0.9.2-r2
-1803222339 metadata/md5-cache/dev-ruby/activemodel-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
 1803252308 metadata/md5-cache/dev-ruby/vcr-3.0.3
 1803021159 metadata/md5-cache/dev-ruby/test-unit-3.2.6
@@ -39415,7 +39427,6 @@
 1803021159 metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
 1803021159 metadata/md5-cache/dev-ruby/multi_test-0.1.2
 1803252108 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.3
-1803280108 metadata/md5-cache/dev-ruby/nokogiri-1.7.1
 1803021159 metadata/md5-cache/dev-ruby/test-unit-3.2.5
 1803021159 metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.8
@@ -39446,6 +39457,7 @@
 1803021159 metadata/md5-cache/dev-ruby/docile-1.2.0
 1803251609 metadata/md5-cache/dev-ruby/activejob-5.1.4
 1803021159 metadata/md5-cache/dev-ruby/hashr-2.0.1
+1804011008 metadata/md5-cache/dev-ruby/actionview-5.1.6
 1803222339 metadata/md5-cache/dev-ruby/activejob-5.1.1
 1803021159 metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
 1803280809 metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
@@ -39467,7 +39479,6 @@
 1803021159 metadata/md5-cache/dev-ruby/rake-compiler-1.0.4
 1803021159 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
 1803021159 metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
-1803222339 metadata/md5-cache/dev-ruby/actionpack-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.74
 1709241039 metadata/md5-cache/dev-ruby/puppetdb-termini-5.0.1
 1803021159 metadata/md5-cache/dev-ruby/parslet-1.8.2
@@ -39486,6 +39497,7 @@
 1803021159 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.0
 1803222339 metadata/md5-cache/dev-ruby/actionmailer-4.2.10
 1803241609 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
+1803312138 metadata/md5-cache/dev-ruby/activesupport-5.0.7
 1712140109 metadata/md5-cache/dev-ruby/puppetdb-termini-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
 1803021159 metadata/md5-cache/dev-ruby/bunny-2.9.2
@@ -39502,7 +39514,6 @@
 1803241138 metadata/md5-cache/dev-ruby/rspec-2.99.0
 1803222339 metadata/md5-cache/dev-ruby/loofah-2.1.1
 1803021159 metadata/md5-cache/dev-ruby/webmock-1.20.3
-1803222339 metadata/md5-cache/dev-ruby/activejob-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/actioncable-5.1.1
 1803211008 metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
 1803021159 metadata/md5-cache/dev-ruby/listen-3.1.5
@@ -39560,6 +39571,7 @@
 1803252308 metadata/md5-cache/dev-ruby/spring-2.0.2
 1803021159 metadata/md5-cache/dev-ruby/ruby-progressbar-1.8.1
 1803222339 metadata/md5-cache/dev-ruby/erubi-1.7.1
+1803312138 metadata/md5-cache/dev-ruby/rails-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
 1803251609 metadata/md5-cache/dev-ruby/actionmailer-5.1.4
 1803021159 metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
@@ -39567,12 +39579,14 @@
 1803280108 metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
 1803021159 metadata/md5-cache/dev-ruby/rake-10.5.0
 1803021159 metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+1804010838 metadata/md5-cache/dev-ruby/sanitize-4.6.4
 1803021159 metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
 1803021159 metadata/md5-cache/dev-ruby/syntax-1.2.1
 1803021159 metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
 1803021159 metadata/md5-cache/dev-ruby/twitter-5.17.0-r1
 1803021159 metadata/md5-cache/dev-ruby/little-plugger-1.1.4
 1803021159 metadata/md5-cache/dev-ruby/rex-zip-0.1.1
+1803312138 metadata/md5-cache/dev-ruby/activejob-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/sdoc-0.4.1
 1803222339 metadata/md5-cache/dev-ruby/crass-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -39634,7 +39648,6 @@
 1803021159 metadata/md5-cache/dev-ruby/bundler-1.16.1
 1803061008 metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
 1803222339 metadata/md5-cache/dev-ruby/erubi-1.7.0
-1803280108 metadata/md5-cache/dev-ruby/nokogiri-1.6.8.1
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.100
 1803140208 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
 1803021159 metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -39703,8 +39716,6 @@
 1803222339 metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
 1803222339 metadata/md5-cache/dev-ruby/public_suffix-3.0.2
 1803222339 metadata/md5-cache/dev-ruby/maruku-0.7.3
-1803222339 metadata/md5-cache/dev-ruby/activejob-5.1.3
-1803252308 metadata/md5-cache/dev-ruby/activesupport-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/instance_storage-1.0.0
 1803021159 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
 1803021159 metadata/md5-cache/dev-ruby/bundler-1.13.7
@@ -39726,6 +39737,7 @@
 1803021159 metadata/md5-cache/dev-ruby/bit-struct-0.16
 1803021159 metadata/md5-cache/dev-ruby/ruby-prof-0.16.2
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.37
+1803312138 metadata/md5-cache/dev-ruby/actionpack-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/builder-3.2.3
 1803021159 metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
 1803021159 metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -39750,6 +39762,7 @@
 1803021159 metadata/md5-cache/dev-ruby/qed-2.9.2
 1803021159 metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
 1803021159 metadata/md5-cache/dev-ruby/sass-3.4.25
+1803312138 metadata/md5-cache/dev-ruby/actionview-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/fivemat-1.3.6
 1803021159 metadata/md5-cache/dev-ruby/chunky_png-1.3.8
 1803021159 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
@@ -39775,7 +39788,7 @@
 1803021159 metadata/md5-cache/dev-ruby/sanitize-4.5.0
 1803021159 metadata/md5-cache/dev-ruby/capistrano-3.9.1
 1803021159 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1803311738 metadata/md5-cache/dev-ruby/Manifest.gz
+1804011008 metadata/md5-cache/dev-ruby/Manifest.gz
 1803021159 metadata/md5-cache/dev-ruby/bunny-2.8.1
 1803021159 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1803021159 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -39788,6 +39801,7 @@
 1803090938 metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0
 1803021159 metadata/md5-cache/dev-ruby/eventmachine-1.2.0.1
 1803252308 metadata/md5-cache/dev-ruby/vcr-4.0.0
+1804011008 metadata/md5-cache/dev-ruby/rails-5.1.6
 1803021159 metadata/md5-cache/dev-ruby/d3_rails-4.1.1
 1803021159 metadata/md5-cache/dev-ruby/plist-3.4.0
 1803021159 metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.0-r1
@@ -39828,7 +39842,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-gio2-3.0.8
 1803021159 metadata/md5-cache/dev-ruby/pry-0.11.3
 1803021159 metadata/md5-cache/dev-ruby/rails-4.2.10
-1803222339 metadata/md5-cache/dev-ruby/activesupport-5.1.2
 1803190938 metadata/md5-cache/dev-ruby/request_store-1.4.1
 1803252308 metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
 1803021159 metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -39865,6 +39878,7 @@
 1803021159 metadata/md5-cache/dev-ruby/activesupport-5.1.1
 1803222339 metadata/md5-cache/dev-ruby/tilt-2.0.8
 1803021159 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+1803312138 metadata/md5-cache/dev-ruby/activerecord-5.0.7
 1803211008 metadata/md5-cache/dev-ruby/stringex-2.8.4
 1803021159 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
 1803021159 metadata/md5-cache/dev-ruby/network_interface-0.0.2
@@ -39888,7 +39902,6 @@
 1803290617 metadata/md5-cache/dev-ruby/facter-3.9.5
 1803222339 metadata/md5-cache/dev-ruby/addressable-2.5.2
 1803021159 metadata/md5-cache/dev-ruby/awesome_print-1.8.0
-1803222339 metadata/md5-cache/dev-ruby/railties-5.1.3
 1803222339 metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r1
 1803222339 metadata/md5-cache/dev-ruby/sinatra-1.4.7
 1803251609 metadata/md5-cache/dev-ruby/hashdiff-0.3.7
@@ -39930,6 +39943,7 @@
 1803021159 metadata/md5-cache/dev-ruby/jsobfu-0.4.2
 1803021159 metadata/md5-cache/dev-ruby/escape_utils-1.2.1
 1803222339 metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+1803312138 metadata/md5-cache/dev-ruby/actioncable-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/ttfunk-1.5.0
 1803021159 metadata/md5-cache/dev-ruby/rake-12.0.0
 1803021159 metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
@@ -39937,7 +39951,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ruby-atk-3.1.3
 1803061008 metadata/md5-cache/dev-ruby/rex-zip-0.1.3
 1803021159 metadata/md5-cache/dev-ruby/magic-0.2.9
-1803222339 metadata/md5-cache/dev-ruby/activerecord-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/color-1.8
 1803021159 metadata/md5-cache/dev-ruby/packetfu-1.1.13
 1803021159 metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -39962,7 +39975,6 @@
 1803021159 metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
 1803021159 metadata/md5-cache/dev-ruby/faraday_middleware-0.11.0
 1803021159 metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.4
-1803021159 metadata/md5-cache/dev-ruby/actioncable-5.1.3
 1803210508 metadata/md5-cache/dev-ruby/racc-1.4.14
 1803021408 metadata/md5-cache/dev-ruby/netrc-0.11.0
 1803021159 metadata/md5-cache/dev-ruby/fast_gettext-1.6.0
@@ -39971,7 +39983,6 @@
 1803021159 metadata/md5-cache/dev-ruby/ffaker-2.6.0
 1803021159 metadata/md5-cache/dev-ruby/pdf-core-0.7.0
 1803021159 metadata/md5-cache/dev-ruby/ruby-pango-3.1.3
-1803222339 metadata/md5-cache/dev-ruby/activerecord-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.0
 1803021159 metadata/md5-cache/dev-ruby/octokit-4.7.0
 1803021159 metadata/md5-cache/dev-ruby/faraday-0.11.0
@@ -39995,10 +40006,12 @@
 1803021159 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
 1803252108 metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1
 1803021159 metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
+1803312138 metadata/md5-cache/dev-ruby/actionmailer-5.0.7
 1803222339 metadata/md5-cache/dev-ruby/http-2.2.1
 1803222339 metadata/md5-cache/dev-ruby/activemodel-5.1.1
 1803222339 metadata/md5-cache/dev-ruby/globalid-0.4.0
 1803021159 metadata/md5-cache/dev-ruby/rubypants-0.7.0
+1804011008 metadata/md5-cache/dev-ruby/activerecord-5.1.6
 1803311738 metadata/md5-cache/dev-ruby/pkg-config-1.2.8
 1803021159 metadata/md5-cache/dev-ruby/libxml-2.9.0
 1803021159 metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -40061,7 +40074,6 @@
 1803021159 metadata/md5-cache/dev-ruby/serialport-1.3.1
 1803021159 metadata/md5-cache/dev-ruby/pg-0.17.1-r1
 1803021159 metadata/md5-cache/dev-ruby/kissfft-0.0.2
-1803222339 metadata/md5-cache/dev-ruby/actionpack-5.1.2
 1803252108 metadata/md5-cache/dev-ruby/rails-5.1.4
 1803021159 metadata/md5-cache/dev-ruby/power_assert-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/multi_xml-0.5.5
@@ -40077,6 +40089,7 @@
 1803222339 metadata/md5-cache/dev-ruby/haml-5.0.2
 1803021159 metadata/md5-cache/dev-ruby/d3_rails-3.5.17
 1803021159 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+1804011008 metadata/md5-cache/dev-ruby/actioncable-5.1.6
 1803021159 metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.8
 1803021159 metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -40144,7 +40157,6 @@
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-core-2.9.44
 1803251609 metadata/md5-cache/dev-ruby/activejob-5.1.5
 1803021159 metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.1.9
-1803021159 metadata/md5-cache/dev-ruby/rails-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/html2haml-2.2.0
 1803021159 metadata/md5-cache/dev-ruby/slop-4.4.1
 1803021159 metadata/md5-cache/dev-ruby/vlad-2.7.0
@@ -40201,6 +40213,7 @@
 1803252308 metadata/md5-cache/dev-ruby/celluloid-0.17.3
 1803021159 metadata/md5-cache/dev-ruby/factory_girl-4.8.1
 1803021159 metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0-r2
+1804011008 metadata/md5-cache/dev-ruby/railties-5.1.6
 1803280108 metadata/md5-cache/dev-ruby/kramdown-1.14.0
 1803311738 metadata/md5-cache/dev-ruby/nokogiri-1.8.1
 1803222339 metadata/md5-cache/dev-ruby/asciidoctor-1.5.6
@@ -40208,8 +40221,8 @@
 1803021159 metadata/md5-cache/dev-ruby/rake-12.1.0
 1803222339 metadata/md5-cache/dev-ruby/asciimath-1.0.4
 1803021159 metadata/md5-cache/dev-ruby/dalli-2.7.6
+1804011008 metadata/md5-cache/dev-ruby/actionpack-5.1.6
 1803252308 metadata/md5-cache/dev-ruby/actionview-4.2.10
-1803222339 metadata/md5-cache/dev-ruby/actionmailer-5.1.3
 1803021159 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.8
 1803190938 metadata/md5-cache/dev-ruby/selenium-webdriver-3.11.0
 1803021159 metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -40255,11 +40268,11 @@
 1803222339 metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
 1803021159 metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.3
 1803021159 metadata/md5-cache/dev-ruby/rdoc-6.0.1
+1804011008 metadata/md5-cache/dev-ruby/activejob-5.1.6
 1803021159 metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
 1803021159 metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
 1803021159 metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
 1803290617 metadata/md5-cache/dev-ruby/facter-3.9.2
-1803021159 metadata/md5-cache/dev-ruby/rails-5.1.2
 1803021159 metadata/md5-cache/dev-ruby/rex-struct2-0.1.1
 1803021159 metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
 1803072038 metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -40281,6 +40294,7 @@
 1803021159 metadata/md5-cache/dev-ruby/aws-sdk-2.10.74
 1803021159 metadata/md5-cache/dev-ruby/sawyer-0.8.1
 1803021159 metadata/md5-cache/dev-ruby/jquery-rails-4.2.2
+1804010838 metadata/md5-cache/dev-ruby/ddplugin-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/mime-types-2.6.2
 1803222339 metadata/md5-cache/dev-ruby/mini_mime-1.0.0
 1803021159 metadata/md5-cache/dev-ruby/dbf-3.1.0
@@ -40291,11 +40305,13 @@
 1803252308 metadata/md5-cache/dev-ruby/hashie-3.5.7
 1803021159 metadata/md5-cache/dev-ruby/poltergeist-1.14.0
 1803021159 metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+1804011008 metadata/md5-cache/dev-ruby/actionmailer-5.1.6
 1803021159 metadata/md5-cache/dev-ruby/atomic-1.1.99
 1803021159 metadata/md5-cache/dev-ruby/childprocess-0.7.0
 1803021159 metadata/md5-cache/dev-ruby/mini_magick-4.8.0
 1803210508 metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
 1803021159 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
+1803312138 metadata/md5-cache/dev-ruby/railties-5.0.7
 1803021159 metadata/md5-cache/dev-ruby/mocha-0.14.0
 1803021159 metadata/md5-cache/dev-ruby/syslogger-1.6.5
 1803021159 metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3-r1
@@ -40846,14 +40862,14 @@
 1712292010 metadata/md5-cache/app-emacs/jasmin-1.2-r2
 1712292010 metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
 1802210008 metadata/md5-cache/app-emacs/inform-mode-1.5.8
-1803310938 metadata/md5-cache/app-emacs/Manifest.gz
+1803312138 metadata/md5-cache/app-emacs/Manifest.gz
 1712292010 metadata/md5-cache/app-emacs/flim-1.14.9-r2
 1712292010 metadata/md5-cache/app-emacs/emacs-daemon-0.22
 1801011404 metadata/md5-cache/app-emacs/mpg123-el-1.59
 1712292010 metadata/md5-cache/app-emacs/riece-8.0.0
 1802210008 metadata/md5-cache/app-emacs/folding-2012.0226.1623
 1802210008 metadata/md5-cache/app-emacs/setnu-1.06
-1803310938 metadata/md5-cache/app-emacs/ghub-2.0.0
+1803312138 metadata/md5-cache/app-emacs/ghub-2.0.0
 1712292010 metadata/md5-cache/app-emacs/yasnippet-0.6.0c
 1712292010 metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
 1712292010 metadata/md5-cache/app-emacs/fff-20050517
@@ -41278,11 +41294,11 @@
 1803021159 metadata/md5-cache/net-fs/smbnetfs-0.6.0-r1
 1803021159 metadata/md5-cache/net-fs/libnfs-1.9.5
 1803201012 metadata/md5-cache/net-fs/s3fs-1.83
-1803191438 metadata/md5-cache/net-fs/sshfs-3.3.1
+1803312208 metadata/md5-cache/net-fs/sshfs-3.3.1
 1803021159 metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
 1702282328 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.3
-1803191438 metadata/md5-cache/net-fs/sshfs-2.10-r1
-1803301739 metadata/md5-cache/net-fs/minio-0_pre20180330
+1803312208 metadata/md5-cache/net-fs/sshfs-2.10-r1
+1803312238 metadata/md5-cache/net-fs/minio-0_pre20180330
 1803190338 metadata/md5-cache/net-fs/cifs-utils-6.7
 1803021159 metadata/md5-cache/net-fs/cifs-utils-6.4
 1803021159 metadata/md5-cache/net-fs/libnfs-1.10.0
@@ -41307,32 +41323,32 @@
 1803290009 metadata/md5-cache/net-fs/nfs-utils-2.3.1-r3
 1802262111 metadata/md5-cache/net-fs/s3fs-1.80
 1803021159 metadata/md5-cache/net-fs/openafs-1.6.22.1
-1802202308 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+1803312238 metadata/md5-cache/net-fs/docker-volume-netshare-0.35
 1803021159 metadata/md5-cache/net-fs/netatalk-3.1.11
 1803021159 metadata/md5-cache/net-fs/libnfs-1.9.7
 1803021159 metadata/md5-cache/net-fs/openafs-kernel-1.6.22.1
-1803301739 metadata/md5-cache/net-fs/Manifest.gz
+1803312238 metadata/md5-cache/net-fs/Manifest.gz
 1803271108 metadata/md5-cache/net-fs/samba-4.7.6
 1803220938 metadata/md5-cache/net-fs/samba-4.5.16
 1803100309 metadata/md5-cache/net-fs/smbnetfs-0.6.1
 1803021159 metadata/md5-cache/net-fs/openafs-1.6.22.2
 1803271108 metadata/md5-cache/net-fs/samba-4.8.0
-1802271608 metadata/md5-cache/net-fs/minio-0_pre20180209
+1803312238 metadata/md5-cache/net-fs/minio-0_pre20180209
 1803021159 metadata/md5-cache/net-fs/nfs-utils-2.2.2_rc1-r1
 1803131609 metadata/md5-cache/net-fs/samba-4.2.14
 1803021159 metadata/md5-cache/net-fs/autofs-5.1.2
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
 1803150038 metadata/md5-cache/net-fs/libnfs-2.0.0
-1803301739 metadata/md5-cache/net-fs/mc-0_pre20180325
+1803312238 metadata/md5-cache/net-fs/mc-0_pre20180325
 1803290617 metadata/md5-cache/net-fs/nfstest-1.0.2
 1803021159 metadata/md5-cache/net-fs/libnfs-1.9.8
 1803021159 metadata/md5-cache/net-fs/nfs-utils-1.3.4-r1
 1803021159 metadata/md5-cache/net-fs/netatalk-3.1.8
 1803221908 metadata/md5-cache/net-fs/samba-4.6.14
-1801280009 metadata/md5-cache/net-fs/docker-volume-netshare-0.34
+1803312238 metadata/md5-cache/net-fs/docker-volume-netshare-0.34
 1801301738 metadata/md5-cache/net-fs/autofs-5.1.4
 1803021159 metadata/md5-cache/net-fs/nfs-utils-2.2.1-r1
-1802271608 metadata/md5-cache/net-fs/mc-0_pre20180209
+1803312238 metadata/md5-cache/net-fs/mc-0_pre20180209
 1803021159 metadata/md5-cache/net-fs/nfs-utils-2.1.1-r1
 1802262111 metadata/md5-cache/net-fs/btfs-2.18
 1803150038 metadata/md5-cache/net-fs/davfs2-1.5.4
@@ -41449,7 +41465,7 @@
 1801011404 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
 1803021159 metadata/md5-cache/app-crypt/sbsigntool-0.6-r1
 1802262111 metadata/md5-cache/app-crypt/stoken-0.92
-1802261338 metadata/md5-cache/app-crypt/cfssl-1.3.1
+1803312238 metadata/md5-cache/app-crypt/cfssl-1.3.1
 1702282308 metadata/md5-cache/app-crypt/etcd-ca-0_p20150423
 1702282308 metadata/md5-cache/app-crypt/gpg-ringmgr-1.12
 1803290617 metadata/md5-cache/app-crypt/qca-2.1.3-r2
@@ -41484,7 +41500,7 @@
 1803290617 metadata/md5-cache/app-crypt/acme-0.21.1
 1803021159 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1802262111 metadata/md5-cache/app-crypt/onak-0.5.0
-1803311738 metadata/md5-cache/app-crypt/Manifest.gz
+1803312238 metadata/md5-cache/app-crypt/Manifest.gz
 1708210038 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1802262111 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1803021159 metadata/md5-cache/app-crypt/jetring-0.25
@@ -41554,7 +41570,7 @@
 1803270108 metadata/md5-cache/app-crypt/dehydrated-0.6.1
 1803021159 metadata/md5-cache/app-crypt/sign-1.0.7
 1702282308 metadata/md5-cache/app-crypt/pkcs11-data-0.7.4
-1803291508 metadata/md5-cache/app-crypt/cfssl-1.3.2
+1803312238 metadata/md5-cache/app-crypt/cfssl-1.3.2
 1802102238 metadata/md5-cache/app-crypt/hmaccalc-0.9.14
 1802262111 metadata/md5-cache/app-crypt/signing-party-2.6
 1803290617 metadata/md5-cache/app-crypt/gkeys-9999
@@ -41955,7 +41971,7 @@
 1803021159 metadata/md5-cache/net-irc/irssi-1.0.4
 1803021159 metadata/md5-cache/net-irc/irssi-otr-1.0.0-r1
 1702282328 metadata/md5-cache/net-irc/ircmap-0.99
-1803260209 metadata/md5-cache/net-irc/irssi-1.0.7
+1803312308 metadata/md5-cache/net-irc/irssi-1.0.7
 1803021159 metadata/md5-cache/net-irc/eiwic-1.1.4
 1803290617 metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
 1803021159 metadata/md5-cache/net-irc/irker-2.12
@@ -41975,7 +41991,7 @@
 1803021159 metadata/md5-cache/net-irc/cgiirc-0.5.10
 1803290617 metadata/md5-cache/net-irc/kvirc-9999
 1803041138 metadata/md5-cache/net-irc/irssi-1.0.6
-1803290617 metadata/md5-cache/net-irc/Manifest.gz
+1803312308 metadata/md5-cache/net-irc/Manifest.gz
 1803021159 metadata/md5-cache/net-irc/ircii-20111115
 1803021159 metadata/md5-cache/net-irc/onis-0.8.2-r1
 1803290617 metadata/md5-cache/net-irc/quassel-0.12.4
@@ -42093,11 +42109,11 @@
 1802262111 metadata/md5-cache/sys-auth/google-authenticator-1.05
 1803021159 metadata/md5-cache/sys-auth/openpam-20140912-r1
 1802262111 metadata/md5-cache/sys-auth/libnss-nis-1.4
-1803310408 metadata/md5-cache/sys-auth/Manifest.gz
+1803312238 metadata/md5-cache/sys-auth/Manifest.gz
 1803021159 metadata/md5-cache/sys-auth/pambase-20120417-r3
 1803021159 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 1803021159 metadata/md5-cache/sys-auth/pambase-20150213
-1711260441 metadata/md5-cache/sys-auth/docker_auth-1.3-r2
+1803312238 metadata/md5-cache/sys-auth/docker_auth-1.3-r2
 1803021159 metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
 1802262111 metadata/md5-cache/sys-auth/pam-script-1.1.8
 1803290617 metadata/md5-cache/sys-auth/polkit-qt-0.112.0_p20160416-r1
@@ -42314,7 +42330,7 @@
 1803021159 metadata/md5-cache/net-libs/net6-1.3.14-r2
 1801011404 metadata/md5-cache/net-libs/net6-1.3.14
 1803290617 metadata/md5-cache/net-libs/mbedtls-2.8.0
-1803052038 metadata/md5-cache/net-libs/libident-0.32-r1
+1803312308 metadata/md5-cache/net-libs/libident-0.32-r1
 1802161609 metadata/md5-cache/net-libs/gnutls-3.5.18
 1803290617 metadata/md5-cache/net-libs/nfqueue-bindings-0.6
 1803290617 metadata/md5-cache/net-libs/biblesync-1.1.2
@@ -42353,7 +42369,7 @@
 1702282329 metadata/md5-cache/net-libs/libntlm-1.3
 1803201708 metadata/md5-cache/net-libs/libtirpc-1.0.3
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.2
-1803021159 metadata/md5-cache/net-libs/libnatpmp-20150609
+1803312208 metadata/md5-cache/net-libs/libnatpmp-20150609
 1802262111 metadata/md5-cache/net-libs/libpcap-1.8.1-r2
 1803021159 metadata/md5-cache/net-libs/vanessa-socket-0.0.12
 1801011404 metadata/md5-cache/net-libs/libqmi-1.18.0
@@ -42391,7 +42407,7 @@
 1803021159 metadata/md5-cache/net-libs/ccnet-6.1.4
 1803021159 metadata/md5-cache/net-libs/libsrtp-1.5.2
 1801011404 metadata/md5-cache/net-libs/libmbim-1.6.0
-1803311408 metadata/md5-cache/net-libs/Manifest.gz
+1804010238 metadata/md5-cache/net-libs/Manifest.gz
 1803290617 metadata/md5-cache/net-libs/librsync-2.0.0
 1803021159 metadata/md5-cache/net-libs/courier-unicode-1.4
 1803290617 metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -42548,6 +42564,7 @@
 1803021159 metadata/md5-cache/net-libs/gupnp-igd-0.2.4
 1803021159 metadata/md5-cache/net-libs/libpcapnav-0.8
 1803021159 metadata/md5-cache/net-libs/libmnl-1.0.4
+1804010238 metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.0
 1803021159 metadata/md5-cache/net-libs/serf-1.3.9
 1803011408 metadata/md5-cache/net-libs/libbloom-1.5
 1803021159 metadata/md5-cache/net-libs/telepathy-accounts-signon-1.0
@@ -43318,7 +43335,7 @@
 1801011405 metadata/md5-cache/x11-misc/spnavcfg-0.3
 1703221038 metadata/md5-cache/x11-misc/fbpager-20090221-r1
 1706141238 metadata/md5-cache/x11-misc/sct-0.3
-1803120939 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+1803312208 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
 1801091400 metadata/md5-cache/x11-misc/notification-daemon-3.20.0
 1803021159 metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
 1802262208 metadata/md5-cache/x11-misc/xbatt-1.3_rc1
@@ -43546,7 +43563,7 @@
 1803021159 metadata/md5-cache/x11-misc/spacefm-1.0.4-r1
 1803021159 metadata/md5-cache/x11-misc/peksystray-0.4.0
 1803021159 metadata/md5-cache/x11-misc/shutter-0.93.1-r3
-1803310208 metadata/md5-cache/x11-misc/Manifest.gz
+1803312208 metadata/md5-cache/x11-misc/Manifest.gz
 1801042239 metadata/md5-cache/x11-misc/libinput-gestures-2.30
 1803021159 metadata/md5-cache/x11-misc/gccmakedep-1.0.3
 1801091400 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
@@ -43588,7 +43605,7 @@
 1803021159 metadata/md5-cache/x11-misc/xfractint-20.04_p12
 1803021159 metadata/md5-cache/x11-misc/peksystray-0.2.1
 1803021159 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.1-r1
-1803021159 metadata/md5-cache/x11-misc/redshift-1.11-r1
+1803311938 metadata/md5-cache/x11-misc/redshift-1.11-r1
 1803270108 metadata/md5-cache/x11-misc/i3lock-2.10
 1803290617 metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0
 1801041840 metadata/md5-cache/x11-misc/primus-0.2
@@ -44196,7 +44213,7 @@
 1803021159 metadata/md5-cache/dev-libs/newt-0.52.15
 1803290617 metadata/md5-cache/dev-libs/qrosspython-9999
 1802262111 metadata/md5-cache/dev-libs/fstrm-0.3.0
-1803290617 metadata/md5-cache/dev-libs/qtkeychain-0.8.0
+1803312208 metadata/md5-cache/dev-libs/qtkeychain-0.8.0
 1803021159 metadata/md5-cache/dev-libs/leveldb-1.13.0-r1
 1801050119 metadata/md5-cache/dev-libs/tut-2016.12.19
 1801011404 metadata/md5-cache/dev-libs/opensc-0.16.0
@@ -44246,7 +44263,7 @@
 1803021159 metadata/md5-cache/dev-libs/libmateweather-1.16.1
 1802141308 metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
 1803021159 metadata/md5-cache/dev-libs/libmacaroons-0.3.0
-1803290617 metadata/md5-cache/dev-libs/jsoncpp-1.8.4
+1804010308 metadata/md5-cache/dev-libs/jsoncpp-1.8.4
 1803251408 metadata/md5-cache/dev-libs/dotconf-1.3-r1
 1803021159 metadata/md5-cache/dev-libs/libnsutils-0.0.3
 1803021159 metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p1-r1
@@ -44322,7 +44339,7 @@
 1803021159 metadata/md5-cache/dev-libs/log4shib-1.0.1
 1803021159 metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1
 1803021159 metadata/md5-cache/dev-libs/squareball-0.2.0
-1803201308 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
+1803311908 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
 1803150108 metadata/md5-cache/dev-libs/vala-common-0.36.7
 1803021159 metadata/md5-cache/dev-libs/xmlwrapp-0.8.1
 1803021159 metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2
@@ -44388,7 +44405,7 @@
 1801140209 metadata/md5-cache/dev-libs/libmowgli-1.0.0-r1
 1803211008 metadata/md5-cache/dev-libs/libpcre-8.42
 1801011404 metadata/md5-cache/dev-libs/crossguid-0_pre20150817
-1803311408 metadata/md5-cache/dev-libs/libtasn1-4.13
+1803311908 metadata/md5-cache/dev-libs/libtasn1-4.13
 1702282313 metadata/md5-cache/dev-libs/libmodbus-3.1.4
 1803021159 metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
 1803290617 metadata/md5-cache/dev-libs/libevent-9999
@@ -44753,7 +44770,7 @@
 1803021159 metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
 1803021159 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p03-r1
 1803290617 metadata/md5-cache/dev-libs/beignet-9999
-1803311408 metadata/md5-cache/dev-libs/Manifest.gz
+1804010308 metadata/md5-cache/dev-libs/Manifest.gz
 1803021159 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1803021159 metadata/md5-cache/dev-libs/libcli-1.9.7
 1803021159 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -45760,13 +45777,13 @@
 1803270108 metadata/md5-cache/sys-process/htop-3.0.0_beta3
 1803021159 metadata/md5-cache/sys-process/daemontools-0.76-r7
 1803021159 metadata/md5-cache/sys-process/numactl-2.0.11
-1707301139 metadata/md5-cache/sys-process/ctop-0.5.1
+1803312238 metadata/md5-cache/sys-process/ctop-0.5.1
 1803290617 metadata/md5-cache/sys-process/memwatch-0.2.1
 1803021159 metadata/md5-cache/sys-process/dumb-init-1.2.1
 1803021159 metadata/md5-cache/sys-process/incron-0.5.10-r1
 1803021159 metadata/md5-cache/sys-process/prll-0.6.2
 1803021159 metadata/md5-cache/sys-process/time-1.7-r3
-1803290617 metadata/md5-cache/sys-process/Manifest.gz
+1803312238 metadata/md5-cache/sys-process/Manifest.gz
 1803021159 metadata/md5-cache/sys-process/latencytop-0.5-r1
 1803290617 metadata/md5-cache/sys-process/memwatch-0.3.1
 1803290617 metadata/md5-cache/sys-process/memwatch-0.3.2
@@ -46172,7 +46189,7 @@
 1803021159 metadata/md5-cache/app-arch/pbzip2-1.1.13
 1801011404 metadata/md5-cache/app-arch/hardlink-0.3.0
 1803290617 metadata/md5-cache/app-arch/lz4-1.8.1.2
-1803311408 metadata/md5-cache/app-arch/unace-2.5-r5
+1803311908 metadata/md5-cache/app-arch/unace-2.5-r5
 1803021159 metadata/md5-cache/app-arch/gzip-1.8
 1803290617 metadata/md5-cache/app-arch/patool-1.12
 1801091400 metadata/md5-cache/app-arch/dump-0.4.46
@@ -46182,7 +46199,7 @@
 1803021159 metadata/md5-cache/app-arch/xz-utils-5.2.2
 1803290617 metadata/md5-cache/app-arch/brotli-9999
 1803021159 metadata/md5-cache/app-arch/mt-st-1.3
-1803021159 metadata/md5-cache/app-arch/file-roller-3.24.1
+1803312208 metadata/md5-cache/app-arch/file-roller-3.24.1
 1803021159 metadata/md5-cache/app-arch/arj-3.10.22-r5
 1803021159 metadata/md5-cache/app-arch/fastjar-0.98-r2
 1803021159 metadata/md5-cache/app-arch/engrampa-1.16.1
@@ -46198,7 +46215,7 @@
 1802272308 metadata/md5-cache/app-arch/afio-2.5.1-r1
 1803021159 metadata/md5-cache/app-arch/cfv-1.18.3-r1
 1803021159 metadata/md5-cache/app-arch/engrampa-1.14.1-r1
-1803311608 metadata/md5-cache/app-arch/Manifest.gz
+1803312208 metadata/md5-cache/app-arch/Manifest.gz
 1803290617 metadata/md5-cache/app-arch/brotli-1.0.3-r1
 1801011404 metadata/md5-cache/app-arch/zstd-1.1.3
 1803021159 metadata/md5-cache/app-arch/pbzip2-1.1.12
@@ -46342,11 +46359,11 @@
 1801191240 metadata/md5-cache/dev-db/cockroach-1.1.3
 1803021159 metadata/md5-cache/dev-db/repmgr-3.3.2
 1801191240 metadata/md5-cache/dev-db/cockroach-1.1.2
-1803291609 metadata/md5-cache/dev-db/etcd-3.3.3
+1803312238 metadata/md5-cache/dev-db/etcd-3.3.3
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.2
 1710300239 metadata/md5-cache/dev-db/xtrabackup-bin-2.4.4
 1803021159 metadata/md5-cache/dev-db/mysql++-2.3.2
-1709151038 metadata/md5-cache/dev-db/rqlite-4.1.0
+1803312238 metadata/md5-cache/dev-db/rqlite-4.1.0
 1803172338 metadata/md5-cache/dev-db/sqlite-3.22.0
 1802221208 metadata/md5-cache/dev-db/psqlodbc-10.01.0000
 1803021159 metadata/md5-cache/dev-db/mongodb-3.4.13
@@ -46414,7 +46431,7 @@
 1803021159 metadata/md5-cache/dev-db/libdbi-0.9.0
 1803180039 metadata/md5-cache/dev-db/postgresql-10.3
 1707051608 metadata/md5-cache/dev-db/m17n-contrib-1.1.13
-1703170309 metadata/md5-cache/dev-db/mysqltuner-1.6.18
+1804010308 metadata/md5-cache/dev-db/mysqltuner-1.6.18
 1803021159 metadata/md5-cache/dev-db/libzdb-2.12
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
 1803021159 metadata/md5-cache/dev-db/odbtp-1.1.4
@@ -46467,7 +46484,7 @@
 1803290617 metadata/md5-cache/dev-db/mariadb-10.0.33
 1803021159 metadata/md5-cache/dev-db/firebird-3.0.2.32703.0-r2
 1803290617 metadata/md5-cache/dev-db/mycli-1.15.0-r2
-1803091839 metadata/md5-cache/dev-db/etcd-3.3.2
+1803312238 metadata/md5-cache/dev-db/etcd-3.3.2
 1803042038 metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
 1803021159 metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
 1802262111 metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
@@ -46498,7 +46515,7 @@
 1803021159 metadata/md5-cache/dev-db/go-etcd-2.0.0
 1803301709 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1803021159 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1803310438 metadata/md5-cache/dev-db/Manifest.gz
+1804010308 metadata/md5-cache/dev-db/Manifest.gz
 1803021159 metadata/md5-cache/dev-db/sqldeveloper-4.1.5.21.78
 1803290617 metadata/md5-cache/dev-db/freetds-9999
 1707051608 metadata/md5-cache/dev-db/m17n-db-1.6.3
@@ -46526,7 +46543,7 @@
 1803290617 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
 1801152209 metadata/md5-cache/dev-db/pgbadger-9.2
 1707051509 metadata/md5-cache/dev-db/m17n-contrib-1.1.14
-1803240038 metadata/md5-cache/dev-db/influxdb-1.5.1
+1803312238 metadata/md5-cache/dev-db/influxdb-1.5.1
 1803021159 metadata/md5-cache/dev-db/hyperdex-1.8.0
 1710300239 metadata/md5-cache/dev-db/xtrabackup-bin-2.4.6
 1803021159 metadata/md5-cache/dev-db/postgresql-9.5.10
@@ -46540,7 +46557,7 @@
 1801181739 metadata/md5-cache/dev-db/myodbc-5.3.9
 1803021159 metadata/md5-cache/dev-db/cdb-0.75-r4
 1801130040 metadata/md5-cache/dev-db/pgpool2-3.7.1
-1708091009 metadata/md5-cache/dev-db/rqlite-4.0.2
+1803312238 metadata/md5-cache/dev-db/rqlite-4.0.2
 1803290617 metadata/md5-cache/dev-db/mariadb-10.1.31-r1
 1803280439 metadata/md5-cache/dev-db/lmdb-0.9.19
 1803250109 metadata/md5-cache/dev-db/apgdiff-1.4
@@ -46583,7 +46600,7 @@
 1803290617 metadata/md5-cache/dev-db/soci-3.2.3
 1801280009 metadata/md5-cache/dev-db/rethinkdb-2.3.6
 1802262111 metadata/md5-cache/dev-db/xbase-3.1.2
-1803091839 metadata/md5-cache/dev-db/etcd-3.2.17
+1803312238 metadata/md5-cache/dev-db/etcd-3.2.17
 1801011404 metadata/md5-cache/dev-db/datadraw-3.1.1
 1803021159 metadata/md5-cache/dev-db/postgis-2.4.3
 1803021159 metadata/md5-cache/dev-db/libzdb-3.1
@@ -46655,6 +46672,7 @@
 1803290617 metadata/md5-cache/sys-kernel/spl-9999
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.4.110
 1803141508 metadata/md5-cache/sys-kernel/rt-sources-4.9.84_p62
+1804010238 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.126
 1803290617 metadata/md5-cache/sys-kernel/dracut-9999
 1803251738 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.124
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.9.68
@@ -46746,6 +46764,7 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.15.2
 1803021159 metadata/md5-cache/sys-kernel/linux-headers-4.13
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.68
+1804010238 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.92
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.15.3
 1803101309 metadata/md5-cache/sys-kernel/aufs-sources-4.4.119
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.107
@@ -46770,7 +46789,7 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.83
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.104
 1803021159 metadata/md5-cache/sys-kernel/linux-headers-3.18
-1803292209 metadata/md5-cache/sys-kernel/Manifest.gz
+1804010238 metadata/md5-cache/sys-kernel/Manifest.gz
 1803021159 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1803290617 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.82
@@ -46799,6 +46818,7 @@
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.9.67
 1803290617 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.1.43-r1
+1804010208 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.32
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.119
 1803021159 metadata/md5-cache/sys-kernel/genkernel-3.5.2.4
 1803021159 metadata/md5-cache/sys-kernel/aufs-sources-4.4.104
@@ -46849,6 +46869,7 @@
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.110
 1803101309 metadata/md5-cache/sys-kernel/aufs-sources-4.15.5
 1803190338 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.85
+1804010208 metadata/md5-cache/sys-kernel/gentoo-sources-4.15.15
 1803290617 metadata/md5-cache/sys-kernel/genkernel-9999
 1803021159 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76
 1803191508 metadata/md5-cache/sys-kernel/git-sources-4.16_rc6
@@ -47034,7 +47055,7 @@
 1702282325 metadata/md5-cache/media-gfx/galleryadd-2.30
 1803290617 metadata/md5-cache/media-gfx/displaycal-3.5.0.0
 1803290617 metadata/md5-cache/media-gfx/gimp-9999
-1803220138 metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+1803312108 metadata/md5-cache/media-gfx/gimp-2.8.22-r1
 1803021159 metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
 1803021159 metadata/md5-cache/media-gfx/tuxpaint-stamps-20090628
 1803021159 metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
@@ -47107,7 +47128,7 @@
 1803021159 metadata/md5-cache/media-gfx/shotwell-0.26.4
 1803021159 metadata/md5-cache/media-gfx/ipe-7.1.2
 1803021159 metadata/md5-cache/media-gfx/fotoxx-13.11.1
-1803201038 metadata/md5-cache/media-gfx/gimp-2.9.8-r1
+1803312108 metadata/md5-cache/media-gfx/gimp-2.9.8-r1
 1801011404 metadata/md5-cache/media-gfx/cptutils-1.68
 1803021159 metadata/md5-cache/media-gfx/sxiv-24
 1803021159 metadata/md5-cache/media-gfx/png2ico-2002.12.08
@@ -47124,7 +47145,7 @@
 1803290617 metadata/md5-cache/media-gfx/photoqt-1.5.1-r1
 1803021159 metadata/md5-cache/media-gfx/xli-1.17.0-r5
 1803021159 metadata/md5-cache/media-gfx/viewnior-1.6
-1803310808 metadata/md5-cache/media-gfx/libimagequant-2.11.7
+1803312238 metadata/md5-cache/media-gfx/libimagequant-2.11.7
 1803021159 metadata/md5-cache/media-gfx/cura-0.15.04.4
 1803021159 metadata/md5-cache/media-gfx/imagemagick-7.0.7.21
 1803021159 metadata/md5-cache/media-gfx/comix-4.0.4-r1
@@ -47194,7 +47215,7 @@
 1801011404 metadata/md5-cache/media-gfx/curaengine-0.15.04.6
 1803290617 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
 1803021159 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1803311408 metadata/md5-cache/media-gfx/Manifest.gz
+1803312238 metadata/md5-cache/media-gfx/Manifest.gz
 1803290617 metadata/md5-cache/media-gfx/xdot-0.7
 1803012238 metadata/md5-cache/media-gfx/feh-2.24
 1702282326 metadata/md5-cache/media-gfx/rotoscope-0.2
@@ -47396,7 +47417,7 @@
 1702282326 metadata/md5-cache/media-gfx/jp2a-1.0.6-r1
 1803290617 metadata/md5-cache/media-gfx/pycam-0.5.1
 1801142139 metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
-1803052038 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
+1803312138 metadata/md5-cache/media-gfx/sane-frontends-1.0.14-r3
 1803021159 metadata/md5-cache/media-gfx/graphviz-2.40.1
 1803021159 metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
 1803021159 metadata/md5-cache/media-gfx/fondu-20060102-r1
@@ -47709,7 +47730,7 @@
 1803021159 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
 1801011404 metadata/md5-cache/dev-vcs/topgit-0.9
 1803021159 metadata/md5-cache/dev-vcs/git-mantle-0.6
-1707301138 metadata/md5-cache/dev-vcs/git-lfs-2.1.1
+1803312238 metadata/md5-cache/dev-vcs/git-lfs-2.1.1
 1803021159 metadata/md5-cache/dev-vcs/cssc-1.4.0
 1803290617 metadata/md5-cache/dev-vcs/git-deps-9999
 1803290617 metadata/md5-cache/dev-vcs/mercurial-4.4.2
@@ -47738,7 +47759,7 @@
 1803021159 metadata/md5-cache/dev-vcs/giggle-0.7-r2
 1801011404 metadata/md5-cache/dev-vcs/rcsi-0.5
 1803292309 metadata/md5-cache/dev-vcs/git-9999-r1
-1707301138 metadata/md5-cache/dev-vcs/git-lfs-2.2.1
+1803312238 metadata/md5-cache/dev-vcs/git-lfs-2.2.1
 1803021159 metadata/md5-cache/dev-vcs/git-pimp-0.8
 1803290617 metadata/md5-cache/dev-vcs/stgit-0.18
 1803290617 metadata/md5-cache/dev-vcs/qgit-2.7
@@ -47766,8 +47787,8 @@
 1803021159 metadata/md5-cache/dev-vcs/rsvndump-0.6
 1702282322 metadata/md5-cache/dev-vcs/notify-webhook-0.1.0
 1702282322 metadata/md5-cache/dev-vcs/git-crypt-0.5.0
-1707301138 metadata/md5-cache/dev-vcs/git-lfs-1.5.6
-1802031308 metadata/md5-cache/dev-vcs/git-lfs-2.3.4
+1803312238 metadata/md5-cache/dev-vcs/git-lfs-1.5.6
+1803312238 metadata/md5-cache/dev-vcs/git-lfs-2.3.4
 1801011404 metadata/md5-cache/dev-vcs/cvs-fast-export-1.26
 1801011404 metadata/md5-cache/dev-vcs/gitstats-0_pre20151223
 1803290617 metadata/md5-cache/dev-vcs/hgsubversion-1.8.5
@@ -47806,12 +47827,12 @@
 1803021159 metadata/md5-cache/dev-vcs/darcs-2.12.0
 1803290617 metadata/md5-cache/dev-vcs/svn2git-9999
 1803021159 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1803310238 metadata/md5-cache/dev-vcs/Manifest.gz
+1803312238 metadata/md5-cache/dev-vcs/Manifest.gz
 1803021159 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1801011404 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
 1711100209 metadata/md5-cache/dev-vcs/cvsq-0.4.4
-1803021159 metadata/md5-cache/dev-vcs/git-lfs-9999
+1803312238 metadata/md5-cache/dev-vcs/git-lfs-9999
 1803021159 metadata/md5-cache/dev-vcs/gitolite-3.6.4
 1803021159 metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
 1803290617 metadata/md5-cache/dev-vcs/hgsubversion-1.8.6
@@ -47900,7 +47921,7 @@
 1803021159 metadata/md5-cache/java-virtuals/jms-1.1
 1803021159 metadata/md5-cache/java-virtuals/servlet-api-3.1-r1
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.0.1
-1803260209 metadata/md5-cache/gnome-extra/gucharmap-10.0.3
+1804010108 metadata/md5-cache/gnome-extra/gucharmap-10.0.3
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.4.4
 1803021159 metadata/md5-cache/gnome-extra/synapse-0.2.99.2
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-menus-3.4.0
@@ -47974,7 +47995,7 @@
 1803021159 metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.2.2-r1
-1803290617 metadata/md5-cache/gnome-extra/Manifest.gz
+1804010108 metadata/md5-cache/gnome-extra/Manifest.gz
 1803171208 metadata/md5-cache/gnome-extra/nm-applet-1.8.6
 1803021159 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
 1803021159 metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1
@@ -48111,7 +48132,7 @@
 1803290617 metadata/md5-cache/mail-filter/spambayes-1.1_beta1
 1803290617 metadata/md5-cache/mail-filter/rmilter-1.9.2
 1803290617 metadata/md5-cache/mail-filter/postsrsd-1.4-r1
-1803170038 metadata/md5-cache/mail-filter/postforward-1.1.0
+1803312238 metadata/md5-cache/mail-filter/postforward-1.1.0
 1803021159 metadata/md5-cache/mail-filter/anubis-4.1.1
 1702282325 metadata/md5-cache/mail-filter/procmail-lib-20081108
 1803021159 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
@@ -48186,7 +48207,7 @@
 1803021159 metadata/md5-cache/mail-filter/assp-1.8.5.9
 1803021159 metadata/md5-cache/mail-filter/dspam-3.10.2-r1
 1803180208 metadata/md5-cache/mail-filter/spamassassin-3.4.1-r21
-1803291709 metadata/md5-cache/mail-filter/Manifest.gz
+1803312238 metadata/md5-cache/mail-filter/Manifest.gz
 1803021159 metadata/md5-cache/mail-filter/qmail-scanner-2.06
 1803021159 metadata/md5-cache/mail-filter/amavisd-new-2.10.1
 1803021159 metadata/md5-cache/mail-filter/libsrs2-1.0.18
@@ -48516,7 +48537,7 @@
 1803021159 metadata/md5-cache/app-editors/moe-1.7
 1802210008 metadata/md5-cache/app-editors/mg-20170828
 1803280809 metadata/md5-cache/app-editors/zile-2.4.13
-1803292309 metadata/md5-cache/app-editors/Manifest.gz
+1804010108 metadata/md5-cache/app-editors/Manifest.gz
 1702282308 metadata/md5-cache/app-editors/emact-2.56.0
 1801091400 metadata/md5-cache/app-editors/elvis-2.2.0-r5
 1803250109 metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -48527,10 +48548,10 @@
 1801211608 metadata/md5-cache/app-editors/ghostwriter-1.5.0
 1803021159 metadata/md5-cache/app-editors/dhex-0.68
 1803021159 metadata/md5-cache/app-editors/elvis-2.2.0-r4
-1803260208 metadata/md5-cache/app-editors/gvim-8.0.1645
+1803312208 metadata/md5-cache/app-editors/gvim-8.0.1645
 1803021159 metadata/md5-cache/app-editors/pluma-1.14.1
 1803282239 metadata/md5-cache/app-editors/xemacs-21.4.24
-1802262111 metadata/md5-cache/app-editors/gummi-0.6.6-r1
+1803312208 metadata/md5-cache/app-editors/gummi-0.6.6-r1
 1803290617 metadata/md5-cache/app-editors/neovim-0.2.0-r1
 1803021159 metadata/md5-cache/app-editors/ne-3.0.1-r1
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p27
@@ -48549,7 +48570,7 @@
 1803282239 metadata/md5-cache/app-editors/xemacs-21.5.34-r4
 1803021159 metadata/md5-cache/app-editors/focuswriter-1.6.9-r1
 1803221008 metadata/md5-cache/app-editors/diakonos-0.9.4
-1803260208 metadata/md5-cache/app-editors/scite-4.0.2
+1804010108 metadata/md5-cache/app-editors/scite-4.0.2
 1803240238 metadata/md5-cache/app-editors/adie-1.7.54
 1803021159 metadata/md5-cache/app-editors/scite-3.5.5
 1803021159 metadata/md5-cache/app-editors/bvi-1.3.2-r2
@@ -48879,7 +48900,7 @@
 1803021159 metadata/md5-cache/dev-lang/mono-2.10.9-r2
 1803021159 metadata/md5-cache/dev-lang/mercury-14.01
 1801011404 metadata/md5-cache/dev-lang/coffee-script-1.9.3-r1
-1803301239 metadata/md5-cache/dev-lang/php-5.6.34
+1803312108 metadata/md5-cache/dev-lang/php-5.6.34
 1803290617 metadata/md5-cache/dev-lang/hy-0.12.0
 1803021159 metadata/md5-cache/dev-lang/srf-1.0-r2
 1803021159 metadata/md5-cache/dev-lang/php-7.1.14
@@ -48939,7 +48960,7 @@
 1803021159 metadata/md5-cache/dev-lang/mmix-20131017
 1803021159 metadata/md5-cache/dev-lang/python-2.7.14-r1
 1803021159 metadata/md5-cache/dev-lang/erlang-19.1
-1803301239 metadata/md5-cache/dev-lang/php-7.1.15
+1804010108 metadata/md5-cache/dev-lang/php-7.1.15
 1801091400 metadata/md5-cache/dev-lang/teyjus-2.0.2
 1803021159 metadata/md5-cache/dev-lang/tk-8.6.6
 1803021159 metadata/md5-cache/dev-lang/tcl-8.5.17-r100
@@ -48965,7 +48986,6 @@
 1803071709 metadata/md5-cache/dev-lang/mercury-14.01.1
 1801091400 metadata/md5-cache/dev-lang/execline-2.3.0.3
 1803021159 metadata/md5-cache/dev-lang/epic-0.9.3.3-r1
-1801011404 metadata/md5-cache/dev-lang/go-1.9.1
 1803021159 metadata/md5-cache/dev-lang/erlang-19.3
 1803250109 metadata/md5-cache/dev-lang/scala-2.11.7-r1
 1801290538 metadata/md5-cache/dev-lang/ekopath-6.0.967_p20161020-r1
@@ -49040,7 +49060,7 @@
 1803290617 metadata/md5-cache/dev-lang/nqp-9999
 1803250109 metadata/md5-cache/dev-lang/tuprolog-3.1.0
 1803021159 metadata/md5-cache/dev-lang/whitespace-0.4
-1803311308 metadata/md5-cache/dev-lang/Manifest.gz
+1804010738 metadata/md5-cache/dev-lang/Manifest.gz
 1803021159 metadata/md5-cache/dev-lang/moarvm-2018.01
 1803021159 metadata/md5-cache/dev-lang/ghc-7.10.3
 1803021159 metadata/md5-cache/dev-lang/qu-prolog-10.0
@@ -49066,7 +49086,6 @@
 1801011404 metadata/md5-cache/dev-lang/tcc-0.9.26-r3
 1801170209 metadata/md5-cache/dev-lang/crystal-0.24.1-r1
 1803241208 metadata/md5-cache/dev-lang/swi-prolog-7.7.11
-1801182210 metadata/md5-cache/dev-lang/go-1.9.2
 1803210508 metadata/md5-cache/dev-lang/ruby-2.3.6
 1802262111 metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
 1803021159 metadata/md5-cache/dev-lang/ocaml-4.05.0
@@ -49074,7 +49093,6 @@
 1803021159 metadata/md5-cache/dev-lang/open-cobol-1.1
 1801290538 metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r100
 1803171708 metadata/md5-cache/dev-lang/elixir-1.6.4
-1801230408 metadata/md5-cache/dev-lang/go-1.9.3
 1803021159 metadata/md5-cache/dev-lang/luajit-2.0.2
 1702282312 metadata/md5-cache/dev-lang/snobol-0.99.4
 1803021159 metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -49096,7 +49114,7 @@
 1801091400 metadata/md5-cache/dev-lang/rust-1.16.0
 1803021159 metadata/md5-cache/dev-lang/icon-9.5.0
 1803021159 metadata/md5-cache/dev-lang/python-3.6.3-r1
-1803311308 metadata/md5-cache/dev-lang/perl-5.24.3-r1
+1804010738 metadata/md5-cache/dev-lang/perl-5.24.3-r1
 1803021159 metadata/md5-cache/dev-lang/rakudo-2018.01
 1803021159 metadata/md5-cache/dev-lang/f2c-20100827
 1803290617 metadata/md5-cache/dev-lang/solidity-0.4.18
@@ -49122,7 +49140,7 @@
 1803100208 metadata/md5-cache/dev-lang/elixir-1.6.3
 1803021159 metadata/md5-cache/dev-lang/tk-8.6.7
 1803021159 metadata/md5-cache/dev-lang/logtalk-3.11.2
-1803301239 metadata/md5-cache/dev-lang/php-7.0.28
+1804010108 metadata/md5-cache/dev-lang/php-7.0.28
 1702282312 metadata/md5-cache/dev-lang/snobol-1.4.1
 1801290538 metadata/md5-cache/dev-lang/ekopath-6.0.967_p20161020-r100
 1803291009 metadata/md5-cache/dev-lang/ruby-2.4.4
@@ -49141,7 +49159,7 @@
 1801011404 metadata/md5-cache/dev-lang/ispc-1.9.1
 1803171008 metadata/md5-cache/dev-lang/helium-1.6
 1801091400 metadata/md5-cache/dev-lang/teyjus-2.1
-1803282239 metadata/md5-cache/dev-lang/orc-0.4.28-r1
+1804010008 metadata/md5-cache/dev-lang/orc-0.4.28-r1
 1803171008 metadata/md5-cache/dev-lang/lazarus-1.0.12
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1803301909 metadata/md5-cache/dev-lang/nqp-2018.03
@@ -49185,6 +49203,7 @@
 1803021159 metadata/md5-cache/dev-lang/yasm-1.2.0-r1
 1803301909 metadata/md5-cache/dev-lang/moarvm-2018.03
 1711251740 metadata/md5-cache/dev-lang/opendylan-bin-2012.1
+1803312138 metadata/md5-cache/dev-lang/go-1.10.1
 1803021159 metadata/md5-cache/dev-lang/python-3.6.4
 1803250109 metadata/md5-cache/dev-lang/scala-2.11.2-r2
 1803021159 metadata/md5-cache/dev-lang/scala-bin-2.11.8
@@ -49327,7 +49346,7 @@
 1803290617 metadata/md5-cache/dev-python/python-stdnum-1.7
 1803290617 metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
 1803290617 metadata/md5-cache/dev-python/pycairo-1.16.3-r1
-1803021159 metadata/md5-cache/dev-python/dbus-python-1.2.4
+1803312108 metadata/md5-cache/dev-python/dbus-python-1.2.4
 1803290617 metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
 1803290617 metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
 1803290617 metadata/md5-cache/dev-python/python-pam-0.1.4
@@ -50026,7 +50045,7 @@
 1803290617 metadata/md5-cache/dev-python/ply-3.9
 1803290617 metadata/md5-cache/dev-python/pandas-0.17.0
 1803290617 metadata/md5-cache/dev-python/python-daemon-1.6-r1
-1803290617 metadata/md5-cache/dev-python/olefile-0.44
+1803312238 metadata/md5-cache/dev-python/olefile-0.44
 1803290617 metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
 1803290617 metadata/md5-cache/dev-python/backports-shutil_which-3.5.1
 1803290617 metadata/md5-cache/dev-python/billiard-3.5.0.0
@@ -50315,7 +50334,7 @@
 1803310508 metadata/md5-cache/dev-python/pypowervm-1.1.10
 1803290617 metadata/md5-cache/dev-python/pyopenssl-17.2.0
 1803310508 metadata/md5-cache/dev-python/python-barbicanclient-4.6.0
-1803310808 metadata/md5-cache/dev-python/pyopenssl-17.5.0
+1803312208 metadata/md5-cache/dev-python/pyopenssl-17.5.0
 1803290617 metadata/md5-cache/dev-python/notebook-4.1.0
 1803290617 metadata/md5-cache/dev-python/pyasn1-modules-0.0.8
 1803290617 metadata/md5-cache/dev-python/python-lzo-1.11
@@ -50594,7 +50613,7 @@
 1803290617 metadata/md5-cache/dev-python/pandocfilters-1.2.4
 1803290617 metadata/md5-cache/dev-python/flask-bootstrap-3.3.6.0
 1803290617 metadata/md5-cache/dev-python/pytoml-0.1.14
-1803290617 metadata/md5-cache/dev-python/rarfile-3.0
+1804010308 metadata/md5-cache/dev-python/rarfile-3.0
 1803290617 metadata/md5-cache/dev-python/jsonrpclib-0.3.1
 1803290617 metadata/md5-cache/dev-python/ansi2html-1.3.0
 1803290617 metadata/md5-cache/dev-python/dpkt-1.8.8
@@ -50864,7 +50883,7 @@
 1803132108 metadata/md5-cache/dev-python/clang-python-6.0.0
 1803290617 metadata/md5-cache/dev-python/watchdog-0.8.3-r1
 1803290617 metadata/md5-cache/dev-python/theano-0.9.0
-1803311738 metadata/md5-cache/dev-python/Manifest.gz
+1804010308 metadata/md5-cache/dev-python/Manifest.gz
 1803302139 metadata/md5-cache/dev-python/mamba-0.8.6
 1803290617 metadata/md5-cache/dev-python/spyder-3.2.4
 1803310408 metadata/md5-cache/dev-python/pycadf-2.7.0
@@ -51119,7 +51138,7 @@
 1803290617 metadata/md5-cache/dev-python/bokeh-0.12.4
 1803290617 metadata/md5-cache/dev-python/twisted-pair-13.2.0
 1803290617 metadata/md5-cache/dev-python/osc-lib-1.7.0
-1803021159 metadata/md5-cache/dev-python/nautilus-python-1.1-r2
+1803312208 metadata/md5-cache/dev-python/nautilus-python-1.1-r2
 1803290617 metadata/md5-cache/dev-python/notebook-4.3.2
 1803290617 metadata/md5-cache/dev-python/python-ironicclient-1.11.1
 1803290617 metadata/md5-cache/dev-python/ipyparallel-5.2.0
@@ -51298,7 +51317,7 @@
 1803290617 metadata/md5-cache/dev-python/python-zaqarclient-1.2.0
 1803310408 metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
 1803290617 metadata/md5-cache/dev-python/glueviz-0.9.1
-1803290617 metadata/md5-cache/dev-python/pillow-4.3.0
+1803312238 metadata/md5-cache/dev-python/pillow-4.3.0
 1803021159 metadata/md5-cache/dev-python/pygobject-2.28.6-r55
 1803290617 metadata/md5-cache/dev-python/glue-vispy-viewers-0.7.2
 1803290617 metadata/md5-cache/dev-python/flask-login-0.3.2-r1
@@ -51432,7 +51451,7 @@
 1803290617 metadata/md5-cache/dev-python/symengine-0.3.0
 1803290617 metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
 1803290617 metadata/md5-cache/dev-python/simpy-3.0.8
-1803310808 metadata/md5-cache/dev-python/cryptography-2.1.4
+1803312208 metadata/md5-cache/dev-python/cryptography-2.1.4
 1803290617 metadata/md5-cache/dev-python/django-ldapdb-0.4.0
 1803290617 metadata/md5-cache/dev-python/pyface-4.5.2
 1803290617 metadata/md5-cache/dev-python/sure-1.2.5
@@ -52873,81 +52892,81 @@
 1803300309 metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.08
 1803021159 metadata/md5-cache/games-roguelike/rogue-5.4.4
 1803021159 metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
-1712161139 metadata/md5-cache/dev-go/siphash-1.0.0
-1707301138 metadata/md5-cache/dev-go/go-crypto-0_pre20150808
-1707301138 metadata/md5-cache/dev-go/go-tools-0_pre20150902
-1707301138 metadata/md5-cache/dev-go/golint-0_pre20161114
-1803021159 metadata/md5-cache/dev-go/go-tools-9999
-1802211938 metadata/md5-cache/dev-go/glide-0.13.1
-1803021159 metadata/md5-cache/dev-go/go-snappy-9999
-1706141738 metadata/md5-cache/dev-go/sarama-1.4.3
-1707301138 metadata/md5-cache/dev-go/goptlib-0.6
-1707301138 metadata/md5-cache/dev-go/goptlib-0.5
-1707301138 metadata/md5-cache/dev-go/go-tools-0_pre20160220
-1707301138 metadata/md5-cache/dev-go/delve-0.12.2
-1707301138 metadata/md5-cache/dev-go/cli-0_pre20160306
-1707301138 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
-1803252338 metadata/md5-cache/dev-go/go-oauth2-9999
-1803252338 metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
-1707301138 metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
-1707301138 metadata/md5-cache/dev-go/go-crypto-0_pre20160126
-1707301138 metadata/md5-cache/dev-go/blackfriday-1.4
-1707301138 metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
-1707301138 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
-1802072338 metadata/md5-cache/dev-go/qr-0_p20161121
-1707301138 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
-1710171639 metadata/md5-cache/dev-go/ed25519-0_pre20160420
-1803021159 metadata/md5-cache/dev-go/toml-9999
-1707301138 metadata/md5-cache/dev-go/toml-0.2.0_p20160716
-1707301138 metadata/md5-cache/dev-go/go-tools-0_pre20160121
-1707301138 metadata/md5-cache/dev-go/gox-0_pre20160725
-1803021159 metadata/md5-cache/dev-go/sanitized-anchor-name-9999
-1707301138 metadata/md5-cache/dev-go/go-text-0_pre20160211
-1803021159 metadata/md5-cache/dev-go/godep-9999
-1802211938 metadata/md5-cache/dev-go/delve-1.0.0
-1803021159 metadata/md5-cache/dev-go/blackfriday-9999
-1803302139 metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
-1707301138 metadata/md5-cache/dev-go/go-sys-0_pre20160204
-1803021159 metadata/md5-cache/dev-go/go-net-9999
-1707301138 metadata/md5-cache/dev-go/go-tour-0_p20160209
-1707301138 metadata/md5-cache/dev-go/go-net-0_pre20160216
-1707301138 metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
-1707301138 metadata/md5-cache/dev-go/gom-0_pre20151110
-1803302139 metadata/md5-cache/dev-go/Manifest.gz
-1803021159 metadata/md5-cache/dev-go/sarama-9999
-1803021159 metadata/md5-cache/dev-go/go-sys-9999
-1707301138 metadata/md5-cache/dev-go/go-bindata-0_pre20151023
-1803252338 metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
-1707301138 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
-1707301138 metadata/md5-cache/dev-go/glide-0.12.3
-1707301138 metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
-1707301138 metadata/md5-cache/dev-go/go-md2man-1.0.3
-1707301138 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
-1707301138 metadata/md5-cache/dev-go/godep-74
-1707301138 metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
-1803021159 metadata/md5-cache/dev-go/go-resiliency-9999
-1803091639 metadata/md5-cache/dev-go/goversion-1.0.0_p20180222
-1707301138 metadata/md5-cache/dev-go/go-text-0_pre20150806
-1803021159 metadata/md5-cache/dev-go/go-eapache-queue-9999
-1802072338 metadata/md5-cache/dev-go/zglob-0_p20171230
-1707301138 metadata/md5-cache/dev-go/go-resiliency-1.0.0
-1707301138 metadata/md5-cache/dev-go/go-sys-0_pre20150729
-1803021159 metadata/md5-cache/dev-go/go-spew-9999
-1707301138 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
-1803021159 metadata/md5-cache/dev-go/go-crypto-9999
-1802072338 metadata/md5-cache/dev-go/twofactor-0_p20170917
-1803021159 metadata/md5-cache/dev-go/go-text-9999
-1803021159 metadata/md5-cache/dev-go/go-protobuf-9999
-1707301138 metadata/md5-cache/dev-go/go-snappy-0_pre20160213
-1803302139 metadata/md5-cache/dev-go/fuzzy-0.0.3
-1707301138 metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
-1707301138 metadata/md5-cache/dev-go/go-md2man-1.0.6
-1707301138 metadata/md5-cache/dev-go/go-snappy-0_pre20150729
-1707301138 metadata/md5-cache/dev-go/go-colortext-0_pre20150720
-1707301138 metadata/md5-cache/dev-go/delve-1.0.0_rc1
-1708231609 metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
-1707301138 metadata/md5-cache/dev-go/go-spew-0_pre20150619
-1707301138 metadata/md5-cache/dev-go/go-net-0_pre20150804
+1803312238 metadata/md5-cache/dev-go/siphash-1.0.0
+1803312238 metadata/md5-cache/dev-go/go-crypto-0_pre20150808
+1803312238 metadata/md5-cache/dev-go/go-tools-0_pre20150902
+1803312238 metadata/md5-cache/dev-go/golint-0_pre20161114
+1803312238 metadata/md5-cache/dev-go/go-tools-9999
+1803312238 metadata/md5-cache/dev-go/glide-0.13.1
+1803312238 metadata/md5-cache/dev-go/go-snappy-9999
+1803312238 metadata/md5-cache/dev-go/sarama-1.4.3
+1803312238 metadata/md5-cache/dev-go/goptlib-0.6
+1803312238 metadata/md5-cache/dev-go/goptlib-0.5
+1803312238 metadata/md5-cache/dev-go/go-tools-0_pre20160220
+1803312238 metadata/md5-cache/dev-go/delve-0.12.2
+1803312238 metadata/md5-cache/dev-go/cli-0_pre20160306
+1803312238 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20151027
+1803312238 metadata/md5-cache/dev-go/go-oauth2-9999
+1803312238 metadata/md5-cache/dev-go/go-oauth2-0_pre20150701
+1803312238 metadata/md5-cache/dev-go/go-protobuf-0_pre20150809
+1803312238 metadata/md5-cache/dev-go/go-crypto-0_pre20160126
+1803312238 metadata/md5-cache/dev-go/blackfriday-1.4
+1803312238 metadata/md5-cache/dev-go/go-gitlab-client-0_pre20160305
+1803312238 metadata/md5-cache/dev-go/sanitized-anchor-name-0_pre20150822
+1803312238 metadata/md5-cache/dev-go/qr-0_p20161121
+1803312238 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
+1803312238 metadata/md5-cache/dev-go/ed25519-0_pre20160420
+1803312238 metadata/md5-cache/dev-go/toml-9999
+1803312238 metadata/md5-cache/dev-go/toml-0.2.0_p20160716
+1803312238 metadata/md5-cache/dev-go/go-tools-0_pre20160121
+1803312238 metadata/md5-cache/dev-go/gox-0_pre20160725
+1803312238 metadata/md5-cache/dev-go/sanitized-anchor-name-9999
+1803312238 metadata/md5-cache/dev-go/go-text-0_pre20160211
+1803312238 metadata/md5-cache/dev-go/godep-9999
+1803312238 metadata/md5-cache/dev-go/delve-1.0.0
+1803312238 metadata/md5-cache/dev-go/blackfriday-9999
+1803312238 metadata/md5-cache/dev-go/godebug-pretty-0_p20170819
+1803312238 metadata/md5-cache/dev-go/go-sys-0_pre20160204
+1803312238 metadata/md5-cache/dev-go/go-net-9999
+1803312238 metadata/md5-cache/dev-go/go-tour-0_p20160209
+1803312238 metadata/md5-cache/dev-go/go-net-0_pre20160216
+1803312238 metadata/md5-cache/dev-go/go-bindata-assetfs-0_pre20160822
+1803312238 metadata/md5-cache/dev-go/gom-0_pre20151110
+1803312238 metadata/md5-cache/dev-go/Manifest.gz
+1803312238 metadata/md5-cache/dev-go/sarama-9999
+1803312238 metadata/md5-cache/dev-go/go-sys-9999
+1803312238 metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+1803312238 metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
+1803312238 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
+1803312238 metadata/md5-cache/dev-go/glide-0.12.3
+1803312238 metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
+1803312238 metadata/md5-cache/dev-go/go-md2man-1.0.3
+1803312238 metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160131
+1803312238 metadata/md5-cache/dev-go/godep-74
+1803312238 metadata/md5-cache/dev-go/go-protobuf-0_pre20160216
+1803312238 metadata/md5-cache/dev-go/go-resiliency-9999
+1803312238 metadata/md5-cache/dev-go/goversion-1.0.0_p20180222
+1803312238 metadata/md5-cache/dev-go/go-text-0_pre20150806
+1803312238 metadata/md5-cache/dev-go/go-eapache-queue-9999
+1803312238 metadata/md5-cache/dev-go/zglob-0_p20171230
+1803312238 metadata/md5-cache/dev-go/go-resiliency-1.0.0
+1803312238 metadata/md5-cache/dev-go/go-sys-0_pre20150729
+1803312238 metadata/md5-cache/dev-go/go-spew-9999
+1803312238 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216
+1803312238 metadata/md5-cache/dev-go/go-crypto-9999
+1803312238 metadata/md5-cache/dev-go/twofactor-0_p20170917
+1803312238 metadata/md5-cache/dev-go/go-text-9999
+1803312238 metadata/md5-cache/dev-go/go-protobuf-9999
+1803312238 metadata/md5-cache/dev-go/go-snappy-0_pre20160213
+1803312238 metadata/md5-cache/dev-go/fuzzy-0.0.3
+1803312238 metadata/md5-cache/dev-go/go-eapache-queue-1.0.2
+1803312238 metadata/md5-cache/dev-go/go-md2man-1.0.6
+1803312238 metadata/md5-cache/dev-go/go-snappy-0_pre20150729
+1803312238 metadata/md5-cache/dev-go/go-colortext-0_pre20150720
+1803312238 metadata/md5-cache/dev-go/delve-1.0.0_rc1
+1803312238 metadata/md5-cache/dev-go/gogo-protobuf-0.4_p20170815
+1803312238 metadata/md5-cache/dev-go/go-spew-0_pre20150619
+1803312238 metadata/md5-cache/dev-go/go-net-0_pre20150804
 1803021159 metadata/md5-cache/games-sports/speed-dreams-1.4.0-r1
 1803021159 metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
 1803021159 metadata/md5-cache/games-sports/miniracer-1.04
@@ -52992,7 +53011,7 @@
 1801050119 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1803021159 metadata/md5-cache/app-shells/mpibash-1.2
 1802262111 metadata/md5-cache/app-shells/ctypes-sh-1.1
-1707301809 metadata/md5-cache/app-shells/peco-0.5.1
+1803312238 metadata/md5-cache/app-shells/peco-0.5.1
 1801011404 metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
 1803021159 metadata/md5-cache/app-shells/heirloom-sh-050706-r1
 1803021159 metadata/md5-cache/app-shells/localshell-1.3.4-r1
@@ -53018,7 +53037,7 @@
 1803021159 metadata/md5-cache/app-shells/bash-2.05b_p13
 1803301639 metadata/md5-cache/app-shells/bash-completion-2.7-r3
 1803021159 metadata/md5-cache/app-shells/scsh-install-lib-1.3.0
-1803301639 metadata/md5-cache/app-shells/Manifest.gz
+1803312238 metadata/md5-cache/app-shells/Manifest.gz
 1711071609 metadata/md5-cache/app-shells/fish-2.6.0
 1702282309 metadata/md5-cache/app-shells/bashdb-4.3.0.91-r2
 1803020438 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911-r1
@@ -53052,7 +53071,7 @@
 1711231808 metadata/md5-cache/app-shells/fish-2.7.0
 1801231609 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
 1803021159 metadata/md5-cache/app-shells/mksh-52c
-1801110040 metadata/md5-cache/app-shells/peco-0.5.2
+1803312238 metadata/md5-cache/app-shells/peco-0.5.2
 1803021159 metadata/md5-cache/app-shells/ksh-93.20140625
 1803021159 metadata/md5-cache/app-shells/esh-0.8.5-r2
 1711121938 metadata/md5-cache/app-shells/posh-0.12.6
@@ -53664,7 +53683,7 @@
 1803290617 metadata/md5-cache/net-analyzer/nmap-9999
 1704101139 metadata/md5-cache/net-analyzer/arp-scan-1.9
 1803290617 metadata/md5-cache/net-analyzer/fail2ban-0.9.6
-1803260209 metadata/md5-cache/net-analyzer/telegraf-1.5.3
+1803312238 metadata/md5-cache/net-analyzer/telegraf-1.5.3
 1802262111 metadata/md5-cache/net-analyzer/ntopng-3.0-r2
 1803021159 metadata/md5-cache/net-analyzer/nast-0.2.0-r1
 1702282328 metadata/md5-cache/net-analyzer/ike-scan-1.9-r1
@@ -53676,7 +53695,7 @@
 1803021159 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r2
 1803290617 metadata/md5-cache/net-analyzer/vnstat-9999
 1803021159 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
-1803302039 metadata/md5-cache/net-analyzer/Manifest.gz
+1803312238 metadata/md5-cache/net-analyzer/Manifest.gz
 1803021159 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r2
 1702282328 metadata/md5-cache/net-analyzer/neti-2.0
 1803021159 metadata/md5-cache/net-analyzer/sinfo-0.0.48
@@ -53763,7 +53782,7 @@
 1803021159 metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
 1801011404 metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
 1803021159 metadata/md5-cache/net-analyzer/cacti-spine-1.1.28
-1803270108 metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+1803312238 metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
 1802262111 metadata/md5-cache/net-analyzer/raddump-0.3.1
 1801011404 metadata/md5-cache/net-analyzer/sguil-server-0.8.0
 1803021159 metadata/md5-cache/net-analyzer/cloudshark-1.0.2.174
@@ -54074,7 +54093,7 @@
 1803021159 metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.9
 1802262111 metadata/md5-cache/x11-themes/vertex-theme-20170128
 1802262111 metadata/md5-cache/x11-themes/vertex-theme-20170128-r1
-1803260908 metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
+1804010108 metadata/md5-cache/x11-themes/golden-xcursors-0.8-r1
 1803021159 metadata/md5-cache/x11-themes/gnome-colors-themes-5.5.1
 1702282336 metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2006.1
 1803021159 metadata/md5-cache/x11-themes/arc-icon-theme-20161122
@@ -54083,7 +54102,7 @@
 1803161338 metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
 1709181109 metadata/md5-cache/x11-themes/clearlooks-phenix-5.0.7
 1702282336 metadata/md5-cache/x11-themes/zukitwo-2016.08.08
-1803302208 metadata/md5-cache/x11-themes/Manifest.gz
+1804010108 metadata/md5-cache/x11-themes/Manifest.gz
 1803021159 metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.14.0
 1803021159 metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
 1803021159 metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
@@ -54185,7 +54204,7 @@
 1710212038 metadata/md5-cache/app-misc/nullmodem-0.0.6-r1
 1803021159 metadata/md5-cache/app-misc/ca-certificates-20161130.3.30.2
 1803021159 metadata/md5-cache/app-misc/smtm-1.6.10-r1
-1803052038 metadata/md5-cache/app-misc/calendar-0.9.1-r1
+1803312108 metadata/md5-cache/app-misc/calendar-0.9.1-r1
 1801011404 metadata/md5-cache/app-misc/bgrep-0_p20110121
 1803021159 metadata/md5-cache/app-misc/lcd4linux-0.10.1_rc2-r4
 1803021159 metadata/md5-cache/app-misc/vit-1.2-r1
@@ -54260,7 +54279,7 @@
 1712191909 metadata/md5-cache/app-misc/neofetch-3.3.0
 1803290617 metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
 1702282309 metadata/md5-cache/app-misc/perltrash-0.3-r1
-1803191238 metadata/md5-cache/app-misc/away-0.9.5-r2
+1803312108 metadata/md5-cache/app-misc/away-0.9.5-r2
 1803290617 metadata/md5-cache/app-misc/openastro-data-1.6
 1803021159 metadata/md5-cache/app-misc/grc-1.11-r1
 1803021159 metadata/md5-cache/app-misc/realpath-1.17
@@ -54407,7 +54426,7 @@
 1803021159 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
 1803290617 metadata/md5-cache/app-misc/asciinema-1.4.0
 1803240138 metadata/md5-cache/app-misc/mosquitto-1.4.15
-1803311508 metadata/md5-cache/app-misc/Manifest.gz
+1803312238 metadata/md5-cache/app-misc/Manifest.gz
 1803021159 metadata/md5-cache/app-misc/socnetv-2.2
 1803290617 metadata/md5-cache/app-misc/pdfpc-3.1.1
 1803021159 metadata/md5-cache/app-misc/mmv-1.01b_p18
@@ -54437,7 +54456,7 @@
 1803021159 metadata/md5-cache/app-misc/graphlcd-base-0.1.9
 1801011404 metadata/md5-cache/app-misc/digitemp-3.7.1
 1803290617 metadata/md5-cache/app-misc/webcomics-collector-0.7.3-r1
-1803201012 metadata/md5-cache/app-misc/go-jira-1.0.14
+1803312238 metadata/md5-cache/app-misc/go-jira-1.0.14
 1803290617 metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
 1803290617 metadata/md5-cache/app-misc/ranger-9999
 1803270108 metadata/md5-cache/app-misc/mc-4.8.20-r2
@@ -54486,7 +54505,7 @@
 1803021159 metadata/md5-cache/app-misc/hivex-1.3.14
 1803021159 metadata/md5-cache/app-misc/datefudge-1.17
 1803290617 metadata/md5-cache/app-misc/i2bits-0.0.2
-1803201012 metadata/md5-cache/app-misc/go-jira-1.0.15
+1803312238 metadata/md5-cache/app-misc/go-jira-1.0.15
 1801011404 metadata/md5-cache/app-misc/beep-1.3-r2
 1803021159 metadata/md5-cache/app-misc/worker-2.19.6
 1803021159 metadata/md5-cache/app-misc/tmate-2.2.1
@@ -54573,7 +54592,7 @@
 1803021159 metadata/md5-cache/app-misc/glimpse-4.18.6-r1
 1803021159 metadata/md5-cache/app-misc/fslint-2.46
 1803180108 metadata/md5-cache/app-misc/interceptty-0.6-r1
-1803052038 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+1803312108 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
 1803021159 metadata/md5-cache/app-misc/fslurp-2.1.4
 1803021159 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 1803021159 metadata/md5-cache/app-misc/bfr-1.6-r2
@@ -54619,9 +54638,9 @@
 1803021159 metadata/md5-cache/app-misc/ttysnoop-0.12d
 1803021159 metadata/md5-cache/app-misc/boxes-1.1.2-r3
 1803021159 metadata/md5-cache/app-misc/gcalcli-3.3.2
-1707301809 metadata/md5-cache/app-misc/pet-0.2.3
+1803312238 metadata/md5-cache/app-misc/pet-0.2.3
 1801011404 metadata/md5-cache/app-misc/evemu-2.6.0
-1710072039 metadata/md5-cache/app-misc/pet-0.2.3-r1
+1803312238 metadata/md5-cache/app-misc/pet-0.2.3-r1
 1803021159 metadata/md5-cache/app-misc/ignuit-2.24.3
 1801011404 metadata/md5-cache/app-misc/todo-2.10-r2
 1803021159 metadata/md5-cache/app-misc/conmux-0.15.1-r3
@@ -54647,7 +54666,7 @@
 1803021159 metadata/md5-cache/app-misc/mswinurl_launcher-1.0
 1803021159 metadata/md5-cache/app-misc/wcd-5.3.4
 1803290617 metadata/md5-cache/app-misc/ddate-0.2.1
-1802050308 metadata/md5-cache/app-misc/pet-0.2.4
+1803312238 metadata/md5-cache/app-misc/pet-0.2.4
 1702282309 metadata/md5-cache/app-misc/cdcat-0.3
 1702282309 metadata/md5-cache/app-misc/joymouse-0.5
 1803021159 metadata/md5-cache/sci-calculators/grpn-1.4.0
@@ -54663,11 +54682,11 @@
 1803021159 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
 1803201012 metadata/md5-cache/sci-calculators/datamash-1.3
 1802262111 metadata/md5-cache/sci-calculators/calculator-1.7.54
-1803290617 metadata/md5-cache/sci-calculators/Manifest.gz
+1803312208 metadata/md5-cache/sci-calculators/Manifest.gz
 1801191110 metadata/md5-cache/sci-calculators/pcalc-4
 1801011404 metadata/md5-cache/sci-calculators/pcalc-3-r1
 1803290617 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
-1803290617 metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
+1803312208 metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
 1708240139 metadata/md5-cache/sci-calculators/datamash-1.2
 1803021159 metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
 1802262111 metadata/md5-cache/sci-calculators/orpie-1.5.2-r1
@@ -54708,7 +54727,7 @@
 1803021159 metadata/md5-cache/net-voip/yate-9999
 1803021159 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
 1803021159 metadata/md5-cache/net-voip/linphone-3.6.1
-1802072338 metadata/md5-cache/www-plugins/browserpass-2.0.11
+1803312238 metadata/md5-cache/www-plugins/browserpass-2.0.11
 1803290617 metadata/md5-cache/www-plugins/lightspark-9999
 1712242039 metadata/md5-cache/www-plugins/pdfjs-1.9.426
 1803210417 metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.181
@@ -54718,11 +54737,11 @@
 1803021159 metadata/md5-cache/www-plugins/gnash-0.8.10_p20160329-r1
 1803290617 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
 1803290617 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
-1803302139 metadata/md5-cache/www-plugins/browserpass-2.0.13
+1803312238 metadata/md5-cache/www-plugins/browserpass-2.0.13
 1803021159 metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
 1803021159 metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.8
 1803290617 metadata/md5-cache/www-plugins/lightspark-0.8.0
-1803302139 metadata/md5-cache/www-plugins/Manifest.gz
+1803312238 metadata/md5-cache/www-plugins/Manifest.gz
 1803290617 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
 1803282309 metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.66_beta
 1803282309 metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3381.0_alpha
@@ -54834,7 +54853,7 @@
 1803290617 metadata/md5-cache/dev-embedded/urjtag-9999
 1803021159 metadata/md5-cache/dev-embedded/u-boot-tools-2016.03
 1703240008 metadata/md5-cache/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.5
-1803062308 metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
+1803312238 metadata/md5-cache/dev-embedded/arduino-builder-1.3.25
 1803021159 metadata/md5-cache/dev-embedded/pk2cmd-1.20
 1702282310 metadata/md5-cache/dev-embedded/avarice-2.12
 1801011404 metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
@@ -54849,7 +54868,7 @@
 1703240008 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.5
 1801011404 metadata/md5-cache/dev-embedded/zmac-1.3
 1803021159 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
-1803290617 metadata/md5-cache/dev-embedded/Manifest.gz
+1803312238 metadata/md5-cache/dev-embedded/Manifest.gz
 1703240008 metadata/md5-cache/dev-embedded/scratchbox-devkit-doctools-1.0.9
 1703240008 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.4
 1703240008 metadata/md5-cache/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
@@ -55112,10 +55131,10 @@
 1702282330 metadata/md5-cache/net-wireless/hidclient-20120728
 1803021159 metadata/md5-cache/net-wireless/blueberry-1.1.8-r1
 1803290617 metadata/md5-cache/net-wireless/bladerf-9999
-1803300139 metadata/md5-cache/net-wireless/Manifest.gz
+1803312108 metadata/md5-cache/net-wireless/Manifest.gz
 1803021159 metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
 1803290617 metadata/md5-cache/net-wireless/inspectrum-9999
-1803290617 metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
+1803312108 metadata/md5-cache/net-wireless/python-wifi-0.5.0-r3
 1803021159 metadata/md5-cache/net-wireless/wepattack-0.1.3-r3
 1803290617 metadata/md5-cache/net-wireless/osmocom-bb-9999
 1803260138 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
@@ -55358,7 +55377,7 @@
 1711172138 metadata/md5-cache/dev-php/PEAR-HTML_QuickForm_advmultiselect-1.5.1-r1
 1702282315 metadata/md5-cache/dev-php/pear-1.10.3
 1803141438 metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
-1803260208 metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
+1804010108 metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
 1803230338 metadata/md5-cache/dev-php/pecl-htscanner-1.0.1-r3
 1803230338 metadata/md5-cache/dev-php/pecl-mailparse-2.1.6-r4
 1803230338 metadata/md5-cache/dev-php/xcache-3.2.0-r2
@@ -55391,7 +55410,7 @@
 1703121808 metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
 1802191838 metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
 1702282315 metadata/md5-cache/dev-php/phar-utils-1.0.0
-1803290617 metadata/md5-cache/dev-php/Manifest.gz
+1804010108 metadata/md5-cache/dev-php/Manifest.gz
 1711172138 metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
 1803230338 metadata/md5-cache/dev-php/pecl-http-2.6.0-r1
 1803230338 metadata/md5-cache/dev-php/pecl-mongodb-1.1.10
@@ -55591,7 +55610,7 @@
 1803021159 metadata/md5-cache/app-text/a2ps-4.14-r6
 1803021159 metadata/md5-cache/app-text/antiword-0.37-r1
 1803021159 metadata/md5-cache/app-text/mupdf-1.11-r1
-1802221208 metadata/md5-cache/app-text/convertlit-1.8-r3
+1803312138 metadata/md5-cache/app-text/convertlit-1.8-r3
 1803071338 metadata/md5-cache/app-text/qpdf-8.0.1
 1803021159 metadata/md5-cache/app-text/fbreader-0.99.4-r4
 1803021159 metadata/md5-cache/app-text/convertlit-1.8-r1
@@ -55825,7 +55844,7 @@
 1712292110 metadata/md5-cache/app-text/libmwaw-0.3.13
 1803260038 metadata/md5-cache/app-text/ding-1.8.1
 1803131609 metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
-1803311308 metadata/md5-cache/app-text/Manifest.gz
+1803312138 metadata/md5-cache/app-text/Manifest.gz
 1803131609 metadata/md5-cache/app-text/atril-1.14.2-r2
 1702282310 metadata/md5-cache/app-text/writerperfect-0.9.5
 1801211608 metadata/md5-cache/app-text/qpdfview-0.4.17_beta1
@@ -56078,23 +56097,23 @@
 1803021159 metadata/md5-cache/app-text/paps-0.6.8-r2
 1803290617 metadata/md5-cache/app-text/pdfminer-20140328-r1
 1706171438 metadata/md5-cache/app-text/ttf2pk2-2.0_p20170524
-1803271708 metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
-1803271438 metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
-1803302039 metadata/md5-cache/app-metrics/pushgateway-0.4.0
-1803271208 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
-1803301739 metadata/md5-cache/app-metrics/node_exporter-0.15.2
-1803271638 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
-1803302039 metadata/md5-cache/app-metrics/Manifest.gz
+1803312238 metadata/md5-cache/app-metrics/alertmanager-0.14.0-r1
+1803312238 metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
+1803312238 metadata/md5-cache/app-metrics/pushgateway-0.4.0
+1803312238 metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
+1803312238 metadata/md5-cache/app-metrics/node_exporter-0.15.2
+1803312238 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+1803312238 metadata/md5-cache/app-metrics/Manifest.gz
 1803290617 metadata/md5-cache/app-metrics/buildbot-prometheus-17.7.2-r2
-1803301739 metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
-1803291809 metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1
-1803271438 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
-1803301809 metadata/md5-cache/app-metrics/snmp_exporter-0.9.0
-1803301739 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
-1803302009 metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
-1803302009 metadata/md5-cache/app-metrics/redis_exporter-0.15.0
-1803271208 metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
-1803271638 metadata/md5-cache/app-metrics/prometheus-2.2.1
+1803312238 metadata/md5-cache/app-metrics/blackbox_exporter-0.12.0
+1803312238 metadata/md5-cache/app-metrics/prometheus-mysqld_exporter-0.10.0-r1
+1803312238 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
+1803312238 metadata/md5-cache/app-metrics/snmp_exporter-0.9.0
+1803312238 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
+1803312238 metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+1803312238 metadata/md5-cache/app-metrics/redis_exporter-0.15.0
+1803312238 metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
+1803312238 metadata/md5-cache/app-metrics/prometheus-2.2.1
 1801011404 metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
 1803021159 metadata/md5-cache/app-forensics/ovaldi-5.10.1.4
 1803021159 metadata/md5-cache/app-forensics/afflib-3.7.7
@@ -56328,7 +56347,7 @@
 1803290617 metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
 1803021159 metadata/md5-cache/app-i18n/im-canna-0.3.2.2
 1803290617 metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2
-1803282239 metadata/md5-cache/app-i18n/unicode-data-10.0.0
+1804010108 metadata/md5-cache/app-i18n/unicode-data-10.0.0
 1802262111 metadata/md5-cache/app-i18n/man-pages-de-1.21
 1803021159 metadata/md5-cache/app-i18n/scim-pinyin-0.5.91-r3
 1803290617 metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
@@ -56338,7 +56357,7 @@
 1803021159 metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
 1803290617 metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
 1803290617 metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
-1803290617 metadata/md5-cache/app-i18n/Manifest.gz
+1804010108 metadata/md5-cache/app-i18n/Manifest.gz
 1712311440 metadata/md5-cache/app-i18n/scim-sayura-0.3.3
 1706121438 metadata/md5-cache/app-i18n/man-pages-fr-3.40.1
 1803021159 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r2
@@ -56449,8 +56468,8 @@
 1801011405 metadata/md5-cache/www-apps/venus-20100911-r2
 1801011405 metadata/md5-cache/www-apps/nanoblogger-3.2.3
 1802151739 metadata/md5-cache/www-apps/otrs-6.0.4
-1712110238 metadata/md5-cache/www-apps/gitea-1.3.1
-1712011709 metadata/md5-cache/www-apps/gitea-1.3.0
+1803312238 metadata/md5-cache/www-apps/gitea-1.3.1
+1803312238 metadata/md5-cache/www-apps/gitea-1.3.0
 1711071709 metadata/md5-cache/www-apps/airdcpp-webui-2.2.1
 1803282309 metadata/md5-cache/www-apps/drupal-7.58
 1702282334 metadata/md5-cache/www-apps/phpsysinfo-3.2.3
@@ -56487,6 +56506,7 @@
 1803021159 metadata/md5-cache/www-apps/ikiwiki-3.20171001
 1803021159 metadata/md5-cache/www-apps/rutorrent-3.4-r1
 1803290617 metadata/md5-cache/www-apps/nikola-7.8.11
+1803311908 metadata/md5-cache/www-apps/nikola-7.8.14
 1801060139 metadata/md5-cache/www-apps/cgisysinfo-0.4.1
 1803290617 metadata/md5-cache/www-apps/icingaweb2-module-graphite-9999
 1702282334 metadata/md5-cache/www-apps/phpwebsite-1.7.2
@@ -56522,14 +56542,14 @@
 1803282309 metadata/md5-cache/www-apps/drupal-8.5.1
 1803021159 metadata/md5-cache/www-apps/liquid_feedback_frontend-3.0.6
 1803180008 metadata/md5-cache/www-apps/moodle-3.4.2
-1711260441 metadata/md5-cache/www-apps/gitea-1.2.3
+1803312238 metadata/md5-cache/www-apps/gitea-1.2.3
 1702282334 metadata/md5-cache/www-apps/agendav-1.2.6.2
 1702282334 metadata/md5-cache/www-apps/phpmp-0.11.0-r1
 1803021159 metadata/md5-cache/www-apps/mypictures-20040202-r1
 1803021159 metadata/md5-cache/www-apps/postfixadmin-3.1
 1706301438 metadata/md5-cache/www-apps/ampache-3.8.3
 1803252008 metadata/md5-cache/www-apps/grafana-bin-5.0.3
-1803301839 metadata/md5-cache/www-apps/Manifest.gz
+1803312238 metadata/md5-cache/www-apps/Manifest.gz
 1803290617 metadata/md5-cache/www-apps/scgi-1.14-r1
 1803021159 metadata/md5-cache/www-apps/davical-1.1.3.1-r2
 1702282334 metadata/md5-cache/www-apps/cvsweb-3.0.5
@@ -56560,7 +56580,7 @@
 1803290617 metadata/md5-cache/www-apps/nikola-7.8.12
 1803290617 metadata/md5-cache/www-apps/tt-rss-99999999
 1803021159 metadata/md5-cache/www-apps/gitit-0.12.2.1
-1803301839 metadata/md5-cache/www-apps/hugo-0.37.1
+1803312238 metadata/md5-cache/www-apps/hugo-0.37.1
 1803021159 metadata/md5-cache/www-apps/gnopaste-0.5.5
 1803021159 metadata/md5-cache/www-apps/b2evolution-4.1.7
 1803021159 metadata/md5-cache/www-apps/webdavcgi-0.8.3
@@ -56862,7 +56882,7 @@
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-pam-modules-9.1-r1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1803021159 metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
-1803311738 metadata/md5-cache/Manifest.gz
+1804011038 metadata/md5-cache/Manifest.gz
 1801011405 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1803021159 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1803021159 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -56981,6 +57001,7 @@
 1803021159 metadata/md5-cache/dev-util/scanmem-0.16.1
 1803021159 metadata/md5-cache/dev-util/imediff2-1.1.2-r3
 1803021159 metadata/md5-cache/dev-util/catfish-1.2.2
+1803312208 metadata/md5-cache/dev-util/hadolint-1.6.1
 1803290617 metadata/md5-cache/dev-util/catalyst-3.0.1
 1803021159 metadata/md5-cache/dev-util/idutils-4.6
 1803260038 metadata/md5-cache/dev-util/geany-1.33
@@ -56997,7 +57018,7 @@
 1803290617 metadata/md5-cache/dev-util/mdds-9999
 1803021159 metadata/md5-cache/dev-util/its4-1.1.1-r1
 1803021159 metadata/md5-cache/dev-util/cucumber-1.3.20-r1
-1711260441 metadata/md5-cache/dev-util/drone-0.7.3
+1803312238 metadata/md5-cache/dev-util/drone-0.7.3
 1803021159 metadata/md5-cache/dev-util/csup-20060318
 1803290617 metadata/md5-cache/dev-util/glslang-9999
 1803021159 metadata/md5-cache/dev-util/fatrace-0.12
@@ -57019,7 +57040,7 @@
 1801011404 metadata/md5-cache/dev-util/rebar-2.6.1
 1803040138 metadata/md5-cache/dev-util/cargo-0.20.0
 1709152138 metadata/md5-cache/dev-util/herdtools7-7.47
-1802210038 metadata/md5-cache/dev-util/drone-cli-0.8.3
+1803312238 metadata/md5-cache/dev-util/drone-cli-0.8.3
 1803290617 metadata/md5-cache/dev-util/obs-service-extract_file-20130318
 1803290617 metadata/md5-cache/dev-util/buildbot-www-1.1.0
 1712021609 metadata/md5-cache/dev-util/appdata-tools-0.1.8-r1
@@ -57049,7 +57070,7 @@
 1803021159 metadata/md5-cache/dev-util/ccache-3.2.7
 1702282321 metadata/md5-cache/dev-util/android-ndk-9d
 1803021159 metadata/md5-cache/dev-util/google-perftools-2.0-r2
-1803201012 metadata/md5-cache/dev-util/drone-0.8.4_p20180216
+1803312238 metadata/md5-cache/dev-util/drone-0.8.4_p20180216
 1803290617 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
 1711260441 metadata/md5-cache/dev-util/artifactory-bin-4.16.1
 1803151808 metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -57080,7 +57101,7 @@
 1803290617 metadata/md5-cache/dev-util/tailor-0.9.35-r1
 1702282322 metadata/md5-cache/dev-util/peg-0.1.15
 1702282322 metadata/md5-cache/dev-util/shtool-2.0.8-r1
-1801011404 metadata/md5-cache/dev-util/docker-ls-0.3.1
+1803312238 metadata/md5-cache/dev-util/docker-ls-0.3.1
 1803021159 metadata/md5-cache/dev-util/mingw64-runtime-4.0.6
 1803021159 metadata/md5-cache/dev-util/icmake-9.02.02
 1801011404 metadata/md5-cache/dev-util/ninja-1.7.2
@@ -57099,11 +57120,11 @@
 1803290617 metadata/md5-cache/dev-util/vint-0.3.18
 1801011404 metadata/md5-cache/dev-util/vtable-dumper-1.2
 1801091400 metadata/md5-cache/dev-util/duma-2.5.15-r2
-1803082208 metadata/md5-cache/dev-util/promu-0.1.0_p20180227
+1803312238 metadata/md5-cache/dev-util/promu-0.1.0_p20180227
 1803021159 metadata/md5-cache/dev-util/makepp-1.18
 1801011404 metadata/md5-cache/dev-util/tinlink-1.0.0
 1803290617 metadata/md5-cache/dev-util/dwarves-1.10_p20140618
-1801261708 metadata/md5-cache/dev-util/drone-0.8.4
+1803312238 metadata/md5-cache/dev-util/drone-0.8.4
 1803290617 metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
 1803290617 metadata/md5-cache/dev-util/rosinstall-0.7.8
 1803021159 metadata/md5-cache/dev-util/ccache-3.2.4
@@ -57131,7 +57152,7 @@
 1801100239 metadata/md5-cache/dev-util/shards-0.7.2
 1803290617 metadata/md5-cache/dev-util/buildbot-waterfall-view-1.1.0
 1803290617 metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
-1803271438 metadata/md5-cache/dev-util/clair-2.0.2
+1803312238 metadata/md5-cache/dev-util/clair-2.0.2
 1702282321 metadata/md5-cache/dev-util/android-ndk-10d
 1803270108 metadata/md5-cache/dev-util/patchelf-0.9_p20180129
 1702282321 metadata/md5-cache/dev-util/cgvg-1.6.2
@@ -57144,7 +57165,7 @@
 1803290617 metadata/md5-cache/dev-util/obs-service-verify_file-20130403
 1803040138 metadata/md5-cache/dev-util/cargo-0.17.0
 1803290617 metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
-1803021808 metadata/md5-cache/dev-util/drone-cli-0.8.4
+1803312238 metadata/md5-cache/dev-util/drone-cli-0.8.4
 1803290617 metadata/md5-cache/dev-util/bcc-0.5.0
 1803171008 metadata/md5-cache/dev-util/mingw-runtime-3.18
 1803290617 metadata/md5-cache/dev-util/buildbot-www-0.9.12
@@ -57180,7 +57201,7 @@
 1803021159 metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
 1803021159 metadata/md5-cache/dev-util/astyle-3.0.1
 1802191908 metadata/md5-cache/dev-util/uftrace-0.8.3
-1803191608 metadata/md5-cache/dev-util/drone-cli-0.8.5
+1803312238 metadata/md5-cache/dev-util/drone-cli-0.8.5
 1803021159 metadata/md5-cache/dev-util/qdevicemonitor-1.0.1
 1711260441 metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
 1803021159 metadata/md5-cache/dev-util/radare2-2.3.0
@@ -57262,6 +57283,7 @@
 1711260441 metadata/md5-cache/dev-util/artifactory-bin-5.4.6
 1803021159 metadata/md5-cache/dev-util/ccache-3.3.4
 1803290617 metadata/md5-cache/dev-util/cmdtest-0.16
+1804010138 metadata/md5-cache/dev-util/pycharm-professional-2018.1
 1803290617 metadata/md5-cache/dev-util/min-cscope-16.1.0
 1803290617 metadata/md5-cache/dev-util/cmocka-1.0.1
 1803021159 metadata/md5-cache/dev-util/duma-2.5.13
@@ -57351,7 +57373,7 @@
 1702282322 metadata/md5-cache/dev-util/treecc-0.3.10
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.3.0
 1702282321 metadata/md5-cache/dev-util/cpuinfo-collection-20060720
-1801252208 metadata/md5-cache/dev-util/promu-0.1.0
+1803312238 metadata/md5-cache/dev-util/promu-0.1.0
 1803021159 metadata/md5-cache/dev-util/desktop-file-utils-0.23
 1803021159 metadata/md5-cache/dev-util/crash-7.0.0
 1801191240 metadata/md5-cache/dev-util/android-ndk-14b
@@ -57359,7 +57381,7 @@
 1702282322 metadata/md5-cache/dev-util/xxdi-1.0.0
 1803311338 metadata/md5-cache/dev-util/debootstrap-1.0.89
 1803290617 metadata/md5-cache/dev-util/spec-cleaner-0.8.9
-1803021159 metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
+1804010108 metadata/md5-cache/dev-util/pycharm-professional-2017.3.3
 1803021159 metadata/md5-cache/dev-util/radare2-2.1.0-r2
 1803241838 metadata/md5-cache/dev-util/clion-2017.3.4
 1803021159 metadata/md5-cache/dev-util/crash-7.1.4
@@ -57376,7 +57398,7 @@
 1803021159 metadata/md5-cache/dev-util/ragel-6.9
 1803040138 metadata/md5-cache/dev-util/cargo-0.16.0
 1803021159 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1803311408 metadata/md5-cache/dev-util/Manifest.gz
+1804010238 metadata/md5-cache/dev-util/Manifest.gz
 1802262111 metadata/md5-cache/dev-util/xdelta-3.1.0
 1803021159 metadata/md5-cache/dev-util/dmake-4.12.2
 1801011404 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -57542,7 +57564,7 @@
 1803290617 metadata/md5-cache/dev-util/sysdig-0.20.0
 1702282322 metadata/md5-cache/dev-util/obs-service-meta-2
 1801011404 metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
-1803301709 metadata/md5-cache/dev-util/drone-0.8.5
+1803312238 metadata/md5-cache/dev-util/drone-0.8.5
 1803290617 metadata/md5-cache/dev-util/cgdb-9999
 1803260209 metadata/md5-cache/dev-util/sel-0.08.4-r2
 1803290617 metadata/md5-cache/dev-util/abi-compliance-checker-9999
@@ -57555,7 +57577,7 @@
 1803021159 metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
 1706221738 metadata/md5-cache/dev-util/patdiff-0.9.0
 1803290617 metadata/md5-cache/dev-util/kdevelop-python-5.2.1
-1707301138 metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
+1803312238 metadata/md5-cache/dev-util/drone-cli-0.7.0_p20170717
 1803021159 metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
 1803021159 metadata/md5-cache/dev-util/mingw64-runtime-3.0.0
 1801011404 metadata/md5-cache/dev-util/huc-0.1-r1
@@ -57571,7 +57593,6 @@
 1702282321 metadata/md5-cache/dev-util/cproto-4.7e
 1802150008 metadata/md5-cache/dev-util/jenkins-bin-2.107
 1803021159 metadata/md5-cache/dev-util/gob-2.0.20
-1803021159 metadata/md5-cache/dev-util/hadolint-1.4.0
 1803290617 metadata/md5-cache/dev-util/comparator-2.10
 1803021159 metadata/md5-cache/dev-util/checkstyle-7.2
 1801011404 metadata/md5-cache/dev-util/vmtouch-1.3.0
@@ -57583,6 +57604,7 @@
 1803021159 metadata/md5-cache/dev-util/pycharm-community-2017.3
 1802262111 metadata/md5-cache/dev-util/ply-0_pre20160313
 1801011404 metadata/md5-cache/dev-util/usb-robot-0.2.0
+1804010138 metadata/md5-cache/dev-util/pycharm-community-2018.1
 1803290617 metadata/md5-cache/dev-util/spirv-headers-9999
 1803021159 metadata/md5-cache/dev-util/ccache-3.3.3
 1803290617 metadata/md5-cache/dev-util/cram-0.7
@@ -57603,6 +57625,7 @@
 1803021159 metadata/md5-cache/dev-util/strace-4.20
 1801011404 metadata/md5-cache/dev-util/makeheaders-0_p4
 1803222339 metadata/md5-cache/dev-util/cucumber-3.0.2
+1804010238 metadata/md5-cache/dev-util/bitcoin-tx-0.16.0
 1802262111 metadata/md5-cache/dev-util/global-6.5.7
 1803021159 metadata/md5-cache/dev-util/lttng-modules-2.7.1
 1803021159 metadata/md5-cache/dev-util/babeltrace-1.2.4
@@ -57668,7 +57691,7 @@
 1803021159 metadata/md5-cache/dev-util/bazel-0.10.1
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.4.0
 1803021159 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
-1711260441 metadata/md5-cache/dev-util/clair-2.0.1
+1803312238 metadata/md5-cache/dev-util/clair-2.0.1
 1803021159 metadata/md5-cache/dev-util/aruba-0.8.1
 1803290617 metadata/md5-cache/dev-util/osc-0.152.0
 1803290617 metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
@@ -57680,7 +57703,6 @@
 1803190338 metadata/md5-cache/dev-util/doxy-coverage-151229
 1803021159 metadata/md5-cache/dev-util/autodia-2.140.0-r1
 1803290617 metadata/md5-cache/dev-util/gertty-1.4.0
-1803021159 metadata/md5-cache/dev-util/hadolint-1.3.0
 1801011404 metadata/md5-cache/dev-util/stubgen-2.08
 1803021159 metadata/md5-cache/dev-util/shellcheck-0.4.7
 1803222339 metadata/md5-cache/dev-util/cucumber-2.4.0-r1
@@ -57693,7 +57715,7 @@
 1803021159 metadata/md5-cache/dev-util/debhelper-9.20160814
 1803310038 metadata/md5-cache/dev-util/clion-2018.1
 1803082239 metadata/md5-cache/dev-util/cpputest-3.8
-1803021159 metadata/md5-cache/dev-util/pycharm-community-2017.3.3
+1804010108 metadata/md5-cache/dev-util/pycharm-community-2017.3.3
 1803290617 metadata/md5-cache/dev-util/cookiecutter-1.6.0
 1801011404 metadata/md5-cache/dev-util/rebar-2.6.4
 1803290617 metadata/md5-cache/dev-util/obs-service-set_version-0.3
@@ -57723,7 +57745,7 @@
 1712021609 metadata/md5-cache/dev-util/xdelta-3.0.11
 1803021159 metadata/md5-cache/dev-util/rats-2.4
 1702282321 metadata/md5-cache/dev-util/android-ndk-10
-1707301138 metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
+1803312238 metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
 1803021159 metadata/md5-cache/dev-util/kup-0.3.4-r1
 1803021159 metadata/md5-cache/dev-util/babeltrace-1.2.3
 1803290617 metadata/md5-cache/dev-util/spirv-tools-9999
@@ -59295,7 +59317,7 @@
 1707070039 metadata/md5-cache/sci-astronomy/casa-data-20170703
 1803021159 metadata/md5-cache/sci-astronomy/casa-data-99999
 1803021159 metadata/md5-cache/app-admin/analog-6.0-r4
-1802122338 metadata/md5-cache/app-admin/helm-2.8.1
+1803312238 metadata/md5-cache/app-admin/helm-2.8.1
 1803021159 metadata/md5-cache/app-admin/puppet-agent-5.3.4
 1803021159 metadata/md5-cache/app-admin/aerospike-amc-community-3.6.11
 1803021159 metadata/md5-cache/app-admin/packagekit-base-1.0.11
@@ -59310,7 +59332,7 @@
 1803021159 metadata/md5-cache/app-admin/mongo-tools-3.0.14
 1801281039 metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.7.0-r1
-1802082308 metadata/md5-cache/app-admin/ksonnet-0.8.0
+1803312238 metadata/md5-cache/app-admin/ksonnet-0.8.0
 1803021159 metadata/md5-cache/app-admin/whowatch-1.8.5
 1803190338 metadata/md5-cache/app-admin/puppet-5.3.4
 1803021159 metadata/md5-cache/app-admin/monit-5.25.1
@@ -59346,10 +59368,10 @@
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.7.1
 1706061008 metadata/md5-cache/app-admin/rcm-1.3.1
 1803290617 metadata/md5-cache/app-admin/supervisor-3.1.4
-1803252338 metadata/md5-cache/app-admin/consul-replicate-0.2.0
+1803312238 metadata/md5-cache/app-admin/consul-replicate-0.2.0
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.3
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.7.1
-1710262338 metadata/md5-cache/app-admin/cli53-0.8.12
+1803312238 metadata/md5-cache/app-admin/cli53-0.8.12
 1803140138 metadata/md5-cache/app-admin/webalizer-2.23.08
 1803021159 metadata/md5-cache/app-admin/aerospike-amc-community-3.6.12
 1801011404 metadata/md5-cache/app-admin/lnav-0.8.2
@@ -59374,7 +59396,7 @@
 1802262111 metadata/md5-cache/app-admin/cronolog-1.6.2-r5
 1803290617 metadata/md5-cache/app-admin/gixy-0.1.5
 1803021159 metadata/md5-cache/app-admin/packagekit-gtk-1.1.5
-1803021159 metadata/md5-cache/app-admin/cli53-9999
+1803312238 metadata/md5-cache/app-admin/cli53-9999
 1711131908 metadata/md5-cache/app-admin/petrovich-1.0.0-r1
 1803130209 metadata/md5-cache/app-admin/logstash-bin-5.6.8
 1803021159 metadata/md5-cache/app-admin/equo-302
@@ -59390,7 +59412,7 @@
 1803190338 metadata/md5-cache/app-admin/conserver-8.1.18-r1
 1803290617 metadata/md5-cache/app-admin/webapp-config-1.52-r1
 1803290617 metadata/md5-cache/app-admin/glance-2018.1.9999
-1802150238 metadata/md5-cache/app-admin/vault-0.9.3
+1803312238 metadata/md5-cache/app-admin/vault-0.9.3
 1803201012 metadata/md5-cache/app-admin/lnav-0.8.3
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.5.2
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.4.1
@@ -59400,7 +59422,7 @@
 1803021159 metadata/md5-cache/app-admin/sysstat-11.4.0
 1803021159 metadata/md5-cache/app-admin/psmon-1.39-r1
 1803021159 metadata/md5-cache/app-admin/puppet-lint-2.3.3
-1801280009 metadata/md5-cache/app-admin/consul-0.9.3
+1803312238 metadata/md5-cache/app-admin/consul-0.9.3
 1803021159 metadata/md5-cache/app-admin/tmpwatch-2.11-r2
 1803021159 metadata/md5-cache/app-admin/fam-2.7.0-r7
 1803290617 metadata/md5-cache/app-admin/keepassxc-2.2.4
@@ -59414,7 +59436,7 @@
 1801011404 metadata/md5-cache/app-admin/chrootuid-1.3
 1803021159 metadata/md5-cache/app-admin/cgmanager-0.41
 1802041208 metadata/md5-cache/app-admin/systemrescuecd-x86-5.2.0
-1801280009 metadata/md5-cache/app-admin/serf-0.8.1-r1
+1803312238 metadata/md5-cache/app-admin/serf-0.8.1-r1
 1803290617 metadata/md5-cache/app-admin/elektra-0.8.16
 1803290617 metadata/md5-cache/app-admin/lastpass-cli-1.2.2
 1801050119 metadata/md5-cache/app-admin/rex-1.4.0-r1
@@ -59449,14 +59471,14 @@
 1803290109 metadata/md5-cache/app-admin/kpcli-3.2
 1803162138 metadata/md5-cache/app-admin/syslog-ng-3.7.3
 1803290617 metadata/md5-cache/app-admin/setools-4.1.1
-1802082008 metadata/md5-cache/app-admin/kube-bench-0.0.11
+1803312238 metadata/md5-cache/app-admin/kube-bench-0.0.11
 1803290617 metadata/md5-cache/app-admin/ansible-2.5.0
 1702282308 metadata/md5-cache/app-admin/hardening-check-2.6
-1803190338 metadata/md5-cache/app-admin/apache-tools-2.4.29
+1803312108 metadata/md5-cache/app-admin/apache-tools-2.4.29
 1803290617 metadata/md5-cache/app-admin/webapp-config-9999
 1803021159 metadata/md5-cache/app-admin/sshguard-1.7.1
 1801011404 metadata/md5-cache/app-admin/pydf-12-r1
-1802082108 metadata/md5-cache/app-admin/docker-bench-0_p20171206
+1803312238 metadata/md5-cache/app-admin/docker-bench-0_p20171206
 1712251809 metadata/md5-cache/app-admin/sagan-rules-20140617
 1803021159 metadata/md5-cache/app-admin/sudo-1.8.22
 1801011404 metadata/md5-cache/app-admin/sysrqd-14
@@ -59497,6 +59519,7 @@
 1803021159 metadata/md5-cache/app-admin/packagekit-gtk-1.1.4
 1703080808 metadata/md5-cache/app-admin/sshguard-2.0.0
 1801011404 metadata/md5-cache/app-admin/cpulimit-1.8
+1803312138 metadata/md5-cache/app-admin/kubectx-0.4.1
 1803290617 metadata/md5-cache/app-admin/lastpass-cli-1.2.1
 1801011404 metadata/md5-cache/app-admin/chrootuid-1.3-r1
 1803290617 metadata/md5-cache/app-admin/lsyncd-2.2.2
@@ -59511,7 +59534,7 @@
 1803021159 metadata/md5-cache/app-admin/prelude-manager-3.0.0
 1803021159 metadata/md5-cache/app-admin/verynice-1.1-r3
 1801291909 metadata/md5-cache/app-admin/su-exec-0.2
-1803191608 metadata/md5-cache/app-admin/helm-2.8.2
+1803312238 metadata/md5-cache/app-admin/helm-2.8.2
 1803190338 metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
 1803211938 metadata/md5-cache/app-admin/mcollective-2.12.0-r1
 1803290617 metadata/md5-cache/app-admin/rex-9999
@@ -59523,7 +59546,7 @@
 1803021159 metadata/md5-cache/app-admin/tenshi-0.14
 1803290617 metadata/md5-cache/app-admin/eclean-kernel-9999
 1803310508 metadata/md5-cache/app-admin/glance-16.0.0
-1801280009 metadata/md5-cache/app-admin/consul-template-0.18.5-r1
+1803312238 metadata/md5-cache/app-admin/consul-template-0.18.5-r1
 1801280009 metadata/md5-cache/app-admin/mcelog-154
 1708091009 metadata/md5-cache/app-admin/pwgen-2.08
 1803021159 metadata/md5-cache/app-admin/bastille-3.0.9-r1
@@ -59536,7 +59559,7 @@
 1803280809 metadata/md5-cache/app-admin/rsyslog-8.32.0-r3
 1803021159 metadata/md5-cache/app-admin/puppet-4.10.10-r1
 1711260441 metadata/md5-cache/app-admin/graylog2-2.2.3
-1803310508 metadata/md5-cache/app-admin/Manifest.gz
+1803312238 metadata/md5-cache/app-admin/Manifest.gz
 1801271708 metadata/md5-cache/app-admin/filebeat-6.1.1
 1703071908 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.3
 1803290617 metadata/md5-cache/app-admin/diamond-9999
@@ -59561,7 +59584,7 @@
 1803021159 metadata/md5-cache/app-admin/setools-3.3.8-r7
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.2
-1801280009 metadata/md5-cache/app-admin/vault-0.9.0
+1803312238 metadata/md5-cache/app-admin/vault-0.9.0
 1704231508 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.5
 1803021159 metadata/md5-cache/app-admin/syslog-summary-1.14-r1
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.8.0
@@ -59574,7 +59597,7 @@
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.9.0-r1
 1702282308 metadata/md5-cache/app-admin/grubconfig-1.28-r2
 1803290617 metadata/md5-cache/app-admin/eclean-kernel-0.4.2
-1801280009 metadata/md5-cache/app-admin/consul-1.0.0
+1803312238 metadata/md5-cache/app-admin/consul-1.0.0
 1704231508 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.4
 1803061638 metadata/md5-cache/app-admin/puppetserver-5.1.5
 1803290617 metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
@@ -59614,7 +59637,7 @@
 1803021159 metadata/md5-cache/app-admin/packagekit-base-1.1.5-r2
 1803250109 metadata/md5-cache/app-admin/389-console-1.1.7-r1
 1803040038 metadata/md5-cache/app-admin/tenshi-0.17
-1802150238 metadata/md5-cache/app-admin/mtail-3.0.0_rc5
+1803312238 metadata/md5-cache/app-admin/mtail-3.0.0_rc5
 1803021159 metadata/md5-cache/app-admin/syslogread-0.92-r1
 1801241438 metadata/md5-cache/app-admin/eselect-1.4.12
 1801011404 metadata/md5-cache/app-admin/lastpass-cli-1.0.0
@@ -59641,7 +59664,7 @@
 1704231508 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.6
 1801050409 metadata/md5-cache/app-admin/systemrescuecd-x86-5.1.2
 1803021159 metadata/md5-cache/app-admin/genromfs-0.5.2
-1802150408 metadata/md5-cache/app-admin/consul-1.0.6
+1803312238 metadata/md5-cache/app-admin/consul-1.0.6
 1709081038 metadata/md5-cache/app-admin/systemrescuecd-x86-5.1.0
 1712300140 metadata/md5-cache/app-admin/aws-elb-tools-1.0.15.1-r1
 1702282308 metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -59649,7 +59672,7 @@
 1803290617 metadata/md5-cache/app-admin/webapp-config-1.54-r2
 1803290617 metadata/md5-cache/app-admin/keepassxc-2.3.1
 1803212138 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.3.1-r1
-1801280009 metadata/md5-cache/app-admin/vault-0.8.3
+1803312238 metadata/md5-cache/app-admin/vault-0.8.3
 1803021159 metadata/md5-cache/app-admin/sysstat-11.7.1
 1803021738 metadata/md5-cache/app-admin/mongo-tools-3.6.3
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.5.0
@@ -59696,7 +59719,7 @@
 1803290617 metadata/md5-cache/app-admin/ansible-2.4.2.0-r1
 1705160038 metadata/md5-cache/app-admin/fifo-cronolog-1.1.1-r1
 1803290617 metadata/md5-cache/app-admin/cdist-4.7.3
-1710131538 metadata/md5-cache/app-admin/mtail-3.0.0_rc4
+1803312238 metadata/md5-cache/app-admin/mtail-3.0.0_rc4
 1702282308 metadata/md5-cache/app-admin/systemrescuecd-x86-4.6.1
 1712091439 metadata/md5-cache/app-admin/packagekit-1.1.7
 1803021159 metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
@@ -59719,7 +59742,7 @@
 1705150108 metadata/md5-cache/app-admin/filewatcher-2.4.6-r1
 1803290617 metadata/md5-cache/app-admin/salt-2016.11.9-r1
 1702282308 metadata/md5-cache/app-admin/emacs-updater-1.15
-1709142308 metadata/md5-cache/app-admin/cli53-0.8.9
+1803312238 metadata/md5-cache/app-admin/cli53-0.8.9
 1801011404 metadata/md5-cache/app-admin/ide-smart-1.4-r1
 1803130209 metadata/md5-cache/app-admin/logstash-bin-6.2.2
 1803021159 metadata/md5-cache/app-admin/fsvs-1.2.5-r1
@@ -59771,8 +59794,8 @@
 1802262111 metadata/md5-cache/net-proxy/squidclamav-6.10
 1803021159 metadata/md5-cache/net-proxy/http-replicator-4.0_alpha2-r5
 1803280209 metadata/md5-cache/net-proxy/3proxy-0.8.6
-1803302039 metadata/md5-cache/net-proxy/Manifest.gz
-1707301138 metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
+1803312238 metadata/md5-cache/net-proxy/Manifest.gz
+1803312238 metadata/md5-cache/net-proxy/obfs4proxy-0.0.7
 1803021159 metadata/md5-cache/net-proxy/squid-3.5.27
 1803290617 metadata/md5-cache/net-proxy/redsocks-9999
 1803021159 metadata/md5-cache/net-proxy/dnsproxy-1.16-r2
@@ -59781,12 +59804,12 @@
 1803021159 metadata/md5-cache/net-proxy/squid-3.5.26
 1803021159 metadata/md5-cache/net-proxy/nutcracker-0.3.0
 1803021159 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
-1707301138 metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
+1803312238 metadata/md5-cache/net-proxy/obfs4proxy-0.0.6
 1803021159 metadata/md5-cache/net-proxy/haproxy-1.5.14
 1802262111 metadata/md5-cache/net-proxy/tinyproxy-1.8.3-r4
 1803021159 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
 1803021159 metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
-1803021159 metadata/md5-cache/net-proxy/obfs4proxy-9999
+1803312238 metadata/md5-cache/net-proxy/obfs4proxy-9999
 1803290617 metadata/md5-cache/net-proxy/haproxy-1.9.9999
 1803021159 metadata/md5-cache/net-proxy/http-replicator-3.0-r7
 1711260441 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
@@ -60115,7 +60138,7 @@
 1803021159 metadata/md5-cache/mail-mta/postfix-3.2.5
 1803161138 metadata/md5-cache/mail-mta/exim-4.91_rc1
 1803021159 metadata/md5-cache/mail-mta/opensmtpd-6.0.2_p1-r2
-1803290617 metadata/md5-cache/mail-mta/Manifest.gz
+1803312108 metadata/md5-cache/mail-mta/Manifest.gz
 1803021159 metadata/md5-cache/mail-mta/nullmailer-2.0-r1
 1803021159 metadata/md5-cache/mail-mta/postfix-3.2.3
 1803021159 metadata/md5-cache/mail-mta/exim-4.90
@@ -60135,7 +60158,7 @@
 1803021159 metadata/md5-cache/mail-mta/netqmail-1.06-r3
 1803021159 metadata/md5-cache/mail-mta/netqmail-1.06-r1
 1803021159 metadata/md5-cache/mail-mta/exim-4.89-r5
-1803082309 metadata/md5-cache/mail-mta/exim-4.90.1
+1803312108 metadata/md5-cache/mail-mta/exim-4.90.1
 1803021159 metadata/md5-cache/mail-mta/postfix-3.2.2
 1803290617 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.7.5
 1803232308 metadata/md5-cache/xfce-extra/tumbler-0.2.0
@@ -60435,7 +60458,7 @@
 1803290617 metadata/md5-cache/app-portage/flaggie-0.2.1-r1
 1803290617 metadata/md5-cache/app-portage/mirrorselect-2.2.2
 1803212138 metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
-1803021159 metadata/md5-cache/app-portage/golop-9999
+1803312238 metadata/md5-cache/app-portage/golop-9999
 1803310308 metadata/md5-cache/app-portage/repoman-2.3.9
 1803220138 metadata/md5-cache/app-portage/portpeek-2.1.26
 1712061709 metadata/md5-cache/app-portage/prefix-chain-setup-0.7
@@ -60518,7 +60541,7 @@
 1803290617 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 1803290617 metadata/md5-cache/app-portage/repoman-2.3.6
 1803290617 metadata/md5-cache/app-portage/grs-0.5
-1803310308 metadata/md5-cache/app-portage/Manifest.gz
+1803312238 metadata/md5-cache/app-portage/Manifest.gz
 1803021159 metadata/md5-cache/app-portage/g-cpan-0.16.5
 1803290617 metadata/md5-cache/app-portage/elogv-0.7.6.5
 1803290617 metadata/md5-cache/app-portage/metagen-0.6.4.2
@@ -60576,7 +60599,7 @@
 1803290617 metadata/md5-cache/app-portage/mirrorselect-9999
 1803290617 metadata/md5-cache/app-portage/mirrorselect-2.2.3
 1803290617 metadata/md5-cache/app-portage/grs-9999
-1803302208 metadata/md5-cache/app-portage/portage-utils-0.64
+1803312238 metadata/md5-cache/app-portage/portage-utils-0.64
 1803290617 metadata/md5-cache/app-portage/g-sorcery-0.2-r1
 1803302208 metadata/md5-cache/app-portage/kuroo-9999
 1803212138 metadata/md5-cache/app-portage/eclass-manpages-99999999
@@ -61308,7 +61331,7 @@
 1803021159 metadata/md5-cache/sys-fs/udev-216
 1803021159 metadata/md5-cache/sys-fs/zfs-kmod-0.7.6
 1802262111 metadata/md5-cache/sys-fs/jmtpfs-0.5
-1707100039 metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
+1803312238 metadata/md5-cache/sys-fs/etcd-fs-0_p20170517
 1803290617 metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
 1801011405 metadata/md5-cache/sys-fs/davl-1.2.4-r2
 1803230508 metadata/md5-cache/sys-fs/fuse-2.9.7-r1
@@ -61340,7 +61363,7 @@
 1803021159 metadata/md5-cache/sys-fs/aufs4-0_pre20171002
 1803290617 metadata/md5-cache/sys-fs/cryfs-9999
 1803290617 metadata/md5-cache/sys-fs/cryptsetup-1.7.5
-1802262111 metadata/md5-cache/sys-fs/inotify-tools-3.20.1
+1803312208 metadata/md5-cache/sys-fs/inotify-tools-3.20.1
 1803021159 metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
 1803021159 metadata/md5-cache/sys-fs/autorun-3.17
 1803021159 metadata/md5-cache/sys-fs/aufs4-0_pre20161010
@@ -61449,7 +61472,7 @@
 1803021159 metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
 1707232209 metadata/md5-cache/sys-fs/exfat-utils-1.2.4
 1803021159 metadata/md5-cache/sys-fs/ext4magic-0.3.2
-1706141738 metadata/md5-cache/sys-fs/tmsu-0.6.1
+1803312238 metadata/md5-cache/sys-fs/tmsu-0.6.1
 1803021159 metadata/md5-cache/sys-fs/udev-init-scripts-27
 1802262111 metadata/md5-cache/sys-fs/cryptsetup-2.0.1
 1801011405 metadata/md5-cache/sys-fs/btrfs-progs-4.9.1
@@ -61481,7 +61504,7 @@
 1803021159 metadata/md5-cache/sys-fs/dd-rescue-1.46
 1803021159 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
 1802262111 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1803311738 metadata/md5-cache/sys-fs/Manifest.gz
+1803312238 metadata/md5-cache/sys-fs/Manifest.gz
 1803021159 metadata/md5-cache/sys-fs/zerofree-1.0.1
 1803021159 metadata/md5-cache/sys-fs/aufs3-3_p20160627
 1803021159 metadata/md5-cache/sys-fs/libeatmydata-82
@@ -61541,7 +61564,7 @@
 1803021159 metadata/md5-cache/sys-fs/zerofree-1.0.4
 1710290939 metadata/md5-cache/sys-fs/bindfs-1.13.8
 1803290617 metadata/md5-cache/sys-fs/owfs-3.1_p4-r1
-1711151108 metadata/md5-cache/sys-fs/tmsu-0.7.0
+1803312238 metadata/md5-cache/sys-fs/tmsu-0.7.0
 1802070408 metadata/md5-cache/sys-fs/mp3fs-0.91-r1
 1803291009 metadata/md5-cache/sys-fs/eudev-3.2.5
 1705310108 metadata/md5-cache/sys-fs/ldapfuse-1.0-r1
@@ -61602,7 +61625,7 @@
 1803021159 metadata/md5-cache/sys-fs/snapraid-8.1
 1803021159 metadata/md5-cache/sys-fs/lvm2-2.02.116-r4
 1803021159 metadata/md5-cache/sys-fs/udev-225-r1
-1707092239 metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
+1803312238 metadata/md5-cache/sys-fs/etcd-fs-0_p20140620
 1803190338 metadata/md5-cache/sys-fs/archivemount-0.8.10
 1803021159 metadata/md5-cache/sys-fs/devfsd-1.3.25-r9
 1803021159 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
@@ -62036,7 +62059,7 @@
 1801050119 metadata/md5-cache/dev-perl/File-Scan-ClamAV-1.930.0
 1803021159 metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
 1801050119 metadata/md5-cache/dev-perl/Mail-Sendmail-0.800.0
-1803151938 metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
+1803312138 metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
 1801050119 metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
 1803021159 metadata/md5-cache/dev-perl/Lingua-EN-NameCase-1.190.0
 1803021159 metadata/md5-cache/dev-perl/Apache-Session-1.930.0
@@ -63409,7 +63432,7 @@
 1801050119 metadata/md5-cache/dev-perl/String-Flogger-1.101.245
 1803021159 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
 1803021159 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
-1803311338 metadata/md5-cache/dev-perl/Manifest.gz
+1803312138 metadata/md5-cache/dev-perl/Manifest.gz
 1803021159 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.40.0-r2
 1803280638 metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
 1801050119 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
@@ -64544,10 +64567,10 @@
 1803290617 metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
 1712210209 metadata/md5-cache/net-nntp/slrn-1.0.3
 1803290617 metadata/md5-cache/sys-cluster/libquo-9999
-1803190338 metadata/md5-cache/sys-cluster/teleport-2.4.5
+1803312238 metadata/md5-cache/sys-cluster/teleport-2.4.5
 1803021159 metadata/md5-cache/sys-cluster/pconsole-1.0-r3
 1803021159 metadata/md5-cache/sys-cluster/charm-6.6.1
-1803271438 metadata/md5-cache/sys-cluster/kube-proxy-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kube-proxy-1.10.0
 1803021159 metadata/md5-cache/sys-cluster/corosync-1.3.0
 1803021159 metadata/md5-cache/sys-cluster/mpich2-1.5
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.10.7
@@ -64557,7 +64580,7 @@
 1702282333 metadata/md5-cache/sys-cluster/zookeepercli-1.0.10
 1803120039 metadata/md5-cache/sys-cluster/slurm-17.11.4
 1803021159 metadata/md5-cache/sys-cluster/ploop-1.14.1
-1803201508 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.5
 1801091400 metadata/md5-cache/sys-cluster/libdlm-3.1.5
 1803290617 metadata/md5-cache/sys-cluster/heat-2017.2.9999
 1803021159 metadata/md5-cache/sys-cluster/charm-6.6.0-r1
@@ -64574,10 +64597,10 @@
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.3.15
 1803290617 metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
 1803290617 metadata/md5-cache/sys-cluster/cinder-2017.2.9999
-1803221838 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
-1803201508 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.5
 1803021159 metadata/md5-cache/sys-cluster/torque-6.0.3
-1803270108 metadata/md5-cache/sys-cluster/minikube-0.25.2
+1803312238 metadata/md5-cache/sys-cluster/minikube-0.25.2
 1803021159 metadata/md5-cache/sys-cluster/drbd-kernel-8.3.6
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.3.12
 1803021159 metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
@@ -64594,7 +64617,7 @@
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.4.5
 1803021159 metadata/md5-cache/sys-cluster/rgmanager-2.03.09-r1
 1802262111 metadata/md5-cache/sys-cluster/heartbeat-3.0.6
-1803231808 metadata/md5-cache/sys-cluster/kubelet-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kubelet-1.9.6
 1803021159 metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
 1803290617 metadata/md5-cache/sys-cluster/legion-9999
 1803021159 metadata/md5-cache/sys-cluster/corosync-2.3.3
@@ -64617,13 +64640,13 @@
 1803021159 metadata/md5-cache/sys-cluster/csync2-2.0
 1801091400 metadata/md5-cache/sys-cluster/libccs-perl-3.1.5
 1803290617 metadata/md5-cache/sys-cluster/legion-17.08.0
-1803231808 metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kube-proxy-1.9.6
 1803021159 metadata/md5-cache/sys-cluster/maui-3.3.1-r3
 1803290617 metadata/md5-cache/sys-cluster/neutron-2018.1.9999
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.4.0
 1803260708 metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
 1803021159 metadata/md5-cache/sys-cluster/charm-6.5.1-r1
-1803221838 metadata/md5-cache/sys-cluster/kubectl-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kubectl-1.9.6
 1802262111 metadata/md5-cache/sys-cluster/gasnet-1.30.0
 1803021159 metadata/md5-cache/sys-cluster/torque-4.2.9-r5
 1803021159 metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
@@ -64634,24 +64657,24 @@
 1803021159 metadata/md5-cache/sys-cluster/fence-agents-3.1.5-r2
 1802262111 metadata/md5-cache/sys-cluster/ampi-0_pre20140616
 1803021159 metadata/md5-cache/sys-cluster/mpich-3.2
-1803290617 metadata/md5-cache/sys-cluster/teleport-9999
+1803312238 metadata/md5-cache/sys-cluster/teleport-9999
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.4.2
 1802262111 metadata/md5-cache/sys-cluster/gasnet-1.26.4
 1803310508 metadata/md5-cache/sys-cluster/neutron-12.0.1
 1803021159 metadata/md5-cache/sys-cluster/wulfware-2.6.0
-1803271308 metadata/md5-cache/sys-cluster/kubectl-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kubectl-1.10.0
 1803290617 metadata/md5-cache/sys-cluster/legion-17.10.0
 1702282333 metadata/md5-cache/sys-cluster/lspbs-1.1-r1
 1803290617 metadata/md5-cache/sys-cluster/nova-2017.2.9999
 1702282333 metadata/md5-cache/sys-cluster/onesis-2.0.2
 1803021159 metadata/md5-cache/sys-cluster/libqb-0.17.1
 1803021159 metadata/md5-cache/sys-cluster/classads-1.0.10
-1711260441 metadata/md5-cache/sys-cluster/zetcd-0.0.4
+1803312238 metadata/md5-cache/sys-cluster/zetcd-0.0.4
 1803100239 metadata/md5-cache/sys-cluster/glusterfs-4.0.0-r1
 1803021159 metadata/md5-cache/sys-cluster/crmsh-2.1.1
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.4.3
 1803021159 metadata/md5-cache/sys-cluster/ceph-10.2.10-r2
-1803271308 metadata/md5-cache/sys-cluster/kube-apiserver-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kube-apiserver-1.10.0
 1803290617 metadata/md5-cache/sys-cluster/swift-2.17.0
 1803021159 metadata/md5-cache/sys-cluster/moosefs-1.6.26-r1
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.4.3
@@ -64669,12 +64692,12 @@
 1803290617 metadata/md5-cache/sys-cluster/polysh-0.4-r1
 1803021159 metadata/md5-cache/sys-cluster/charm-6.5.1-r2
 1802262111 metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
-1803201438 metadata/md5-cache/sys-cluster/kubectl-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/kubectl-1.9.5
 1801091400 metadata/md5-cache/sys-cluster/cman-3.1.5-r1
 1803021159 metadata/md5-cache/sys-cluster/singularity-2.4.2
 1803021159 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
-1803310508 metadata/md5-cache/sys-cluster/Manifest.gz
-1803201508 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/Manifest.gz
+1803312238 metadata/md5-cache/sys-cluster/kube-scheduler-1.9.5
 1803021159 metadata/md5-cache/sys-cluster/cman-lib-2.03.09-r1
 1803290617 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
 1803021159 metadata/md5-cache/sys-cluster/openmpi-2.0.2
@@ -64684,7 +64707,7 @@
 1802262111 metadata/md5-cache/sys-cluster/keepalived-1.2.24
 1803290617 metadata/md5-cache/sys-cluster/knem-9999
 1803021159 metadata/md5-cache/sys-cluster/libqb-0.17.2
-1803221838 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.6
 1803021159 metadata/md5-cache/sys-cluster/projections-6.2.1
 1803021159 metadata/md5-cache/sys-cluster/ceph-10.2.9-r2
 1803021159 metadata/md5-cache/sys-cluster/dlm-2.03.09
@@ -64700,7 +64723,7 @@
 1803021159 metadata/md5-cache/sys-cluster/ceph-10.2.7-r1
 1803021159 metadata/md5-cache/sys-cluster/ceph-10.2.3-r2
 1803021159 metadata/md5-cache/sys-cluster/corosync-1.4.7
-1803271408 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.0
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
 1801091400 metadata/md5-cache/sys-cluster/ipvsadm-1.24
 1803021159 metadata/md5-cache/sys-cluster/feedbackd-master-0.4
@@ -64712,7 +64735,7 @@
 1803021159 metadata/md5-cache/sys-cluster/maui-3.3.1-r2
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
 1802262111 metadata/md5-cache/sys-cluster/nullmpi-0.7
-1801272139 metadata/md5-cache/sys-cluster/minikube-0.25.0
+1803312238 metadata/md5-cache/sys-cluster/minikube-0.25.0
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.3.10
 1803021159 metadata/md5-cache/sys-cluster/ipvsadm-1.28
 1803021159 metadata/md5-cache/sys-cluster/mpich-3.0.4
@@ -64722,9 +64745,9 @@
 1803021159 metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
 1702282333 metadata/md5-cache/sys-cluster/poolmon-0.5
 1803290617 metadata/md5-cache/sys-cluster/heat-2018.1.9999
-1803190338 metadata/md5-cache/sys-cluster/teleport-2.5.2
+1803312238 metadata/md5-cache/sys-cluster/teleport-2.5.2
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.3.13
-1803271408 metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kube-scheduler-1.10.0
 1801091400 metadata/md5-cache/sys-cluster/libfence-3.1.5
 1803021159 metadata/md5-cache/sys-cluster/openmpi-2.0.4
 1803281339 metadata/md5-cache/sys-cluster/keepalived-1.4.2
@@ -64733,16 +64756,16 @@
 1803021159 metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
 1803021159 metadata/md5-cache/sys-cluster/libquo-1.2.4-r1
 1803021159 metadata/md5-cache/sys-cluster/rgmanager-3.1.5
-1803201508 metadata/md5-cache/sys-cluster/kubelet-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/kubelet-1.9.5
 1803290617 metadata/md5-cache/sys-cluster/hpx-0.9.10
 1803021159 metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
 1803190338 metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
 1803021159 metadata/md5-cache/sys-cluster/libquo-1.2.9
-1803271438 metadata/md5-cache/sys-cluster/kubelet-1.10.0
+1803312238 metadata/md5-cache/sys-cluster/kubelet-1.10.0
 1803290617 metadata/md5-cache/sys-cluster/swift-2018.1.9999
 1803290617 metadata/md5-cache/sys-cluster/neutron-11.0.3
 1801091400 metadata/md5-cache/sys-cluster/liblogthread-3.2.0
-1803201508 metadata/md5-cache/sys-cluster/kube-proxy-1.9.5
+1803312238 metadata/md5-cache/sys-cluster/kube-proxy-1.9.5
 1803021159 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 1803021159 metadata/md5-cache/sys-cluster/drbd-8.0.16
 1803190338 metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
@@ -64760,7 +64783,7 @@
 1803310508 metadata/md5-cache/sys-cluster/heat-10.0.0
 1712020039 metadata/md5-cache/sys-cluster/charliecloud-0.2.3_pre20171121
 1802262111 metadata/md5-cache/sys-cluster/gasnet-1.28.0
-1803031408 metadata/md5-cache/sys-cluster/teleport-2.4.2
+1803312238 metadata/md5-cache/sys-cluster/teleport-2.4.2
 1803021159 metadata/md5-cache/sys-cluster/util-vserver-0.30.216_pre3120
 1802262111 metadata/md5-cache/sys-cluster/gasnet-1.28.2
 1803021159 metadata/md5-cache/sys-cluster/drbd-kernel-8.3.8.1
@@ -64781,7 +64804,7 @@
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
 1803021159 metadata/md5-cache/sys-cluster/open-mx-1.5.4
 1803021159 metadata/md5-cache/sys-cluster/galera-25.3.23
-1803221838 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
+1803312238 metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.6
 1803290617 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.11
 1802262111 metadata/md5-cache/sys-cluster/glusterfs-3.12.3
 1802262111 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
@@ -65030,10 +65053,10 @@
 1803021159 metadata/md5-cache/x11-libs/libFS-1.0.7
 1803021159 metadata/md5-cache/x11-libs/libXinerama-1.1.3
 1803021159 metadata/md5-cache/x11-libs/libfm-1.2.4
-1803021159 metadata/md5-cache/x11-libs/fltk-1.3.4
+1803312208 metadata/md5-cache/x11-libs/fltk-1.3.4
 1803021159 metadata/md5-cache/x11-libs/libva-intel-driver-2.0.0-r1
 1803021159 metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
-1803260908 metadata/md5-cache/x11-libs/libast-0.7-r1
+1803311908 metadata/md5-cache/x11-libs/libast-0.7-r1
 1803021159 metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
 1803021159 metadata/md5-cache/x11-libs/libXvMC-1.0.10
 1803021159 metadata/md5-cache/x11-libs/xtrans-1.3.5
@@ -65060,7 +65083,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXt-1.1.4
 1803021159 metadata/md5-cache/x11-libs/vte-0.46.2
 1803021159 metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
-1803260908 metadata/md5-cache/x11-libs/dnd-1.1-r2
+1803311908 metadata/md5-cache/x11-libs/dnd-1.1-r2
 1803021159 metadata/md5-cache/x11-libs/libXfont2-2.0.3
 1803021159 metadata/md5-cache/x11-libs/xapps-1.0.4
 1802262111 metadata/md5-cache/x11-libs/libfm-extra-1.2.3
@@ -65154,7 +65177,7 @@
 1702282335 metadata/md5-cache/x11-libs/fox-wrapper-3
 1803120939 metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
 1803021159 metadata/md5-cache/x11-libs/libwnck-2.31.0
-1803260908 metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
+1803311908 metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
 1803052038 metadata/md5-cache/x11-libs/qscintilla-2.10.3
 1803021159 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
 1803021159 metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
@@ -65165,7 +65188,7 @@
 1803021159 metadata/md5-cache/x11-libs/libXxf86vm-1.1.3
 1803290617 metadata/md5-cache/x11-libs/libfm-9999
 1803190338 metadata/md5-cache/x11-libs/motif-2.3.8-r1
-1803310108 metadata/md5-cache/x11-libs/Manifest.gz
+1803312208 metadata/md5-cache/x11-libs/Manifest.gz
 1803021159 metadata/md5-cache/x11-libs/xapps-1.0.2-r1
 1803021159 metadata/md5-cache/x11-libs/xapps-1.0.3
 1702282335 metadata/md5-cache/x11-libs/fox-wrapper-2
@@ -65301,12 +65324,12 @@
 1803021159 metadata/md5-cache/app-backup/bareos-16.2.7
 1803290617 metadata/md5-cache/app-backup/holland-backup-mysql-lvm-1.0.10
 1803021159 metadata/md5-cache/app-backup/snapper-0.4.1
-1710040509 metadata/md5-cache/app-backup/restic-0.7.3
+1803312238 metadata/md5-cache/app-backup/restic-0.7.3
 1803290617 metadata/md5-cache/app-backup/borgbackup-1.1.4-r1
 1801280009 metadata/md5-cache/app-backup/btrbk-0.24.0-r1
 1702282308 metadata/md5-cache/app-backup/duply-2.0.1
 1803021159 metadata/md5-cache/app-backup/rear-1.17.1
-1801011404 metadata/md5-cache/app-backup/restic-0.8.0
+1803312238 metadata/md5-cache/app-backup/restic-0.8.0
 1702282308 metadata/md5-cache/app-backup/duply-1.11.3
 1803021159 metadata/md5-cache/app-backup/pdumpfs-1.3-r2
 1803290617 metadata/md5-cache/app-backup/holland-lib-mysql-1.0.10
@@ -65346,7 +65369,7 @@
 1803052038 metadata/md5-cache/app-backup/btrbk-0.26.1
 1802262111 metadata/md5-cache/app-backup/amanda-3.5-r1
 1803040138 metadata/md5-cache/app-backup/rdedup-1.0.2
-1803290617 metadata/md5-cache/app-backup/Manifest.gz
+1803312238 metadata/md5-cache/app-backup/Manifest.gz
 1801260238 metadata/md5-cache/app-backup/luckybackup-0.4.9
 1801011404 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 1803021159 metadata/md5-cache/app-backup/rear-1.15-r1
@@ -65367,7 +65390,7 @@
 1803252238 metadata/md5-cache/app-backup/snapper-0.5.4
 1803290617 metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
 1803021159 metadata/md5-cache/app-backup/dar-2.5.11
-1803141408 metadata/md5-cache/app-backup/restic-0.8.3
+1803312238 metadata/md5-cache/app-backup/restic-0.8.3
 1712281839 metadata/md5-cache/app-backup/mylvmbackup-0.14
 1802262111 metadata/md5-cache/app-backup/fsarchiver-0.8.1
 1802262111 metadata/md5-cache/app-backup/amanda-3.4.4
@@ -65399,7 +65422,7 @@
 1710060039 metadata/md5-cache/app-backup/mirdir-2.1-r2
 1712281839 metadata/md5-cache/app-backup/vzdump-1.2
 1803290617 metadata/md5-cache/app-backup/attic-0.16-r1
-1801011404 metadata/md5-cache/app-backup/restic-0.8.1
+1803312238 metadata/md5-cache/app-backup/restic-0.8.1
 1803310938 metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r2
 1803021159 metadata/md5-cache/x11-proto/inputproto-2.3
 1803021159 metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
@@ -65509,7 +65532,7 @@
 1803021159 metadata/md5-cache/sci-electronics/irsim-9.7.87
 1702282330 metadata/md5-cache/sci-electronics/gplcver-2.12a
 1803290617 metadata/md5-cache/sci-electronics/Stage-9999
-1803290617 metadata/md5-cache/sci-electronics/kicad-4.0.7
+1803312238 metadata/md5-cache/sci-electronics/kicad-4.0.7
 1803021159 metadata/md5-cache/sci-electronics/puff-20100127
 1803021159 metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
@@ -65517,7 +65540,7 @@
 1803021159 metadata/md5-cache/sci-electronics/magic-8.0.207
 1803021159 metadata/md5-cache/sci-electronics/systemc-2.3.1-r1
 1803290617 metadata/md5-cache/sci-electronics/kicad-4.0.4
-1803260209 metadata/md5-cache/sci-electronics/spice-3.5.5-r2
+1804010108 metadata/md5-cache/sci-electronics/spice-3.5.5-r2
 1803021159 metadata/md5-cache/sci-electronics/pcb-0_p20140316
 1803021159 metadata/md5-cache/sci-electronics/splat-1.4.2
 1803021159 metadata/md5-cache/sci-electronics/gtkwave-3.3.73
@@ -65525,7 +65548,7 @@
 1803021159 metadata/md5-cache/sci-electronics/balsa-4.0-r1
 1803021159 metadata/md5-cache/sci-electronics/alliance-5.0.20110203
 1803021159 metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
-1803310108 metadata/md5-cache/sci-electronics/Manifest.gz
+1804010108 metadata/md5-cache/sci-electronics/Manifest.gz
 1803021159 metadata/md5-cache/sci-electronics/plcedit-2.2.1
 1803021159 metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
 1803021159 metadata/md5-cache/sci-electronics/gwave-20090213-r1
@@ -65543,7 +65566,7 @@
 1803021159 metadata/md5-cache/sci-electronics/netgen-1.3.11
 1803021159 metadata/md5-cache/sci-electronics/xoscope-2.0
 1803290617 metadata/md5-cache/sci-electronics/gresistor-0.0.2
-1803021159 metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+1803312238 metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
 1803021159 metadata/md5-cache/sci-electronics/spice-3.5.5-r1
 1803021159 metadata/md5-cache/sci-electronics/xnec2c-3.5.1
 1712240039 metadata/md5-cache/sci-electronics/geda-suite-20171223
@@ -65779,7 +65802,7 @@
 1803290617 metadata/md5-cache/x11-wm/lumina-9999
 1803021159 metadata/md5-cache/x11-wm/fvwm-2.6.5-r1
 1803021159 metadata/md5-cache/x11-wm/windowlab-1.34
-1803290617 metadata/md5-cache/x11-wm/Manifest.gz
+1804010308 metadata/md5-cache/x11-wm/Manifest.gz
 1803021159 metadata/md5-cache/x11-wm/muffin-3.6.0
 1712042339 metadata/md5-cache/x11-wm/page-1.9.9-r1
 1803290617 metadata/md5-cache/x11-wm/qtile-0.10.5
@@ -65823,7 +65846,7 @@
 1803221908 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
 1803021159 metadata/md5-cache/x11-wm/xmonad-0.13
 1803190338 metadata/md5-cache/x11-wm/spectrwm-3.1.0
-1801011405 metadata/md5-cache/x11-wm/lwm-1.2.4
+1804010308 metadata/md5-cache/x11-wm/lwm-1.2.4
 1803021159 metadata/md5-cache/x11-wm/openbox-3.6
 1803022338 metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1
 1803021159 metadata/md5-cache/x11-wm/enlightenment-0.16.9999
@@ -66082,6 +66105,7 @@
 1803021159 metadata/md5-cache/net-dns/odsclient-1.03-r1
 1803041138 metadata/md5-cache/net-dns/unbound-1.6.4
 1801011404 metadata/md5-cache/net-dns/mdns-repeater-20110921
+1804010438 metadata/md5-cache/net-dns/coredns-1.1.1
 1803021159 metadata/md5-cache/net-dns/updatedd-2.6
 1803270108 metadata/md5-cache/net-dns/pdns-4.0.5
 1803021159 metadata/md5-cache/net-dns/dnssec-system-tray-2.2
@@ -66091,7 +66115,7 @@
 1803021159 metadata/md5-cache/net-dns/bind-dns-keygen-9.3.2.39-r1
 1803021159 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 1803052038 metadata/md5-cache/net-dns/idnkit-2.3
-1803191938 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7
+1803312238 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.7
 1803021159 metadata/md5-cache/net-dns/libidn2-2.0.4
 1801280009 metadata/md5-cache/net-dns/ddclient-3.8.2
 1801201508 metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
@@ -66099,7 +66123,7 @@
 1803021159 metadata/md5-cache/net-dns/avahi-0.6.31-r10
 1803021159 metadata/md5-cache/net-dns/libidn-1.33
 1803021159 metadata/md5-cache/net-dns/sheerdns-1.0.3
-1802211808 metadata/md5-cache/net-dns/coredns-1.0.5
+1803312238 metadata/md5-cache/net-dns/coredns-1.0.5
 1803041138 metadata/md5-cache/net-dns/unbound-1.6.8
 1803202238 metadata/md5-cache/net-dns/dnssec-lookup-2.2
 1803021159 metadata/md5-cache/net-dns/ndu-0.4-r4
@@ -66127,9 +66151,8 @@
 1802262111 metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
 1803120509 metadata/md5-cache/net-dns/bind-9.11.2_p1
 1702282328 metadata/md5-cache/net-dns/dnswalk-2.0.2
-1710271508 metadata/md5-cache/net-dns/coredns-0.9.9
 1803021159 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-1803311738 metadata/md5-cache/net-dns/Manifest.gz
+1804010438 metadata/md5-cache/net-dns/Manifest.gz
 1803120509 metadata/md5-cache/net-dns/libidn-1.33-r2
 1803202238 metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
 1803021159 metadata/md5-cache/net-dns/unbound-1.5.1-r2
@@ -66190,11 +66213,11 @@
 1803191008 metadata/md5-cache/dev-scheme/scm-5.5.6-r3
 1803021159 metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
 1803061538 metadata/md5-cache/dev-scheme/racket-6.11
-1803310108 metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
+1803312108 metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
 1708030039 metadata/md5-cache/dev-scheme/stklos-1.10-r1
 1803191008 metadata/md5-cache/dev-scheme/slib-3.2.5-r1
 1803021159 metadata/md5-cache/dev-scheme/gauche-0.9.5
-1803310108 metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+1803312108 metadata/md5-cache/dev-scheme/guile-2.0.14-r3
 1803021159 metadata/md5-cache/dev-scheme/gauche-0.9.4-r1
 1802132008 metadata/md5-cache/dev-scheme/net-http-0.3.1-r1
 1702282321 metadata/md5-cache/dev-scheme/guile-cairo-1.4.0
@@ -66208,7 +66231,7 @@
 1702282321 metadata/md5-cache/dev-scheme/guile-lib-0.1.9
 1708031509 metadata/md5-cache/dev-scheme/sigscheme-0.8.5-r1
 1803021159 metadata/md5-cache/dev-scheme/slib-3.2.1
-1803311338 metadata/md5-cache/dev-scheme/Manifest.gz
+1803312108 metadata/md5-cache/dev-scheme/Manifest.gz
 1803191008 metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
 1803021159 metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -66513,6 +66536,7 @@
 1803021159 metadata/md5-cache/dev-haskell/pango-0.13.3.1
 1803021159 metadata/md5-cache/dev-haskell/hspec-meta-1.10.0
 1803021159 metadata/md5-cache/dev-haskell/derive-2.5.26
+1803312138 metadata/md5-cache/dev-haskell/language-docker-4.0.1
 1803021159 metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.12-r1
 1803021159 metadata/md5-cache/dev-haskell/hdbc-mysql-0.6.6.1-r3
 1803021159 metadata/md5-cache/dev-haskell/curl-1.3.8
@@ -67012,7 +67036,7 @@
 1803021159 metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.8
 1803021159 metadata/md5-cache/dev-haskell/x509-validation-1.6.5
 1803021159 metadata/md5-cache/dev-haskell/http2-1.6.2
-1803300609 metadata/md5-cache/dev-haskell/Manifest.gz
+1803312138 metadata/md5-cache/dev-haskell/Manifest.gz
 1803021159 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
 1803021159 metadata/md5-cache/dev-haskell/iproute-1.4.0
 1803021159 metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -68221,16 +68245,16 @@
 1803290617 metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
 1801011404 metadata/md5-cache/net-misc/htpdate-1.2.0
 1702282329 metadata/md5-cache/net-misc/autossh-1.4e
-1709111508 metadata/md5-cache/net-misc/calicoctl-1.5.0
+1803312238 metadata/md5-cache/net-misc/calicoctl-1.5.0
 1803021159 metadata/md5-cache/net-misc/ofono-1.18
 1801280009 metadata/md5-cache/net-misc/igmpproxy-0.2
 1710031639 metadata/md5-cache/net-misc/spiped-1.6.0-r1
 1803290617 metadata/md5-cache/net-misc/grive-0.4.0_pre20150905
 1712010010 metadata/md5-cache/net-misc/iprange-1.0.3
 1803021159 metadata/md5-cache/net-misc/iputils-20121221-r2
-1709131508 metadata/md5-cache/net-misc/cni-plugins-0.6.0
+1803312238 metadata/md5-cache/net-misc/cni-plugins-0.6.0
 1803021159 metadata/md5-cache/net-misc/ser2net-2.7-r1
-1709151038 metadata/md5-cache/net-misc/drive-0.3.9.1
+1803312238 metadata/md5-cache/net-misc/drive-0.3.9.1
 1803290617 metadata/md5-cache/net-misc/httpie-0.9.4
 1803190338 metadata/md5-cache/net-misc/iprange-1.0.4
 1801280009 metadata/md5-cache/net-misc/sks-1.1.6-r2
@@ -68264,7 +68288,7 @@
 1803021159 metadata/md5-cache/net-misc/ptpd-2.3.1-r1
 1702282329 metadata/md5-cache/net-misc/sshpass-1.05
 1803220138 metadata/md5-cache/net-misc/ntp-4.2.8_p11
-1803190338 metadata/md5-cache/net-misc/rclone-1.39
+1803312238 metadata/md5-cache/net-misc/rclone-1.39
 1803021159 metadata/md5-cache/net-misc/x11-ssh-askpass-1.2.4.1-r1
 1803021159 metadata/md5-cache/net-misc/ncp-1.2.4
 1803021159 metadata/md5-cache/net-misc/networkmanager-sstp-1.2.0
@@ -68283,7 +68307,7 @@
 1702282329 metadata/md5-cache/net-misc/pcapfix-0.7
 1803021159 metadata/md5-cache/net-misc/whois-5.2.12
 1802262111 metadata/md5-cache/net-misc/axel-2.14.1
-1803290617 metadata/md5-cache/net-misc/tigervnc-1.8.0-r2
+1803312208 metadata/md5-cache/net-misc/tigervnc-1.8.0-r2
 1705171708 metadata/md5-cache/net-misc/puf-1.0.0-r1
 1702282329 metadata/md5-cache/net-misc/ucarp-1.5.2-r5
 1702282329 metadata/md5-cache/net-misc/monmotha-2.3.8-r1
@@ -68322,7 +68346,7 @@
 1803021159 metadata/md5-cache/net-misc/htpdate-1.1.3
 1803021159 metadata/md5-cache/net-misc/udpcast-20120424-r1
 1803021159 metadata/md5-cache/net-misc/netifrc-0.2.3
-1801280009 metadata/md5-cache/net-misc/felix-2.5.1
+1803312238 metadata/md5-cache/net-misc/felix-2.5.1
 1702282329 metadata/md5-cache/net-misc/stuntman-1.2.7
 1803290617 metadata/md5-cache/net-misc/mikutter-9999
 1803021159 metadata/md5-cache/net-misc/dhcpcd-6.11.3
@@ -68477,10 +68501,10 @@
 1803291739 metadata/md5-cache/net-misc/dhcpcd-7.0.2
 1803290617 metadata/md5-cache/net-misc/trackma-0.7.4
 1803021159 metadata/md5-cache/net-misc/cfengine-2.2.10-r4
-1801280009 metadata/md5-cache/net-misc/felix-3.0.1
+1803312238 metadata/md5-cache/net-misc/felix-3.0.1
 1803021159 metadata/md5-cache/net-misc/cfengine-3.4.5
 1803021159 metadata/md5-cache/net-misc/dahdi-tools-2.6.2
-1802082238 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0
+1803312238 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.0
 1803290617 metadata/md5-cache/net-misc/gerbera-9999
 1803170208 metadata/md5-cache/net-misc/dhcp-4.4.1
 1803021159 metadata/md5-cache/net-misc/hsc-1.0b
@@ -68501,7 +68525,7 @@
 1801011404 metadata/md5-cache/net-misc/vde-2.3.2-r4
 1702282329 metadata/md5-cache/net-misc/ucarp-1.5.2-r4
 1803220108 metadata/md5-cache/net-misc/curl-7.59.0
-1802191608 metadata/md5-cache/net-misc/cni-plugins-0.7.0
+1803312238 metadata/md5-cache/net-misc/cni-plugins-0.7.0
 1803021159 metadata/md5-cache/net-misc/arpsponge-3.12.2
 1803072238 metadata/md5-cache/net-misc/ethertypes-0
 1801280009 metadata/md5-cache/net-misc/eventd-0.21.0
@@ -68511,7 +68535,7 @@
 1803021159 metadata/md5-cache/net-misc/networkmanager-1.8.4
 1803021159 metadata/md5-cache/net-misc/memcached-1.5.5
 1803290617 metadata/md5-cache/net-misc/hotot-9999
-1802191908 metadata/md5-cache/net-misc/felix-3.0.2
+1803312238 metadata/md5-cache/net-misc/felix-3.0.2
 1803290617 metadata/md5-cache/net-misc/crossbar-17.12.1
 1803290617 metadata/md5-cache/net-misc/streamlink-9999
 1803290617 metadata/md5-cache/net-misc/clusterssh-9999
@@ -68544,8 +68568,8 @@
 1803021159 metadata/md5-cache/net-misc/dahdi-tools-2.10.1
 1711260441 metadata/md5-cache/net-misc/samplicator-1.3.6
 1702282329 metadata/md5-cache/net-misc/jwhois-4.0
-1803290617 metadata/md5-cache/net-misc/youtube-dl-2018.03.20
-1803290617 metadata/md5-cache/net-misc/nextcloud-client-2.3.3
+1803312208 metadata/md5-cache/net-misc/youtube-dl-2018.03.20
+1803312208 metadata/md5-cache/net-misc/nextcloud-client-2.3.3
 1803021159 metadata/md5-cache/net-misc/connman-1.29
 1803290617 metadata/md5-cache/net-misc/gsutil-4.27
 1801280009 metadata/md5-cache/net-misc/guacamole-server-0.9.9-r1
@@ -68555,7 +68579,7 @@
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
 1803121409 metadata/md5-cache/net-misc/x2goserver-4.0.1.22
 1803021159 metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3
-1803311408 metadata/md5-cache/net-misc/Manifest.gz
+1804010308 metadata/md5-cache/net-misc/Manifest.gz
 1803021159 metadata/md5-cache/net-misc/haeredes-0.4.4
 1803021159 metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
 1802141708 metadata/md5-cache/net-misc/kea-1.3.0
@@ -68607,7 +68631,7 @@
 1803021159 metadata/md5-cache/net-misc/sslh-1.19c
 1803021159 metadata/md5-cache/net-misc/wget-1.19.3
 1801280009 metadata/md5-cache/net-misc/stunnel-5.43
-1801011404 metadata/md5-cache/net-misc/aria2-1.33.1
+1804010308 metadata/md5-cache/net-misc/aria2-1.33.1
 1803290617 metadata/md5-cache/net-misc/grive-0.5.1_pre20160706
 1802220808 metadata/md5-cache/net-misc/openntpd-6.2_p3
 1801011404 metadata/md5-cache/net-misc/plowshare-2.1.7
@@ -68668,7 +68692,7 @@
 1802262111 metadata/md5-cache/net-misc/axel-2.12
 1802262111 metadata/md5-cache/net-misc/connman-gtk-1.0-r1
 1803021159 metadata/md5-cache/net-misc/dahdi-2.10.2-r2
-1802191908 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
+1803312238 metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
 1801211408 metadata/md5-cache/net-misc/whois-5.3.0
 1803021159 metadata/md5-cache/net-misc/siproxd-0.8.1-r2
 1803021159 metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.4
@@ -68710,7 +68734,7 @@
 1702282329 metadata/md5-cache/net-misc/stuntman-1.2.9
 1803021159 metadata/md5-cache/net-misc/curl-7.57.0-r1
 1803021159 metadata/md5-cache/net-misc/rdate-1.4-r4
-1803190338 metadata/md5-cache/net-misc/rclone-9999
+1803312238 metadata/md5-cache/net-misc/rclone-9999
 1803170208 metadata/md5-cache/net-misc/iputils-20171016_pre
 1803211338 metadata/md5-cache/net-misc/ubridge-0.9.14
 1803021159 metadata/md5-cache/net-misc/bridge-utils-1.5
@@ -68777,7 +68801,7 @@
 1803021159 metadata/md5-cache/net-misc/jwhois-3.2.3-r1
 1803021159 metadata/md5-cache/net-misc/axel-2.4-r3
 1801011404 metadata/md5-cache/net-misc/pimpd-0.8
-1801031609 metadata/md5-cache/net-misc/calicoctl-2.0.0
+1803312238 metadata/md5-cache/net-misc/calicoctl-2.0.0
 1803091909 metadata/md5-cache/net-misc/asterisk-13.19.2
 1802050308 metadata/md5-cache/net-misc/uftp-4.9.5
 1803021159 metadata/md5-cache/net-misc/cfengine-3.5.3
@@ -68850,6 +68874,7 @@
 1803021159 metadata/md5-cache/net-misc/termpkg-3.3.9.1-r2
 1803021159 metadata/md5-cache/net-misc/netctl-1.10
 1803021159 metadata/md5-cache/net-misc/ip-sentinel-0.12
+1803311808 metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.2
 1803021159 metadata/md5-cache/net-misc/quagga-1.2.2
 1803270108 metadata/md5-cache/net-misc/teamviewer-13.1.3026
 1702282329 metadata/md5-cache/net-misc/ndisc6-1.0.3
@@ -69107,7 +69132,6 @@
 1803141438 metadata/md5-cache/mail-client/roundcube-1.3.4
 1803132338 metadata/md5-cache/mail-client/claws-mail-3.16.0
 1710181208 metadata/md5-cache/mail-client/nmh-1.6
-1803101809 metadata/md5-cache/mail-client/mutt-1.9.4
 1803290617 metadata/md5-cache/mail-client/geary-0.12.0
 1802262111 metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1
 1803031708 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
@@ -69119,7 +69143,6 @@
 1803021159 metadata/md5-cache/mail-client/mailx-support-20060102-r1
 1803021159 metadata/md5-cache/mail-client/neomutt-20171208
 1803290617 metadata/md5-cache/mail-client/neomutt-9999
-1803021159 metadata/md5-cache/mail-client/mutt-1.9.3
 1803021159 metadata/md5-cache/mail-client/thunderbird-52.6.0-r1
 1712071909 metadata/md5-cache/mail-client/roundcube-1.3.3-r1
 1803021159 metadata/md5-cache/mail-client/mailx-support-20060102-r2
@@ -69128,7 +69151,7 @@
 1803290617 metadata/md5-cache/mail-client/trojita-9999
 1803021159 metadata/md5-cache/mail-client/nail-12.4-r3
 1803201012 metadata/md5-cache/mail-client/roundcube-1.2.7
-1803311338 metadata/md5-cache/mail-client/Manifest.gz
+1804011038 metadata/md5-cache/mail-client/Manifest.gz
 1803021159 metadata/md5-cache/mail-client/sylpheed-3.7.0
 1803021159 metadata/md5-cache/mail-client/neomutt-20171215-r2
 1803290617 metadata/md5-cache/mail-client/kube-0.5.0
@@ -69145,6 +69168,7 @@
 1712211609 metadata/md5-cache/mail-client/clawsker-1.1.0
 1803132338 metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
 1803021159 metadata/md5-cache/mail-client/cone-0.96
+1804011038 metadata/md5-cache/mail-client/mutt-1.9.4-r1
 1803021159 metadata/md5-cache/mail-client/sylpheed-3.5.1
 1803311338 metadata/md5-cache/mail-client/mailx-8.1.2.20160123
 1803290617 metadata/md5-cache/mail-client/alot-0.6
@@ -69500,7 +69524,7 @@
 1803021159 metadata/md5-cache/sys-apps/uam-0.3.2
 1803290617 metadata/md5-cache/sys-apps/iproute2-9999
 1803290617 metadata/md5-cache/sys-apps/toybox-9999
-1803311738 metadata/md5-cache/sys-apps/Manifest.gz
+1804010308 metadata/md5-cache/sys-apps/Manifest.gz
 1801120740 metadata/md5-cache/sys-apps/hwids-20170328
 1803290617 metadata/md5-cache/sys-apps/restorecond-9999
 1702282332 metadata/md5-cache/sys-apps/daemonize-1.7.6
@@ -69510,7 +69534,7 @@
 1803021159 metadata/md5-cache/sys-apps/usermode-utilities-20070815-r3
 1803021159 metadata/md5-cache/sys-apps/ifplugd-0.28-r9
 1803021159 metadata/md5-cache/sys-apps/agedu-20170831
-1803311738 metadata/md5-cache/sys-apps/haveged-1.9.2-r1
+1803311808 metadata/md5-cache/sys-apps/haveged-1.9.2-r1
 1801231609 metadata/md5-cache/sys-apps/ed-1.13
 1801012210 metadata/md5-cache/sys-apps/darwin-miscutils-12
 1803071238 metadata/md5-cache/sys-apps/util-linux-2.31.1-r1
@@ -69640,7 +69664,7 @@
 1803041338 metadata/md5-cache/sys-apps/hwinfo-21.23
 1803021159 metadata/md5-cache/sys-apps/gnome-disk-utility-3.24.1
 1803290617 metadata/md5-cache/sys-apps/systemd-9999
-1803311408 metadata/md5-cache/sys-apps/setserial-2.17-r5
+1803311908 metadata/md5-cache/sys-apps/setserial-2.17-r5
 1802262111 metadata/md5-cache/sys-apps/miller-4.2.0
 1802262111 metadata/md5-cache/sys-apps/rng-tools-6.1-r1
 1801280009 metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
@@ -69648,8 +69672,7 @@
 1801011404 metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503
 1803290617 metadata/md5-cache/sys-apps/gcp-0.1.3
 1801091400 metadata/md5-cache/sys-apps/apparmor-utils-2.11.1
-1803311738 metadata/md5-cache/sys-apps/haveged-1.9.2
-1803021159 metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+1804010308 metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
 1803021159 metadata/md5-cache/sys-apps/usbutils-008-r1
 1803021159 metadata/md5-cache/sys-apps/pcmciautils-018_p8
 1802262111 metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
@@ -69724,7 +69747,7 @@
 1803021159 metadata/md5-cache/sys-apps/gsmartcontrol-1.1.1
 1803021159 metadata/md5-cache/sys-apps/dbus-1.10.18
 1802061638 metadata/md5-cache/sys-apps/iucode_tool-2.3.1
-1803021159 metadata/md5-cache/sys-apps/timer_entropyd-0.3
+1804010308 metadata/md5-cache/sys-apps/timer_entropyd-0.3
 1803021159 metadata/md5-cache/sys-apps/dmidecode-3.0
 1711160008 metadata/md5-cache/sys-apps/s6-linux-init-0.3.1.1
 1803021159 metadata/md5-cache/sys-apps/gawk-3.1.8
@@ -69736,7 +69759,7 @@
 1803290539 metadata/md5-cache/sys-apps/apply-default-acl-0.4.0
 1803052208 metadata/md5-cache/sys-apps/gawk-4.2.1-r1
 1803021159 metadata/md5-cache/sys-apps/sparc-utils-1.9-r4
-1802062308 metadata/md5-cache/sys-apps/dstat-0.7.3
+1803312108 metadata/md5-cache/sys-apps/dstat-0.7.3
 1801011404 metadata/md5-cache/sys-apps/minised-1.15
 1801011404 metadata/md5-cache/sys-apps/nvme-cli-1.3
 1803021159 metadata/md5-cache/sys-apps/texinfo-6.5
@@ -69815,7 +69838,7 @@
 1803250109 metadata/md5-cache/www-servers/resin-4.0.46
 1803290617 metadata/md5-cache/www-servers/monkeyd-9999
 1803290617 metadata/md5-cache/www-servers/lighttpd-9999
-1802211738 metadata/md5-cache/www-servers/caddy-0.10.11
+1803312238 metadata/md5-cache/www-servers/caddy-0.10.11
 1803021159 metadata/md5-cache/www-servers/nginx-1.13.9
 1803250109 metadata/md5-cache/www-servers/tomcat-8.0.48
 1803021159 metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
@@ -69841,7 +69864,7 @@
 1803021159 metadata/md5-cache/www-servers/thttpd-2.27.1
 1803250109 metadata/md5-cache/www-servers/tomcat-8.5.28
 1702282335 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
-1803291839 metadata/md5-cache/www-servers/Manifest.gz
+1803312238 metadata/md5-cache/www-servers/Manifest.gz
 1803021159 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
 1803290617 metadata/md5-cache/www-servers/tornado-4.5.1
 1803270108 metadata/md5-cache/www-servers/apache-2.2.34
@@ -69850,7 +69873,7 @@
 1803021159 metadata/md5-cache/www-servers/gatling-0.12-r2
 1803250109 metadata/md5-cache/www-servers/tomcat-8.0.50
 1803250109 metadata/md5-cache/www-servers/tomcat-9.0.5
-1710091738 metadata/md5-cache/www-servers/caddy-0.10.10
+1803312238 metadata/md5-cache/www-servers/caddy-0.10.10
 1803021159 metadata/md5-cache/www-servers/fnord-1.11-r1
 1803251609 metadata/md5-cache/www-servers/puma-3.11.3
 1803021159 metadata/md5-cache/www-servers/adsf-1.4.0
@@ -69858,7 +69881,7 @@
 1803290617 metadata/md5-cache/www-servers/servefile-0.4.4
 1803021159 metadata/md5-cache/www-servers/gatling-0.15
 1803021159 metadata/md5-cache/www-servers/cherokee-1.2.104
-1803270108 metadata/md5-cache/www-servers/apache-2.4.29-r1
+1803312108 metadata/md5-cache/www-servers/apache-2.4.29-r1
 1803290617 metadata/md5-cache/www-servers/gunicorn-19.1.1
 1803290617 metadata/md5-cache/www-servers/pathod-0.12.0
 1803290617 metadata/md5-cache/www-servers/gunicorn-19.6.0
@@ -69890,7 +69913,7 @@
 1803021159 metadata/md5-cache/media-libs/libpano13-2.9.18
 1803021159 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
 1802081008 metadata/md5-cache/media-libs/libvpx-1.7.0
-1803201038 metadata/md5-cache/media-libs/libmypaint-1.3.0
+1803312108 metadata/md5-cache/media-libs/libmypaint-1.3.0
 1803021159 metadata/md5-cache/media-libs/libsndfile-1.0.26
 1803021159 metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
 1803272308 metadata/md5-cache/media-libs/mesa-18.0.0
@@ -69903,7 +69926,7 @@
 1803290617 metadata/md5-cache/media-libs/opencv-3.3.0-r2
 1803021159 metadata/md5-cache/media-libs/libjpeg-turbo-1.5.2
 1702282326 metadata/md5-cache/media-libs/phat-0.4.1
-1803021159 metadata/md5-cache/media-libs/gexiv2-0.10.3
+1803312108 metadata/md5-cache/media-libs/gexiv2-0.10.3
 1803290617 metadata/md5-cache/media-libs/opencollada-1.6.31
 1803021159 metadata/md5-cache/media-libs/xine-lib-1.2.9
 1803290617 metadata/md5-cache/media-libs/libebur128-1.1.0
@@ -69921,13 +69944,13 @@
 1803021159 metadata/md5-cache/media-libs/libyami-1.1.0
 1803021159 metadata/md5-cache/media-libs/gstreamer-1.12.3
 1803290617 metadata/md5-cache/media-libs/mutagen-1.35.1
-1803021159 metadata/md5-cache/media-libs/gegl-0.2.0-r4
+1803312108 metadata/md5-cache/media-libs/gegl-0.2.0-r4
 1803021159 metadata/md5-cache/media-libs/libao-1.2.0
 1803021159 metadata/md5-cache/media-libs/libquvi-0.4.1-r2
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.0-r1
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.0-r1
 1803021159 metadata/md5-cache/media-libs/liboggz-1.1.1
 1803290617 metadata/md5-cache/media-libs/vigra-1.9.0
-1803021159 metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
+1803312108 metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
 1802262111 metadata/md5-cache/media-libs/tiff-4.0.9-r2
 1803021159 metadata/md5-cache/media-libs/libmng-2.0.2-r1
 1803021159 metadata/md5-cache/media-libs/libmtp-1.1.13
@@ -69959,7 +69982,7 @@
 1803290617 metadata/md5-cache/media-libs/libmygpo-qt-1.0.9_p20180307
 1803021159 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
 1803021159 metadata/md5-cache/media-libs/lilv-0.24.2
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.8
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.8
 1803021159 metadata/md5-cache/media-libs/stimg-0.1.0
 1803021159 metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1
 1803021159 metadata/md5-cache/media-libs/libilbc-1.1.1
@@ -69977,7 +70000,7 @@
 1803021159 metadata/md5-cache/media-libs/gst-plugins-ugly-1.12.3
 1803021159 metadata/md5-cache/media-libs/gavl-1.4.0-r1
 1801092039 metadata/md5-cache/media-libs/libpagemaker-0.0.4
-1803220938 metadata/md5-cache/media-libs/gegl-0.3.26
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.26
 1803190338 metadata/md5-cache/media-libs/bcg729-1.0.4
 1803021159 metadata/md5-cache/media-libs/celt-0.11.3
 1803021159 metadata/md5-cache/media-libs/libpano13-2.9.19
@@ -70057,7 +70080,7 @@
 1803260238 metadata/md5-cache/media-libs/kvazaar-1.1.0
 1803021159 metadata/md5-cache/media-libs/fidlib-0.9.10-r1
 1803021159 metadata/md5-cache/media-libs/libmatemixer-1.16.0
-1803311738 metadata/md5-cache/media-libs/libraw-0.18.8
+1803312108 metadata/md5-cache/media-libs/libraw-0.18.8
 1803021159 metadata/md5-cache/media-libs/libdc1394-2.2.1
 1803290617 metadata/md5-cache/media-libs/chromaprint-1.4.2
 1803021159 metadata/md5-cache/media-libs/libsidplayfp-1.1.0
@@ -70074,7 +70097,8 @@
 1711221908 metadata/md5-cache/media-libs/opusfile-0.10
 1802262111 metadata/md5-cache/media-libs/bio2jack-0.9-r2
 1803021159 metadata/md5-cache/media-libs/libjsw-1.5.8
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.24
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.24
+1803311838 metadata/md5-cache/media-libs/giflib-5.1.4-r2
 1803290617 metadata/md5-cache/media-libs/libbluray-9999
 1803290617 metadata/md5-cache/media-libs/kodi-platform-9999
 1803021159 metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
@@ -70110,7 +70134,7 @@
 1803290009 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
 1803021159 metadata/md5-cache/media-libs/plib-1.8.5-r1
 1803311408 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
-1803190338 metadata/md5-cache/media-libs/glew-2.1.0
+1803312108 metadata/md5-cache/media-libs/glew-2.1.0
 1803021159 metadata/md5-cache/media-libs/aalib-1.4_rc5-r6
 1803021159 metadata/md5-cache/media-libs/libv4l-1.14.1
 1702282326 metadata/md5-cache/media-libs/stops-0.3.0-r1
@@ -70150,7 +70174,7 @@
 1803021159 metadata/md5-cache/media-libs/libclxclient-3.9.0
 1803021159 metadata/md5-cache/media-libs/suil-0.10.0
 1802262111 metadata/md5-cache/media-libs/libafterimage-1.20-r2
-1803021159 metadata/md5-cache/media-libs/gexiv2-0.10.6
+1803312108 metadata/md5-cache/media-libs/gexiv2-0.10.6
 1803021159 metadata/md5-cache/media-libs/libshout-2.4.1
 1803282239 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2
 1702282326 metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r1
@@ -70169,7 +70193,7 @@
 1801041840 metadata/md5-cache/media-libs/opus-1.1.3-r1
 1803021159 metadata/md5-cache/media-libs/libmetalink-0.1.0-r1
 1803230208 metadata/md5-cache/media-libs/xine-lib-1.2.9-r1
-1802181308 metadata/md5-cache/media-libs/libraw-0.18.7
+1803312108 metadata/md5-cache/media-libs/libraw-0.18.7
 1803120739 metadata/md5-cache/media-libs/coin-3.1.3-r2
 1803021159 metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
 1803260109 metadata/md5-cache/media-libs/stk-4.5.0
@@ -70207,9 +70231,9 @@
 1803021159 metadata/md5-cache/media-libs/giflib-4.1.6-r3
 1802262111 metadata/md5-cache/media-libs/dssi-1.1.1-r1
 1803021159 metadata/md5-cache/media-libs/sbc-1.3
-1803290617 metadata/md5-cache/media-libs/babl-9999
+1803312108 metadata/md5-cache/media-libs/babl-9999
 1803290617 metadata/md5-cache/media-libs/libprojectm-2.1.0-r1
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.0
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.0
 1802262111 metadata/md5-cache/media-libs/fnlib-0.5-r2
 1711202339 metadata/md5-cache/media-libs/adplug-2.3
 1803021159 metadata/md5-cache/media-libs/libfpx-1.3.1_p6
@@ -70262,7 +70286,7 @@
 1803052038 metadata/md5-cache/media-libs/libshout-2.4.1-r1
 1801041840 metadata/md5-cache/media-libs/portaudio-19.06.00-r1
 1803021159 metadata/md5-cache/media-libs/libsbsms-2.0.2
-1803021159 metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
+1803312108 metadata/md5-cache/media-libs/libmypaint-1.3.0_beta1
 1803290617 metadata/md5-cache/media-libs/kvazaar-9999
 1803270108 metadata/md5-cache/media-libs/openexr-2.2.0-r2
 1803021159 metadata/md5-cache/media-libs/libdc1394-2.2.4
@@ -70281,7 +70305,7 @@
 1803021159 metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
 1803021159 metadata/md5-cache/media-libs/cogl-1.22.2
 1803021159 metadata/md5-cache/media-libs/gst-rtsp-server-1.12.3
-1802181308 metadata/md5-cache/media-libs/libraw-0.18.4
+1803312108 metadata/md5-cache/media-libs/libraw-0.18.4
 1801050119 metadata/md5-cache/media-libs/lvtk-1.2.0
 1803290617 metadata/md5-cache/media-libs/oyranos-0.9.6
 1803151838 metadata/md5-cache/media-libs/libsndfile-1.0.28-r1
@@ -70291,7 +70315,7 @@
 1803021159 metadata/md5-cache/media-libs/netpbm-10.66.00
 1803021159 metadata/md5-cache/media-libs/faac-1.28-r4
 1803021159 metadata/md5-cache/media-libs/libexif-0.6.21
-1803021159 metadata/md5-cache/media-libs/gegl-0.2.0-r2
+1803312108 metadata/md5-cache/media-libs/gegl-0.2.0-r2
 1803290617 metadata/md5-cache/media-libs/mutagen-1.38
 1712121839 metadata/md5-cache/media-libs/jbig2dec-0.13-r4
 1803290617 metadata/md5-cache/media-libs/assimp-3.2-r3
@@ -70346,13 +70370,13 @@
 1702282326 metadata/md5-cache/media-libs/libmpdclient-2.9
 1803290617 metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
 1803021159 metadata/md5-cache/media-libs/gavl-1.2.0
-1803311738 metadata/md5-cache/media-libs/Manifest.gz
+1803312308 metadata/md5-cache/media-libs/Manifest.gz
 1801091400 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1803302139 metadata/md5-cache/media-libs/libmtp-1.1.14
 1803021159 metadata/md5-cache/media-libs/libshout-2.3.1
 1803021538 metadata/md5-cache/media-libs/libsdl2-2.0.4
 1803021159 metadata/md5-cache/media-libs/libclxclient-1.0.1
-1803052038 metadata/md5-cache/media-libs/gexiv2-0.10.8
+1803312138 metadata/md5-cache/media-libs/gexiv2-0.10.8
 1803021159 metadata/md5-cache/media-libs/libmp3splt-0.7.3
 1801231609 metadata/md5-cache/media-libs/libpng-1.6.31
 1803021159 metadata/md5-cache/media-libs/babl-0.1.12
@@ -70371,7 +70395,7 @@
 1803021159 metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r4
 1803021159 metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1
 1803311338 metadata/md5-cache/media-libs/jasper-2.0.14
-1803021159 metadata/md5-cache/media-libs/libopenraw-0.0.9
+1803312108 metadata/md5-cache/media-libs/libopenraw-0.0.9
 1803290617 metadata/md5-cache/media-libs/phonon-4.10.0
 1803021159 metadata/md5-cache/media-libs/libmp3splt-0.9.0
 1702282326 metadata/md5-cache/media-libs/libmpdclient-2.10
@@ -70401,7 +70425,7 @@
 1802262111 metadata/md5-cache/media-libs/exempi-2.4.2
 1803290617 metadata/md5-cache/media-libs/libsub-9999
 1803052038 metadata/md5-cache/media-libs/sdl2-gfx-1.0.4
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.28
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.28
 1803030508 metadata/md5-cache/media-libs/libpng-1.6.29
 1803021159 metadata/md5-cache/media-libs/varconf-0.6.7-r1
 1803061538 metadata/md5-cache/media-libs/mlt-6.6.0
@@ -70441,7 +70465,7 @@
 1803021159 metadata/md5-cache/media-libs/openexr-2.2.0
 1802262111 metadata/md5-cache/media-libs/fontconfig-2.12.4
 1803290617 metadata/md5-cache/media-libs/libebur128-1.2.0-r1
-1803021159 metadata/md5-cache/media-libs/gegl-0.3.20
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.20
 1803290617 metadata/md5-cache/media-libs/glfw-3.2.1
 1803290617 metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
 1803031538 metadata/md5-cache/media-libs/lcms-2.9
@@ -70457,7 +70481,7 @@
 1803021159 metadata/md5-cache/media-libs/xine-lib-1.2.8
 1803301909 metadata/md5-cache/media-libs/osl-1.8.12
 1803021159 metadata/md5-cache/media-libs/t1lib-5.1.2-r1
-1803280139 metadata/md5-cache/media-libs/gegl-0.3.30
+1803312108 metadata/md5-cache/media-libs/gegl-0.3.30
 1803290617 metadata/md5-cache/media-libs/aften-0.0.8-r2
 1803052038 metadata/md5-cache/media-libs/libkate-0.4.1-r3
 1803021159 metadata/md5-cache/media-libs/sdl-pango-0.1.2
@@ -70530,7 +70554,6 @@
 1803021159 metadata/md5-cache/media-libs/grilo-0.2.15
 1803290617 metadata/md5-cache/media-libs/opencv-3.2.0-r2
 1803021159 metadata/md5-cache/media-libs/sge-030809
-1803240238 metadata/md5-cache/media-libs/giflib-5.1.4-r1
 1803021308 metadata/md5-cache/media-libs/libepoxy-1.4.3
 1803290617 metadata/md5-cache/media-libs/libsndfile-9999
 1803021159 metadata/md5-cache/media-libs/quvi-0.9.4
@@ -70559,7 +70582,7 @@
 1802262111 metadata/md5-cache/media-libs/audiofile-0.3.6-r3
 1803290617 metadata/md5-cache/media-libs/osl-1.9.6
 1803290617 metadata/md5-cache/media-libs/freeglut-3.0.0
-1803021159 metadata/md5-cache/media-libs/libopenraw-0.1.0
+1803312108 metadata/md5-cache/media-libs/libopenraw-0.1.0
 1803021159 metadata/md5-cache/media-libs/sdl2-ttf-2.0.13
 1803290617 metadata/md5-cache/media-libs/avidemux-plugins-2.6.20
 1803021159 metadata/md5-cache/media-libs/babl-0.1.20
@@ -70580,7 +70603,7 @@
 1803021159 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r1
 1803021159 metadata/md5-cache/media-libs/gsound-1.0.2-r1
 1803022138 metadata/md5-cache/media-libs/freetype-2.8.1
-1803021159 metadata/md5-cache/media-libs/gexiv2-0.10.5-r1
+1803312108 metadata/md5-cache/media-libs/gexiv2-0.10.5-r1
 1803021159 metadata/md5-cache/media-libs/libdca-0.0.5-r3
 1803311738 metadata/md5-cache/media-libs/gd-2.2.5
 1803021159 metadata/md5-cache/media-libs/portaudio-19.06.00
@@ -70616,7 +70639,7 @@
 1803290617 metadata/md5-cache/media-libs/freetype-9999
 1803290617 metadata/md5-cache/media-libs/jasper-9999
 1803290617 metadata/md5-cache/media-libs/vulkan-loader-9999
-1803021159 metadata/md5-cache/media-libs/libopenraw-0.1.1
+1803312108 metadata/md5-cache/media-libs/libopenraw-0.1.1
 1803021159 metadata/md5-cache/media-libs/id3lib-3.8.3-r8
 1801041840 metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
 1803290617 metadata/md5-cache/media-libs/Field3D-1.7.2
@@ -70631,7 +70654,7 @@
 1803021159 metadata/md5-cache/media-libs/sampleicc-1.6.6
 1803021159 metadata/md5-cache/media-libs/libbluray-1.0.0
 1803290617 metadata/md5-cache/media-libs/waffle-9999
-1803021159 metadata/md5-cache/media-libs/babl-0.1.44
+1803312108 metadata/md5-cache/media-libs/babl-0.1.44
 1803290617 metadata/md5-cache/media-libs/libsamplerate-9999
 1803021159 metadata/md5-cache/media-libs/libhdhomerun-20150826
 1803021159 metadata/md5-cache/media-libs/libdiscid-0.6.1
@@ -70661,7 +70684,7 @@
 1803021159 metadata/md5-cache/media-libs/libxmlbird-1.2.0
 1803260109 metadata/md5-cache/media-libs/stk-4.5.1-r1
 1803021159 metadata/md5-cache/media-libs/libnspsl-0.1.0
-1803021159 metadata/md5-cache/media-libs/gegl-0.2.0-r5
+1803312108 metadata/md5-cache/media-libs/gegl-0.2.0-r5
 1803290617 metadata/md5-cache/media-libs/elementary-9999
 1803052038 metadata/md5-cache/media-libs/libcdr-0.1.4
 1802131408 metadata/md5-cache/media-libs/fontconfig-infinality-20120619
@@ -70685,7 +70708,7 @@
 1803021159 metadata/md5-cache/media-libs/speex-1.2_rc1-r2
 1803052038 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
 1803021159 metadata/md5-cache/media-libs/svgalib-1.9.25-r5
-1803210008 metadata/md5-cache/media-libs/fontconfig-2.12.6
+1803312308 metadata/md5-cache/media-libs/fontconfig-2.12.6
 1803021159 metadata/md5-cache/media-libs/librosprite-0.1.2-r1
 1802262111 metadata/md5-cache/media-libs/liblrdf-0.5.0-r1
 1803021159 metadata/md5-cache/media-libs/giflib-4.1.6-r2
@@ -70702,7 +70725,7 @@
 1803021159 metadata/md5-cache/media-libs/libdv-1.0.0-r3
 1803021159 metadata/md5-cache/media-libs/libsidplay-2.1.1-r4
 1803290617 metadata/md5-cache/media-libs/openimageio-1.8.7
-1803291009 metadata/md5-cache/media-libs/libopenraw-0.1.2
+1803312108 metadata/md5-cache/media-libs/libopenraw-0.1.2
 1803021159 metadata/md5-cache/media-libs/libfpx-1.3.1_p10
 1803290617 metadata/md5-cache/media-libs/soxr-0.1.3
 1801041840 metadata/md5-cache/media-libs/libass-0.14.0
@@ -73881,7 +73904,7 @@
 1801011405 metadata/md5-cache/sys-power/acpilight-1.0
 1803021159 metadata/md5-cache/sys-power/thermald-1.7.1
 1803021159 metadata/md5-cache/sys-power/nvclock-0.8_p20110102-r2
-1801280009 metadata/md5-cache/sys-power/acpid-2.0.28
+1803312208 metadata/md5-cache/sys-power/acpid-2.0.28
 1803021159 metadata/md5-cache/sys-power/iasl-20121018
 1803021159 metadata/md5-cache/sys-power/bbswitch-0.8
 1803190338 metadata/md5-cache/sys-power/acpi_call-1.1.0
@@ -73892,8 +73915,8 @@
 1803151938 metadata/md5-cache/sys-power/nut-2.7.4-r1
 1803021159 metadata/md5-cache/sys-power/nvram-wakeup-1.0
 1803021159 metadata/md5-cache/sys-power/apcupsd-3.14.13
-1803021159 metadata/md5-cache/sys-power/bbswitch-0.8-r1
-1803290617 metadata/md5-cache/sys-power/Manifest.gz
+1804010738 metadata/md5-cache/sys-power/bbswitch-0.8-r1
+1804010738 metadata/md5-cache/sys-power/Manifest.gz
 1803021159 metadata/md5-cache/sys-power/powertop-2.9
 1803021159 metadata/md5-cache/sys-power/cpupower-4.13.0
 1803021159 metadata/md5-cache/sys-power/iasl-20160729
@@ -73930,9 +73953,9 @@
 1803021159 metadata/md5-cache/sys-power/powertop-2.8
 1803042038 metadata/md5-cache/app-antivirus/clamav-0.99.3-r1
 1702282308 metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-3.7.2
-1803301539 metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
+1803312108 metadata/md5-cache/app-antivirus/clamav-0.99.4-r1
 1803021159 metadata/md5-cache/app-antivirus/skyldav-0.7
-1803301539 metadata/md5-cache/app-antivirus/Manifest.gz
+1803312108 metadata/md5-cache/app-antivirus/Manifest.gz
 1703172309 metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.1
 1803021159 metadata/md5-cache/app-antivirus/clamav-0.99.2-r3
 1803300339 metadata/md5-cache/app-antivirus/clamav-0.99.4
@@ -74062,11 +74085,11 @@
 1712162039 metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r2
 1803031308 metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
 1803270108 metadata/md5-cache/app-eselect/eselect-repository-3
-1802092008 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112
+1803312238 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180112
 1803021159 metadata/md5-cache/app-emulation/softgun-0.21
 1803021159 metadata/md5-cache/app-emulation/xen-pvgrub-4.8.2-r1
 1803021159 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.6.120293
-1801252208 metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
+1803312238 metadata/md5-cache/app-emulation/cadvisor-0.28.3-r1
 1803021159 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.6
 1803290617 metadata/md5-cache/app-emulation/cloud-init-0.7.8-r2
 1803021159 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -74075,7 +74098,7 @@
 1712151139 metadata/md5-cache/app-emulation/libspectrum-1.4.1
 1803021159 metadata/md5-cache/app-emulation/wine-d3d9-2.21
 1803021159 metadata/md5-cache/app-emulation/dynamips-0.2.12
-1803211808 metadata/md5-cache/app-emulation/docker-17.12.1
+1803312238 metadata/md5-cache/app-emulation/docker-17.12.1
 1803021159 metadata/md5-cache/app-emulation/wine-d3d9-2.19
 1803021159 metadata/md5-cache/app-emulation/virt-what-1.12
 1803021159 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
@@ -74087,7 +74110,7 @@
 1803290617 metadata/md5-cache/app-emulation/q4wine-1.3.5
 1802262111 metadata/md5-cache/app-emulation/libguestfs-1.36.13
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-15.0.1
-1801280009 metadata/md5-cache/app-emulation/docker-17.09.1
+1803312238 metadata/md5-cache/app-emulation/docker-17.09.1
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-3.2
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-15.0.0
@@ -74098,22 +74121,22 @@
 1803021159 metadata/md5-cache/app-emulation/wine-any-2.19
 1803021159 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.32.120294
 1707240139 metadata/md5-cache/app-emulation/virt-what-1.15
-1803201012 metadata/md5-cache/app-emulation/containerd-1.0.1
+1803312238 metadata/md5-cache/app-emulation/containerd-1.0.1
 1803290617 metadata/md5-cache/app-emulation/aqemu-0.9.2
 1803290617 metadata/md5-cache/app-emulation/rex-client-9999
 1803291839 metadata/md5-cache/app-emulation/qemu-2.11.1-r1
 1803021159 metadata/md5-cache/app-emulation/xen-4.8.2-r3
 1803290617 metadata/md5-cache/app-emulation/diskimage-builder-2.12.1
-1709151608 metadata/md5-cache/app-emulation/docker-machine-0.12.2
+1803312238 metadata/md5-cache/app-emulation/docker-machine-0.12.2
 1803021159 metadata/md5-cache/app-emulation/uae-0.8.29-r2
 1803021159 metadata/md5-cache/app-emulation/coldfire-0.3.1
 1803012138 metadata/md5-cache/app-emulation/spim-8.0-r3
 1803021159 metadata/md5-cache/app-emulation/vagrant-2.0.1-r1
-1801021610 metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
+1803312238 metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
 1803270108 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
 1803021159 metadata/md5-cache/app-emulation/virtualbox-bin-5.1.34.121010
 1803021159 metadata/md5-cache/app-emulation/vov-2.0.0
-1801280009 metadata/md5-cache/app-emulation/lxd-2.19
+1803312238 metadata/md5-cache/app-emulation/lxd-2.19
 1803040038 metadata/md5-cache/app-emulation/virtualbox-5.2.6
 1803021159 metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
 1802262111 metadata/md5-cache/app-emulation/x48-0.6.4-r1
@@ -74121,7 +74144,7 @@
 1803021159 metadata/md5-cache/app-emulation/rkt-1.29.0
 1803130738 metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
 1803011138 metadata/md5-cache/app-emulation/libdsk-1.5.8
-1709112238 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
+1803312238 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.20
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -74157,7 +74180,7 @@
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
 1711121938 metadata/md5-cache/app-emulation/docker-swarm-1.2.5
 1704102038 metadata/md5-cache/app-emulation/wine-mono-4.7.0
-1802092008 metadata/md5-cache/app-emulation/docker-18.02.0
+1803312238 metadata/md5-cache/app-emulation/docker-18.02.0
 1801191240 metadata/md5-cache/app-emulation/libguestfs-appliance-1.28.1-r1
 1803021159 metadata/md5-cache/app-emulation/xen-4.9.1
 1803021159 metadata/md5-cache/app-emulation/rkt-1.28.1
@@ -74167,16 +74190,17 @@
 1803290617 metadata/md5-cache/app-emulation/cloud-init-0.7.6-r2
 1803290617 metadata/md5-cache/app-emulation/virt-manager-1.5.0
 1705261309 metadata/md5-cache/app-emulation/vmips-1.3.1
-1802211208 metadata/md5-cache/app-emulation/lxd-2.21
+1803312238 metadata/md5-cache/app-emulation/lxd-2.21
 1803021159 metadata/md5-cache/app-emulation/phpvirtualbox-5.0.5
-1803290617 metadata/md5-cache/app-emulation/docker-9999
-1803201012 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
+1803312238 metadata/md5-cache/app-emulation/docker-9999
+1803312238 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
 1708172038 metadata/md5-cache/app-emulation/libcacard-2.5.1
 1707051539 metadata/md5-cache/app-emulation/bochs-2.6.9
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.21
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.126
-1802262111 metadata/md5-cache/app-emulation/runv-0.7.0
-1802280138 metadata/md5-cache/app-emulation/runc-1.0.0_rc5
+1803312238 metadata/md5-cache/app-emulation/runv-0.7.0
+1803312238 metadata/md5-cache/app-emulation/runc-1.0.0_rc5
+1804010138 metadata/md5-cache/app-emulation/docker-compose-1.20.1
 1803021159 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
 1802262111 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.16
@@ -74185,14 +74209,14 @@
 1803021159 metadata/md5-cache/app-emulation/xen-4.9.1-r1
 1803021159 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0-r1
 1803202008 metadata/md5-cache/app-emulation/libvirt-4.1.0
-1710252239 metadata/md5-cache/app-emulation/docker-machine-0.13.0
-1803231808 metadata/md5-cache/app-emulation/docker-proxy-9999
+1803312238 metadata/md5-cache/app-emulation/docker-machine-0.13.0
+1803312238 metadata/md5-cache/app-emulation/docker-proxy-9999
 1710122038 metadata/md5-cache/app-emulation/docker-bench-security-1.3.3
 1803021159 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.6
 1803021159 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.2-r2
 1803021159 metadata/md5-cache/app-emulation/open-vm-tools-10.1.10
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.0-r1
-1802131738 metadata/md5-cache/app-emulation/runc-1.0.0_rc4
+1803312238 metadata/md5-cache/app-emulation/runc-1.0.0_rc4
 1801011404 metadata/md5-cache/app-emulation/vpcs-0.6
 1712151139 metadata/md5-cache/app-emulation/fuse-utils-1.4.0
 1803290617 metadata/md5-cache/app-emulation/nemu-9999
@@ -74209,12 +74233,12 @@
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-3.1
 1803021159 metadata/md5-cache/app-emulation/wine-staging-2.21
 1803021159 metadata/md5-cache/app-emulation/vagrant-2.0.0
-1803302139 metadata/md5-cache/app-emulation/Manifest.gz
+1804010138 metadata/md5-cache/app-emulation/Manifest.gz
 1803021159 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1803190338 metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
 1803290617 metadata/md5-cache/app-emulation/docker-gc-9999
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
-1802150408 metadata/md5-cache/app-emulation/containerd-1.0.2
+1803312238 metadata/md5-cache/app-emulation/containerd-1.0.2
 1803021159 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.8
 1803290617 metadata/md5-cache/app-emulation/wine-any-9999
 1803021159 metadata/md5-cache/app-emulation/virtualbox-additions-5.1.32
@@ -74229,12 +74253,12 @@
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-3.0
 1803260038 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.8
 1803021159 metadata/md5-cache/app-emulation/vagrant-2.0.2
-1803021159 metadata/md5-cache/app-emulation/containerd-9999
+1803312238 metadata/md5-cache/app-emulation/containerd-9999
 1803021159 metadata/md5-cache/app-emulation/xen-4.9.0
 1802262111 metadata/md5-cache/app-emulation/dinero-4.7-r1
 1803021159 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.34.121010
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
-1707301138 metadata/md5-cache/app-emulation/umoci-0.2.1
+1803312238 metadata/md5-cache/app-emulation/umoci-0.2.1
 1803290617 metadata/md5-cache/app-emulation/wine-staging-9999
 1803291839 metadata/md5-cache/app-emulation/spice-0.14.0-r1
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-15.1.0
@@ -74244,11 +74268,11 @@
 1803021159 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
 1803240538 metadata/md5-cache/app-emulation/libvirt-4.1.0-r3
 1803021159 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.3
-1707301138 metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
+1803312238 metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
 1803290617 metadata/md5-cache/app-emulation/spice-protocol-9999
-1709112208 metadata/md5-cache/app-emulation/go-secbench-0.1.0
-1707301138 metadata/md5-cache/app-emulation/docker-swarm-1.2.0
-1803091738 metadata/md5-cache/app-emulation/kompose-1.10.0
+1803312238 metadata/md5-cache/app-emulation/go-secbench-0.1.0
+1803312238 metadata/md5-cache/app-emulation/docker-swarm-1.2.0
+1803312238 metadata/md5-cache/app-emulation/kompose-1.10.0
 1803290617 metadata/md5-cache/app-emulation/wine-d3d9-9999
 1803021159 metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.96
@@ -74258,7 +74282,7 @@
 1803021159 metadata/md5-cache/app-emulation/playonlinux-4.2.12
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.117
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
-1801021610 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
+1803312238 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
 1803190338 metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
 1803271939 metadata/md5-cache/app-emulation/qemu-2.11.1-r52
@@ -74272,9 +74296,9 @@
 1803270108 metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
 1803290617 metadata/md5-cache/app-emulation/cloud-init-9999
 1801191240 metadata/md5-cache/app-emulation/libguestfs-appliance-1.28.1
-1801280009 metadata/md5-cache/app-emulation/lxd-2.14-r1
+1803312238 metadata/md5-cache/app-emulation/lxd-2.14-r1
 1803290617 metadata/md5-cache/app-emulation/nemu-1.3.0
-1801021610 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
+1803312238 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
 1803142038 metadata/md5-cache/app-emulation/fuse-1.5.1
 1702282308 metadata/md5-cache/app-emulation/xcpc-20070122
 1803021159 metadata/md5-cache/app-emulation/wine-desktop-common-20150204
@@ -74282,11 +74306,11 @@
 1709290138 metadata/md5-cache/app-emulation/wine-mono-4.6.4
 1803021159 metadata/md5-cache/app-emulation/virt-viewer-6.0
 1802262111 metadata/md5-cache/app-emulation/x48-0.6.4
-1802262111 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
+1803312238 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
 1802262111 metadata/md5-cache/app-emulation/libguestfs-1.28.5-r3
 1803040038 metadata/md5-cache/app-emulation/virtualbox-5.2.8
 1702282308 metadata/md5-cache/app-emulation/grub-xen-host-1.0
-1801011404 metadata/md5-cache/app-emulation/containerd-1.0.0
+1803312238 metadata/md5-cache/app-emulation/containerd-1.0.0
 1802262111 metadata/md5-cache/app-emulation/ganeti-2.15.2-r5
 1802262111 metadata/md5-cache/app-emulation/ganeti-2.15.2-r6
 1709080309 metadata/md5-cache/app-emulation/docker-bench-security-1.3.2
@@ -74315,14 +74339,14 @@
 1803250109 metadata/md5-cache/app-emulation/edumips64-1.2
 1803021159 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.8.121009
 1803021159 metadata/md5-cache/app-emulation/virt-viewer-5.0
-1802091838 metadata/md5-cache/app-emulation/flannel-0.10.0
+1803312238 metadata/md5-cache/app-emulation/flannel-0.10.0
 1709150138 metadata/md5-cache/app-emulation/libspectrum-1.4.0
 1801191240 metadata/md5-cache/app-emulation/libguestfs-appliance-1.26.0-r1
 1801091400 metadata/md5-cache/app-emulation/spice-vdagent-0.17.0
 1803290617 metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.20
-1802280138 metadata/md5-cache/app-emulation/cadvisor-0.29.1
-1803231808 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
+1803312238 metadata/md5-cache/app-emulation/cadvisor-0.29.1
+1803312238 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180314
 1803021159 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.11
 1803040038 metadata/md5-cache/app-emulation/virtualbox-5.1.34
 1803290617 metadata/md5-cache/app-emulation/qt-virt-manager-9999
@@ -74333,7 +74357,7 @@
 1803021159 metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
 1803130738 metadata/md5-cache/app-emulation/xen-4.9.1-r2
 1802262111 metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
-1803231808 metadata/md5-cache/app-emulation/docker-18.03.0
+1803312238 metadata/md5-cache/app-emulation/docker-18.03.0
 1803021159 metadata/md5-cache/app-emulation/wine-any-2.21
 1803021159 metadata/md5-cache/app-emulation/wine-d3d9-2.20
 1803021159 metadata/md5-cache/app-emulation/wine-any-2.0-r1
@@ -74343,13 +74367,13 @@
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
 1803021159 metadata/md5-cache/app-emulation/virtualbox-bin-5.1.32.120294
 1803021159 metadata/md5-cache/app-emulation/wine-vanilla-2.22
-1801280009 metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
+1803312238 metadata/md5-cache/app-emulation/docker-registry-2.6.2-r1
 1803290617 metadata/md5-cache/app-emulation/lxc-1.0.8
 1803021159 metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
-1707301138 metadata/md5-cache/app-emulation/skopeo-0.1.22
+1803312238 metadata/md5-cache/app-emulation/skopeo-0.1.22
 1702282308 metadata/md5-cache/app-emulation/vmips-cross-bin-1.0
 1803021159 metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
-1803271139 metadata/md5-cache/app-emulation/kompose-1.11.0
+1803312238 metadata/md5-cache/app-emulation/kompose-1.11.0
 1801011404 metadata/md5-cache/app-emulation/dlx-1.0.0-r1
 1803021159 metadata/md5-cache/app-emulation/wine-any-2.20
 1803021159 metadata/md5-cache/gnustep-base/gnustep-gui-0.26.2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8fd803369f57..5a32802aedd3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Mar 2018 15:00:01 +0000
+Sun, 01 Apr 2018 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 685a410f4b4f..db07589eb357 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9bc74ef2bb91373de0beb13c6e2acad4dab7d993 1522506495 2018-03-31T14:28:15+00:00
+9d21d15760711027915b4b2b36d66be2b6ff8ed4 1522566718 2018-04-01T07:11:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index df8727b4d48f..e28a14d25555 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1522506901 Sat 31 Mar 2018 02:35:01 PM UTC
+1522569901 Sun 01 Apr 2018 08:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 904a2a2d441d..62a146d649ba 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 31 Mar 2018 14:38:17 +0000
+Sun, 01 Apr 2018 08:08:13 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 8d32e1a8033d..40f2d078f11f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 8a6c29c361aa..2c051e547702 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,16 +1,19 @@
-DIST coredns-0.9.9.tar.gz 4756460 BLAKE2B a3cd452c37d4f3fbe516318c8596d80ebe3c1dbb3600dd80bc1a7e9f20cf9680c21c0152e9e9d26749913ecf81cf09a5ed13361565a9f2372f2fe5cda83086d4 SHA512 340dacfbd65e964a9ab7602024c08d8ab5c04f9748b0975c2cf0000a664672415fbcce809450e54fca8ef838f15deb9258c99eddc98bf4a82e96dacd26050de6
 DIST coredns-1.0.5.tar.gz 5016183 BLAKE2B 93bc88a1fdd792b357ac7678a75a415fd4fbfb29e6c75768e6c444cd547abe1a7166e5d3645f360790209c4fa437170cd33bcdb097242db06fd08170ab77067a SHA512 ef5b9704932b972cd38f5eb160b1c0c405943dbb19af77db7358f1eeaf7d11d73b589e6de9dfb62f75bbf37db351cd856ae0aac2b7b1a1a909b01f4895406b81
+DIST coredns-1.1.1.tar.gz 5087192 BLAKE2B 21ca6975c56bace24d9c63581b37be6bfef54055332dc13171d93698003a848d775f4806d6276ca120703a11088a4afc9fc827f8b14a16e11d61320c31a1364f SHA512 53434a73c7899ed0b0b126ace4466b91d0529cad305dc10d3b83dd011c97fec969a669fc1ef38337957bfa16af404af0a088daaf62af715abf0414797de6eee0
+DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
-DIST github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz 926104 BLAKE2B c5b31791af99bfd82edcf233dd9291df58102383786b77dd131af858e5f7868dfb4faa63de5c85218b2458fc9dd9f8a0d735aaf28b4f6f2a1835201ce0f93b3a SHA512 ce014933d3b8a30057c99bca54e9ba630e1940d1afbba3b9c7ef9d4f3e78d2ad26fa5ea9f0cbb0ada877d651b67d449e099d287b4af1d320fbf0b9d50d8d169a
+DIST github.com-golang-net-b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz 938028 BLAKE2B 04b66e87d3664ccff451349146ca886f56d8d306a82ceac0931b6b714cfd0e0fa88221986233f38a4f1dcac09be2222e23f03ecd761ff4cddaf422dd98a79641 SHA512 2f7120e4b3d6496f6e3e01d9df1c41e81b1fb7874fae1f6dfda1928f0df2dfa1a08f2522d44ef2209a3b251f6da4fb9a67041dc22a6f8262d7ae6701ddb6cc5b
 DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
-DIST github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz 4625238 BLAKE2B a6bcc608bcbe42e03b19c2e8777623088fce206d2595444ad756f34982f50eb884aa87c92d7f23816b91d4e1b3f86e4d638c47866152f385674c7186debdcc67 SHA512 98c651a37fd60e62109d0eac3fe2a21473d7f270ec7a941f4a84485d3276da84b526d406baa185360ac842348320e9f373c124f9d88675e34d8126e71a9e8de9
 DIST github.com-golang-text-9e2b64d659da1afe07ce1c9c1dfefc09d188f21e.tar.gz 6112515 BLAKE2B 1c28dd8598c700c9c1d83ba7ba43cc97993c7261253bcac9f49a9fa0aababf05f2d522cf7ae4549d1679bf6a49ae9d0840863bcc9fa23ed1ba789904e42e853d SHA512 0b483eb86a2681264f66b320a25524690a86a56d28e97c2e91ff7cf7d8b8d531e2d5cd96cd4b842d33ea01355eadae6b6856195a0bd6c128b380b5e16fcbc286
+DIST github.com-golang-text-ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz 6563431 BLAKE2B b889252096070044687cc804b828a9b55a444895fde87a75d1ed7de89a9953d208ef7cf54ecd501ebd8240a9f42e7bcc2c6ed09cb76256e235b94cac122abd61 SHA512 0c1814462560a3cb3e5f1b8a82a321a66baae712cd415043b2c910427ec5217f5cc65cf0d64b07c113c3e06aca9260c28a06e19f1a535fa457a3c2a67e683b07
 DIST github.com-mholt-caddy-9619fe224c96d0c4a060e83badbf95b6bd69a0ac.tar.gz 2712643 BLAKE2B 96f529d158a4133c266d54530a895d5b5b5e9bb0960569e42c14b1152677fdb06be91a9ba9d25eb92cdf858827983aa247b7e162feaf9f16819d22d19b4f5fc5 SHA512 f48d4d211ba182a7b3ef4322329167d8ec01ee92010b85fe67a663780b4771445d9ce1297ed38ff572b15b0649c9fe9cb321e45bb7131755e57c66ca59fea89b
-DIST github.com-mholt-caddy-c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz 2708435 BLAKE2B 13f5b0f7072e55be4fb3ec1656f880b1ee2eddaaa70ee9ea3d9b881a2dd9865c9338fc7d0246e9766adb9bf71083eaacf55296d1d2ca49b6cf6ee62276c13edd SHA512 6b51fb8bb6689ca15317a8c82d438636975698e900f251081147aab5366829e19c1e8b4710024480e169669c70550e4c802abe40c21fb1c8487025477be49516
+DIST github.com-mholt-caddy-b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz 2910394 BLAKE2B e52576f5f952dea15c43f66b6a088f29caa0fa4534727897f8a2134c90425b5b97dcf4d5a45d310be5da8b51d3704382be8c2e191b062f026f9847d2cee85eec SHA512 1e03a9a2ca4e2a1be27e9ca69a2382a1749ce31a472716b3390bbf7dffcd36ea1569b2f2982efb0fe292307bc72cfd34af1431ae993151315007065383b8eb3e
 DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb
-DIST github.com-miekg-dns-822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz 182599 BLAKE2B 0ab2de4bd707326b87377f099a3f9eb110dc41b64f5974aa0a389e20bc93579b8b495797ae218e4e2e5a9d6b8a475a7de593ce61c71d5abf49d6c7a44e844c26 SHA512 cdced57b5fc6093a4de6200efc5558417c13d3e7e82d10dcb58b11e7f827e82c747554e803c8b8fd4b27c086af6f25e27101ceb240d3fdef5698fe3614106b53
+DIST github.com-miekg-dns-d174bbf0a57b4ab555db36b0e55f692d5e8dfca8.tar.gz 2517044 BLAKE2B 7577220d999ad5e9f77e5d9f08e7cf22f390122f35994742a566c28583d491785070e13a5ba2f39a79da8f377ed421466cf914eb34647fa68106fe811a64ba99 SHA512 7a6fc4c95762e4439cd9ae880f019f041e2a67fc3b0ada24394d8388fba3a83888ad9b53a9f308955ef8c139e545a4848fecde63baa1969923bd17bad2b05078
 DIST github.com-prometheus-client_golang-e69720d204a4aa3b0c65dc91208645ba0a52b9cd.tar.gz 106879 BLAKE2B 788fbe906d4e2fe4c9e61c95256d7ec8e70b038438fb9afc69dcdc402f9c52509fe2645e0b1929dd0595ea75f160013c1b71f82d5320775724a60b34d22c1877 SHA512 27fd454387c730704b2e44e40d873843a5d36894307587a8eea3ddf0604052e9ecbef36ca37cb6a2153452ff7e1c1294d8e1cbdde7b11742db74be55bd4e2b7a
+DIST github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz 106949 BLAKE2B b5ee911f6d478ae21a71c2827f541ecd174dee7dbf23fff58a517e739f0e16bf91451a6aabf3f3f786b62256e2c4ee8481cc3169d01819425d56a0eb802a36c9 SHA512 234ad2fa57751901ab2a0e5843bce17689166d8fc285d63f9de0da412cfe7176e8a9f96c0bf5342184985fbb564def31087255bf11766331636c3624fe85eb62
 DIST github.com-prometheus-procfs-282c8707aa210456a825798969cc27edda34992a.tar.gz 54057 BLAKE2B f6b5f64f85c153a8423d83ac8f8b810a4ba1fee716a597b9030b54524932513fa92139ecc363a0e89b9198092c88477cace244a4a5cf03075ce37cecf8a503be SHA512 2fb6b399eea1bebfcf1fde8dbe6443a5906834ea4a9738230b407610ef22f8726be13cf713a354a084ed3f27bf77ea7dbe5dedf20c7a9f6efe3e36f074aaee38
-EBUILD coredns-0.9.9.ebuild 993 BLAKE2B 4e56dd34fc16751470517606d69edad48a2faa9983670b0528b0408a40fe106bffa98a5ea65f318e4d4848900c6eebc8cf1e489379d91f3e0cf119f2df8b63cd SHA512 5e7be9091711d82e7ae5803d74983f5de3d6a7f23067e407282a54de591eedaadb5a0e56b268879edf7c34bb2f67e791302760a79b9d60bc960c35356f075fc2
+DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
 EBUILD coredns-1.0.5.ebuild 1314 BLAKE2B 0ab37dc4194fd5a16a8fc3c35519c2883a4ce364a17305bc4f22f19cda9db094ef1135053a39c2ab5fbb34296f3758dc194d0fe18b9432c038050a550d29274f SHA512 13892b631ac55ae1e026ba59730ead8b60cc85c6221b9a2bb214a12afdd038ab30286e6703ac7de0a0b3856498559c52d99cafdfabc0dbeee8d61d53165e84b8
+EBUILD coredns-1.1.1.ebuild 1314 BLAKE2B dc1ae9b46b2301944ad6b5784b4e404c7e74e993df2d9d941ce51ce9fcdb35a61c4677697a2ce0a61180b2eef9a227cb99f33091c5212db071cf03cbf16b51f2 SHA512 865d5643bb73e5ab2339d00fb41c00b3d4701f624b820e882140fc44b6a25ac868aa342e3108327e7c7555754ddc7b929b490427d68043ebc8ef4c62c68e5517
 MISC metadata.xml 335 BLAKE2B 61dbcf471a1e9c3714531b8f0de0a79577aa666966cf71b92855aeff383246895424d1681b1ba45f03092f7735a17d0223419bb1d76eded1bd93264ab06c8e2d SHA512 f520f2f4129fb9ce453cc95527d3ccd30029fdc45411cae376c85bc02870c01b880f593b92ce35cc083e0f65bf8e7a4e0ffc57cfca7cdad84cc41fec995e88ad
diff --git a/net-dns/coredns/coredns-0.9.9.ebuild b/net-dns/coredns/coredns-0.9.9.ebuild
deleted file mode 100644
index 50bd09a25922..000000000000
--- a/net-dns/coredns/coredns-0.9.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/mholt/caddy c4dfbb9956095c92d0586a52723748c070c7b459"
-	"github.com/miekg/dns 822ae18e7187e1bbde923a37081f6c1b8e9ba68a"
-	"golang.org/x/net c73622c77280266305273cb545f54516ced95b93 github.com/golang/net"
-	"golang.org/x/text 6eab0e8f74e86c598ec3b6fad4888e0c11482d48 github.com/golang/text" )
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A DNS server that chains middleware"
-HOMEPAGE="https://github.com/coredns/coredns"
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN}
-	dobin ${PN}
-	dodoc README.md
-	popd || die
-}
diff --git a/net-dns/coredns/coredns-1.1.1.ebuild b/net-dns/coredns/coredns-1.1.1.ebuild
new file mode 100644
index 000000000000..9b68d9371b1f
--- /dev/null
+++ b/net-dns/coredns/coredns-1.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/mholt/caddy b33b24fc9e9d50ce73ec386e44c316d70c47642c"
+	"github.com/miekg/dns d174bbf0a57b4ab555db36b0e55f692d5e8dfca8"
+	"github.com/prometheus/client_golang f504d69affe11ec1ccb2e5948127f86878c9fd57"
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/prometheus/procfs 780932d4fbbe0e69b84c34c20f5c8d0981e109ea"
+	"golang.org/x/net b68f30494add4df6bd8ef5e82803f308e7f7c59c github.com/golang/net"
+	"golang.org/x/text ece95c760240037f89ebcbdd7155ac8cb52e38fa github.com/golang/text"
+)
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+GITCOMMIT="231c2c0ef3fb921f5cae31ff4a2f7c6653da01ad"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A DNS server that chains middleware"
+HOMEPAGE="https://github.com/coredns/coredns"
+
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${GITCOMMIT}" || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN}
+	dobin ${PN}
+	dodoc README.md
+	popd || die
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 10d651f24969..7a87d27e1573 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index c9d74c1406b8..a1336a8c3805 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -1,7 +1,7 @@
 DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc19a215b8606317fb02ef3ea370d0f3fbbe01e6f5c49581c74faefbceb9f50ab44bb3791c82e0a633d86655 SHA512 8887eb634edc4c64cf7a0c1a1be4d9ef72d5080eec687d187898dc31bb841ed730850bae8467247a05e56c2b4ef7e9d02fdc0812d48876e145c9826a7406d9ff
 DIST sshfs-2.8.tar.gz 153230 BLAKE2B c2d7116d72145dee1a31093ce3225e92681a8bc5c5cd8472ffb0f6e46c9dd8e6b99089b91466311d2cf437ceb0cab9eeead5cccb890763c8f0302fbc0f16bceb SHA512 a3c6a75137a4410a0c4e049ffdb6e219319add9673de32cf32a74c12ff4bb80f92a6e75088417a180a4dd01957deec39bd780a02140e8b0348f5868c92d67cfd
 DIST sshfs-3.3.1.tar.xz 46076 BLAKE2B 719c04e383b35ed5ce380db1a5a77858444768f27ac45a09205f4854a03aaad04ce418582dc79e5a9d23ccf9e225838bbdc20b0538bb867cca9af919fb294e34 SHA512 d0b623859a5b98db48c0ac6703e148603b2240114e22216e314f798ce645b39bbe7119a4e3f2d32d7bb41e07b2015761313e8249097a21bef9ad83287df9b80a
-EBUILD sshfs-2.10-r1.ebuild 557 BLAKE2B 4adc5dd50559add2d4b35d899b7fb91a23819d31fb74ae12e7f6d3238da47c991b775e3619606cf13e662af6b5bffbe3469dae5bace04c92e2a071f38f7b516a SHA512 acb4c6dc98b655404a373417bc1b6990f0ae427069f3c44daf03322471abf0518671e2c8ffe8027d3847c55f4b85886c0ae7a2d0b05f3d1e360ee65a643b99b8
+EBUILD sshfs-2.10-r1.ebuild 564 BLAKE2B fca8aeab884777c7fd6f6b0751120ec835a97583ef09757978e249deb6b550aab7ff93c06809d66bf5db03f1f86fc76d6ea4faa4c2eb75c72f5f5463767f62db SHA512 f778d76a6f389a68a9b60a805274c5427ede9cc51be191bcfd01912899378f93c467ba00f2d57d23f8caba57792579714fe8813700e4494f33821951ef5d5840
 EBUILD sshfs-2.8.ebuild 586 BLAKE2B 47a92fe81d0b2c341fc1368f7c13c8ce97876fc9d9c12c3799672161c311c0f7ff9305169b2a8c2dbf32051f31dc7c56ff33ba3aa62bac7d3a871dc87e901744 SHA512 236e68382702733eb3fa109f12a4d2626065340a3ae9bf7d0fb954dd4f76d08a77772101e9807118061c5311c8b8b41db194dff7c55a7dda5293b5cf76b624f6
-EBUILD sshfs-3.3.1.ebuild 567 BLAKE2B da738f78cbb73fb7d220e759258e5af2444604540355f8351a19f7962976d6fbbff83c85472b0c2af19baff35d70b394c33b3e510071b43369462e9b1b9266ee SHA512 7a8f2ba4fa1b7253a9969a013e1165e00c1acbb2af6e58f6e58e3bd70c15b2d62bb1d2110314a93c1bc1ff4769ad048bfa2ec1ce6f027f682845902ced81b69c
+EBUILD sshfs-3.3.1.ebuild 574 BLAKE2B 938ad04f1cb7c66d257478885e08944f9c6f65b30329baaac2032c22c0cecabd2464946e0286557e86cd277cfe7ead11786cc654122c6a0cd024212d11a3d538 SHA512 895dc2c890c6f019f9e97628b64b757fffb60346647ed483f61ec4ccbc1012fb8f707f51780968268f2e69db780fa9c9fda0cf337849e4fba18b5eedfe6fbbfa
 MISC metadata.xml 334 BLAKE2B efe6b250e6679987941b578fc0dabd47bad1ab687eb08d99bcedabb5064ea87fad7e2fc36657f0cea0ebd42489c92d85bc9c44d65fc6abc1451622584fb4a766 SHA512 17d120fe909408832fcfcae2cc074316fb1c1952f92b8ad1d395ac2b44f99a38cee499116b976b2326cea3778e01c2cd7b31dd82d05a11d97b95585a32071cec
diff --git a/net-fs/sshfs/sshfs-2.10-r1.ebuild b/net-fs/sshfs/sshfs-2.10-r1.ebuild
index 687a6819045f..4beedc9b7bed 100644
--- a/net-fs/sshfs/sshfs-2.10-r1.ebuild
+++ b/net-fs/sshfs/sshfs-2.10-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-2.6.0_pre3:0
diff --git a/net-fs/sshfs/sshfs-3.3.1.ebuild b/net-fs/sshfs/sshfs-3.3.1.ebuild
index 5de09d00ec8e..577eab09162a 100644
--- a/net-fs/sshfs/sshfs-3.3.1.ebuild
+++ b/net-fs/sshfs/sshfs-3.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-3.1.0:3
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6d2bdffe473e..67ec45f66467 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 48663fb91f9a..6e771a0f49d1 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -7,7 +7,7 @@ DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f9924
 EBUILD irssi-1.0.4.ebuild 1262 BLAKE2B 7c9562df38e7b0889ef44c3c905d46ad1cf29d892889af131c96828e1e3656a62824b1dc714cb1e1411c500e61e8614a3ce2e736aa4cb9120394e4b367316189 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164
 EBUILD irssi-1.0.5.ebuild 1252 BLAKE2B ab7c9b9df8fe7c7c18e94a1c70a0a01b311d38fe8cf51587ba4c6ce35e15c03db32385724b47ba06707f713e5d16bcff8699c8b6572c0497a17a1656a4d0304f SHA512 709aa545bcacf13cd72be4d04359b02058e769952525cb2f95da12255cdfdce8dc8f400de5bfd8d0474fb031d61ce335761097b65cc2f5524df2fc37158fdfbc
 EBUILD irssi-1.0.6.ebuild 1248 BLAKE2B c694a02939c61515d55cbcc08f192a593abe3df663dd108e169c68cc9430ab6a0e1148bd23f665fa9a3d085bc113a45faeb2f6847946c85b19f124202ad36655 SHA512 c06b8f15c5cb553cb70e4f305f5acd1359fa31fe0fd87cb63d35c1206035f2b44aec7aab745439bf245800c921850246332a143e559b800f24c035439eaf8a9d
-EBUILD irssi-1.0.7.ebuild 1253 BLAKE2B abafc57ea46cd6a083db31049ea819d2c8d89c4baef381971b9f915b483f075e7accf31b19a58f1b8c68731a877a75860f3f41348d08b9d651191c24ffe6a5b4 SHA512 eccbe9c79c27e5d38af3800e596eb41e80418844a583f7d3865efc46eba2c26514bf7f512b320ce5ac4c325bb656a1e944d1b5bf23e5cef51e48a8eb67ee52bb
+EBUILD irssi-1.0.7.ebuild 1251 BLAKE2B 2e9b5a23bdc1f472315569b50785ee4ef5f89bb84113d9303a024fb77182f9b3e123c5202c8e3c81dedd8a645e6e04d4086f0ca506a8b1fc8513fe779758b925 SHA512 a68f3c5f7758a3ba65ed4e0be16b5a67d2f678a88eb36e021345cd741acb90390e5a8ef2880987055f70ada80140aeae87ec2409a058eef578f2de026347bb81
 EBUILD irssi-1.1.0.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-1.1.1.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
 EBUILD irssi-9999.ebuild 1202 BLAKE2B 6fdefbaa5021802fc8326b0a633c3ad666f226070972a34936dc02f26f8cb68eb6036ee7e94b2940c6952e49cd2d151c590aa1badbef35e1817df2fceb7996c9 SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
index 6462d92cba1e..c5890f92fc48 100644
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ b/net-irc/irssi/irssi-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~arm64 ~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"
 IUSE="+perl selinux socks5 +proxy libressl"
 
 CDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 48b1dd747e90..68d80207d9fb 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index ffc01a961471..1471e8a9d817 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD libbitcoinconsensus-0.15.1.ebuild 2388 BLAKE2B af9dec58358b370c37b770d6a0762af2940f45aa4f8ba723df2ca8f605dc87672a5134c3c773f5c83103efb4df1e0c9efeb8487a584f37b2063e35510bac0e3a SHA512 fbf7381d56add2aaf0b62016f981efbac71031ecf266a6044f0742d86e30054e01c592e276a0c1e1c66f52f99c642a29fd91757cd39ec9905d85aeb4fe726124
+EBUILD libbitcoinconsensus-0.16.0.ebuild 2344 BLAKE2B 561422a65b6f7a80500cb5422aa116e7c5bbae782ab29c0a392f57abcd14e55669195a6330145e26f2a52558065c46325d825903a93ba35cd6b5af7c4f24f12b SHA512 93d3638e10b6f3200d30b21c9416240b41752da8f50f04968d917b08e268cfce616b764747705526af0cd9a8d7b886f1a970a8b6cc47bc890a59ec18e70c9fca
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild
new file mode 100644
index 000000000000..4fdba1775ec8
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
index dc40c0a2fc92..503a62bbd683 100644
--- a/net-libs/libident/Manifest
+++ b/net-libs/libident/Manifest
@@ -1,4 +1,4 @@
 DIST libident-0.32.tar.bz2 205831 BLAKE2B c1f7798c83764774be933d0c34ec8729c66f3fd2bee6c7f8e5e472d929068c56bda9353cfa1b2fa5e7636fbecb38c02fe133233958992ccde766d1b614dd7a0f SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244
-EBUILD libident-0.32-r1.ebuild 532 BLAKE2B a4bdb0449c03602f81e778645063e19d0cd7b188f19bed8e9c7ca0c1643d3ad50383af7b6ddeb6c11d705652a8aef826580b95be39fb53677248002d6a0b18c2 SHA512 5452bb923a33b1c13ccced5dcc05079c19eaed2fa97ab180c29afcf24be7ca1960efe95b868c55b26ff4ead7927d8bc7d509c2789d3241cf4056cca61cc7092d
+EBUILD libident-0.32-r1.ebuild 531 BLAKE2B 2054f4ceefc38f07d9d7786af1923b720dd847e88bf2c443e425b2e061bec0053bf2c32ee3076874d7e42e6a8ced2285f4cf4857156725614d22272f5e9df5b9 SHA512 243ee05a0dda03d628075c758ea9ad0693833051f97fbec5f42ebecfb8a4c40e1a05d1a6129341531b7b6166f03dbdef2003208e84e8bfc70c452456fd99ba77
 EBUILD libident-0.32.ebuild 507 BLAKE2B 3347d5ab443d80f390d9c3cad8102d8d1013859c30301a68c511f961bbad0714502f2b9e5c49ae78668925d25d9bf457584d75637ece373f1277c47f0f0a9096 SHA512 4eb6f180aa0cf6926801c0f1b5bc5a401feeb0a1ef4880fe48a426ae1711af73e044dd704f9a7f33d7b88442ae857bacddd961da95c1d47d403b8f2c6fa59fc9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libident/libident-0.32-r1.ebuild b/net-libs/libident/libident-0.32-r1.ebuild
index 6820b8b4bce0..673e864c2774 100644
--- a/net-libs/libident/libident-0.32-r1.ebuild
+++ b/net-libs/libident/libident-0.32-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index c8e7754ee765..839bd0c66202 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -12,5 +12,5 @@ DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42
 EBUILD libnatpmp-20110808-r1.ebuild 722 BLAKE2B bdace565e17460df38361f3b7e7bbe6c83be72d0a7b863b0f989108aa02196c175b2fcc7a454b08d21992924de6a458bd8ed750e407d8bfdb91c357e2e04a9e4 SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c
 EBUILD libnatpmp-20130911.ebuild 786 BLAKE2B 151d792ae96f9886958c46c263aca1f28e624fceac65997f159a8d85fd9b62090ac22f5fa2a821ee36050fd8598961c03ce491a3221da6e50095de78a391d137 SHA512 1b698ebab057ef860b759240b133c343ce89cc4696b21250be00fec5050b86c632154d18b3a96925de52fa766a2f702d56b8c53c0252caac364bfe52a5ae914b
 EBUILD libnatpmp-20140401-r1.ebuild 882 BLAKE2B 85af17d2694d163605448e5399004f9417490c539a3fb579d715385664e9371a7ffcf2a47af5ac181dde71fe04af041e6895f89098831c45d7ae8728946c7a43 SHA512 ccee86e0aff0d6ee4cc581872019efd4261ca4a4ee33cb651681c77c1900ae49728cdf9effb7f3603a96f74ba22db86657f035c311ffc318ea6f0d5ad95c9925
-EBUILD libnatpmp-20150609.ebuild 888 BLAKE2B 3613308a692f1f5681091dd31bf2457ba2e34272107223d6ab0dbe6db65bb0ccaf581c6b9b72a648f51c1644dae584c5f0e496b94da933fbde0bdd9afbb14cfc SHA512 890fead9eb9beddf4c894edb10bcae213cefee4da4deab6e2153fe1ab8bc0d1c7ad59d4978435bf23ab7de4e98c3a3154e4a55ad943ba60fa15fae8a1f489351
+EBUILD libnatpmp-20150609.ebuild 895 BLAKE2B da4a6af8adc582a0fb225d422f05d1a7830c4bfb97f8b3058176993332942158693bd9832fef771a87a07c005b7d1e6e76b021a14c1770056ee9f40b9639ae8b SHA512 a13b2c9e4bcbcc2b0d0a9274cc675b5db30de865d22bb68140ad70e32571a86b6bd518ddab6530b9eabd622065de4fc462ec4b43ce919c4f6ff36211daea0cc0
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index 557cd58f561e..f0b0e91989d6 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8292e866bdb9..11b89ce2ccab 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 6aad6a5a9e50..ef4ae1ab26a1 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,5 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
-EBUILD aria2-1.33.1.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
+EBUILD aria2-1.33.1.ebuild 4271 BLAKE2B d7d4dc030160ae62698574f5c72bbc4d119e28d926aa39dc018b8d3ac2dac24c27ddc5951d8ab4f2e08b2141f9e3c36d15ee2ae9d05050bafb60cd54f6a737ba SHA512 92a5b96a718e6ee07c2eb030d28dede399f6fae538bc745508ff79ec601650571e0401b5a7a091e79f80213c08448f92aeea84babe2a81890c144748a9ef631e
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.33.1.ebuild b/net-misc/aria2/aria2-1.33.1.ebuild
index de956e8d1695..0ac749fc2764 100644
--- a/net-misc/aria2/aria2-1.33.1.ebuild
+++ b/net-misc/aria2/aria2-1.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index f201fd5edec1..a6239210f5ea 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,5 +1,7 @@
 AUX networkmanager-openvpn-1.8.0-static-key.patch 1273 BLAKE2B 311b87ac48595b3276ce9c5651f813d13c4d39f7355903220a0d2149a52b6ed9e7c8c405a5aa0ef30aae5bd2c8b9f6c13211a68503dcd53ea3c981acdbf676d7 SHA512 2b91e6bdf0994ee276a201c277020e9dc12ef3e9d1f55e9d06d0eebb2599760a0810dc1f8a59e63d2b57c974f81b1dd55d12bfa243f81410d785f5516f91de18
 AUX networkmanager-openvpn-1.8.0-user_cert.patch 1037 BLAKE2B 4034034aa8c983d6a362f342fbb1639e9a691b2abee686ad916c888936eaad39c1bde0a6475a155a2f8d45cf3b34ddcfaa18850b9a93057b00bb4acfbd9be7f2 SHA512 86424821c47925492186a950bb16548a1d57745cb2ca462223d1944a71e8bb4cd330b88e8b60e60014a716505a1bcc80afae0aea2b2987a8e3b304c0064b8480
 DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
+DIST NetworkManager-openvpn-1.8.2.tar.xz 540912 BLAKE2B e972a1767fa8219aff2ecfb18c69d309f0147db16ff08db2fe50f9154defea2e805142ac38e77854902f430390f0909c692110a8bcb2e18cec27ce9661a1510c SHA512 c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927
 EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1442 BLAKE2B fe7fe98d03e869b1e1c643300c44bfa6514b6a2d487362477eed8204fe91c250f80e96822b8b487dfb0ee76c371c503723f51923f6e55acff4f39a288ebd5732 SHA512 7b769a310afa02e0a4aed20d3ff43fff4e67c452ecf325dfd0a25ad938c6d4e9f1e5d8873a150c66d0277aa88b5018a9c15307ab43095302a8e98781f7a89f20
+EBUILD networkmanager-openvpn-1.8.2.ebuild 1241 BLAKE2B 03aa5e03bc41650344a204282dc693283fb0f0741b061b1663dd1adc0a2fa816ad8742db923fee3d4d77f25208a4587d584765c9c21059e50bb717e7768bbf69 SHA512 1ca4603a49e872fd1420705588180b7fc10673d822ef92007b48085ffdd9864b53d94d8bc07e468bbd709b44224aa4d45bb0809faf9f20b8c8c240d89139bfc1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild
new file mode 100644
index 000000000000..6a30526364ca
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 82729ecf7db3..38b8b6535cc3 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -3,5 +3,5 @@ DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e
 DIST owncloudclient-2.3.2.tar.xz 12266008 BLAKE2B 53d08aec4971ae309b4fd07cea4e6ed9643411d4f6921c82213d55ec757abcd61ee64abc81e359ea0808b54d8447e3742fdec5394ed55b2e09805616f5430a75 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.2-r1.ebuild 2508 BLAKE2B ec90d6896a8f285e86e8cc2f3a80ec7428838f3a335ca61ff91adf5d2e02ead8732a3015d3b3f2b0b4e54ed7546eb1c9ec289ef4320cbba9a0732fccee9e40d5 SHA512 563c8391302c808bdc1f513882be4e876533a1dba958c20f33a1fa76ed05375ef5e4d57e902a2c817335e18d226bbbff89ca05e20a5c7d7f6cb605861a17ca45
-EBUILD nextcloud-client-2.3.3.ebuild 2591 BLAKE2B acfedc53d717f7b06b5c9ef274f26365480ba72c89f7c6e70c636373e1bdf92654044912b8a1af75fd896dda3e56025a89c5aff006bac21b556036827a4b0981 SHA512 499c966a9b2634e20093ad1b595b5248620e3d7a0c0c386ce9b1d2c49c90cf7f11a2d69c296e5cad350720306ecafd568c56e948abf70dfb2bd21a83fab3da64
+EBUILD nextcloud-client-2.3.3.ebuild 2598 BLAKE2B 980eef29ab17e6121a45c255b1278323fb92e0a661969cfc7167c616bae5bf21997ecda9d15b0f8a70bfbe33becc7510c328e1dd03273a24cbd68fc1416efb9e SHA512 76ab1db1d0701999d0799961d25960238b30f206b221670b60c5c0e2ba7100d2523bc2e08c11c1cbb1dae085b3700afecd0a38424e84b3d593919c0bd6036fd7
 MISC metadata.xml 684 BLAKE2B 68867eb334a7fba5a788d8174b44982d656e3a055372e42aaa1d08be948fb0ee8309fc547fe75adbb3f586f0761e6a4b31beb2f7a90be4c00a1ac2ce9c6776dd SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
index 9c1fb0aca247..78061d676ba9 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus samba +sftp shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 0a208346a5b0..45b8bb0451c6 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,6 +7,6 @@ DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b95
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 EBUILD tigervnc-1.8.0-r1.ebuild 4579 BLAKE2B 2100ceaed621bf414fa0a906ce425a30be56a8f946f82b8dd10b94b314a575670c88fa95902d5182cb7fb253b6399cd8e26441526b31b13f5fe34a9c08ce712a SHA512 57e1233a4e19d556bd86886dd62fcfc53b966a3fa45cfbc311618db3d31ca01d3216cd6af03c52293c277856e271a09a337a68207ec2d5b5e0e25b800453995b
-EBUILD tigervnc-1.8.0-r2.ebuild 4658 BLAKE2B d4659ca7697fc98830c6a8ec8e805e3e6f8f93582d0e3e78e9bdc946019196240c8222e18fafc2e50724c47b5180f0a4f841ad50a11ce68fe8690513bd2880e8 SHA512 a42a319286bc53f5b386f44b338bb958be77152f9376414b95835027b38256216177b3eceb1be0760246888d37146978da9ecba2a678ddd9226eab78391670a3
+EBUILD tigervnc-1.8.0-r2.ebuild 4665 BLAKE2B 60d2397a6c90a09c58a92af26f92ba4c81b0d01cac9c64506d85b0c2fcaf5ad9d294795508c5e4dcc76920c4357228a5f87cdb8ff11ae9918034c21da5c6f1ae SHA512 57ab001805e332b202bbfcba8aa7466d405ea62273eed49ef3d00b2e2e5b547c471426989a39e8f74c14080d8b72ed2edd4d509f575aa15dc0c74fd219993220
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 725 BLAKE2B 9ea0092828f41c3ef3617f10918436795dd5af0397288f0b0c20debc5aded651c5fa6d2afc5c7b011b5480ea820d42c567cd6b22c822dd16895ce9445310981d SHA512 65f32dbbc20c53f154f87a01bf88bc0e73493921ff73c2b3b482e1c9fc7a3159cf6a94d1d7cb830bb60fd8da2b8ef77cbdd2a3cad329634ea82dd4f288f69deb
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
index 0e9970a9ab5a..7c2bb8fa5d0b 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 8fb204f65a45..86ba009f2793 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,6 +3,6 @@ DIST youtube-dl-2018.03.14.tar.gz 2930477 BLAKE2B b0acd81acbaebf698a665f7d744cef
 DIST youtube-dl-2018.03.20.tar.gz 2934486 BLAKE2B 52149045f4832e14c92203e2b59904134a88cd58c817b4391f03592d7fc6ad83ce1681733af8d2c21305b67008805d3840cf54ca109f0d101c443534e66baa31 SHA512 5423454a72dbb81f492b594b421a77c804d9a54fc11d287336b413d4ce5934cc58125ac8da318475d888d18dbb2c24f49a8f3d3c014d730a57857a9c7c93c0d7
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
 EBUILD youtube-dl-2018.03.14.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
-EBUILD youtube-dl-2018.03.20.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
+EBUILD youtube-dl-2018.03.20.ebuild 3291 BLAKE2B 9b8e6327eeadff5e7a88a1b8ef124ff4bc062b4315342a28ec0475f08e128c74b676732444bb85effa3e6d13dc1fc00d85d080e4ca519ad6a6b2edfcc3b64dc7 SHA512 9e9f103435767d8210fbbe3fcc6637507d3a949a669ed3df1b8059404eef9ea8ba6c2cb4d0d350c3670f365bf5e91d1350e14bd50a3bfe9d698a3a590d892d43
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild b/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild
index db51a779b025..cb6c9aff43e0 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="+offensive test"
 
 RDEPEND="
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ffdb1cb9e6d6..53552165b34a 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 1e97efba6d0b..450ab32663c7 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-cli-0.15.1.ebuild 2444 BLAKE2B d669c80e3dae939a4b869743c26b45167c70770b5edebf640b10292a9fa9637e794aec41319ef50c593e12e153ee48fe89bd679b193aa352de69ed1937ea5cd8 SHA512 115f6fc08d571ef46a410236ea9cf6c26ccb4c2a45f5abee117d35e30ddf32f912714603e83b89c9735ea45dab2f2e346e445e2fe0ad127292289d56a3b968a0
+EBUILD bitcoin-cli-0.16.0.ebuild 2406 BLAKE2B 2714ba8a053856cfb567f5fd01e17db751760dc7da85f1d29ad4e93dbf5376c7d0ebc1cb6f2ec07aba755a2944d5f6c7fc66245a96fb1b0325454897292b9cbc SHA512 01514da32f5f7592fc203696137d527094cab593669799155d818d98fdc1ac9ac8d285b0e01121ab0acd8e2f976eb4ac9a2ebce02edee0fd7b0b8c6a4537fb6d
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild
new file mode 100644
index 000000000000..dca844f05621
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.16.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	dev-libs/univalue:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 7e76b1d9045a..68efead228ef 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,7 +1,11 @@
 AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8400aecbf027cfe04a9f4b140bd6a5f31c593995abb5cb7c819a3c4e81bc677e2495009718813d63059dfa6d SHA512 88ef81df293bd05dce54aefeda2d0a2c1fd26842ddf26a138760aa365b22637d9d782d41d93967d0a81c6404fd133159d096397c77a2e1ac71787686dc384602
 AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
 AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
+AUX bitcoin-qt-0.16.0-fix_mempoolstats.patch 1672 BLAKE2B 252efa28461f2367044da6e2a46e2273857022da8a73af654ab6b7acd02fd90051290190d3c3de1ce283a930beac64cf15847f2cc8c2b79f3d3ace61b7181bc4 SHA512 b1143d45e8de2d4a1de572bca758b01889bd14140d475de1cdf8224cdb1962dd3c418e504879a0ba81abd5e4e673131646c72ff54e1cf5972d9cc1dafac52b7f
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-qt-0.15.1.ebuild 7197 BLAKE2B 1aa41f45e03b1c567fda197271007a17f07c3600e6759a4a9dfa0be918ff6878d8b81582647316efbe15d386e6499ebdd54b161ce8afe97c81e10a4ea92ef757 SHA512 7d452b1526df5815d309987beaee84086d4091c198b0e31bc2c80f6a6baeab5a99aff4b4b366d3c06829c070f87683bcabbfb6c14a22d7f551c0b53cd8b5bc5d
-MISC metadata.xml 1430 BLAKE2B 2dcd5526e33c3ec12074eac15982fc23a4d6fab345eadc44aa2b941066c92255d5e4005308da0f6973593528ec2198a32074d2bc95d941b5b97487054175cc2f SHA512 9f1bedd3494d9dd353efdacc9636316e589c1852a1c7f1266d4812b3e65790f66317ac62495d49ae47e28ca44d79df2d84c7421b2cb2ce8122bc1bcc1093d9a7
+EBUILD bitcoin-qt-0.16.0.ebuild 4987 BLAKE2B 356bc3619bcf546e37fdd2e12287455b9eb84fb1198413e13ecb72a02db25a739e8938acb4b4df6f79c07f3d507bfe96319fa0cb01278ef92564754b5885f59a SHA512 009ffb28925b791b6b330ab9c4d8bef8c2bbbc3c1453b12b1b1fe15c5c87235d9f8147d65741395861aea40d37d1959f9cf6a3561d6544ea0a6325932d7e5a27
+MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
new file mode 100644
index 000000000000..a0987233c6ff
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
+
+RDEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	dev-libs/univalue:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	virtual/bitcoin-leveldb
+	bip70? ( dev-libs/protobuf:= )
+	dbus? (
+		dev-qt/qtdbus:5
+	)
+	libevent? ( dev-libs/libevent:= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	qrcode? (
+		media-gfx/qrencode:=
+	)
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	knots? (
+		gnome-base/librsvg
+		media-gfx/imagemagick[png]
+	)
+"
+
+DOCS=( doc/bips.md doc/files.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+	if use bitcoin_policy_rbf; then
+		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+		elog "relay transactions paying the highest fee, regardless of receive order."
+	else
+		elog "Replace By Fee policy is disabled: Your node will only accept the first"
+		elog "transaction seen consuming a conflicting input, regardless of fee"
+		elog "offered by later ones."
+	fi
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+		eapply "${FILESDIR}/${P}-fix_mempoolstats.patch"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		$(use_enable bip70)
+		$(use_with dbus qtdbus)
+		$(use_with libevent)
+		$(use_with qrcode qrencode)
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-gui=qt5
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /usr/share/pixmaps
+	if use knots; then
+		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
+	else
+		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	fi
+	insinto /usr/share/applications
+	newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop"
+
+	use libevent && dodoc doc/REST-interface.md doc/tor.md
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+	if use kde; then
+		insinto /usr/share/kservices5
+		doins contrib/debian/bitcoin-qt.protocol
+		dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+
+	if use libevent; then
+		elog "To have ${PN} automatically use Tor when it's running, be sure your"
+		elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+		elog "correctly, and add your user to the 'tor' user group."
+	fi
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
new file mode 100644
index 000000000000..95219c67982b
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
@@ -0,0 +1,46 @@
+From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Fri, 23 Mar 2018 20:30:11 +0000
+Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL
+
+---
+ src/qt/mempoolstats.cpp | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp
+index ebc72e95d0..50a3ef71ab 100644
+--- a/src/qt/mempoolstats.cpp
++++ b/src/qt/mempoolstats.cpp
+@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model)
+ 
+ void MempoolStats::drawChart()
+ {
+-    if (!isVisible())
++    if (!(isVisible() && clientModel))
+         return;
+ 
+-    const bool drawTxCount = cbShowNumTxns->isChecked();
+-    const bool drawMinFee = cbShowMinFeerate->isChecked();
+-    const bool drawDynMemUsage = cbShowMemUsage->isChecked();
+-
+     if (!titleItem)
+     {
+         // create labels (only once)
+@@ -349,11 +345,11 @@ void MempoolStats::drawChart()
+     QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+     QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+ 
+-    if (drawTxCount)
++    if (cbShowNumTxns->isChecked())
+         redrawItems.append(scene->addPath(txCountPath, linePenRed));
+-    if (drawMinFee)
++    if (cbShowMinFeerate->isChecked())
+         redrawItems.append(scene->addPath(minFeePath, linePenGreen));
+-    if (drawDynMemUsage)
++    if (cbShowMemUsage->isChecked())
+     {
+         redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue));
+         redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru));
+-- 
+2.16.1
+
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index f92f879affd4..c3c11c51b20d 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -15,7 +15,7 @@
 		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
-		<flag name="libevent">Use dev-libs/libevent</flag>
+		<flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
 		<flag name="tor">Enable automatic configuration of a Tor hidden service</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 6bf5af17b881..7323fd036f8a 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -5,6 +5,9 @@ AUX bitcoind-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
+DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
+DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoind-0.15.1.ebuild 5035 BLAKE2B c23995b5457256b33cbd726c8e7d5d840212ecac7450409d31e38bdc9589f3172c668ec4105d22435998c6118d0f85170f9cc133ccfa25bc1690b1417eb5aa4f SHA512 0d311093f9ff11ab9d795e7b6fc12ef477ff46964b4d94259f882da7fbcfab3a7252b0dc9bacda09fea96ebd5cca58b470464e8a220f66d511d8bc3ca224953b
+EBUILD bitcoind-0.16.0.ebuild 4852 BLAKE2B 56480326d77fee37121a4cb9124d09a08cbf913c51529f09c3426f99f62f814b6143cb64264ab2e85bda5206e5dcb304e4691bd9321d7d7b33094a7d2b07c620 SHA512 a0ed87cdb9e9dc49b2471037546295144e0afb95dce1ae9208a70a2f9a2f1b5665e2e655503ebe0da91a8b76888c28e09fe5c0ad7d1f6141ff77b4287f9f432b
 MISC metadata.xml 1033 BLAKE2B e79ed83740379df868320d024cf761995aac60ad9fcb451b137910814ce5b7964c8231853819c2b2ed95890f75c8ef18aee455eedd79543d8c44b2199124f0d0 SHA512 4e530a735d38119cc26b8fa31c2d4a117555004e79fad00f105f581ae6ba20d00d59d54f155c6e3f8c2bbe36aae745ff6e79a66187dac1975ec399e329d9a919
diff --git a/net-p2p/bitcoind/bitcoind-0.16.0.ebuild b/net-p2p/bitcoind/bitcoind-0.16.0.ebuild
new file mode 100644
index 000000000000..299419adc9fb
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.16.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
+KNOTS_PV="${PV}.knots20180322"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	dev-libs/univalue:=
+	virtual/bitcoin-leveldb
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+	fi
+	if use bitcoin_policy_rbf; then
+		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+		elog "relay transactions paying the highest fee, regardless of receive order."
+	else
+		elog "Replace By Fee policy is disabled: Your node will only accept the first"
+		elog "transaction seen consuming a conflicting input, regardless of fee"
+		elog "offered by later ones."
+	fi
+}
+
+pkg_setup() {
+	enewgroup bitcoin
+	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "${FILESDIR}/bitcoind.service-r1" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	elog "To have ${PN} automatically use Tor when it's running, be sure your"
+	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+	elog "correctly, and:"
+	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+	elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index bde16fcbdcc7..de8620a15799 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,7 +1,9 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.4.1.tar.gz 1678548 BLAKE2B 86ff1dce5abf735982f1272f6a97a18bb06d57d0f8008050ae5531323158e629325292c0cd8ba1ef1f1fb9a5d8a79848ea19cb7ab42b1baab40b12d4fd27f921 SHA512 38f8f62de08cc9fbcaa187f4abac2238a3aa0011c6d4bede67b48bc78add32e78bd0e3edb422795246573ece17397a32067d2f20dbc64f020b23f5a86c767021
 DIST cpuminer-opt-3.8.5.tar.gz 1701640 BLAKE2B b42d52da56e141bac42b4e5159325f8344434ecfee6e740fbd3c10cc64b448c6b849b029ea703e0f63e6720625fedcfd84e22dd34fc4a4ce37a88e120337ac1e SHA512 27047b8ee4c2a84f40f62ee6a0a4b24245096ade061d55c3c5374aa12e548aeb6d2dc665799ac81edaabcce63a21af11cef8df6ad050fb8cc7094170ec7a8384
+DIST cpuminer-opt-3.8.6.tar.gz 1701535 BLAKE2B ed51168879e6ca6ada67f13b7325b36c8e58dd3d6d71c55993e84ff9363864fd503f70849fd29366607e57b23f1493539e0e17d1043295266ed4505fbd032cb7 SHA512 57ab3ff3f0a298a4c24d0d8cf4f145627435bbdc4577952995a8babbd7838ae36e56a0d1e2b4c8900af6beecae95af29fef58b74b9afb5268307b67043ef93c4
 EBUILD cpuminer-opt-3.8.4.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.5.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
+EBUILD cpuminer-opt-3.8.6.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-9999.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.ebuild
new file mode 100644
index 000000000000..a1f4a660f6b9
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	curl? ( >=net-misc/curl-7.15[ssl] )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto $(use_with curl)
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 6fe7ee33aa8b..80f9dd0e8331 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -9,6 +9,6 @@ DIST transmission-2.92.tar.xz 3378116 BLAKE2B 8929a2eab8a1617db44ca8a081fd7de786
 DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087
 EBUILD transmission-2.92-r2.ebuild 4347 BLAKE2B ccdce02673646bcc583f0fbd173c10cb2445669e04dd48ac2012298e1d7f663e78fe50ed6e300194e29a08dba3fbea3dc8c1028722f6a9e6a894dd85a696cac8 SHA512 1dc44445ec7bda9aff29c70a0a368cfca377795e14d887e66c9c552f0629142398f13b49c8b1da8b46fa8f5d15f7a9c7c7430e772dfc135e45619c69e35bf332
 EBUILD transmission-2.92-r3.ebuild 4409 BLAKE2B d6a4fa648bffd2a900aa5cf6dd962188aab4e9fe25d83ccce8f24b19389d3e2b5c9c1a552e37304b564be3d1ed69e657048afe850f4a592c73676b270c7fa911 SHA512 5fb59bff0ada74dc9ee9d12e81ebafba842ce2c56d7259640ca78f5b55983792b8763dc1076732f2c539703778e70f918a40055940c9445c3d65721c11dd6bb6
-EBUILD transmission-2.93.ebuild 4368 BLAKE2B 6aff6ab17e3ecd7b829cac156ea1dc48cbbe6ace28936659fc8837d94d6696e6284d8e04bf2abdbf0d2d8985558bc6738c8907505bca62aa31ce7bb5815304f6 SHA512 e7da2757b513979eae8c3b8e3914dd1e2a8c5bd0b4298a179a27ad4d4ac483dee7b0944c0ec9a02a11253c78c7394da134f00caf59c81fcb237576b903ea1efa
+EBUILD transmission-2.93.ebuild 4375 BLAKE2B dd60b643985afdb20cb782f229011535b1c6dd98554e1b28b32dc805ca6b4ffd25485d10ca3dcd0eaa7b0a498d40edbd5c5533965def675e3c7b93193a38acb6 SHA512 5afb734ad2ee190605e6d7204b59afd556cbfd50e3a8c5308d916f2d40fbaf81301c53f5e664ffc0db7bf701d37bb6e01d9b73027de527f1fe036b0638926e91
 EBUILD transmission-9999.ebuild 3723 BLAKE2B 1e51460058b1558a1a5e74d3e53d212d824b0fd387e38f854ab8c807aa7eff9db9dca7916ba2432852bd90123c8b2d87a4650fe3a3ada05d91581678ffa2ec31 SHA512 35a45181911532da8a7b1c7b1cac6ca2d1c0cf6cd385c8b7598eb53a255fcd4cf79e86a3a1f98eec346cbc153489b2c35eb9fd4ec7d2f33ea3301a73dafeebd2
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/transmission-2.93.ebuild b/net-p2p/transmission/transmission-2.93.ebuild
index 6c362c60ac81..3630df860353 100644
--- a/net-p2p/transmission/transmission-2.93.ebuild
+++ b/net-p2p/transmission/transmission-2.93.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
 RDEPEND=">=dev-libs/libevent-2.0.10:=
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b98114be07d1..153a3c2de5ef 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
index 44f5a3f15d6b..87e01cfcd525 100644
--- a/net-wireless/python-wifi/Manifest
+++ b/net-wireless/python-wifi/Manifest
@@ -1,3 +1,3 @@
 DIST python-wifi-0.5.0.tar.bz2 69113 BLAKE2B fe2a6693ca22a963c5149991693ea72e58542ea0c9622573f0f6ad7194d50daa09fe52e8f349224a2131bf2a8fbe0ee9538e17d5413fefe574e60ee9416aa345 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8
-EBUILD python-wifi-0.5.0-r3.ebuild 875 BLAKE2B 2f2969f41118e32e1faad60376a78f2974403b0e3f9aa524140b1ed5d6668dd100da4d08e3a1abf2fb5a2296483a4b476183c2cd5aecea5120c6c814ca665c36 SHA512 d13c4a1f6af1e65d64d2b0a3e5e57cd8fa068dc925b686187a09e04737b541a90b4442262918d2ca37b41e2d3f3b8a99966abb4ef18a4b356a6dbc4625066bd5
+EBUILD python-wifi-0.5.0-r3.ebuild 846 BLAKE2B 2694c0a010a1a4cfc9a60e2770abc884a3be5e91d07d440610dadee7d3c625432f80c6ac6ab2b1374bae8adf7d02b2f9c0e4c085be387ebb3f537824d801c1f9 SHA512 c92fda3deb3d994b878663144c480e08faab7774dd667e6691c8692ed7134d220239a96e626d222d252439bdbe946d58afc7f1ab9ca0382a1ed03fd30d5314e9
 MISC metadata.xml 329 BLAKE2B 9bb66e4d52b4b290c05ef91d15cdef7ae45d46da08311d825b9c33f8fded2106be79edd68e32a44d6399dae763204220dc60c6348f440fd8dd30fc9163c91e4f SHA512 254d847c410e8ab8f3822a03f7689245ca47e5682c73f60ca40a2e2a81ca661421c0db040332dcc6800d942d4904d2e2ca7e234b5eda1b257a358f2236258978
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
index e25f03779673..2398d2b4f3be 100644
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+++ b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="Provides r/w access to a wireless network card's capabilities using the Linux Wireless Extensions"
+DESCRIPTION="Provides r/w access to a wireless network card's capabilities"
 HOMEPAGE="https://pypi.python.org/pypi/python-wifi"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1 examples? ( GPL-2 )"
 IUSE="examples"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f7b371a2e5fa..585eafa01fa6 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 29c4e3c459ff..0e5eb740a39b 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (31 Mar 2018)
+# Boost.Context can be built on arm64
+dev-libs/boost -context
+
 # Michał Górny <mgorny@gentoo.org> (12 Mar 2018)
 # Requires masked net-misc/curl with libressl.
 dev-libs/libgit2 libressl
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index a842fffd8f16..5887b02a610e 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -60,10 +60,6 @@ ruby_targets_ruby22
 # dev-vcs/subversion not marked stable yet
 subversion
 
-# Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
-# sys-apps/dbus not marked stable yet
-dbus
-
 # Mart Raudsepp <leio@gentoo.org> (28 Jan 2017)
 # sys-auth/skey not marked stable yet
 skey
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f3656aedd35d..eb0937cbde29 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6676,7 +6676,7 @@ net-p2p/bitcoin-qt:bip70 - Enable support for the BIP70 payment protocol
 net-p2p/bitcoin-qt:bitcoin_policy_rbf - Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order
 net-p2p/bitcoin-qt:http - Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)
 net-p2p/bitcoin-qt:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
-net-p2p/bitcoin-qt:libevent - Use dev-libs/libevent
+net-p2p/bitcoin-qt:libevent - Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration
 net-p2p/bitcoin-qt:qrcode - Enable generation of QR Codes for receiving payments
 net-p2p/bitcoin-qt:tor - Enable automatic configuration of a Tor hidden service
 net-p2p/bitcoin-qt:upnp - Enable Universal Plug and Play
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 7916ad8f7011..b233870a48aa 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index bda3226cc83a..7e24ea80001d 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1,3 +1,3 @@
 DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
-EBUILD speedcrunch-0.12.0.ebuild 1486 BLAKE2B adae1ed5b6b0a160ca6bceb17b099718f39d56f45414df63becf11016f3f3b57b5bb01e57708b13a0ede56c90cf12cefd8703b81e147177741638503dc162f7c SHA512 ed2145534753a76c25ec20dc4b84266b89c0c783448881793ca457481eda0465f875a37789ca0300191b0c1c54f4fb213c93c6ae577d17a82a4e2e83420427e3
+EBUILD speedcrunch-0.12.0.ebuild 1493 BLAKE2B fbefa5e3e918a7b718fa73ac0b0469dfd812043767ebe590ab84c6e5391f00a80c9ad101c416c3ef37b34fdf11728008458a9e0cbab7148e73fc3d7a6abfcd98 SHA512 f2694f43ea92d32118b706518c4a9dcebede987f78bcc9b50e29064ed995c7da2f90d9cc7b3d41f63f28437f52c4ff689a764b4b5604af3aa7203d89ed3bbca9
 MISC metadata.xml 502 BLAKE2B 8e0471f47af5fe59b74db725b30c6a3b1625b73faf7cfdf2db68b44ce63623d579935275bf28c3e01b48c17a0ed3792cbf25743845e16c4e4efd769196bf41a3 SHA512 9113af02758f4a55914c9492ba455cd66dbb61d0f0d53bf16acd7f7d26bbe3a98b0d9b4372845ea71c5a3ccf02f2b8b8ef9896616cfa3ee63d9534d4293b3f4e
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
index da111d97a3b6..2214915fea67 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc ${PLOCALES[@]/#/l10n_}"
 
 DEPEND="
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index e088fa2351ba..2b125818e67c 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/electronics-menu/Manifest b/sci-electronics/electronics-menu/Manifest
index 716a84ea5c19..14fdfa0b98ad 100644
--- a/sci-electronics/electronics-menu/Manifest
+++ b/sci-electronics/electronics-menu/Manifest
@@ -1,3 +1,3 @@
 DIST electronics-menu-1.0.tar.gz 12284 BLAKE2B 767aa286375b509879d784f82290f3fac8bad0614466a566405ce67f2f06e5b04272cbd58410655dd258dfee9eb6b4cf3af0e9b5a00a247cd79165968dd06dd6 SHA512 c4619d6dfd0641da772a7026af50b0ba1ededee6a5be84ede1c058671764f8c9a7d55e44a018f6bd42bbef0a29d513df5e9056a9a345999a2493fa62d2300b0a
-EBUILD electronics-menu-1.0-r1.ebuild 575 BLAKE2B c837f30d3aed8c4cec3d4f0b22df91e9613e96837768c49bef584e5a02624d1fd74260d4f9ed48cb02011d57dece038093d921af8bd9a2ec5ac6b6cca0b60598 SHA512 664acf8d9a00d01e3c45b3074eb33499753eb78e77ff6676330f7cc7ea88613841920a46725020ea143bb4766029d3c000d09cf241816ebe8003671fa96f64ed
+EBUILD electronics-menu-1.0-r1.ebuild 582 BLAKE2B 5b2e5b734f0aa2b1c47856f9253c7f07216215bc6859c1e4435ed8cc42269d7aa6f2d60c1cfcff5b6f5cf15f5e6dbfff81516d6b833f284822f9e3922126a4eb SHA512 a916afa88e7145c5710f76aacce96687f08bf40021a104bef406cc2eb2da2a7d473c742f8027b0a1627897c5eb27881303c3e2515972cc917b6a7890baed24f7
 MISC metadata.xml 510 BLAKE2B 6345a1d48e8b0c75e2a02bda8615f73f5923796762f62fa08b75a36855ce7e51ca7d4a3d92875b7345892c5003f724b9f6a9542d55ac774090ca0a2131ea1fcf SHA512 2a79ec82566c1493a1f25cdbb30ed4c970d96989caae79614ee40febaa642bb6db96c1bdf4ce3ea081448d0d8550aaa8ce385f5c2ae4060a42842ba6b3b11232
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index 4acadeb50d0c..0ceee2d55f12 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index e84824df8afb..8f4d95542ba6 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -21,5 +21,5 @@ DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff
 EBUILD kicad-4.0.4.ebuild 7381 BLAKE2B a0368f595f54dcaf15d4053be3be8cfdbba40b4729f5e68700e2e970792eeba8b50e8eadd2c2e84de3fd6831f5d0a004ee8128c06809851c11bd6eea8fbb49a8 SHA512 c7784cab7473803eb7c51b62fe09c48d38b1f27dc9b33382cd5a7194fc08572f2024aa8d4564ff2f51eb1b1e651eadf6e389ee25b7d01eb2953ca04bc7a2d3c4
 EBUILD kicad-4.0.5-r1.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
 EBUILD kicad-4.0.6.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
-EBUILD kicad-4.0.7.ebuild 6597 BLAKE2B 6a3450183c5ee0ad9b816dba08c481f1ca92c5cf7b49678b6e3c00d2bd4bd05c281dbd1958ae5258d5da74187d54cb6a90981440aeacd8f05e3392d0eabc4d94 SHA512 1f7caf432182884cd360874602c1582809ac00ca6b1fe55c6145a7f5079a291c40a0b5a025f62d604429708f87a65e41fe2765be732290fe46a4ae1c870496df
+EBUILD kicad-4.0.7.ebuild 6604 BLAKE2B f45e996a806ed15733022ceefc4a33aec4d670e5fdd9c41db312d8ef25c0d638ecc063cfbb237bb6d5b1b822850143a41b11d8c8b1615b2dde63eea24033e94e SHA512 9d10109976cdaa839c503758e2e329cdcc3bffc34eb9cb1bde6a382cd1f726d7455c04ffbbde1b74d3796be4d4227ee91dbe668540dd6a56c28e44248c392292
 MISC metadata.xml 971 BLAKE2B 7f048f2b1d87a7590f0d2bee633f18913e735253b5c6bf209e95ed250c3b0071032860ada3482d52140acf249958b0266748c3367cf71b3ce7a8e1f0148deb54 SHA512 17e95b02c75fb0b36ef3e9f4ab4cc04e98bfb42481cc45f6860f8767cdc56941a140b2f0a417fde62e4644e386439eccc9d04f652914f01701d6c6e4ee86795f
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index 8576fd05480a..5f15284ffd5d 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
 
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug doc examples github i18n libressl minimal +python"
 LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
 for lang in ${LANGS} ; do
diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index 7b28a7b49366..a47161cacd5d 100644
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -1,5 +1,5 @@
 AUX spice-3.5.5-gcc-4.1.patch 2511 BLAKE2B d9bb215dfcaf595d9f62a4748507342c3b6242f551a8458965e37c13e34432d686f00b91ee27d80451261b8baa9d0bd9616b378b246fc895b0dc1fff0d4975c8 SHA512 9ae98c77d8a95b2ccac03e48d778b431a449f8383938ca2d71dc1d77254a0dade6c159f1723aa9a00ac921379ec210584c32ae7e63a849bd07691d34bd92d5c7
 DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8
 EBUILD spice-3.5.5-r1.ebuild 1819 BLAKE2B a9d26a737e2d36c55886d9a299ec0fe0feba30262d7b867992a65b7999644d423f0f16ce60c599db8eb410059fb55692a86db35eb7631d292d1f759eb55c610a SHA512 fd7b016b0cab4e2f57dcf33c60901d5894a52df3ba763dece6bc63cec2da2cdb820e535d893e1829f37d5b4ea7d8ea536ea616b8a923547e700d5b2db2496e27
-EBUILD spice-3.5.5-r2.ebuild 1946 BLAKE2B b32bc2302629cf89b4410c7dc1b97c86bf8eccf2ef80c19016bec12087b3b8d27a8119cbc1b1af071a1b9ade1403c1dacc393fab630238925252e49a85deb831 SHA512 078b6a2c4ae2b57794bbfbc9685f80e542ae75a3398bbb5e54f64fc8cb191fc32f5ac74bbf7a8ee90f92de6a6230360bd84dd39672f54101ca3d3a26d85d11b6
+EBUILD spice-3.5.5-r2.ebuild 1945 BLAKE2B f5f8323df81ea822f8a200353762511514a6de8dcb5e99f4c7013d7830ee7306b80b6519ff3f112447174e80e1fcf9107db05122e6eb495619822b1d242c9356 SHA512 891e93b1e9416f468291d6d311f1af7c78d3c85821d8f974851cb62ad41b4ced194122c47e8697d92db12af7a463692e55d65904d00ffc37c52b3e369f1a092b
 MISC metadata.xml 795 BLAKE2B a0fb4029e9966c86b738f79130a94d73c4c9ea355974010c6ffda8343bc28946fc1ef515fec8367bf5c21af8517cade07ed01496e0d82a597e782769b173c20c SHA512 22b6f5f1ed00b4c4b6106da4c838345cadc8cfa1b3cea891f1f645414970f016ddeab0ef180eb91dac38d2f623d1d33fb2175efde9c02bdec80a0f4ceb85afd5
diff --git a/sci-electronics/spice/spice-3.5.5-r2.ebuild b/sci-electronics/spice/spice-3.5.5-r2.ebuild
index 36f942311ab3..0f73d8396331 100644
--- a/sci-electronics/spice/spice-3.5.5-r2.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="sys-libs/ncurses:0
 	x11-libs/libXaw
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 42a53bd591b0..2199ac5998d7 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 6147fbf33d92..12aabc4b9cac 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,4 +1,4 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 715 BLAKE2B 6d91697bc3f8da96033d70453add77e2151b9e02bbb1bd3cc0dcbc8a58a95e2f76d7ef6582e8cfed44ba21c77dca828557b912704189aa6b0ccfbc0241ddf4c4 SHA512 ae9261e36be74797b89c1507c04216a8b52ee2102a2d725efc2d509df72149561582339b50e49ac57edd645b60624885f5e5de4e2a3c9d22084a1eaa8beeb178
+EBUILD szip-2.1-r2.ebuild 714 BLAKE2B dcdd543f2c706c5f7976608c91570cac16838c448e28b878ee0c7b9019b7e2818924aeb0f6d2f234427dbdc257dc542f88f691b0d65620691e187f51a0ac8d0d SHA512 e4018879eb35a30d0465e5823d889037ab00b97ce93179b882fb228285aff96680cbaef836f20f1a73e9f77042024ab2f2bb035fbd099bed697bdfcc731fdd1f
 EBUILD szip-2.1.ebuild 649 BLAKE2B 93a9fd8bf30d89079ac58ae79658b9b84896bbdcadae530e84da7c62845a887f4f581034a3d333f2e727a3f5dbb9a52307222d6374998254328c07a63badc887 SHA512 fbcaffb62c0827464c812a577e9b828f54f7cab5de9bce1d189a4deb5eab0980142b3d48b20ff263cd40a0c07dc0baaa89d608fa331e2bc71a89532618140890
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index b74b30d44760..fca656b73b0f 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 LICENSE="szip"
 
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="static-libs"
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 657b3b2b7c54..c4b1b57ed97d 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 09ab138dbf7b..fd273698d77e 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,3 +1,3 @@
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
-EBUILD dstat-0.7.3.ebuild 790 BLAKE2B e434dd0519a907a81bc2256b057f2cca6962e3370446d27e47e5305f1f6554b4c3be2afb42a83a13b59abd86e2aa13b23f6f83a9089d4d385ba5e8ac879f1314 SHA512 4de62ceac8519fff91e991d1fffaa8068697358296facac6ab6bf44ea3ebe338fe10d2e7f51bd9b7c22aaf350ae231191de05705e1877ffafbedbf7e16357216
+EBUILD dstat-0.7.3.ebuild 797 BLAKE2B 9846a833e6b416f09446c324141ec27cbfc7111cac5a2e45cb7b5bf15f99ea758b726a0b23d0622800f935735fefff49bc64daef79d567bea952625d4129c828 SHA512 cba3abfed39aac4d2d7fc02feef57f95f768d3c3d23ed0ee3a183a2ba9ca7299e67a3faa588ff429c53849c52610510e9a9c2ccaeb43482960e8b64c8219bdb7
 MISC metadata.xml 832 BLAKE2B 9e08d3bf228c3e0e47534e6518282d5d0bc153921d92de95bb153515544e4adbe4f58d8cbddffa04b3b7175e58d653665fe3799f93c12397f3de3f00b8c31ace SHA512 ef01b0db1825319610196c1e51ba115bd0160b5aaa056ad75a4829e4d068a8e6ffc071ada94e03a81d315d5d9597a502761ee4041848ffc135b980b41486017c
diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild
index 04847b0ef792..cbdd1df1a54c 100644
--- a/sys-apps/dstat/dstat-0.7.3.ebuild
+++ b/sys-apps/dstat/dstat-0.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="wifi doc examples"
 REQUIRED_USE="wifi? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 50aa29d26a2d..d739cc5a0305 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,6 +5,5 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a
 DIST haveged-1.9.1.tar.gz 474845 BLAKE2B bec7ecaac93f7b6ab746dcb228172272bf7575e33d6ea1e2d1cc8a8fa63187db5e41565a5b49d922c6f4c222d71452e41d0b2dd00984eda179a8026fb76432ce SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 EBUILD haveged-1.9.1.ebuild 1002 BLAKE2B c63e879cf82aa18711e357aa62f49ad3f76fdd3b219dd1ef5241585deabf93106428731461d721aab95046ef82e83e67ccfe7e9e919177d927787e47eec25bc2 SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59
-EBUILD haveged-1.9.2-r1.ebuild 935 BLAKE2B d0000ecaaacd075e283ca7b3538e4ed920f086c3bde972a1f71c4b6ec887fa0a65bfbc9ba114406516ea7127ee6e0be1266b437ec33fd39f068d62d7231732d5 SHA512 4d60b0088e96deea441d456db05e3c6ba7c9c9eaaeeb36efd876db2dafd32e3e32a2d189addc01df1881ca1452469dd96c4638f39d60b4b00a896d9ef855c012
-EBUILD haveged-1.9.2.ebuild 1012 BLAKE2B cf4d569e58f9b403f11748341b3636da48bc96183512aa1c8f83fd46ea08b3bbb544e056c66c13f44a48b7773c62ad4481fee5935a81a6bdd7b21e2eacd3aa0e SHA512 74b54eb13e757a359815e75047f0ec09f8560f62ba9d5a97e971ce7623c1e5c37b414d0c91537d63355dbeaa1c07a50f6d86b19a1c56c29f26f28d3015886d5f
+EBUILD haveged-1.9.2-r1.ebuild 963 BLAKE2B 604d7ea1e971826d9b687034bca9160b63103733c2a7e35934c17041ede768c1f3423d557a6cd23fe238dbcd24d441e979dcb8216a7e73a51f89a1fd114484c5 SHA512 45a59d55ff03d6db542a833953da3dcbd36beac880a341eeb7c8a0fa1480ccff24193b41758ca79ee082b7b984d404ac1536a83a3952635a9f3219cec7940c8b
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
index 8b3a59788d33..5d34a81b053d 100644
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="selinux"
+IUSE="selinux static-libs"
 
 DEPEND=""
 RDEPEND="!<sys-apps/openrc-0.11.8
@@ -22,9 +22,9 @@ RDEPEND="!<sys-apps/openrc-0.11.8
 # we should add $(use_enable threads)
 src_configure() {
 	econf \
+		$(use_enable static-libs static) \
 		--bindir=/usr/sbin \
 		--enable-nistest \
-		--disable-static \
 		--disable-threads
 }
 
diff --git a/sys-apps/haveged/haveged-1.9.2.ebuild b/sys-apps/haveged/haveged-1.9.2.ebuild
deleted file mode 100644
index 9ea83a7c5cc8..000000000000
--- a/sys-apps/haveged/haveged-1.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8
-		 selinux? ( sec-policy/selinux-entropyd )"
-
-# threads are broken right now, but eventually
-# we should add $(use_enable threads)
-src_configure() {
-	local myeconfargs=(
-		--bindir=/usr/sbin
-		--enable-nistest
-		--disable-static
-		--disable-threads
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 9642ca7ef7dc..ca4f10adf775 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,6 +1,6 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r1.ebuild 1559 BLAKE2B 9d64eedc69dc7784fedfd851759938e8aa4e223b8678c06c7a4c4024455e8086e705d086ec381c095e45cacb72a7c6d6b15318c2a2f34d7304b67ad3850a4093 SHA512 1ccec3caa8303f8b393dc9bfc53a5eeec301ef0bd5e54b695ec2c72d7f73e6d78aa8a64145b74b7e3966f5df27de2b3d86be10fa86e16e56942170a56d767312
+EBUILD pcmciautils-018_p8-r1.ebuild 1558 BLAKE2B ef53dc63ed2e98eee2e8fe1458b8ebe690aa99e24ba576121667915250f8b8f269c15a95fe012a58ba2f51470ae95381e58984420777c66c9e4c9cfeff7f67ee SHA512 2e5ea5002f51bd2367d7d88f0dfdc46e47863738e4a38cbde7968dfd2a08fed8482f2ad036b33f099605bc43d124368ffcfb61bcc853db86dfe987a5f4df2a0e
 EBUILD pcmciautils-018_p8.ebuild 1513 BLAKE2B 04f16b0dc86e74a539aec390a58b5461b72c7993490e102bbeb958b1934668e8f6833150b7cfa86e3728e6722ba17785a2296f5b4318b21f21dde898f94a0318 SHA512 71f6ce9e540765a471c79ae5dd7b0aacf942c5f60bde01c7b99e5697360dd347045282a2daa30b26ef8851caa7be66c255e5594b2709c78d0a45f5c7c13c0fca
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index a0cc1e8133a3..6513c3dfa77e 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sh ~x86"
 IUSE="debug staticsocket"
 
 RDEPEND="virtual/modutils"
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 635c188a1e2a..c99d5948cc0a 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -7,5 +7,5 @@ AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2ad
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
 EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
-EBUILD setserial-2.17-r5.ebuild 955 BLAKE2B 09839be723185ea27c8af68106527c70edc6592322c431cadb79e16c26e89880ec38943617edfe73f5bdcefd3ac5bfb89a5e853190cf0a8d87d469801e36cb2a SHA512 256c20ec427448db687250f4fb31e726382a4a1b69fb9f7bb8c4e2ba8d040f17f59af7e5eaf0ff933e77b9f1327c9c7e80c6d66aa1bb3f64e7708e5a0ed4a31c
+EBUILD setserial-2.17-r5.ebuild 954 BLAKE2B 187b4f24c48a856af7535b7d67ed0e54f61f10309f69ce685278a5a8733081cbb7f38221dad32dd17307558bca73a139879f56ece5456b9931c0b904b09658c4 SHA512 7feb0dd983eae8d92508095b019ed470982f8a65322167fa15236a9499333f757bd75bbed62b05784a2396099f0ccb93bcfe0075c6a198477bd7243589823b68
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 4ddb4053313b..35c607123491 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index 90eb326fc803..b03addea0006 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -3,5 +3,5 @@ AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a4898210335
 DIST timer_entropyd-0.2.tgz 8323 BLAKE2B 82c33f9a0ba1a27c86550f13b2729dcfcdf2cedd12c4562866cca9e7d9b1bc8cfbb24c6776ff5ed6a9deb6d592ad6cb310ae3f1cc1f25a146f85a62d0a918e55 SHA512 789f19c2652781593b9ce91c584eab4ef9210bb47f1afb6186311416a67c84235ed1a163ffdc017b6d50ff706bf7ff6a84013b4b31fe6c09eabe95a484805898
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
 EBUILD timer_entropyd-0.2.ebuild 975 BLAKE2B 69bda567f330d4bf46aa4ce123920d08b79dd5069ec03f8c6977c8a3548eb396e0b9758076cc2bb1b0a456ffb1f7711d9be307a5084b840f75c62700994b1925 SHA512 b529143760436b945583a8eddd0f4b0b26f772670b5e44f37262c2f13408c4c3997a59adb09f6db083c4a59001e0d1ca21e47a6cbdf5cf261ac821d9f3e7ba28
-EBUILD timer_entropyd-0.3.ebuild 977 BLAKE2B f4a16aa2423cee7615ed3851631be8b10e66bf194bbb12126b9c5da0642d01368593646ccbc9a4801254c82963164e5195d3ed088d7a87797b70483856dac165 SHA512 6a5c0b79e7382c9d9c0a845ea4eb491285a826eb3e64ca5b037bff586898fb22dbc9706fbb198c08a9857a99ee14440dc8370505e6be3de7479f68587466da94
+EBUILD timer_entropyd-0.3.ebuild 976 BLAKE2B 78f86cfefc8a4b4e782abd03c8c7790bcb83a24189435e0df56cd046df2a1248f8eb932f617cef7c611cd045663c010541ad770818b695d45403a9a12f62d8ac SHA512 b616f766bfacbfc11521bf8a76c560a1b26adc3aed770435ad15344afb24bf82390b0d1c509d3e6d0c1060617acf0b2b7cb64734bd734a0de3bc057ec5b55f63
 MISC metadata.xml 274 BLAKE2B d51bf5510ddf8970e76b90692ad94c469cb31da3aa6b9c76b3de4a6d3643290443ad601307f63b809b7d386c7293ada0be699570b4035f80f74bfbcce58f45b4 SHA512 22599f724e804e72e8db6fcab11ee7495bb5cd3c3a6e25a6424c33bc0ba343859cb88664ecfccb9805c3f35128342aba446f1145edfee5b0a39a92f20a48ad81
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index d1a0febbc6a9..0c55fac4e636 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips ~x86"
 IUSE="debug selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c1574b456136..ef09501c186e 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 96f278683fce..ef46e6b275ea 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,5 +1,5 @@
 DIST inotify-tools-3.14.tar.gz 358772 BLAKE2B 99a0b82942d227e3c237edd6ca07bea68a7bbc07fd97bc5d44cb3c07e5e3bfee9513255fe675667872b027f93edd1137c30b61da7c0ef3986994aa812ca74d15 SHA512 6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 EBUILD inotify-tools-3.14.ebuild 793 BLAKE2B aa7e944757801932fdacee27abd3026f6eef864048183dc6b6727a33de40c14b1bdf39464f77f41cde7bc0189d08b589f535f0616f6be6ef7eaa67ddafdec62e SHA512 316279c93f1277e74547a4e728847353e11068bcc0fd2fc26b988d9b9c2c0029ac1c7d5e14a0c64eb526312c7e70c1364c2763835402863838987533a39b7044
-EBUILD inotify-tools-3.20.1.ebuild 822 BLAKE2B 335c2dcb495a674a78e1ba6b6085efb597209febc59786c54148972d3e6f7b64946ae5e7bc5255a88e887bc8f2f4b24f6be0f48228bcc8d316bb4f8a1699608a SHA512 347233060efc80213ef7ccb16716505ef267ae4dffd3ee75dee43c32ea854d4da5b01a534ed6a1980713b49f65866a765e251ac6de87c1124a6a07cd48db7cc7
+EBUILD inotify-tools-3.20.1.ebuild 829 BLAKE2B 913274935f081ad2393c078720058991e42c6db77bbb4e16754b47c8ef454cbfaaa518180e84a1fd289f9d19ff2dc7ec82dbbaa3aa37b3ca72d1a6e62ff47544 SHA512 fe357e872331a2906c5cc2b4afb3758affd4428e918a72733372bba6c2a1c4a66f6002aeec1e8ab971f497b7cdbff9e2623165c27ca8e47c605c68b8360be271
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index 9f5d0f02a1c8..e2c706306876 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c42b64bd7ad3..7aadcab8e615 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 72f8e29a1061..1180d31ac849 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -22,6 +22,9 @@ DIST genpatches-4.14-35.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d5
 DIST genpatches-4.14-36.base.tar.xz 937452 BLAKE2B 6d1a76eb2d49f08980a1ed98e2ee51b4190525febda533f35c809b4c4fdc5006cd76dad93120caa1d677c6b3e65b24ae9f0639b249ae05762e0caa2855c81959 SHA512 8cf07fb978b91edde19edf8f09827a820681ecc9719e8f80803ee9d29a308e5c4f222acbcb401cb05a9e659a4e408e6e5b23f3a0f1c415f87f3374de4ad87ac7
 DIST genpatches-4.14-36.experimental.tar.xz 5184 BLAKE2B b4d97f8f7d4dc4fdeb22e316ee5474f86376571eeee384385e0130d56f6228896d5de5cb74f3abd4e437b0fb2ad5f8e092c431ca3efe076af06e1d1008b70fc3 SHA512 5666450cc357545df8260e7100cfbfdc6389f7c766a93214ed5f8fb0ff7524c90fcdb232e136d3cf451be581e021b8ecc086d37782780b44772eb95e3a0f0432
 DIST genpatches-4.14-36.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d56ce3e548493b1d65e2cffe963d62abe3bab83134eb6a0feef45b94b324c577a7c5aa318bebeb2e97bf2943c8a1319e40ed3a SHA512 df8d909c8897116f42877fce9b7e62f5eb651a0ab51861ad4e3acd68adebb40657755cb7c7757b001beec7f959cf1ef8691609b11deba0aa214baacc7b4f66ae
+DIST genpatches-4.14-37.base.tar.xz 946124 BLAKE2B 92d0dbc05b70d4b1fdf0418b02626bb8ed756dff8945a173c9471e3390c06c0a1130306589ceb847895d801a146f38a6d45a6adac08f04c4e8d5f083829e93a6 SHA512 d8cc75aea82c4901fee990cb1d174b32b1b424b9a3dfafeb9ab06cd5f2acf0a74b4d5ac69751cf701874f0418f4b1a7de8a4f1595189746953e35aa2df9d2fb9
+DIST genpatches-4.14-37.experimental.tar.xz 5184 BLAKE2B ac2a110cce98d65bcfb074b3f89ef697d0bea06da5541d9c469f8d3ccb23c1923747da170fd1b4ca3658f0182bddef1e1a7c69b664522d043f38a0bbce348146 SHA512 802ca0594a46f0f5719a847eb89cd843e8ffccb076fef730d4c95afb7bb8795317f1a0da907ef82f575659b9742d920aa3e24a0953006e3a12770e53fcb34140
+DIST genpatches-4.14-37.extras.tar.xz 17508 BLAKE2B 8b594c88abd0c67b5904a121ecf047ce5682467b5d9ef1af52f896ca0d772243839193409670fbf2bbae4addf78bc2a7b6918306be23ad10a7396f91dceccd4b SHA512 bf246961a70b2209403a8b2e4ae931c970ac5725e173cf146de5a9f0fda5927d808cdaebdab0ded058719a517cbffb6f8d2963a2f88c5bb2abde410f0a01c71f
 DIST genpatches-4.15-1.base.tar.xz 5908 BLAKE2B 6627ff7c5bd6b799dae5e61b1638ccc538715cc253521fd07faa0c5ea7dc9aed5204c040742d37a9d172509577ae5442526d11cbe8714540ee8e1f1637d0fbbc SHA512 c7b8cb613f4a2e6570808d179be6972511ea45c849c4415509e38e1d4688014cab15486628bb282178f306ff786e83718fb2171d1391057bb817ed67a0508caf
 DIST genpatches-4.15-1.experimental.tar.xz 5184 BLAKE2B 814356256c11ea5bb67706f47ed76d6fe6f8b4232b989ca042509ed2a7f3088f55bd113d3cac25342a66e4803f90864cca803c91661af106141b78ac9cf5fe18 SHA512 e840928a463a764d59013424045f64c1fdc8e5d18cf1d20c9ea15388d5f4c4b9ec6aa86e88c33add716366d6b18be175943c22b6bb1c88d3cdbaebb606a38b10
 DIST genpatches-4.15-1.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b2e9dd1c51ae76dc8aaf71f14dfbf3b9c52097cfc4ad59c5e2add1da4ded0a34a06e2d302a0366a8afb665f1536f899fa3f9d SHA512 21830b23a1b16291beba81ac122a36e8bcf9268b548aa6e9258f18283e80f610ed249ccf320f27b0a45acd35e3bd8ba5ceb0420e360ae94635121f89d74903b6
@@ -46,6 +49,9 @@ DIST genpatches-4.15-16.extras.tar.xz 17492 BLAKE2B 585593b652ce04707ded634190d5
 DIST genpatches-4.15-17.base.tar.xz 386736 BLAKE2B e8aefe3adb6e8c592f73dcf89adb99a0bfd019007f85097d4e92f08685c2d2b423b0940a794ecf15b5c167331b72e5ab6684532ce239874fd00e68d33d4a531e SHA512 1d1915f8eca7c74298d0d5d77a608f0c5ca69eb6d8ea09f9a6ad90155b3d9c4b76bf5a47a9c9b4b3b869adb812fb5d6f97191f0d1efd65455f8ef8f5ac9c11d7
 DIST genpatches-4.15-17.experimental.tar.xz 5184 BLAKE2B 6b20cf92325c64327d650e485ab28bad8c3503a014d90ebe76b91044db64f08bd40e92296e72ea7f6377a63a64844d660eed2e289042448689055cc5c34cbe48 SHA512 c6936623609b32b114af11c0cf8bc50280aff42377493783a0f97189b0257e6ed5c5dd71bbbaac298b8da8a97eb7de0fe06891341343471a245f0bf2cc8cdc3b
 DIST genpatches-4.15-17.extras.tar.xz 17496 BLAKE2B 2f13f77a9dcd5fa1a1816d71677064fe530a38fc4717f0227fe1cc990ff3e9ab21716d7343b9d61ed842e99921cc286b4649bab5955ac337d4c67acd582d9203 SHA512 0c88b8dd4c3c22a54ea3e3a18a1e9586309e7b3d070234ebc293d13a63ce97b557cfe89d35c04aea7b7e2ec74040064a27818e5cf8253d8dcf453f818934c044
+DIST genpatches-4.15-18.base.tar.xz 398516 BLAKE2B 749dec282d5c797d9b4ccd407f4a2a1c22443f5fc001b92d37aed4bea0cdf54675ecb3f10c6c4cd6d6d07aabcfabc1a39168bad171854466971226a4a52e2340 SHA512 72e06f953342c492b99674a87fe7c5af1dd12e2341b405abc02343e122273c082258b156e40b629aced22d29e9549da702fbb641cdbee708b3675b995b81ebca
+DIST genpatches-4.15-18.experimental.tar.xz 5188 BLAKE2B 6a0dd796f4d6c3d4c33c0a3ba8978cf868df757739955930e2370a666de29caba76e9a5915944a8fcc05f05b4a385ad76720aa9bf2bb3dbe871cf31d92b1fa52 SHA512 e728868a0aefddb91cb81ab41ef1f5e601acf8f7e9a7abb55cabec8b363b44cac4b3a09cae33b2a82de3263da57670be05f9b567b45ad33049f16832461ca69b
+DIST genpatches-4.15-18.extras.tar.xz 17480 BLAKE2B 67f3486eb2540c351421b24d7ea2d257f7c0b8e4c63d1377561c1491fbffc3bdd4cfa131362758fa1666642e0897315bd30bbc5cce86fd51e738062d3297483c SHA512 0d78634c48183a0eff09f1741e6197f06c73cd892fc01bacaef72bc4273a102225da2a33fb584068ddb0a9e8a62fff826a945e7a12f68f186ee17c9ee29cf36f
 DIST genpatches-4.15-2.base.tar.xz 22348 BLAKE2B a4d4e0b6a83e46a657ced903845dc7adcdb749e6657006c58d7070a0cb906066a1241ba7c33c9431aab4af12debc0e875822c5d327dc29853420cc5699cfae2e SHA512 2d6d8a2cda9ee4c41068c03f1e90e5bec2c25debb2bfbda7d6acc83b49b4ecfe861fd0be68c133dac4c98f23d8c23fca816f817653cb283405148985f20c4e9e
 DIST genpatches-4.15-2.experimental.tar.xz 5184 BLAKE2B 4967ea59aaf9587c5f36e1cb97e0ce454f7d23c0d9e02cacf4bffef14834ca591eb4b64606fdc267d2051cab21ac49cfab16082d1a0affa2e2e555bfda27a72c SHA512 9fbf5806636b2676144dfce4d33c8ff1d97dba9a44703abe5cbc1741c3f54f082416f9628f308a186dfef1c82b42183a9a52970f96be06c1e0a60ae1a1a29257
 DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be363735ee2d016ce03fc22c3c72082eb5c770d5af557c8602ad01e7b98f1eeaa4c0497a6eebf344596365811f402307b3f6d SHA512 053490dac39816e14086781c4aa7a6c66544543a8851fd672b8a8cfcf49a03573e3820284de3a28c0345eec27a1c1687bc445443c5076ae3662686da3ed5e1d5
@@ -130,6 +136,9 @@ DIST genpatches-4.4-126.extras.tar.xz 16460 BLAKE2B e4c01bc55ba62f675b983a3e38e1
 DIST genpatches-4.4-127.base.tar.xz 1936904 BLAKE2B 1a78de18d5484142684c070c47ad18d0a5141065e72daa4970d063e70e5189145b720fcca9b4144a9c3e1daa0be186dfcc1240f8f1b46b82ea2ab8564514e138 SHA512 dc117ddf1263709150c95c0a4aba2e85ee0fac133c094d783de3e109215c5e48c483145d45348d5535ee3c4bdaaae37632cb7ecbba7d8ff5904216079d7f00af
 DIST genpatches-4.4-127.experimental.tar.xz 87800 BLAKE2B cb8bc2cf7ae5658a49aa0f47a3083a7af930b30631f659fdb7621475c3842a43b3749466faa5202d65e3a9157a351c92ab62f44131487a0af95eaea52aa7af8a SHA512 3414de31cf89f186c3acee6b4d788f65b5338b3df21f1d702d7c987cceb6e861b60f95ad629c8a23baefc01581116ceb6a6fc5be167eb8cc4c4a0e344de6f82e
 DIST genpatches-4.4-127.extras.tar.xz 16460 BLAKE2B f793e17ad055a8ada8b8a32f7465c14eca965a737834eafbd6317bfb574ea12f1e8c1f7c01fd612e2267dfebe09618eb5e22af63710149e248cc2fb6a1cc3c00 SHA512 481f96cdd557ef4129790b2f0c0ed4844c54b3004b280a9520de868edc67509644fc03f29f4d8a1123bf094738b0a7f629c16f92ee2e9c918f8a97ca16f7d225
+DIST genpatches-4.4-128.base.tar.xz 1948272 BLAKE2B f4ecf1b4ad1a88e4d04a785da842a68f6054b8e12674e41aa1f727b4e36b83d1d25c9002b9f9776942a3b7ff8d7dbfa6586e628bd22accfe3795b33ac099e6f5 SHA512 f653dc031fef73a51b2e33e1eb34d0aa682583678d5e72056563d460a1d0556128d8226eb835d694476e4b4573aa61ab96898dede546fc048a8c149b9d34ea14
+DIST genpatches-4.4-128.experimental.tar.xz 87780 BLAKE2B 2052b1ad212e2d232842108ff18d850e91d664d287233a2faf6d895ca8db1216f1ca622405e72a700f551ab02b268469e5a188f4bf59d7c9268f077fec00e29d SHA512 ee80fba0512153260908c4c2c12bf380fd8b5ddd42204bf002ce67d3962e41990919d0c427e712e06cb9ae95dab8803df154dcf143de87d4f3d4711d21c05961
+DIST genpatches-4.4-128.extras.tar.xz 16464 BLAKE2B 64106cdfad6d2e4d99005605501a9be8f6f67f642d59338abd9b0ef1e49f6977dcb8e06240c6a58410e11335a6322ca3f59ca1361a99c513a6e48e69a9a009bc SHA512 eb470da7ce0b1023d7d7b6ccfab2f7f2459d0683ce3bb5614f36b69daedbea30c202108e4991cee5ec9b5a2b5b7de468f60f0ab13d478876ef593fec244536e1
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -214,6 +223,9 @@ DIST genpatches-4.9-93.extras.tar.xz 17356 BLAKE2B af835d4ecc744045630c6915658f8
 DIST genpatches-4.9-94.base.tar.xz 1785504 BLAKE2B 8d6caddb3b3119f14c85d45f4270a666a36b1d36deb0e462765cef8941c2ea1aa2c7a9df2101d349e1831a3b16ff53aa8b13049dcb250d3d398884021420df86 SHA512 56e5a40025c9773bff4a051ca35b3f1a1c24dfd57f5164888adf01feb9ab6115aa89fda4c38c8fccebd74826264d5289711689848bbf358390d9080f6fc6feb7
 DIST genpatches-4.9-94.experimental.tar.xz 106392 BLAKE2B b00950bbabf69b13e4a79cc631827b8633b4f446940c5987c39bebf4d534ce3f28e9d3c225503eaa95ff4cce9d2ffcfbda549840c9c09886e5e03c23b76f7a29 SHA512 3f3e9e5a8c165f1e939f5a6312646a7603afc6598fd91bf3973048a474ed72e016a516ab10d3d7f684ce067cb89a262df735b9365d5110a3e0eb69ae360e0d69
 DIST genpatches-4.9-94.extras.tar.xz 17360 BLAKE2B 5b344383357997baa3a0fc315fdcd1376b523977d33cec40188ff5587d863980b7d52f7ca8e64a2cf72595992016f28df1bc00e3dfcb78d28777dbe1fc07e40f SHA512 a19fd32c86acd9e0c26628027454d9fb9c1b962ae2f748786129cfc0d6d7eaca16d081307b3cabfad2663e044940e689fadc2dac15d1aa51d381b57fbfb6b50f
+DIST genpatches-4.9-95.base.tar.xz 1790556 BLAKE2B 0924b9be32773d3bd43c83b6fd4d3d6ab6a0fd7508cb2c6c43ac92287c9f1c5df831c85ca282a2715fa810a94b76a5382a514a35e076d464779ac167556d8ed6 SHA512 13414f98a1b3ea42f96c28c4318f7bfbe86e7ea423931601c4c3358b6d8c765287dc26fc6167d08f6905694afe2928c3b694f33d405995b33a4d8b840f06224a
+DIST genpatches-4.9-95.experimental.tar.xz 106400 BLAKE2B 79dd25cfe14168803df4aeebee12fd9991cc23bd59cc828c2287e5ae2c2d3a4bea755eaa156bf2fc363e2cb2970788279791d424e3af27e45a9b199346f7754c SHA512 7a15a29030be288098f7ef06496d04e52e670084dce7867bc69f9719995c455337528d4dd46f09c1f11b857bb558871f810d17c5f083ce2bea3eef15cc082c39
+DIST genpatches-4.9-95.extras.tar.xz 17360 BLAKE2B 67ce70cd81e6a09636e94cdab628d26cb0df9f5243ef8cb8f52a131260e0a518a26df9d05acbe932ed969ea802285f0b578cadce8cff81ca2678f84e21ec7f3b SHA512 fc95505f3a2a299602a9a1e6c75d660fb03c88b859c5aa0aa38c3d48ce2da9bffbb3429a3eeb55501aefbcbc296e3e1cc66c6837f86d2dcdbaf1a612aa0baab3
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
@@ -227,6 +239,7 @@ EBUILD gentoo-sources-4.14.28.ebuild 742 BLAKE2B be4d2d512eff0f02a94339a2c51fa76
 EBUILD gentoo-sources-4.14.29.ebuild 742 BLAKE2B e187ce51ff0e131340ed4bfec573d40a227404bf04f975dda485d7ae4392a9c76e8bdf1f3194a8470c3238c44b137b361af06ea90fa934d3f538118938317086 SHA512 8555a07e6794cb978941961effc2fd7252cb74e61ed52d40d6bd48105432c54b0d3f5bffeca589c83ca1a12c8a78287d93016c4069412bd081faae2f4aa71b40
 EBUILD gentoo-sources-4.14.30.ebuild 742 BLAKE2B cb21d2e34d1a11144d2b91079bcee61f46c871f94e97f459e27d70515c2da9c6b74e4321730b6add4b4013e3dc8ac8c0172bb18d9231cb3bd8fe8ec076393bb4 SHA512 0e12e46ae2017e656128519ea3d1ee16d8fb56c77763379ccdb4fdeee484b0d80177eab223ce2425a256ebfc8ece92d5f018f9c695f5410c6f8269c71cd99d84
 EBUILD gentoo-sources-4.14.31.ebuild 742 BLAKE2B 50ff95aaefc41efae8efd8d84f5e38b61fb67c12cbf8596e735230d3ae6addc4f1f15269ec6841132ad46dfa7eae8cb2d8b2732354b9f9e978f0b7ae5a653843 SHA512 424e88aa6cef1aa93708b9a1f0d75c47bbadd1ebe02203c208c9544c73abd831fc531546f818ee41ee523d19bd9becdeb172b734e6398bbc9ed69de1994e78f9
+EBUILD gentoo-sources-4.14.32.ebuild 742 BLAKE2B f115190318313baa3e5f9b05075f41702c782d18aa6fc81fa09d87c79fad96a9a081dad747f6b87eb9809b5536a722bc7de27c71d9f1564501662948e2068400 SHA512 45937839e895297747ddbc00fd321a0ee8238b1d73e183404ff1820585ea3d75fc18d6f0433ef6a9d3fb35d58ce85e4d4baa90fc140e5cc0b466b7968edc9f9e
 EBUILD gentoo-sources-4.15.0.ebuild 741 BLAKE2B 6cccd19877bc0d5bc677ea794fd4669268c654d01c156b62f24cc1a7cf89c54db8685b78fc2ba941c9b48602847f3b9c9d5c05a358015e1cabead653c0f4476d SHA512 8daf880f336464e106ea015594b1ee8f476e8391dac6f698327b2c48faacaf0f4c864b6b2bbeb2b723d0cd0ea1e88041e3b23010748baaa313962028453c7164
 EBUILD gentoo-sources-4.15.1.ebuild 741 BLAKE2B bdd6a645dca7b8cb96832f43ba52604d095b4074326e482a08a46bebccfcd88dba40dee9de1d01f55e41d32209b20e99cf632bc8bb4189e97efde854275613c1 SHA512 d3101818abccdb94c1ca8a070301a2261027b655b376d3ee4eebf3ce78e88848efd3c4d770857a9657ceaadba2c34b1f220f5d48accd7f2534d37109b69edc4d
 EBUILD gentoo-sources-4.15.10.ebuild 742 BLAKE2B 818a7736a0eadd81c931bf616cf58ce7011ca1bc2095e765c40faf3d77f5197b695b5bb4ab3b5d0670ef6227180b480e761d64550e4621671231992570b7fc80 SHA512 5bd1d2ead0d2519803c6ba7d09a431d1d0ecb32f92238b60bbbcee3f687ff0aae3f271886ff62281276bb972c29117cc6ea2c1d011735d6025862da0e552f8cc
@@ -234,6 +247,7 @@ EBUILD gentoo-sources-4.15.11.ebuild 742 BLAKE2B 758990368d1b70dc99338f90b7773a5
 EBUILD gentoo-sources-4.15.12.ebuild 742 BLAKE2B c2a813ca6dc44d5c9aa406b764023fcfc0d2937cc6becad1db47b6b845086d6850acb733cb09519d5a1bd10c21d5444d27228d3c8fb88cedcb634bd60b47ddd9 SHA512 29a60c02f676af5dafee0c7f0035e3a829d56b81662c3fc596b214fc528ea0612b2b9e0d3c600a8cf25919c11b95199e6227a6845c6c1bb6679e067c2b00bb9a
 EBUILD gentoo-sources-4.15.13.ebuild 742 BLAKE2B 488ad955893a137a14c5249704ab6df9b14a50924cd57fda114010a65d1fac8481a88115b6a08f9a68b602b683de96f2f126a525e91053285287cd520e698d14 SHA512 d005a5a2ea115f3cc352a1ff721b0be94a58d989480632afbc6646cd6b3e2edd699b3f9856dfdd08963211465bdc2b1501756823c5b7bd50cbeb1db6f7dd8853
 EBUILD gentoo-sources-4.15.14.ebuild 742 BLAKE2B 58861d838c385bdce69f2b373a932d28823020b2208b034ec57d49c88ba74c6a61df046b948d428849daef152e4b39d150ea17eca788000a86f9cb40eea06f2e SHA512 67f2967d872499bfbd7f07685f7230e2c304eee168c5f3ce3684aca478498f7a6d698aae235f11f85944cb8137fc847b367e00c1eb0e781919335ccc4c5f17af
+EBUILD gentoo-sources-4.15.15.ebuild 742 BLAKE2B 79defa786bd57b36c14f7ceb99da40240e55d8da85ad615dfc86d2790fd66d9904b2d9563ed743c70891a72afc0492a1cbc41e7df539e76ab5058cab5e980010 SHA512 1a95e26e2ba26de63b604f0891c4649ea0a929dabc93006592f1388dfe94af90465d0563ee517146dc52b35fcb4dfea0c2e0ade39f8ba6bf0c1eaf1721e79f5d
 EBUILD gentoo-sources-4.15.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
 EBUILD gentoo-sources-4.15.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 EBUILD gentoo-sources-4.15.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
@@ -263,6 +277,7 @@ EBUILD gentoo-sources-4.4.120.ebuild 743 BLAKE2B df2e388bef224bf84820c1c13992120
 EBUILD gentoo-sources-4.4.121.ebuild 743 BLAKE2B f735fd2f7980e5ae343c215682df455b33d565b59d82946e5c8a9c3ef864b7638905f5506640f102b18ccda86e7ff0d78fbf09012d4ab0d476716513a2233612 SHA512 7730d21a53b6d8cf1ec0b889e76a0635cfc70ee640e17b9ff9f8f56988dad2130d13f42eeb53d34b73577869815f9bc55a9f9690f0483c032cf3fa817c2ca7a0
 EBUILD gentoo-sources-4.4.123.ebuild 743 BLAKE2B 28e702c6e7792fe33f823017a985c5fff26593d0c86911fc1dcca4ebc4c8f9f79fd09efaaac095b12b6e558fdf04911f4414e5249344740fad2b14a87abf09ed SHA512 233638c68d65bcdaf7b537565e8f30c234807fb9376ea7af5838d88b1930191da4ae43c361abf8d6759a19c7db8c1332cd511ccdc4332ef36f827912e62d7afb
 EBUILD gentoo-sources-4.4.124.ebuild 743 BLAKE2B 48bc0794014acce93d1479bfb1b551b6347090c8f813bfd4df49a4df9d6cd90090841ee9259112b352912331e8ff47ff64d4850acab4672482618c5702ef5a58 SHA512 784536a62dece4628d2f85880b955b4e480900dd3494ca5e31476e6ef9824f1bb0026dbd5fa37e208d76535adbde538e4b619d263c984878b878ef35699a4f35
+EBUILD gentoo-sources-4.4.126.ebuild 743 BLAKE2B 750c4de3f5f6492f94cc4a255d5a4f969e668f48d9ecee46c005b0960417961c780531250fbc04f1756a398cc7ec303fbaee3907c05ae4276130d9e7ab24d06e SHA512 126394fec9cb289e66503f184b7e5ed9227bc01a07d2089a3be02e79fcaea2b5f9b59e91dee0a7572c700e914ed96db7a00147c6584674a4476f139f09dd611a
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -291,4 +306,5 @@ EBUILD gentoo-sources-4.9.88.ebuild 742 BLAKE2B e49271026e11a649c0f5f00ca629257f
 EBUILD gentoo-sources-4.9.89.ebuild 742 BLAKE2B 8335da57b3da5e8614296311c48b257795aa5692740bc9e461d3a3b8f87706dda8027a3e72e0549e7f6077f962a641ccb6cf440f8ed15ce26170baec73c97bad SHA512 ba61b2fa996dbcc46cd2a280fb8087baa79be14f2e1145a37ce1c5ea616c037d13da31d5b2b000ea84ccefd018112a1920fb9afef662a2e562024b02855a1c3b
 EBUILD gentoo-sources-4.9.90.ebuild 742 BLAKE2B ea4ba2dd2baaf0d84fb2115237e4c256c677d46d6d73e7a3f60b2cc9a35e5cbe5ab2026dcebc112dbb91c8b5dde4a8b60f648a867624a3aa0280e57b268859bf SHA512 a0923d6eea985f05fbffe9296bb9f71b83fdee94bada8c533107f81e67d5636b49158659710afaf3bd76e5ab0d052c52943a6a606fb86b11b1278637fae7ebe3
 EBUILD gentoo-sources-4.9.91.ebuild 742 BLAKE2B 2999615d05b887a35e773e53c8ebd871c4ba3c66671af4386d3ae08941db561e4eeaa7621d20528282cd633f1b6ea98800de6eae3cc47253561a8d47b02e9ee0 SHA512 d7432545f87f969d05eea857ba8e21a717b4770dfddb0781be254d043620d2ee7824f776666f37864685e7fe71bb33002b09b265035a45c8fa759b5f4bda75ea
+EBUILD gentoo-sources-4.9.92.ebuild 742 BLAKE2B cf53301162d767cf9b61419330f59ecdf921fa6bd088a02dce0f08564ea88f043f38df9c202169bccde2de504f2b29eff20c072f5fab1d74cdd574bac7190f6e SHA512 c76544e61d9198b5cc3162338c9dfe67086734f5dbcc0a88a0047e8e83d0b635781932df7136dfddc2796e8871770356e2d0104cbe51dd9ed0275af1a82a1dd6
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.32.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.32.ebuild
new file mode 100644
index 000000000000..d908948f673c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.32.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="37"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.15.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.15.ebuild
new file mode 100644
index 000000000000..d2bc342bb14c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.15.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.126.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.126.ebuild
new file mode 100644
index 000000000000..e5e11f17c602
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.126.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="128"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.92.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.92.ebuild
new file mode 100644
index 000000000000..c621a41c773a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.92.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="95"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 92ff06b7ad2e..9b5a7e4a7303 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index c6469ca2a680..9d49ef8636b2 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -2,5 +2,5 @@ AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a
 DIST libstatgrab-0.17.tar.gz 463224 BLAKE2B fff9f0833a0320de469c81d1dd10a62f0a81413a243c38d449ea8129a4635f55056d431f2b585b5f77082829438c8945d961c4a6ca1db13e0b4c9689bfd47905 SHA512 feb8d8aa345d57a9036700d580a7d1e21aed9bb2063b46b2c57a59fce00eb20a22590e5e391c8a9a1f43055c14a6ce3fcf648b98f1fec3b4efd270455a2933e3
 DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6
 EBUILD libstatgrab-0.17.ebuild 776 BLAKE2B aecb835256c01a586d410dbbe8f117d390e698df823d7476c0415c9c2fc7373e675ec0e96be7191a91c08b112230cf29988d81c28bc79d1729c899d2a4bae6f4 SHA512 e13d4dc6f30aa1c354b9239b99d1d813b400930dfb7ec61ef51c3ef4697b46a3c1470460d1acceeb1dd97db62969396bf977facd1c1e3bbbab97f3b6f842834c
-EBUILD libstatgrab-0.91.ebuild 1029 BLAKE2B a1714343dd88da7c2ea48b55d0483bfe36bf591ab54eff5ddc04d472309d83b621a6cfb4d9b3ce6db09933cfa119660e25a45419e6a733a84a906002f70d4ec3 SHA512 675735af91c7e2a96adf5fb181aaeca63ecb94b0f978ac03b2bb0fad9ae9edad9277c207a801feb0ff2bd6db2252a990e55fe89136f8dc93807371d36148d50f
+EBUILD libstatgrab-0.91.ebuild 1028 BLAKE2B da41c451c0acdab5edd0864f50c03aa5dd785ef1645aa0e3d3b845393795279e43fd9eb64feacc0386d89dea3cf5bd05ebf0beae6b700eac935fb6557dbd2966 SHA512 e818d915ba1ece7a4b5c2103367e9b3d5c1abe45f6872966d061e1c82f95a2aa5533ccdfd8fbdda89832e54a36137f94e0522280b60fb33484a3d1976df4336a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild
index 66d6b6f489ea..cecf282cfc26 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.91.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libsta
 
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT=0
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
 IUSE="doc examples static-libs"
 
 RDEPEND="sys-libs/ncurses"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index f0355d670d6a..e303fb5c5a55 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 42a2bb2f261a..825426fd6a84 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -7,5 +7,5 @@ AUX acpid-2.0.26-init.d 436 BLAKE2B de812b8d63f8427fc32b5d177f39d80cfdc8b92918cf
 AUX systemd/acpid.service 155 BLAKE2B 763b5f0ad5d03e91098ec9e71a17c5d0a52c90f1935381722513ef9ff5e53c4d1c98a989632a73707af006bf6a4fbd54f8e251b188eb84bfa8bf34c9cb8d5df8 SHA512 51c1e2a10968bd6555debf237c064dec7a347a5adfe0e8612e9ad49168e727d0779744ae8c2842b2e943dd46ab310343aeebb9eb6c9e85cb77123d966e8561b1
 AUX systemd/acpid.socket 119 BLAKE2B a0f22e8579c48d7258c81f7fb97a9566f1dd4722da9d2f68c1b960ee88ca432ab17890b556df913a44aaba9b91c309de073afa1710eea71528a3c85988533ad9 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a
 DIST acpid-2.0.28.tar.xz 156036 BLAKE2B a6a78f82f7f4ecbd0d883d175c921195970e157a919fefc9cf48a94db534b496a8570c031fda5b08df3fb1775e26a50b5942bac7717aa582d590605930e3af78 SHA512 effe9c3b30b4a6ea20eca4b36a06d4b3da9b262d100685958faec4b38f89377a87dcaecee7a69b87aaddfa47688bcc46fc47a38391ac4bd2019cb3b48ab18fcb
-EBUILD acpid-2.0.28.ebuild 1848 BLAKE2B 3690edafa00601a5a56856917b584709083cbd1162e8834d1bf666ab95f8d7ffaf4ca621e7b0d53319a2b9a2d17a8f397b024d24effc31005ea441c0ad9b097a SHA512 bf95f7a34b85e83b22c934bfcbb353a17041f0f93c11dd2eabe21c59dadf01ce02a7fdca9cf3ceb43e6ea6e6e057874b4a0c09cfb998c026785f2c80b9082da2
+EBUILD acpid-2.0.28.ebuild 1855 BLAKE2B 62f1e4e4ec4166157ed4d6ff1bbfe7b5780d563f04cc13677994e49c050bab02bf29d5d314e7a193a2b5b9678956d5bc62fe87895c40be6dc80e13326ec11a07 SHA512 20d97d0e1bf2000efd03975a564f8c9c2f5d37312188311efcacc66d6918a85159f223054ccbd79f633666d423b603a8387dd40e23c36178561d534517d14de4
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.28.ebuild b/sys-power/acpid/acpid-2.0.28.ebuild
index 766c975e51a1..d55a1952ea66 100644
--- a/sys-power/acpid/acpid-2.0.28.ebuild
+++ b/sys-power/acpid/acpid-2.0.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="amd64 ~arm64 ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 7bef67a4632b..ce0dbc69b2f5 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,7 +1,7 @@
 AUX bbswitch-0.8-kernel-4.12.patch 528 BLAKE2B 4c4b5dbf29338b9a8bbd4cfc974466bee4f5e73c9c39f1093dc48ab2db721743e425c12fdc80e4cfa12c296897ec367f6b255679cf5c4305bf7a844619da38d7 SHA512 52b8f8cc378d915f0671fff193041c13d756db4d4b8db01594d9411a1422e1d8ff0e364d041f472b15b7c581a2fec583ecd86bcb5477b3703c9d993504a6ab61
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
 DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
-EBUILD bbswitch-0.8-r1.ebuild 1067 BLAKE2B 07a93fdec1bcd4755674bc6f86c194e6b46ec99f877851467b835e4be2f1c008e715e909157cd11d2af9e5c7dfc07a85d1139b68e801c1beec89f2bc60296e0e SHA512 4130a6c02e65506877a61590c42bb7afa86a9dcc485b53d7b64a265f8c153d3ab71c8bff03c9bdca758dbb91bff5966c648aa4afa653f24c6346592e445f98bc
+EBUILD bbswitch-0.8-r1.ebuild 1065 BLAKE2B a2ef9212dff29eafc989f1dc658deb1a5d886d89240b522ce9703970a8646cb453b9c5edc0d6e4a1d9268db327000833df8cdd6a8634cff7b5cc3e9587ab27fe SHA512 2da9fca8f2ce0bf553d3af86c17d3108aec4c957c5677c099212c389dfc7dd5708af4642c35a51e72fbdb83d08fea4679097fdd6768b335588b9b9cd4b13e9cc
 EBUILD bbswitch-0.8.ebuild 870 BLAKE2B 82cf687d98caa7a66d43faf95695b2bc41d29040ab3572c9d9c129387b309345d96a90c3c744d2d427ff5c5d1798be36a97526f9b2ca8bed4a54a11d195fbc3f SHA512 8fc0d492a417cec27ec87d6e0235758e9017f44b1549b8464b187f30173505a391eefb270b74183784613bbc38930e4df2aa99d67445b80938dc3616c0252418
 EBUILD bbswitch-9999.ebuild 1067 BLAKE2B 07a93fdec1bcd4755674bc6f86c194e6b46ec99f877851467b835e4be2f1c008e715e909157cd11d2af9e5c7dfc07a85d1139b68e801c1beec89f2bc60296e0e SHA512 4130a6c02e65506877a61590c42bb7afa86a9dcc485b53d7b64a265f8c153d3ab71c8bff03c9bdca758dbb91bff5966c648aa4afa653f24c6346592e445f98bc
 MISC metadata.xml 866 BLAKE2B a35e8f3ebad2c7a3a4ef43095a8dc381d3e46205ecaad70f5ffbbb46d48206d14b64a25f9b546d2d93af5c6bd938da6a29536b8541b41d40c20acb951212258d SHA512 0a39acf63faef61a12277e39d96fc866ff30822336ab098a0ab6affdcbc63054ff9c78bcbcddae952e205927ac6f00c04dce803bc825ae1c2853bfaded81124d
diff --git a/sys-power/bbswitch/bbswitch-0.8-r1.ebuild b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
index bb29cb2fd85b..d2d37a055f8a 100644
--- a/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
 	SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 96326544f0e8..4383e807f0a3 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 14bf1a885f43..04d2c6708cea 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,9 +1,11 @@
 DIST Nikola-7.8.11.tar.gz 4104413 BLAKE2B 22da280a7f7416ad88680a573aa103dc38a8e7ed5476f0ce35c7d179131aaf6bc41edfd1f591967bcc6e747a279b5e0b9e2e0c6e959d45e93328dcb14d95658e SHA512 9273f56a6cbb08db9a4b5c562cd4e80e8bbb777c299406bc3d816a63d8b21d1b2a3e4aa3fa376858459a650ded54b0526ac54b4f186757cd2dec7ccf656e145e
 DIST Nikola-7.8.12.tar.gz 4106202 BLAKE2B 95ef2d074145b40be90f8daf7de92dc4091e24b0db8e5f949daeff6e6bd03d2437198a4a1e33728c204c907cd94fc1ad6f6d0a1945119eaaa738cbc172dfaadb SHA512 8be18b4a9b61da7de1c0b3d75cd0d2bebc9c45191b30b8f918b2a6c8af333d1a6545f7336a033c3aef25a6920d905ff10f7d8238aba586b1dcbc6b92e03e376d
 DIST Nikola-7.8.13.tar.gz 4131250 BLAKE2B 6fdb12e59d7e977bc1ab9e2dd458de4a8a61104e1237926d5362ce1420fd3533617d268a4b496a4248932255459a2e3fa43488be62fedc86ab7c62a3c3cefeb3 SHA512 95118f9e2a7d884ab3e7f517749de6cde22439579cf6e05245111ab972f2def0c7ab824978cf750d2bedf788b2a994ec743e9574b70d17424e04c570ef796bef
+DIST Nikola-7.8.14.tar.gz 4130538 BLAKE2B dc8cd3a484bf203291ff8ca2b25233814e68bf916081f692a73c87af953cd57ea732dfdedfb8508187fb27566204f9442eb87847c98018fa0e5ef4ab4eb5295f SHA512 1a930e0cebbc9d54437ce438622eb2a6ad01988aaa9706f58cc0add17e483c3510d3a8ba120b8aa3b475c0e030cca471173f2520fd36e9528144cdee40fb1a9c
 DIST Nikola-7.8.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
 EBUILD nikola-7.8.11.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.13.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
+EBUILD nikola-7.8.14.ebuild 2353 BLAKE2B 37b97644d8d6a698482ef6a0886c5e5705aa98273d822a44550e655936593754aed4417866d19a615d06ab9b377dfb3d3dbe79f345f2e1397d403756e7b6bfdd SHA512 1d8475c52977358e626a9aa44242174908908df283796a0d0d87ca8a249d061deac1e3cd164603c5c31ea4aef5667a061226e52008338f7485359e96380b3e4d
 EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.14.ebuild b/www-apps/nikola/nikola-7.8.14.ebuild
new file mode 100644
index 000000000000..c0a87b751c1e
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.14.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	gunzip "docs/man/${PN}.1.gz" || die
+	doman "docs/man/${PN}.1"
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 4a7d4edb90f5..243fe4b1c2a6 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 2f8a329df165..d58970e6929e 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -12,6 +12,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
-EBUILD apache-2.4.29-r1.ebuild 7881 BLAKE2B 9174d627299f4cb538fcd1ea8b90dad8dbf0e0718e0075e7a6d1ce27994b40953b75aee2db68bc3c04b0fffa2060405b573b917ed75a6218813bf23c2925a538 SHA512 12a411cd9a7cc31234e14c24b773dd4d4dfb9eb1102cfe9b1178a3563d2f0b53226943af8955565f029c422ec6c7656b2ec950a5fbb5395897a0bf81f8bba0a3
+EBUILD apache-2.4.29-r1.ebuild 7880 BLAKE2B eab0e57d4dcb2ba3cb7d1c0dd55c1971fac1937479d36d9a713090ce2f9d6312af81360a8a849b0c5be58b145da6aa6761c48a8e3adb99bf248b409244b51a63 SHA512 47707572a4503bd9d737e8298ce88d68af853eb6cf092e0269b945a3e557898311e9fe91d2f812be7ed800e17da6ae5f0d40cabe77d792732bfa8c687263a3d4
 EBUILD apache-2.4.33.ebuild 8031 BLAKE2B c2b6744661c172c941f4188c642311a3f8f7cbbb9cb02eaa3a42338a8796cd7be6862d00f1cc00afb991da825a1b47ccf4441aa1eef19f894bf353c01065f16f SHA512 c6183f5894d7a14448ec56bca2a9f918ced6563aabae6c0ad9cb8f44ef628356a5e5ddcd297d5d42aabe903a5a8e4eaa0d2682e47928eded5cb32f89ed6deb35
 MISC metadata.xml 3554 BLAKE2B d415eb42fbe1614b63620c8d4f60390ca585d56b10cc7d7ab057b299f3a7046bedb2cf0d0490e36d00e497afa3ebd9a46d61e6afa8716ab55c3c4bf59389b4e2 SHA512 3165c25c9f23548ce0c5efdf5ca6fe563eaf51671c1df0cef8fafeb33c128b224fba921e7edd3ce7c194a980dbd4774889dfd57bf7e21559c659e3163532b902
diff --git a/www-servers/apache/apache-2.4.29-r1.ebuild b/www-servers/apache/apache-2.4.29-r1.ebuild
index 26554cef947f..be2d111c477e 100644
--- a/www-servers/apache/apache-2.4.29-r1.ebuild
+++ b/www-servers/apache/apache-2.4.29-r1.ebuild
@@ -128,7 +128,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
 	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index db85963fd949..cc7499334fb3 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index 95de0748dc5a..757065f0ddc8 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -2,5 +2,5 @@ AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38
 AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
 DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
 EBUILD dnd-1.1-r1.ebuild 857 BLAKE2B d2f2374210c94e99487765ec5d5eb265e3f6de19b4573ecbe7a117cd221de902869c20368fb3521b0d28c230bb03f9102cfb46b2e22ae23f80418839d36bd8ed SHA512 5151812e7f8843ac5d9e7fca6c1dd80596727c7978cca424828cf84ee7302bfeb9a0c1c4b85fdca8556e81011396602859d63cfec33ea61ddf02892babf47c8c
-EBUILD dnd-1.1-r2.ebuild 739 BLAKE2B 7458586300324fac230dbec35c3311ee6d774be55f290336e09b827cb9a3fbdf2e89f5e399fc0d9cfbd1ba77814487fb35bb9cfb4c9c393d31871d474e5ccfda SHA512 68ed4110d18e5980846dd0a1a5a3ab406599f9e686802191c4d758b48b179009b34939d48975b6ba9e7016890004e807649844da8615f12efdbdde33f26f9d1b
+EBUILD dnd-1.1-r2.ebuild 738 BLAKE2B ed119a5e43474937200d77ab4d6db5cd51e236ee7641a14e5d62b913ef1c696917c93af57d58e1bfdd35a6f0fad385a30b702a39433257bb64798a61cd1cc1f2 SHA512 2912a03adc64aabe279bf4c0da5895ff3b8ae7d25d6e5ff909ab2906fb8f6b55c0df6c441aeb85f8ef95563ce254d174b3b11c91c7cac395784b058362020aea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/dnd/dnd-1.1-r2.ebuild b/x11-libs/dnd/dnd-1.1-r2.ebuild
index a9714846f5f7..58cbce524833 100644
--- a/x11-libs/dnd/dnd-1.1-r2.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://leb.net/offix"
 SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libXt
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index ec5b9881317f..caba3a31cf3c 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -14,7 +14,7 @@ DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b4
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 EBUILD fltk-1.3.3-r3.ebuild 3803 BLAKE2B fd2812a49fbf0a161e05e9dfc6dd278222d966351547bf1f74ce8e947b9cf5546f5cd6d8873a046c5588c39001186e7dffb0dfbb0e64259ac9a9d60b051d48bb SHA512 ec258a6c44d4f791892c493f21ce315c57c7a55d2120c643c50de72d035c1d34e2c054d6d4384185d0575440b1d160e5035b3c3964fae8347b21b2a383ecb857
 EBUILD fltk-1.3.3-r5.ebuild 4433 BLAKE2B e97a841040f092da5d676cd25356961d78d7c433d30210d2c529ef7c5ce3752c6b46647b315169d501272285610277d793ba36e359905994a7ab47015fe71365 SHA512 c9b5ee046d515e15f6459570c9c730e31202bea50d5405ae39e1ba7cb9ea93b1674f1f919eea0047f20f4c1dcd448f3aefaac563411a8238dffa4a2143d29bb9
-EBUILD fltk-1.3.4.ebuild 4273 BLAKE2B 059897adb2e41c18e73e6f81b54e67278f0eb3cd2dcac67c0145d61a3a523e6e1b250c48d97fb0cbd615f8ac2b34dac64df3406f0a070e1616f9dee3583d7fe6 SHA512 9b5eadd348a133dff01cd0f8babe55e3084a880039286cd425203dbc8290310f91ed393ccfd540e742e70a13a09e0cf1e1e0e97cbf5b67ede5e65625289da434
+EBUILD fltk-1.3.4.ebuild 4280 BLAKE2B 1a22fce32ceb31e374d607586db511796f3caca817191fd52c780af0e3fdd3a4f6aded53899620392961c93c49540cb70829844591ed0ca5d1d0ce60019aa2d5 SHA512 caab687855cf38793ca905969411690f67f3eb2235539db31b01a69cf25ce1f600ee2b7aceae5ae15814fc56f00f7855a769db64d683f07a0b27ce1e18ba7432
 EBUILD fltk-1.3.9999.ebuild 4314 BLAKE2B 9bcea612a9961f13de6e1fcc43e79426455abec9ec3bfeb3c1a790857e9ddc1de82a36719a8cad0bdd1422bbd8325e2b0a4e16ad98b4c74a2fd68c7af993c7ad SHA512 1dc8dbfdd3162fe85d64b52d3a02c330a74e175fad117b8650d6153c50dbd31699b48ae27b6cc1d87cca61b16d3bbc2cffd51581a21d3b80cb25ff01fb754b6d
 EBUILD fltk-1.4.9999.ebuild 4267 BLAKE2B fb010316bda38f47c2fc99334e95cd6e702a27e594cc5df0706dae8e6711df3186a1ed3a8b18679f7da37b36478a6bcc43d8034750bab6f39c0defbfa0f6ab21 SHA512 988a881087c14d3ce74ba95ac5fa6ada696cca7848d1321a12df98912521e274cb189d0ab0bb967bdda2c97a3388ee6ffba9fb0239a5a2a3d61a231747b38092
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index c31768f6fb41..b1786d70018e 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index a9376ab7d38d..dda4e1b6762b 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,5 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r1.ebuild 951 BLAKE2B 8845769e37f4106506f8ce806931d37bb5105737f73ee50718b3fdcaac14033c43b20664e4bab6b74aec5b53760b1700c4b4d876895d1ddaea96884e0e96f82a SHA512 1737e9da6b7345514d0438d5eae4d74689ba3dc9db09fec04a8b25f9dff522ae8cfef3496588efc0719a4c52c7dcebe18029def25536ec5ac738cc99e123e376
+EBUILD libast-0.7-r1.ebuild 950 BLAKE2B 5758a694d50bfc6eb227b3a1dfacc1a10e234a4b097605262655320b8410b27f2806951967aa227dd8d7bf6403d654d5487ac7b89dd7a6e8f697c1d1f4bdc728 SHA512 1799ee045c2174a8882c2e996996a299bc4ac2f8abd814edfc57b291141ce74e19246a60d1f7fc4153ac39af798bbe184785e94b21dbfe42d927b022b4c43bf6
 EBUILD libast-0.7.ebuild 945 BLAKE2B c9a34ed7034bd0cb52f5d9f50e9843d8bc5c15c91e2fb889eb22a3ec4853ebcb70ca24abbd7a83483f1a1f67f770002990406407a9294a88db2021daf03bc9ab SHA512 1632a77e1c5216337fb1f81c15555606f95138c88822feedcf913bc8f33ca16080e5851d8f30bd024e10bb5dd8165d149adca153e25ce1321b2480a8ad5207df
 EBUILD libast-9999.ebuild 1035 BLAKE2B 6d28c6c66fe9fabd36d7a0fd5674d359348d9974a3eef1a4514568663170db108232464ff4297d4616573b8db1d567ab04b47ee3f50ca1609ff4d3bac6ea56db SHA512 9a08bda18d9d681948b58a9dd12e7b2b282cc6f6f780020936a7e77cbb6c4ee576c24648560c414d1ce256ae4b568bf00000fe12b8df6e6ca1331a053ba02a79
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild
index 1a7b5ddaf343..6a91d31e9570 100644
--- a/x11-libs/libast/libast-0.7-r1.ebuild
+++ b/x11-libs/libast/libast-0.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index d108f36feed4..7607e70553ee 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,4 +1,4 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
 EBUILD neXtaw-0.15.1-r1.ebuild 757 BLAKE2B 94f1af2a108d4bb732c297c0b01ad27b7e66837bbb25beda86cfc8aed6a7300bbf6a57d0ff1150cada710ac8c0990f97ba0df61fca32216a5baad09e57e6bda9 SHA512 cc96b5d3579ee917ec8b2986e598a97d4edba46475096af4c5c0435c9a8594fd95c0bf5948623c9dd7865754c2ef36caf51bd59d0dd9c666baf3b200f5cad31e
-EBUILD neXtaw-0.15.1-r2.ebuild 766 BLAKE2B b3633d85c7967c4df989af996b92e23d609348f73ffadf9a06edf109f7133645d0cc5c680e120b833e33a6af625542752b733182830002f4adbef49010fd96a8 SHA512 0740ce8a712eb822ca16cf4aa6767b4bfcf9231b357297769f98a291f1faf05ee38b5c15e7b61c82e54ab8123b64215dc4d41a882ffe2dc9b1848ad5434a92ee
+EBUILD neXtaw-0.15.1-r2.ebuild 765 BLAKE2B e2a87362d91e4e45425e23fe00435599b6c6826ada531dfdd556b7f473ea85042296886b1fa3ece35948cebf52c6d7fbc210cc9c174cce1503509e2f8af42a65 SHA512 a4453f64ca7aa766bb19eeedc97e5318bbd4ff9a912031ffbe7ef3cb97bbb94b1fc5fdbb7c5a2838267d1be4666d768b68b7bf31877243b57c74a1507a5b311b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
index a1ba32aa58cb..0024fd8ce561 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libICE
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3dbe2f7decd1..c0dc22ee187e 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 905dd95b9ecf..5a75524a80bf 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,3 +1,3 @@
 DIST redshift-1.11.tar.gz 543804 BLAKE2B 9921ed703555fda60c06df9425bf4423ce3891db60f41a1c4c4b4897e2506b8ad79e44f765e49b08db5549406008e12c412c6ecb2a07316cdec4b123fd11ef11 SHA512 bcdb4c120efec3955f4f91f1290db0679e987e25d6610bd90ee8540a96bb11338e36b10680736490ea0b7e9eca5bc195b51767a5badf0b80495dc3da44c4ed8c
-EBUILD redshift-1.11-r1.ebuild 1930 BLAKE2B cca145ca14b52ccfc189d806af1665cd1048d9190e8124e60fef2c2b1406367d79309b5ce397f4eb209f1dbbd0d78eb8500ece3a6ff8e6b5f379f671859891c9 SHA512 4ef6dd14ff5fc6ed77eaffde1d8ff31a3c8a3f042c5d3f21cd4a79424136397685d537780649f712755ff77a2a2a85a0c0d40f76f89afd563bdcd882cd11099f
+EBUILD redshift-1.11-r1.ebuild 1937 BLAKE2B 83e4aee509fa6dca39cc1cfc74c81fbf901021b89639f1734f80f6a923d05cbddc4de13e19c6280f28bac35fc35f0d022aa038faa169cc2a43a0f223e44a53d7 SHA512 7242c7db4820d64f9bef555121c1531c3ea041ddd42d5a917e756d6557d487436a4cb01719c444f68a8f6758fabd22d137672021cd92d1b81b6903c780a227fb
 MISC metadata.xml 679 BLAKE2B eaffc3977a1254a59f5f0d66d0758a821a1bb64ab2ccc8d3f71577ce116f94978cd9b6b32d8477a5d67a21e970b1e5cadb4c2246765fd28266ed49c4d541eefe SHA512 45aa40561fbf6b96d68f46f1773eebfdfa60c07a6e3cb85272523f7e7663b10bfe55ede7c95a3377acee87e40dbb9a0c771c6c53352f9a81629e9bc6e30f56d7
diff --git a/x11-misc/redshift/redshift-1.11-r1.ebuild b/x11-misc/redshift/redshift-1.11-r1.ebuild
index f41d95dbc2ff..03db78ec91aa 100644
--- a/x11-misc/redshift/redshift-1.11-r1.ebuild
+++ b/x11-misc/redshift/redshift-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="appindicator geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 61fdeb585b43..6e553ae38be9 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
 EBUILD xdotool-3.20150503.1-r1.ebuild 1298 BLAKE2B f2167214cce8182e0074d2a80670aa6b37ceb66dc612016e12b0d6abdd0d7d22913757ad7cdd5ddf05969e0fa6a1ce6806d25e89675efade5fd1440fbaec1859 SHA512 37ea78350290a4bdfdac0c238b491ec464484e8bdb4bd8f64b2688a9f56728a93ffed84f913a098d0aed6ed5a3323a68b3bc353cf6299dc76f596226afee230b
-EBUILD xdotool-3.20160805.1.ebuild 1365 BLAKE2B 2d177e439d2c2d3fbf42a82b2d5fd37dd0cb5e8a886def7a11ce776088f73154dc1acc52c03aa53df19afbb8ec28dcb842265c25a5490b33d1cded6a0d5b6304 SHA512 1012565f4e7e6752671b054a5b4cd28b8e8c24a76d358917a6173856618a21ca5652ff317d15eb47e1103f2e99fb10b83b9cb68aac158b2ffa0de58e6a693786
+EBUILD xdotool-3.20160805.1.ebuild 1372 BLAKE2B d4e158eebb713c6320fa01334013357d0220525c746d54af59b0c062dc3a85dfa36568d46c23caaa80fa4e7b0df3242bcd3be436ca686ada90817d48b734cbed SHA512 a95c1ae8864b983ac86ddda95571bf9a43de193eaa26bbd2e1f22e3e500081aa2cee63bd417315ce0fe8aa68913a7088978fd0960d8e9556f2f955d223927985
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index ab667f7dce1a..5fbc2ab8e123 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index cc5bf177c50d..5f26f39c3826 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/golden-xcursors/Manifest b/x11-themes/golden-xcursors/Manifest
index 02b34d2aa6fc..d2c5816bd272 100644
--- a/x11-themes/golden-xcursors/Manifest
+++ b/x11-themes/golden-xcursors/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 555 BLAKE2B 234694a3bf671c5dc30af125a6dfd95bc75574e5ae40a7f5df2d8629504835dff6fce0e0c351de4d978c951f73580115c7e174e23be3f3c3250cafc48bde7368 SHA512 f6312da0a054328109f16f7d056bcb79c8109bed332544b8a57102c19f16d3a09ce1734b44af0180759612414fb5cd714c2555a15c231d8b851532db0edf0736
 DIST 5507-Golden-XCursors-3D-0.8.tar.bz2 752331 BLAKE2B 70051f961a891902a125182f24c1d80a295842cb82160030d92c5b95276491bccd521c4d5cb1e3b34522dae4689b4d5d4cb95d2a6440223e6bf91550b3dac076 SHA512 b0098742afae6c18f80150b3c82ea8be0da4d71eabaebc1eb51d52b2300faab683c794fccbe46162109b09a0a00f86e63228bfcd296f97c1c54dd5c113063049
-EBUILD golden-xcursors-0.8-r1.ebuild 645 BLAKE2B f61a3d948c010a5771143190431ab4a9b7a8b9dddf1e1ab9f18f37e05f5e7e232c193d42ab38758551d1050b3d9fe65654d87002a9f9ec06bef651f789d0208b SHA512 c96727dd6b20684479ee9cf46b1d8e6cef877027060ce2fc2e22eceb27455b0cc253e5bef6e03ea374b66567c8475a95ba15112874da17b95658e564f1c3ebe4
+EBUILD golden-xcursors-0.8-r1.ebuild 643 BLAKE2B 241468079b6cb6eacb31254bb3b1e45666854854048dc12971823b628bc70daaaafe686a3477fb81b2009a1f910336a459a13aff77a86712a3868950c57e7cfb SHA512 070a6872b8b0f75742a9b2188ea3f769aeaa577e71e0baa62224e27e1c864a5b89faf29948f10466b57a6c34109364f620518bab4b96e6c52cfc73254c66c8f2
 EBUILD golden-xcursors-0.8.ebuild 1437 BLAKE2B efdd5cb4ce4e7f1a603f965c4ac0c5f23a02576314ade2fa5e99eb4ae54fff69e7af443ba5def9f7471c6c12e6245b9173fc2f183cf2bccf3181c284f4e9bfc8 SHA512 3fe7d7d26ed7fffb16f469e991e581826dd6545906ebf1dca3e8abbad4dc914cb4e6c47f79b852783a76b1a1ffe993da91890ec00d2380e26a54c9478a80c16a
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
index a5e9b63ca00e..7bf9b6f62629 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/content/files/$MY_P.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 
 S=${WORKDIR}/${MY_P:5}
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 915ac38a81d6..846b41dcb589 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index a0f76e6b92dd..bc7bdde03eaf 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -3,5 +3,5 @@ DIST lwm-1.2.3.tar.gz 47253 BLAKE2B 269016589a07783cc74da16e6c24a33e53a5014a2faa
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
 EBUILD lwm-1.2.2.ebuild 833 BLAKE2B 3d390cc680d5f8e7e07008fd0c6784a2c51ac8c5571c498bb5c36ead0be16e8a41164dd49610f85c5f7d565736ea137a2bd4fd40d40fdeb5784fa4d0ca48bed5 SHA512 0b6d762db5b32cbe130278d75149a728fbbd9da4f270c9ffe0e433c88f046d651159131915ec4951113fcf712f321f393cb02e60f8803e99f1f0a155e8f018ff
 EBUILD lwm-1.2.3.ebuild 839 BLAKE2B 32dbfd91115f16e244ecc7cb383471bb82a487b14a007ea7b8e256b00720e774943f451655deb4dd667566ebbcb7c0bcf8c67033da60de3491e7668ec8f19aae SHA512 8a886447290cac165f7dec8bbb46f25bc4ba4a2590c74370e83bbac728ee4540f7ffac542c76ce6fee5783c13b523b91ac1a0fb646f2c49ab0b6b07e178bd7c8
-EBUILD lwm-1.2.4.ebuild 867 BLAKE2B 3d8a45f738d855b0c78033252b1fd2166b99a4880ef65a8db55555a3ef204bb69371c8c08e4380a6e34505ee2b9541e3e04ed0ccc5520fab3e14f2b688db5a43 SHA512 a2d266e2b2159555bbdcadc4c6ed5ca61f7dca01a03ec5b49e5721df86607067dea58189902d2715f4a4b61b4cd7733ffbfe92b8d9ee1fcba5ba1d7c8f5b091f
+EBUILD lwm-1.2.4.ebuild 866 BLAKE2B d7d17388a9239f23c1ea6e7e71e74de9a8c13bd45bc07839b63e8e0fcccbe82a12c5373c75f7cddb999129a9e7cf31580a944be0c5c7e80ed8c6ec13820fcdc0 SHA512 fa23c366daa61ae18d2351734ee4fe64a5ab4bbe2263b69c22e75c4af75a10f80b446acb947a28e803daac5876467ef24011673af2fd36368860c020c61aa2bc
 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index e9c2c04cd628..426a9a34f869 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="The ultimate lightweight window manager"
 SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
 HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"