diff --git a/Manifest b/Manifest
index 42d355540b43..45ecb5b8ce3c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28803 BLAKE2B 2d4be2dff84154a362881cdac4151a4208013d974d483f59837cd5f4de11b1a22d3191255defbd667e57de6d0ab62784bf0d1d60f1bc2c7d67e4091eb7542d53 SHA512 9a731ab38881a6158144ec6f82a5861e49ab9e491ccd4b2acb76b3c5a4cf31f4518ee42b1bf8407c8ecda0604648baefd84a5795bb915f62fccef122bacda69e
-TIMESTAMP 2018-07-18T08:08:46Z
+MANIFEST Manifest.files.gz 28811 BLAKE2B 902eb7fc1c14c6f34c3717944a2a6fd1244f270b191341a64cf8f5b3a2e1ae84e4b870fbf33e80be04ab47e0bfd8f005e49ca8f7bc598b4be683419a4dbb7832 SHA512 a3cd2003a58ca53d8863c9cc6ca76db3c613df4dbc7514eb255e21b77587dd266de07bb2d1ed3968537bd9bbb63b356c03dab4694bee7782f2ebf70b28bf0d0c
+TIMESTAMP 2018-07-18T13:38:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltO9Y5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltPQuVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAAVRAAp35REJ9J/qDQ0qj893YbOR0xiFyBkEoctQDLiX957BWfFWKtJLd/iBlG
-8v3mmdG5bdVqmIcXArnEa4SVjE9X90hvaCazpxKPTf8tUWCf1YwLCIBU1Vquktju
-wI6kCsQP1FBRC1O4qElDFNRO0Ofj1m5NOtldyZ98DiJSEnkLhx8qAhNibLwhwZM6
-H+D36iPCtSLMchpu8cHEHNhauibe9xVlYf4zxyHpG5nYcwg3HuixnDDJjMIPeJ7+
-EZNRm0dnXfcJwIyHzRvlimzXJ6AYmE8Xm2OU+wC8znBmEaCmaDC+T3YvW0+ADukM
-jvGRSIPLKWJjmy5R8MOzNa6IRhy48MrCHFjHDXe45uFZx/nOYEHYr50j3UG25nE6
-a4eJFtxgJl+iEH1Eo0qC3PqU2b8GBUgmji/AfMKegevVKv9NxnE6PB2biB2ux+gn
-5rZkvbZAun1+jDRWL9Tts/X4FMTgfMDl6PxlM9Yhe9I4+41BYoQ/V9SIdM7oi+OV
-5Cx8o59N4PSxR3KSQkx+QjRKYQtzMjXXCktsYuulEHn1d4hkKhvK/jWagaafYl3M
-0Yz+RofzfP90WNun8+7SD2OLuEV0C1eswnrMenumTI4hd/Gz3p8gx4VTdhL2XxZe
-WP4x2NU8x2kYHtIAIOMg3bNg0UhGqK+HmChCz88F0Ni4dUi2Se8=
-=+Ie2
+klCqKQ//cXerwQyH18n8JUdX6IjJSzwUpW54Bcg5L7lx6vGqN4sw/FM8MVyeP/S6
+DHwpq4fImVU4Rq0ySupVxQEHlrhquKelC/PQRzwiHQFz6WSera3elGo9ONPoj597
+K69HkcXA7vWmRNawR2dpC02UFscTnVhc3G+ts/IMtoHf9L0xUjOBT8xiMN4opMr2
+xL5LJGoCiNdM0u7+hrZzmjkws64FbRQiZTNaYd6MI4CYz6u/T9A56G4c9n0K6kTz
+q0PSP2MyJB4UK71WVdXS7jrAiEKB4lwR8qdAS6pOuKVcAEjz158L57YLhQKB5BUd
+uOdWD90RPL1rrHFzHZ3esf7lDcJXpo2B98MqxMo/v9vDCZnkfsNbd0Qszklt8EqI
+aCH1z/HFG3wviB/C6DwMpPQGVtEDutUgzAUB01lPggU1tDg6HLxwgq2IQ6bj7SPz
+5fg9hdnCGA3hHxi5YzK2aypwwIdnfVWs3pUrrowXxTzTaohDdhJEa9vJ0JGfRIjF
+uqWKzUBxnLqHz/hUKgZMWKHU796cAh6x31pTbZ/UtQObnPMjybd5Brsqm7ySmQAj
+EFLuUzQRedbQgDB2O7oeKRUwHuHp7czlYANY7EuAqpt/+sMVKvP/ahgvL4c0eoUY
+fJTdMT9bjTtnYVviWxhwfljTC0/9zl4/5Eyvo5oLdx7/egQEiFM=
+=iNoF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f6e3813ef826..f0db9e41d8f6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 70ad2943c973..121c0597a3c5 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index 5baf3e11fa2e..ae60d2fb68cc 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,9 +1,6 @@
-DIST reg-0.13.3.tar.gz 5396000 BLAKE2B c5fa658010cb5c1cc21d7edfc1b18fac8c65cf2bd3c6de213ab238aabcb1377096172b5484a92f18a04f9ef4c01124dcfcfd4e6eabaf9f9a9b272c6f1f1fc482 SHA512 aefe0e5d3b1a02d54e67a4c7892e6b6c7581793f9e45995933200125c275e38701ad25b772c4541714f72ad1b43865e484bd062e40edbb7ed5faf2a572c224a1
-DIST reg-0.13.4.tar.gz 5401627 BLAKE2B 278462ff66917833feb9a660b39f9826afe1b71f7a75dad07f3673bd5ba63496152aa70147649ddf9d2266cbad3903ba3a4bbe4a7def76a932ea45131bdda8c5 SHA512 f8a1a52824b64cc252a5cd4f6c18d8cf73c88170342f0bab61664f5cdb50295510182c3c15afdfa02c1eae8d299e347a78b47d171ca275c01ecfd9228323c872
-DIST reg-0.14.1.tar.gz 5401469 BLAKE2B 858c699b15e2222685e114d7c7619424dde6eb87cff08f79de621d5c0d35303b0e8f10981b5c0839633eebbb223658189369899f1a3e15bbdf1cf10dffcf88cf SHA512 2904b5da02cd5f0d98447aa86e36e13f96b1e0ef8f81f97d3fd801e3d477909c6d893db8af4e84591a4630633a698b8a21e673d5abbc169812ebd857615b8401
+AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e
+AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
 DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
-EBUILD reg-0.13.3.ebuild 806 BLAKE2B 5c3fe5fb410486a9cd0a6cf615c67115d1146e5a0f7f7af893775d33bf2f019688dc3eb34a82536970c586dfc3426f06737dccddfcdf7a725bcd700fb4750524 SHA512 602b21b967133649100f7b45ef634fa6efafcbccc7ccc4e379cf1d1f35b1299f943e1738a5136bbcf34834ba7b7bf9d842ca2eef3517b657006b280d47992ae2
-EBUILD reg-0.13.4.ebuild 806 BLAKE2B ab560a1208b10c2ffcd8a691d86310a3ec29fcc813008524078d7c298dc40591017f80bd05387de0096264dde2e387b09b81797306744d379b7af78eb7ad9e1d SHA512 03748e3f43301af2b5924f65ab19f40a34cd450debbef6f2d92f06b9aeee84fa702ecd3aa93d12ad766fda3dd3526839ff7c3d8895366f88f66ef801bd060eb0
-EBUILD reg-0.14.1.ebuild 806 BLAKE2B bdb9149e9e8249644e47728ef52ad416dfb921602a35247d9612d91da64804b4a57d2797de5c2e8d5e9fceb0563371f8e3d16df8185c2b6bc6b9f9dba2a5217b SHA512 bf6db05e2f1671908a0cf2f7e234db6f1f8d9f3c87f34094684ae38ac87e142e915a0e81de0ba60fb03bc6bff0ab4eeb9c9017ed4e594422279b0ebe69019337
+EBUILD reg-0.15.4-r1.ebuild 1060 BLAKE2B 769a395dd1cfa2cbcdd691dc66a2e94f8b9efbbf24347dd9ebf56da7a6a705d6e057efaac9a227d9e22e52b679dda38ef3bbebab31c8f33b0989d5cd43f13e8b SHA512 8fc065165a355d2a8cdccd05b94fd49bf0513878f668a0123379adabe5b37a2b5e337bccd9906667ebce2f116837c1eca6923acbc57e017d9bb588e5ab40807d
 EBUILD reg-0.15.4.ebuild 836 BLAKE2B 5f6e3dcef97cdf67fbcc9d07b02ee66a611396fb98831f192e25e5af90fd8c01b9c15f4462008eae7f87174111a1e1f6902237380d7ffe49d151e5525698e0f3 SHA512 6e63c4018a663d0b65a35ea71cefc7dd4d62e3e16c2bc4c79cf38c25a5a2c9f07345f70f3267a356d46214a3092373651692d337798be8facca2b52f028c3405
 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/files/reg.confd b/app-emulation/reg/files/reg.confd
new file mode 100644
index 000000000000..1bd2475decc4
--- /dev/null
+++ b/app-emulation/reg/files/reg.confd
@@ -0,0 +1,2 @@
+# arguments for reg server
+command_args="--asset-path=/var/lib/reg"
diff --git a/app-emulation/reg/files/reg.initd b/app-emulation/reg/files/reg.initd
new file mode 100644
index 000000000000..7759f44f376c
--- /dev/null
+++ b/app-emulation/reg/files/reg.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Reg server - providing a UI for Docker Registry"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/reg server"
+command_args="${command_args:---asset-path=/var/lib/reg}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/app-emulation/reg/reg-0.13.4.ebuild b/app-emulation/reg/reg-0.13.4.ebuild
deleted file mode 100644
index f22026d1213f..000000000000
--- a/app-emulation/reg/reg-0.13.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/reg"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="8dba69bce413988846a6defa063f35ab38a31991"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/reg/reg-0.14.1.ebuild b/app-emulation/reg/reg-0.14.1.ebuild
deleted file mode 100644
index 83a59172bdb2..000000000000
--- a/app-emulation/reg/reg-0.14.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/reg"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="d25a2c83ae5414c8a72f2e1ab96529fb1744fe26"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/reg/reg-0.13.3.ebuild b/app-emulation/reg/reg-0.15.4-r1.ebuild
similarity index 57%
rename from app-emulation/reg/reg-0.13.3.ebuild
rename to app-emulation/reg/reg-0.15.4-r1.ebuild
index 25b44103626a..fe202f002568 100644
--- a/app-emulation/reg/reg-0.13.3.ebuild
+++ b/app-emulation/reg/reg-0.15.4-r1.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot user
 
 EGO_PN="github.com/genuinetools/reg"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="f143bb56a5d7ade706e45a0d8b59d2f1ca35724d"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+GIT_COMMIT="8c930c585418564a4ce472fbbfccb8c5741c2520"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Docker registry v2 command line client"
@@ -19,6 +18,11 @@ IUSE=""
 
 RESTRICT="test"
 
+pkg_setup() {
+	enewgroup reg
+	enewuser reg -1 -1 /var/lib/reg reg
+}
+
 src_compile() {
 	pushd src/${EGO_PN} || die
 	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
@@ -28,4 +32,11 @@ src_compile() {
 src_install() {
 	dobin bin/*
 	dodoc src/${EGO_PN}/README.md
+	insinto /var/lib/${PN}
+	doins -r src/${EGO_PN}/server/*
+	newinitd "${FILESDIR}"/reg.initd reg
+	newconfd "${FILESDIR}"/reg.confd reg
+
+	keepdir /var/log/reg
+	fowners -R reg:reg /var/log/reg /var/lib/reg/static
 }
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index fd8548b1ecd5..2377d389ee43 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,9 @@
 DIST VBoxGuestAdditions_5.1.36.iso 59596800 BLAKE2B c735a88f534b27f1f2f29d125d0fdf881285f64f7ea3f49a0bc9211af4f562562cc321983c222e6106459f3be14af94a3514765607d1cd8edf6e6352398cfe8c SHA512 08049007589f6bf56c84355b908355289f37eac8cb01d970e46ebe3b44b43ff406c37d0ddad245dd007447a00927a2d2312524e3ac99f8b6bad8695b403ca846
 DIST VBoxGuestAdditions_5.1.38.iso 59611136 BLAKE2B cde4ceb59159827304c99ab00fac4cd3598600c252e7b5a410a5be6ea50866ed2efae4ead9e5c4c1a1462b1cd6db973bd4b35b56d426934e80898837c536e778 SHA512 e082e6363e1e6fa8a7b6b6b4847e9f2ed17655b0ac143467553150f910d71e4dfff55686c38464dc60f77c57292610d13dc25ee5423877173467a86cfe232a3b
-DIST VBoxGuestAdditions_5.2.12.iso 57976832 BLAKE2B 3b1485da265a9d7bd659e846ceb9e3e8f3463816f2f8157654704875e9b7a91d6f610cfa6285d9d54b06e87ca4f3e5d4600b26ac622b592c90c42bde0cc0f2ee SHA512 276b6348942bb82f68dacdc957590130281c5b3818d47c60238e00e1015682b5a44f28091163297ea052d327f916ed2e79bc32820f39f8b8e5dab5bd0fccbe77
 DIST VBoxGuestAdditions_5.2.14.iso 57978880 BLAKE2B de5cb3c5b7e2f3ee018588308573389fd973820e87d5b2e6640499c96dc21db95e71eb4e5e2469455febba8b2ccb4a7c6014176e784613218fa7eccabefe9e53 SHA512 1fd878f9e7fc1687907ac8dff6827bfd7aefe3ed48012b0dbbaf42ced21695ce52be6fe146128a6d1c67c7a0c5c39c9ef24e8ee562271fda117d13cca81427cb
+DIST VBoxGuestAdditions_5.2.16.iso 57976832 BLAKE2B 78c8d71e2a68306efaf2951d73099b7199e15d83d9fc2c70f73266fdf59798948b22815234a5e30eff43471fcb8a5967c74a439d79b5ed47971dd170498145de SHA512 f25bf8ce789f640e5a80ac55c5d1918702bfed711aeacddc951948dcb56a4aa43a5a4e8760e3b8cc6e18eee18eabff032dd8fff8b95cc18bc60177b0a481b592
 EBUILD virtualbox-additions-5.1.36-r1.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074
 EBUILD virtualbox-additions-5.1.38.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
-EBUILD virtualbox-additions-5.2.12.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db
 EBUILD virtualbox-additions-5.2.14.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d
+EBUILD virtualbox-additions-5.2.16.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
similarity index 96%
rename from app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
index a28d6005cb4f..93e9fc9b6d49 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils
+EAPI=7
 
 MY_PN=VBoxGuestAdditions
 MY_PV="${PV/beta/BETA}"
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index a94939c08e86..901f92df117f 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -6,22 +6,22 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce
 DIST VirtualBox-5.1.36-122089-Linux_amd64.run 88329683 BLAKE2B 96e0296243056ebaecde4435fe68f82dacfc66a0d23b70365c7495112672b60be7682ef794851b68198d0d0f01ec84cb314f06b434726e5f75e47751771cbd3b SHA512 6c62c642da78561ec5130e18ebac24d52871b4c518ce507f1deb0a279c58dfc1b87c4afecf63236e7274da65d5d784575779ad39e17a4f8b1f05c29a3ca95d55
 DIST VirtualBox-5.1.36-122089-Linux_x86.run 87449039 BLAKE2B 826071838fdb7567ec7064eb6db216d9d695f3504b0c37b2db637df5757ece58b8c1c0b430cef1c1e6657bd9dc556c074891732cd4481243af72051f66ec6bec SHA512 c593483949a5389cddbe47fb3d07e7acc55868671d72ccd696e1c039ace24e7b88be9cf088c32b419c5f4ba76ceada6e388b63dbeac6376b13627543c472afe8
 DIST VirtualBox-5.1.38-122592-Linux_amd64.run 88329683 BLAKE2B 124b1a3d45b0aa213a63ccc225570158faa11adf51a9bc503c014a302ba6a9739e9b50780c93ca6b8704e4666f809b97d1548db74817020301f560252bf71182 SHA512 963ed0b5555bcc43a72dbf49d3d6d9a1a2b1118808ea601765ce102ce72a05439903247680d0b49df4d15cdca68b40a8c5a26df9340c24ed681c3353f2f8e072
 DIST VirtualBox-5.1.38-122592-Linux_x86.run 87449039 BLAKE2B a591a64422cd6e7bb292aaa0f35e5ed9a722b3d835800b2ce09814f2756f088e3a7adc0fc483f2a6ec36e265aeddf6ecfe1aa1bf60a78675696859bff1d0afb9 SHA512 41f9aebbb7c4ad6192cfef57ca956c5ec4b96c8547380abc3b56629c821094ccb28bac69645042e0ac22664db6c59aeff49ccc80d88e1eae5ffb95f55a467a07
-DIST VirtualBox-5.2.12-122591-Linux_amd64.run 88677843 BLAKE2B 3fd56527c106193ea0bb46ad51968c59d1bb6453282ddfc84b08227e0f5ed4af941bc11030edb3a0c2d0845d602c036e033a48af020b80ba225d626a3514d321 SHA512 682e42ef3bb65f0e31e08fda2c2a9ce8b555ae8978692b22e9855c1725e5fd3e3db126501df37849b546a5022480a319db12470d1fed44463f2e49144a6383ac
-DIST VirtualBox-5.2.12-122591-Linux_x86.run 87827919 BLAKE2B 7efc88298b8e96f0d45cfac3d4fd3b24ffc725f14e1ae822dace092abf6a460cbad4349b907c08998dcdacdfdb915a2de6e8ae8db4edb1842c29941faa6acdd8 SHA512 e6f6890baddef29db0c103569d5abe7bdfb597840e8c9b023ba041b85a7c3ba7bf45f983826266722b43fcca95b2e93bfdc944c25ffcf6f0e386794f22eb5e8a
 DIST VirtualBox-5.2.14-123301-Linux_amd64.run 88749523 BLAKE2B 5a2791a1258adcdc82f8776fb0d5502d525faa0083b808f1875f0c61b848aa371fa0b6b73ca024c244b36dfb074a8839747ad27a87cb8dfbaad09096a0cec887 SHA512 8c4633ef0e3a9f7f26603009a23244696a6f91baffa9777a0daf8f09abd80b4aca944dabfd2a10acddf4759e64ec719948d73ecaaf187a60a15e097467060ea9
 DIST VirtualBox-5.2.14-123301-Linux_x86.run 87776718 BLAKE2B 609c24ad2ba5b005f7cb619fbe2c2a82f026a7ae4ef74cda800c526c8c3552a2a1ed1af5a2a2b3d9c56f0dfbcdda493c2cc92b58156cbf41ebfb1d43bfee8aca SHA512 820c2b6c97a48c125b69e1f749a3b1473d5fe672726ae2cec30f20a6652186a28b3900d4aeffca701415275229232925d1c8c347aefa7a86840a2c5bf13f21a7
+DIST VirtualBox-5.2.16-123759-Linux_amd64.run 88729043 BLAKE2B 0bc183146cdafbd5b12c4d46976cd3775a4ea11aaadae155d979ef81cf04ae8c77d6b48d0e240bad3bd440f532530e6d7584f58e7b29161a0f355bc8b7c15061 SHA512 c815a025376d86a5bed753ef8b729155b2a01d9e4c9b573e70d3b4f7db497285b991b278504d4b4fbf382a00080974551f214176c0e3fbaa2679534b3ee32b90
+DIST VirtualBox-5.2.16-123759-Linux_x86.run 87756239 BLAKE2B 911ddf8b260ce18ff12c9cd6675105327b9c5916f436ee7421db3362403ee4960a8e24a6c25348c7188becdfbbfe0685f42a84ac166e39a753d4407c04721248 SHA512 9b52faab1ecd9e30cbf37fbec1a9a150f3dabb47ac62f355ed67744a849f07c52885852c310c39d9d36f90461fb318f8923afde9ec81bd754c1afbeeb2788427
 DIST VirtualBoxSDK-5.1.36-122089.zip 9864160 BLAKE2B 0db3d44c44f93a80607791f2ff5cbdf6aed2b324c207bb9bbc808b5cc836f01ade9c48ed3474c4f174a43b29969fe632b5ccd2b3ad0af197894d63887144bf0c SHA512 98f6e59a5e344bf23f6af6c0e791f28920940de907721981c99b66b8e7c20cb06a7e1211b2029a1279e583fb4ed456019005c2bf3a91b3d8b3fbd61e6e44c914
 DIST VirtualBoxSDK-5.1.38-122592.zip 9867112 BLAKE2B d3deeda2adafcb675370c7228f49a209e5f76986fc4c9ac5aa8ff2e809912f458c9cfc2d8f011404fb4bd7b45b80f0ff857dd85dd597d622971a2556c6b17bbf SHA512 e03fab6573e61f59fc4e017d8c6cfde08e734939efe6c2f8edc5e6e9da5a1d616012cae06d630a3e2a2b1d72775eb8f0a05eb230fa81321ec33ba1975ec34ce9
-DIST VirtualBoxSDK-5.2.12-122591.zip 10153856 BLAKE2B ea4fdc39744e5fcc2edcdcf521c795b2669344cec4be2b7d9f08d1e0917c24b5c06721d76d81966c611ee41d220095aeb6bbab211a0e1b52e6479e0c9595d97a SHA512 6d7e3968c9edb00b88aa5118ec9c74ae85e04d788f49741b68506b07307c4dd2c8cb7bb307c76f9d2908bc47c7683257f39395008b0a03eff72a1e77567f0e77
 DIST VirtualBoxSDK-5.2.14-123301.zip 10154044 BLAKE2B 273219029c59ffd685fffb7e14fff914a5397acc0676c8b4ccaee9cecee51e90880e68d883125e061d6c02e09b53235821ff89a265e937c9b4e67365452a97d2 SHA512 c69e6f537af611b9a4bcbab3e014fa25c6593f754940c6596e451cf895cb088186d037ac4816a3bae793213c774befd54ffa86d43948fa546f753a37fcdabd51
+DIST VirtualBoxSDK-5.2.16-123759.zip 10158952 BLAKE2B 66140092c221b998919a3840745e2ae58671b65f1db774ddb6691d085e95a35cdfa1e939a84cb032e2f67bd4485bd8f940f5db6d3712569942cbcc2a0f1bf234 SHA512 2b735016ea99e94317876f2e845cf94dd845bf51a86b42e938cae4bee003483f6061a7d89150f3d1fe5b84970a4fa83ae5bed7acf6570b849df5258efc8eb38f
 EBUILD virtualbox-bin-5.1.36.122089.ebuild 8381 BLAKE2B 16a4aed3c9ae0fe4621fd97d30ce46808ff7c56783dbc27e2a4c2e6a6a1f290506d71659ad98c4def219d75789ff6f7f66c8d79ff90d2285ca0e1fceec14635a SHA512 a5cd6523a8a08b64f7d60ebd00d56576c7dbb33dbde06dee28b56ae1a31648a3155b7a1f3c3a739e71fa824d427c33b74ccd31dc1fb3520256b759c0e79dd193
 EBUILD virtualbox-bin-5.1.38.122592.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
-EBUILD virtualbox-bin-5.2.12.122591.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b
 EBUILD virtualbox-bin-5.2.14.123301.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e
+EBUILD virtualbox-bin-5.2.16.123759.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
similarity index 94%
rename from app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
index 94de7dd7a102..424d6d96060f 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
 
-MAIN_PV="$(get_version_component_range 1-3)"
+MAIN_PV="$(ver_cut 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
 	MY_PV="${MY_PV/beta/BETA}"
 	MY_PV="${MY_PV/rc/RC}"
 else
 	MY_PV="${MAIN_PV}"
 fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_BUILD_ID="$(ver_cut 4)"
 VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
 MY_P="VirtualBox-${VBOX_PV}-Linux"
 # needed as sometimes the extpack gets another build ID
@@ -207,7 +207,7 @@ src_install() {
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
 	done
 	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
 	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
@@ -219,7 +219,7 @@ src_install() {
 		for each in VBox{SDL,Headless} VirtualBox; do
 			fowners root:vboxusers /opt/VirtualBox/${each}
 			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
 		done
 
 		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
@@ -228,7 +228,7 @@ src_install() {
 		# Hardened build: Mark selected binaries set-user-ID-on-execution
 		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
 		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
 	fi
 
 	exeinto /opt/VirtualBox
@@ -249,9 +249,9 @@ src_install() {
 	insinto ${udevdir}/rules.d
 	doins "${FILESDIR}"/10-virtualbox.rules
 	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
 	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
 	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
 }
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index e0fe9bba721c..89be27bc8841 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,9 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce
 EBUILD virtualbox-extpack-oracle-5.1.36.122089.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05
 EBUILD virtualbox-extpack-oracle-5.1.38.122592.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
-EBUILD virtualbox-extpack-oracle-5.2.12.122591.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb
 EBUILD virtualbox-extpack-oracle-5.2.14.123301.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece
+EBUILD virtualbox-extpack-oracle-5.2.16.123759.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
similarity index 82%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
index 7d7d5d2ea35c..d46e764cf177 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib versionator
+inherit multilib
 
-MAIN_PV="$(get_version_component_range 1-3)"
+MAIN_PV="$(ver_cut 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
 	DEP_PV="${MY_PV}"
 	MY_PV="${MY_PV/beta/BETA}"
 	MY_PV="${MY_PV/rc/RC}"
@@ -15,7 +15,7 @@ else
 	MY_PV="${MAIN_PV}"
 	DEP_PV="${MAIN_PV}"
 fi
-VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_BUILD_ID="$(ver_cut 4)"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index bd4598bd7161..cc3e11207691 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -6,13 +6,13 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
 DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
-DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2
 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
-DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a
+DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
+DIST virtualbox-5.2.16-patches-01.tar.xz 2952 BLAKE2B 1d23d83bdb4d9576d402b67cc81d4427c5fe9163550d2817546382e1c1087000553d4a9a864f2527a909f52ce389105bcfe5518b5407de1299c7d2a62ee3cc21 SHA512 88c21583c51ae8e22e5fd3f08baae686045e884883153e2e365c35ba19f2773d5964c523a4ad3777fe30ca96bf76fab8819e09beeadf8350193041bff783893d
 EBUILD virtualbox-guest-additions-5.1.36.ebuild 5995 BLAKE2B c34c1d3e312781ad4a4a390f12e4986ee197a690f5875f829bf3e87fa7a0741d5eb2c08f506d9a5b43590ea762eb26cf516db591a1b55a2f27e5c36f8fc313e8 SHA512 068ae5ecd8aa8e9f30f5272f1a1f58f8da92b78ee0f62784e335ebcbd63605b34d6654bbb35b16d4b4572bce75478827de217aeacc062bfdd7e206d7d38c7bb6
 EBUILD virtualbox-guest-additions-5.1.38.ebuild 5997 BLAKE2B bd1110242825d9eccfa7235ce8de8fafd720610652dee85169f9e14c4fa6c806619736ab8db2b4f8041aef0a7fe0c6fa8dcd7a49a488287d8b0677b099894494 SHA512 b28006deb4ebe0bb199296262dec479bafc5a02c239116f2e3da9cf8198aca5fbbb281f6679b8415d3a0ffb88e3e42de4f71b808b2f0c38203af66cdebb36683
-EBUILD virtualbox-guest-additions-5.2.12.ebuild 6099 BLAKE2B 4ef9d7f4206d4c584d505c503cebd317b92ee4b7611b015d91d1390f3b07f29de9c7d1059784a13524e3b033c05afd9589203f19f11b64f1c6f8ca8a21dd3334 SHA512 43964cbab6d17f7133f7387e13058d566f4c461ddb9ea315a4fe726783fd97ba7c4d3dc3e98b0189f31cf946ccf9fc8812c217fbf4cc75de38c5d28a91b54b63
 EBUILD virtualbox-guest-additions-5.2.14.ebuild 6030 BLAKE2B 958d03973c922d1012f46631741fbad9d76374b70d2145a2ae388edbb57dbdc40ae1177351b22890fa169e66898dbd3d60cadf391f3c380c2dd814251c68fd2c SHA512 0896bf89ab514354ec6ea50ba528332a4f12e0feed2b18856accc0dc3a5e02f6a1d10912fb076d660bbe9464df7b385b7c6f32daf581f45294b10269ddf2f644
+EBUILD virtualbox-guest-additions-5.2.16.ebuild 6072 BLAKE2B 82dd3e0a88c0d4295eea1be44adeddf553459f799b62af523ff624eb3362d75ba524615bf770fb51b59c007ee86e5cf2db6806975ca384916e1308b6d22d8696 SHA512 7901c8bccce613faa42b2b34209a69940cd323a2b5e98a3fc79d9211c46fa74f1c8d707c0693584de7d47d803890c6bad601fb47e1e5c108132c058b2a10c505
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
similarity index 94%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
index 9a895f357c2a..e694510dc385 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=6
 
-inherit eutils linux-mod systemd user toolchain-funcs
+inherit linux-mod systemd user toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
+MY_P="VirtualBox-${MY_PV}"
 DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -57,10 +57,6 @@ pkg_setup() {
 
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
 }
 
 src_unpack() {
@@ -87,6 +83,7 @@ src_prepare() {
 	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
 
 	# stupid new header references...
+	local vboxheader mdir
 	for vboxheader in {product,revision,version}-generated.h ; do
 		for mdir in vbox{guest,sf} ; do
 			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
@@ -97,7 +94,6 @@ src_prepare() {
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
-	rm "${WORKDIR}/patches/011_virtualbox-5.1.30-sysmacros.patch" || die
 	eapply "${WORKDIR}/patches"
 
 	eapply_user
@@ -171,10 +167,10 @@ src_install() {
 	local udev_rules_dir="/lib/udev/rules.d"
 	dodir ${udev_rules_dir}
 	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
 		|| die
 	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
 		|| die
 
 	# VBoxClient autostart file
@@ -188,6 +184,13 @@ src_install() {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
 pkg_postinst() {
 	linux-mod_pkg_postinst
 	if ! use X ; then
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 8c56c09ee6ae..2f8b88a6c16a 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,10 +5,10 @@ AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8
 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a
 DIST vbox-kernel-module-src-5.1.36.tar.xz 628368 BLAKE2B 49a3dfc4ff573f793eefcfd9b645af6fa6fc63b54475921064be146d3d4bf4db61f48d82f62d65811597fa12b88331153f7491890527fde76f41426355552abb SHA512 c69739c72a5555fc3bca90186129fa4eeb5bd930c4396b416a8a88e6f84bcd9e7498a9bbc9381da648cf87d601d98249feac2e4de6d93d8b7aba46b22d3ec40f
 DIST vbox-kernel-module-src-5.1.38.tar.xz 628552 BLAKE2B 9faa4e837a48ac27be5c0183edcf2b39c08eeab210bd39811704a7a578a93b28f8b8ecf26a34483f2d135a8cb8817756120d7bef0b8de245c5a5e232cfebfff0 SHA512 36311c3ff947fa763db1fc0612c5a4c10ac3d586c3faab3a91e463723488510cedfc1a69696381158a167edfc86d7abf66c18b287ced75cbaba3f1797c4265a8
-DIST vbox-kernel-module-src-5.2.12.tar.xz 637292 BLAKE2B 31b54c8de560a30d228497f5a3f58f868ad09e18051f8fac2257200e324603c5fdfe127d530997f7dae728d13d93ced6321487f20571811352bfbbf1f9c6d646 SHA512 7408e8121bf278050728461d4f7ab4d4b6c502b24859573d4652a58d1058e9b12a4de4b582ce45f7d0b12bf369a7378107c2cab12a6e93b1b082a40d1f2e9712
 DIST vbox-kernel-module-src-5.2.14.tar.xz 637352 BLAKE2B 7ccefbb13f25fe995e0f769192a93baa91358c09e7126d6a6c8bef7fceeab50082f78843140d23cf88c4931c561552c4131b17625e7a3821766571387d78d2a3 SHA512 920eca67fb10ed4d1eeab95b14e65c585dd96df82a4690c34c9d85366ec6dd9835f9a772eb4718a80e6ffb2637de2a698151a6bdfd7984fc2070cd0bade5c077
+DIST vbox-kernel-module-src-5.2.16.tar.xz 638172 BLAKE2B 80a27100bb0be97796f03b368c589965d476e6d0c79424b94a5100561dc84bc2baf28b271a744b7b4ad53e015fb463faf2871d24596fafc83c80ccbe16087730 SHA512 35169a46ca9018f169b25359c0f4bf658622d71ea284768912bf0a8d2ac34ecec94f5dc774f77f0c02d1b83363faad53158baac7423f588deedfe8073a1e56a3
 EBUILD virtualbox-modules-5.1.36.ebuild 1431 BLAKE2B 9ea7afbf141d43d3c6a22d5bb934bddb1c67a6afa69d65ac905df930cde73d5c8b921b11f4954e3577b6b63a1b1c156d23c97c9aaceeb2fd51be75d81df1d936 SHA512 e5becf1d7298567966b7653b73e3245a9db59b3eca1659890b004d8116a1c150e8c7042a81bb7fd9c0757328895dfe12c39baee9a49375110903d83f6422c988
 EBUILD virtualbox-modules-5.1.38.ebuild 1350 BLAKE2B abf66852d4f907de436721b8c8f06dfd3c3676a0676d6e569147e01aced9b6f5492c9e9a2ddaee5798b38aba0fbc8d812179427d8eb7c45e732ef9093542d40f SHA512 e09b4178d5e20260cdd59597c514a4cc7d78b8caa8e126248f213f3bb4a665762216f07076efb6e81b822920a80c09979a94df11a952488397ced662f8862108
-EBUILD virtualbox-modules-5.2.12.ebuild 1195 BLAKE2B 06cf73894136a6dfe80f0cb7b32850bba3590cf72aa23369801bc4f58f7d96d109cb88d4c84d0c00c7bca8b5b17671b5e1478279a79bc7f642b5f3faf4fede3f SHA512 a12223da83f398dacc597d9ff7d0a0592809acfc5033300ead3e5f1ad4672b1527138418db0bc9f16879456d9f136618952e324d42b22645416564942d5649b1
 EBUILD virtualbox-modules-5.2.14.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5
+EBUILD virtualbox-modules-5.2.16.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
similarity index 95%
rename from app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
index 0fd483ae195e..89e331b6d043 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 
 inherit eutils linux-mod user
 
-MY_P=vbox-kernel-module-src-${PV}
+MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
@@ -20,7 +20,7 @@ IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 3feb40377bca..a74e5d19ea6e 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,12 +12,13 @@ AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1
 DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8
-DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2
 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e
+DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654
+DIST virtualbox-5.2.16-patches-01.tar.xz 2952 BLAKE2B 1d23d83bdb4d9576d402b67cc81d4427c5fe9163550d2817546382e1c1087000553d4a9a864f2527a909f52ce389105bcfe5518b5407de1299c7d2a62ee3cc21 SHA512 88c21583c51ae8e22e5fd3f08baae686045e884883153e2e365c35ba19f2773d5964c523a4ad3777fe30ca96bf76fab8819e09beeadf8350193041bff783893d
 EBUILD virtualbox-5.1.36.ebuild 13795 BLAKE2B b988e0db6a107ae6f5f736dd42472e6d3484c5ca99834039156eeb72ef399bc17e06a0d635cd993070450132e4fe847aa0d3b3d4b300cc5fc35507034f4f1fc1 SHA512 5d0cd2e29ebc2603deca6ededf55db38c087a5ecd0245a131fdbc52ea00b293da8f741fb1a44677b39259932930485c27821ea9205ff391011541688f014c01f
 EBUILD virtualbox-5.1.38.ebuild 13797 BLAKE2B efbb490230e3ed1468a397ba3257334bbfa7274e609f2d2c9b454e5f98458c6c78bdda845bf227edc59fda60afe92a0ac3d0e07473619166292c30453ca7c9a9 SHA512 e201534862e708eab0088e08b92b524db3723d6c2a4153507b7f760d45d4f85bb2bf4823d145ecebe7fc12ad06790a2b612e9efae7fa85de950a3147e58fd45b
-EBUILD virtualbox-5.2.12.ebuild 13786 BLAKE2B 6e82bdba1339ce2f547ec372116eb36f3aa5566bdc5ebfb3046e8e36d7ceebce2413bee4c69e8db36b08b58b79451fc8ff4e5c0cd0bccdd800df22eba4938c7b SHA512 46c5eb3c143e1813655355084ffd427577a0664be6748e09fac0729026e3da4f328620d8522a243c465614d75e0538fb51ec659644c555433485678e046afece
 EBUILD virtualbox-5.2.14-r1.ebuild 13841 BLAKE2B 214d86ba21c8885d3e93641423557017b442b3ed19b9effe2247b0ac7df03d47184068430a97dcefd2ff23c4cea2fb9b0a2298a37538b6a09a47a4d84083d1f2 SHA512 060ecf17a73b3f3a6c45044ffcb1419459e307c6775b15e46368138120d024e2f53bae36da2634293d4922c3bcc416418b980af132001f6b8cbb31e7a0d7b278
+EBUILD virtualbox-5.2.16.ebuild 13841 BLAKE2B ad07e370a56dfb1dedc6260c30a0aba02e8445810a99c373233b13fbfdc450862f9f2f31930370cf4e3cb295f115c7542b5312786eca76a6630ce4a7e3ad8a0e SHA512 7c7c55e3196143159b0213b0829166ee38e9946fb67cb6dba35d88bd0e70339ca00f534f52e67a3f25440df30304dd6ed311d1808dc2e79405def429e47f2b12
 MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
diff --git a/app-emulation/virtualbox/virtualbox-5.2.12.ebuild b/app-emulation/virtualbox/virtualbox-5.2.16.ebuild
similarity index 96%
rename from app-emulation/virtualbox/virtualbox-5.2.12.ebuild
rename to app-emulation/virtualbox/virtualbox-5.2.16.ebuild
index d0cd2a8076d7..f29fb3699123 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.16.ebuild
@@ -13,7 +13,7 @@ MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.12-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -279,7 +279,7 @@ src_install() {
 	# Set the correct libdir
 	sed \
 		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
 
 	# Install the wrapper script
 	exeinto ${vbox_inst_path}
@@ -315,7 +315,7 @@ src_install() {
 	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
 	# VBoxXPCOMIPCD (bug #524202)
 	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"${vbox_inst_path}/${each}
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
 	done
 
 	# Symlink binaries to the shipped wrapper
@@ -335,7 +335,7 @@ src_install() {
 
 	if ! use headless ; then
 		vbox_inst VBoxSDL 4750
-		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
 
 		for each in vboxsdl VBoxSDL ; do
 			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
@@ -343,11 +343,11 @@ src_install() {
 
 		if use qt5 ; then
 			vbox_inst VirtualBox 4750
-			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
 
 			if use opengl ; then
 				vbox_inst VBoxTestOGL
-				pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
 			fi
 
 			for each in virtualbox VirtualBox ; do
@@ -356,6 +356,7 @@ src_install() {
 
 			insinto /usr/share/${PN}
 			doins -r nls
+			doins -r UnattendedTemplates
 
 			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
 		fi
@@ -389,8 +390,8 @@ src_install() {
 		doins -r sdk
 
 		if use java ; then
-			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
 		fi
 	fi
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b0fc5500eaf4..da05a351f5e0 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 4cbf495d62c7..7d696faa742b 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -5,5 +5,5 @@ DIST PyGithub-1.40a4.tar.gz 2668409 BLAKE2B 5638f228620fc5c6741f79e3272ba374a71b
 EBUILD PyGithub-1.28.ebuild 548 BLAKE2B 3e8eac8c0cd4d349f2c6455c83b282756d406a40015a4e1e7cdc21a53308efa355ca6d84e1276d43eb4b547f36cfe517b8d0d9d5bdf23c241786da935f0b02d2 SHA512 0e84d2ed8b517e48113443ba17054558eec90509e124de6d400c7ecdd047dcbdc1626da257d63cd31249ed7a24be7bfc71746594bb175cd6111c48b7107d83cc
 EBUILD PyGithub-1.35.ebuild 600 BLAKE2B 7c0d0d18a008afef48e8fef0703721a2ceb2ae7555c3e0b9561bd3514d6d31e41f088b49997d250631111f9f1f34b5d58b049aba394d76fb8a178ba165ab568d SHA512 2741d9e431c6271acf3aba3e7c8d1d878e7bbd3fa388e60d2bb0b40edf20ae3ff0f3fa5c5186eaa7bd9ed9142f8d97c661782870dd6734fb12c7abc5f3d2cbc6
 EBUILD PyGithub-1.39.ebuild 602 BLAKE2B 89204432003da588daea27b3237af0bdf5a01ad376de7737f3f93dc9aca1cb44f04fbf577f357d5a735858b530879d28ba798ddccc2479f7f1319402b8d33e24 SHA512 61e73feb94f59fffcfd5f5dab933c1e33056ae6a98a790dd14e5645875719dc2ea23c6593d8ebf88199c9505ad6079759bd5138bde0201ec46fd74c955a4a72b
-EBUILD PyGithub-1.40_alpha4.ebuild 720 BLAKE2B 57ef78fbb71bebff4d759fb022a1144edc4d1a466e22a885bbf8aece7b6aef7c403751d75a3d8c361cbf3f7688bb4539244feb27d6c70dc5a762c6b651f82c7e SHA512 8d20f780420b94183e00f6724de75906cd61560dea54827c1298b6b11d9315472e6a76defc19bdb2b98d2df51175bce747b4225a2c45b898898f89750242b7bd
+EBUILD PyGithub-1.40_alpha4.ebuild 884 BLAKE2B b0a5826da69be366fcac6f72fee153647f545a64bf22b6ae5398d727ac907b20ab2096420a12f98c716746b85d52cd711f53b69a1e5e4154fc963996f79d3bab SHA512 04e169dd24c344724fb8c7198ae631eaac3905a890bc7234a8177baf44ecb92ddb7e1e595e7ba6664da96dd1044483e14deb7a52b7c7876d8eedcaadfe99d505
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
index e44864c83d71..2d9c8b0680af 100644
--- a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+python_prepare_all() {
+	# tests requiring network access
+	sed -i -e 's:testDecodeJson:_&:' github/tests/Issue142.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 501bbb036c71..0aeacb19bb53 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,7 +1,9 @@
 DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047fc110a8b994db3cf2de39e7470478b78b631138d0d58ae4e2367f84bd8a45caced8e067d35ba0be98891eb7ea SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461
 DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
+DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
 EBUILD gevent-1.0.1.ebuild 1461 BLAKE2B 2d74fcc19654b02d952b6b0b4614633aedc38ad294f359004c59b8ea58e64d869e0eaed913f477147fd42bdb927ec03e178ce6e535cc832ce0afbe8b59bea17e SHA512 e8d65da8ede2d244ab2e9d67c626b84f83b0d1264ef25f63842a7787844411c188019426bd83b412de5fa8c6ce9948efabf29fe128c6e7c10f838d6a8112a76a
 EBUILD gevent-1.2.1.ebuild 1846 BLAKE2B ac52fe91163f2ff60cdd9f0681fc5887c910427cfc284e207bfe61a71d2d9ef3c076c2a71796fa063b7c3d17f835c02a328ac91ceb5695a21808f1d09d7787f8 SHA512 df9cb3451b2c186fed7c7db5d97164fe849bb721ac49c3833891cc1bab4a67874ca065c0c66508bd584433a9ef90f8792df2e37248290308b1421c8a221b2d5f
 EBUILD gevent-1.2.2.ebuild 1856 BLAKE2B e88950d1a0efff78649584c1f745a9212c3e428af471a7522c771ed2c784ef9700adbaeaa51dd54b43d4ebc83497ae1267538f338abed270c49260fdc947a25b SHA512 f9b23e2db58298a567f81eee28a0388814f5deec19ffcec88bb1c47618137997d20bb287abe6949cef157f8f062010f65b90b35ffb8736d2e02b2bd725a8f46b
+EBUILD gevent-1.3.5.ebuild 1791 BLAKE2B 8cdca98a2012faf3dab69f6933e24b575d6028a833ff90e02837fb63e23fde97d5af58939abad4fe3e3239d550d9e7a057529f308e45d4df007ab47a5a864126 SHA512 78545274f97b632aa9addf4782c098e2d85085100c2aeffd2b7aae0ca79bb7a6bfd921e636df8d8c9d5ea52952310526ad32d776960e8547248a7cd53c1381e7
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.3.5.ebuild b/dev-python/gevent/gevent-1.3.5.ebuild
new file mode 100644
index 000000000000..ea439ad7d480
--- /dev/null
+++ b/dev-python/gevent/gevent-1.3.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.13
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index e3ab02ce97b3..5075a9fc06e1 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,5 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
 EBUILD greenlet-0.4.12.ebuild 1079 BLAKE2B 39169db1ed98f0685cb36a9761f68a6884ed5ba633a398d4834d53e09b0a43b835125769f4d8189793527a71a4fbd275142a9ce95c5af2a58df4ff487f75a099 SHA512 257224005781fb5cb1871714bf21963616b6c233653b7700e18d943ad97037d88b14e31622ff2317a894433bf3b306d4dbcebbd2c0f77b7d70e41c9d48fcfb4c
-EBUILD greenlet-0.4.13.ebuild 1084 BLAKE2B 0052f254ed678ee40ac9a17e514d4feb4654bec98a2ba10e51ce78180dc1f622e339ada4744488ec07d361115542367d785debc7f1ef7fb5ee39e2ef80d61487 SHA512 7cad57f57ba39f099784afb598086ab348e7d4011ae8d7551a8e4735b3fe991a72306ae91688330ffba9680b432fddb13667895bc0af71f361210d967bc1e119
+EBUILD greenlet-0.4.13.ebuild 1086 BLAKE2B b83981cb8992091fee5df423f5434d5afdbd06ef0c1f8f9f329e2396807d30cc39acd804a5f427ea1c3e5acd0546953c36638fa86219c7e459bb69ac8d09eea4 SHA512 3dc08375923c4e114d6680e9ae9e86623508176c8ea2d349cce535f9f5a5f7b01dd86c5c047548ff5a329ecf77cbe8e5e4bba14c1f330dfdf50085ebba00dffa
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
index cc9bcb53e847..83376ef6a4fd 100644
--- a/dev-python/greenlet/greenlet-0.4.13.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 2b96de0c201b..839aba71281f 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,3 +1,3 @@
 DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
-EBUILD pyjwt-1.5.3.ebuild 1265 BLAKE2B b0288608cf84527d858af2f5313198807cf7fe6189a9d7e0c20335adc8aab0566ff8c4c11f12677f5a37ad02841e3fe6e27438be115720c40f015e3826622efd SHA512 f560fc4f5764cb250e5e055df542ee1d518bc15737cd6304720db3500a78a971bd3fb0a3005d0b2c3307485f6df5154f40875467512be0f03ab8932b36c12327
+EBUILD pyjwt-1.5.3.ebuild 1274 BLAKE2B aca14ed6abc283ac649ec62cf7eaff6cd1324cc2bf191d67ee67e8eea6a7ebcaa793756f1d1758d68a2f2ec2273640bca630cd27707abfd2bfa88c2e54a8a53f SHA512 76a505fe837f0d199960b90f699483b24c9a5da67c5632875f0a28090615e332a34a06c125cd0dfcb048c5355ed1ef45eff063433f76de0b1a4a2d81e965fbcd
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
index ae1f2157dead..4f508b7efe49 100644
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 
 inherit distutils-r1 eutils
 
@@ -24,8 +24,6 @@ DEPEND="
 	test? (
 		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)"
 
 S="${WORKDIR}"/${MY_PN}-${PV}
@@ -34,11 +32,14 @@ python_prepare_all() {
 	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
 	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
 
+	# enables coverage, we don't need that
+	rm setup.cfg || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	esetup.py test
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 45cde17c13bc..f90c7034f0f4 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index 830934926e91..f4205c372155 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,4 +1,4 @@
-AUX tornado-1.4-gentoo.patch 955 BLAKE2B 923f1f8aff22a9ac20e67220c249e57fd80a028ab8f2f58106c1c7300a29cd97e2bf52cb6403150f645a8a91f565b2a853631d656ddf80d909bfc35dd508537b SHA512 16499538f588370026e05518d5f437599b9f1a291e47c681cb8f7c3c7a88ba4dd1aafb8b979bc8fc35640777be8b54bf209433c88ac9f1c667f97a39500973d9
-DIST tornado-1.4.tar.gz 54591 BLAKE2B 6a734730e987c6e0516f08e6b3a594b46285e86f3e9b967bd6ff575dc3a55c053b9e4bb7795b51914eebed87979e2a1a290a0273f68a045630b6255cc9714794 SHA512 764c18b228a24cdcaf1456af79d1bdb997f200c09bc33d8f54df28f1f995db1b1a3a328550c5561bc8ebd38d4187f472aa1c892d91889e613b9ff42b86bee322
-EBUILD tornado-1.4.ebuild 867 BLAKE2B e846e4a5ee6325cf8a175f5864bd2cc128195e101fcb87252c9f9913775e812ae56578b2f18c5311f29d33420df3e3f1b46922af176efe4c06902ba815040c37 SHA512 e260752c861452a53624b62579efdd8246c2f104a404f3197844f9c233218ac867b530b2082e145dc5a86d2d39c9abd33519fa102d5fa26a54dd8d2340a8d82b
+AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a
+DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12
+EBUILD tornado-1.4-r2.ebuild 740 BLAKE2B f762b2cac420201ed1df9e77c58e19c79d9f9c113e0159f77a7d9b03c61f120ea856e7561994fe0e64db582161abed2a6288789053adb32d716e9007c1380640 SHA512 463357f175bd3707fd95f8274f248b71fd1df335bfc24e3aed9b2162a753edce7c82e23d46d9fc8e2d40f08edb93babe5a88e97f95b7ddbafef568818dda7c20
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
deleted file mode 100644
index fb8966841158..000000000000
--- a/games-strategy/tornado/files/tornado-1.4-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.old        2009-02-12 12:42:25.000000000 +0100
-+++ Makefile    2009-02-12 12:44:52.000000000 +0100
-@@ -1,10 +1,9 @@
--CC = gcc
- MAKE = make
--LDFLAGS = -lncurses
-+LDLIBS = -lncurses
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
-+PREFIX = /usr
-+LOCALEPATH = /usr/share/locale
-+CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
- VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- LOCALES = de
- MAN = doc/man
-@@ -25,7 +24,7 @@
- $(MAKE) -C $(MAN) all
- 
- tornado: $(OBJFILES)
--	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
-+	$(CC) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
- 
- debug: tornado.6 locales
- 	gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
diff --git a/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
new file mode 100644
index 000000000000..72951781f3e2
--- /dev/null
+++ b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
@@ -0,0 +1,388 @@
+--- a/doc/man/de/Makefile
++++ b/doc/man/de/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing german manpage ..."
+-	if [ ! -d "$(PREFIX)/man/de/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/de/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/de/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/de/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/de/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/de/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/doc/man/fr/Makefile
++++ b/doc/man/fr/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing French manpage ..."
+-	if [ ! -d "$(PREFIX)/man/fr/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/fr/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/fr/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/fr/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/fr/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/fr/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/doc/man/it/Makefile
++++ b/doc/man/it/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing Italian manpage ..."
+-	if [ ! -d "$(PREFIX)/man/it/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/it/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/it/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/it/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/it/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/it/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/doc/man/Makefile
++++ b/doc/man/Makefile
+@@ -15,10 +15,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing manpage ..."
+-	if [ ! -d "$(PREFIX)/man/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/man6
+ 	$(MAKE) -C de install-man
+ 	$(MAKE) -C fr install-man
+ 	$(MAKE) -C it install-man
+--- a/doc/man/nl/Makefile
++++ b/doc/man/nl/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing Dutch manpage ..."
+-	if [ ! -d "$(PREFIX)/man/nl/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/nl/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/nl/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/nl/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/nl/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/nl/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/doc/man/no/Makefile
++++ b/doc/man/no/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing Norwegian manpage ..."
+-	if [ ! -d "$(PREFIX)/man/no/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/no/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/no/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/no/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/no/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/no/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/doc/man/ru/Makefile
++++ b/doc/man/ru/Makefile
+@@ -9,10 +9,10 @@
+ 
+ install-man: tornado.6
+ 	@echo "Installing Russian manpage ..."
+-	if [ ! -d "$(PREFIX)/man/ru/man6" ]; then \
+-	  mkdir -p $(PREFIX)/man/ru/man6; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/ru/man6" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/share/man/ru/man6; \
+ 	fi
+-	install -m 0644 tornado.6 $(PREFIX)/man/ru/man6
++	install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/ru/man6
+ 
+ clean:
+ 	rm -f tornado.6
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,9 @@
+-CC = gcc
+ MAKE = make
+-LDFLAGS = -lncurses
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ OBJFILES = main.o draw.o erwin.o network.o scores.o
+-PREFIX = /usr/local
+-LOCALEPATH = /usr/local/share/locale
+-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" 
++PREFIX = /usr
++LOCALEPATH = /usr/share/locale
++CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
+ VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+ LOCALES = de
+ MAN = doc/man
+@@ -25,7 +24,7 @@
+ 	$(MAKE) -C $(MAN) all
+ 
+ tornado: $(OBJFILES)
+-	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
+ 
+ debug: tornado.6 locales
+ 	gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" 
+@@ -43,25 +42,24 @@
+ 
+ install: tornado tornado.6 install-locale-data
+ 	@echo "Installing tornado binary in $(PREFIX)/bin..."
+-	if [ ! -d "$(PREFIX)/bin" ]; then \
+-	  mkdir -p $(PREFIX)/bin; \
++	if [ ! -d "$(DESTDIR)/$(PREFIX)/bin" ]; then \
++	  mkdir -p $(DESTDIR)/$(PREFIX)/bin; \
+ 	fi
+-	install -s tornado $(PREFIX)/bin
++	install tornado $(DESTDIR)/$(PREFIX)/bin
+ 
+ 	$(MAKE) -C $(MAN) install-man
+ 
++	if [ ! -d "$(DESTDIR)/var/games" ]; then \
++	  mkdir -p $(DESTDIR)/var/games; \
++	fi; \
+ 	if [ -f "/var/games/tornado.scores" ]; then \
+ 	  echo "Skipping install of the highscores file. File exists."; \
+ 	  cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \
+-	  mv -f score.tmp /var/games/tornado.scores; \
+-	  chmod a+rw-x "/var/games/tornado.scores"; \
+-	else \
+-	  if [ ! -d "/var/games" ]; then \
+-	    mkdir /var/games; \
+-	  fi; \
+-	  install tornado.scores /var/games; \
+-	  chmod a+w-x "/var/games/tornado.scores"; \
+-	fi
++	  mv -f score.tmp $(DESTDIR)/var/games/tornado.scores; \
++    else \
++      install tornado.scores $(DESTDIR)/var/games; \
++	fi; \
++	chmod a+w-x "$(DESTDIR)/var/games/tornado.scores";
+ 
+ install-locale-data:
+ 	$(MAKE) -C po install-locale-data
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -1,9 +1,3 @@
+-CC = gcc
+-MAKE = make
+-LDFLAGS = -lncurses
+-OBJFILES = main.o draw.o erwin.o network.o scores.o
+-PREFIX = /usr/local
+-LOCALEPATH = /usr/local/share/locale
+-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
+-LOCALES = de
++PREFIX = /usr
++LOCALEPATH = /usr/share/locale
+ MAN = doc/man
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -14,38 +14,38 @@
+ 	msgfmt no.po -o no.mo
+ 
+ install-locale-data: de.mo fr.mo pt.mo es.mo it.mo ru.mo nl.mo no.po
+-	if [ ! -d "$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/de/LC_MESSAGES/; \
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/; \
+ 	fi
+-	install -m 0644 de.mo $(LOCALEPATH)/de/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/fr/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 fr.mo $(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/pt/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 pt.mo $(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/es/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 es.mo $(LOCALEPATH)/es/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/it/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 it.mo $(LOCALEPATH)/it/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/ru/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 ru.mo $(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/nl/LC_MESSAGES/; \
+-	fi
+-	install -m 0644 nl.mo $(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo
+-	if [ ! -d "$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \
+-	  mkdir -p $(LOCALEPATH)/no/LC_MESSAGES/; \
++	install -m 0644 de.mo $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/; \
++	fi
++	install -m 0644 fr.mo $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/; \
++	fi
++	install -m 0644 pt.mo $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/; \
++	fi
++	install -m 0644 es.mo $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/; \
++	fi
++	install -m 0644 it.mo $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/; \
++	fi
++	install -m 0644 ru.mo $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/; \
++	fi
++	install -m 0644 nl.mo $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo
++	if [ ! -d "$(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \
++	  mkdir -p $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/; \
+ 	fi
+-	install -m 0644 no.mo $(LOCALEPATH)/no/LC_MESSAGES/tornado.mo
++	install -m 0644 no.mo $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/tornado.mo
+ 
+ clean:
+ 	rm -f *.mo
+--- a/doc/man/de/tornado.6.de.in
++++ b/doc/man/de/tornado.6.de.in
+@@ -90,13 +90,13 @@
+ .SH FILES
+ PREFIX/bin/tornado
+ .P
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH NOTES
+ Wenn das Spiel im Netzwerkmodus läuft sollte auf beiden Seiten die selbe
+ Version laufen. Versionen vor 1.0pre4 funktionieren damit überhaupt nicht,
+--- a/doc/man/fr/tornado.6.fr.in
++++ b/doc/man/fr/tornado.6.fr.in
+@@ -72,13 +72,13 @@
+ .SH FICHIERS
+ PREFIX/bin/tornado
+ .P
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH NOTES
+ Pour jouer en mode réseau, le client et le serveur doivent avoir le même numéro de version. Les versions antérieures à la 1.0pre4 ne sont pas prévues pour jouer en réseau. Le jeu en réseau entre deux versions différentes du programme acceptera de démarrer, mais sera susceptible de crasher à tout moment.
+ .P
+--- a/doc/man/it/tornado.6.it.in
++++ b/doc/man/it/tornado.6.it.in
+@@ -74,13 +74,13 @@
+ .SH FILE
+ PREFIX/bin/tornado
+ .P
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH NOTE
+ Avviando il gioco in modalità network, dovreste avere la stessa versione del gioco dal lato server e client. Le versioni precedenti alla 1.0pre4 non funzioneranno per nulla, a causa della mancanza delle funzionalità di rete. Con versioni diverse ai due lati, il gioco si avvierà ugualmente, ma potrebbe andare in crash ad ogni momento, se c'é troppa differenza tra le due versioni.
+ .P
+--- a/doc/man/nl/tornado.6.nl.in
++++ b/doc/man/nl/tornado.6.nl.in
+@@ -71,15 +71,15 @@
+ .B \-\-version,
+ Toont de het versienummer en beeindigt.
+ .SH "FILES"
+-/usr/local/bin/tornado
++/usr/bin/tornado
+ .P
+-/usr/local/man/man6/tornado.6
++/usr/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH "NOTES"
+ Als u het spel in netwerk modus draait moeten de client en de server dezelfde versie draaien. Versies voor 1.0pre4 werken helemaal niet,
+ omdat die geen netwerk functionaliteit hebben. Het spel zal wel starten met verschillende versies, mar het zal waarschijnlijk later crashen, als er te veel verschillen zijn.
+--- a/doc/man/no/tornado.6.no.in
++++ b/doc/man/no/tornado.6.no.in
+@@ -86,13 +86,13 @@
+ .SH FILES
+ PREFIX/bin/tornado
+ .P
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH NOTES
+ Når du starter spillet i nettverksmodus bør du ha samme versjon på klient
+ og tjener. Versjoner før 1.0pre4 vil ikke virke i det heletatt på grunn
+--- a/doc/man/ru/tornado.6.ru.in
++++ b/doc/man/ru/tornado.6.ru.in
+@@ -92,7 +92,7 @@
+ .SH æáêìù
+ .nf
+ PREFIX/bin/tornado
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ /var/games/tornado.scores
+ .fi
+ .SH ðòéíåþáîéå
+--- a/doc/man/tornado.6.in
++++ b/doc/man/tornado.6.in
+@@ -88,13 +88,13 @@
+ .SH FILES
+ PREFIX/bin/tornado
+ .P
+-PREFIX/man/man6/tornado.6
++/usr/share/man/man6/tornado.6
+ .P
+ /var/games/tornado.scores
+ .P
+-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo
++/usr/share/locale/de/LC_MESSAGES/tornado.mo
+ .P
+-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo
++/usr/share/locale/fr/LC_MESSAGES/tornado.mo
+ .SH NOTES
+ When you run the game in network mode you should have the same game versions
+ on client and server side. Versions prior 1.0pre4 won't work at all due to
diff --git a/games-strategy/tornado/tornado-1.4-r2.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild
new file mode 100644
index 000000000000..c2a5f7c2f76c
--- /dev/null
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
+HOMEPAGE="https://github.com/kouya/tornado"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PF}-gentoo.patch
+)
+
+src_configure() {
+	if ! use nls; then
+		sed -i \
+			-e '/^all:/s|locales||g' \
+			-e '/^install:/s|install-locale-data||g' \
+			Makefile || die
+	fi
+
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+	fperms 664 "/var/games/tornado.scores"
+}
diff --git a/games-strategy/tornado/tornado-1.4.ebuild b/games-strategy/tornado/tornado-1.4.ebuild
deleted file mode 100644
index 0c6638176e97..000000000000
--- a/games-strategy/tornado/tornado-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
-HOMEPAGE="http://kiza.kcore.de/software/tornado/"
-SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "s:PREFIX/bin:${GAMES_BINDIR}:" \
-		-e "s:PREFIX/man:/usr/man:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:/usr/local:/usr:" \
-		doc/man/tornado.6.in \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	dogamesbin tornado
-	doman doc/man/tornado.6
-	dodoc AUTHOR CREDITS Changelog README TODO
-	insinto "${GAMES_STATEDIR}"
-	doins tornado.scores
-	prepgamesdirs
-	fperms 664 "${GAMES_STATEDIR}/tornado.scores"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 68a3d65d76f5..5d40a9466781 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 75273542e1d5..5e2976f2b2e3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jul 2018 08:08:41 +0000
+Wed, 18 Jul 2018 13:38:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0fd3fcb77e46..7f4237763a80 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 426937 BLAKE2B fd40fb2cce7e8bb9b86f11cc0b67099c90238f284b3a458c8153c050be8f5f23899e2d0a85dee8371053bc572661a4ef4f721c0fbfb7976cc36ee7c7480ac631 SHA512 829750d5237ed3b11ae3dc9afdaacd5fe79e390dedf6730a47ac29c7f64e7bcce35e880cc0e44d263a4b9a9ed0186d2e6503cec484fcd93b4c19afde5af0ab31
-TIMESTAMP 2018-07-18T08:08:45Z
+TIMESTAMP 2018-07-18T13:38:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltO9Y1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltPQuRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDqJA/+PDJFJ/b3wX1S1QL/vfAIcUP2kkZqSTrQKgZptefZmhb6EGKioqdSRG8m
-746eZ1A1q1Gw2B7uzRHQk7vZPmnG+H1jsQIIzP7Tx282Qu5/5Tliw5BjOs1gJZ66
-w2kHgH32OwPTOaIesBbG/olQak7tnvcVshcZmLU2c4PGZbXwyy6uK2Zrxqmjz14w
-b1M3kcoOZ68s4cDNBgnRj3j8TXmGv6Jxo4dhGGW4xgn84nE9sbEvOFHDPqG5aWIE
-dz/Gze8LjvfJ8Xc3hTF+fu3OPXBES5/Db4TDATmOHox7wJuDG+TNzZ5agmT5BT2C
-oBAsMzdwUUhCYAzZ1RnKk7Tuzy+vGpwS+TVQoCc1yWhPk7n4Yl2tbBsHaWh08/I8
-w+xmGyPMiBZTbqibm/+ZDDYwO51xDh1gQVcKtoKQHuthzMbArbzW32kPzXxch/SZ
-nWgvqTHNGq3bCy/b8dg6oPekgDwJb+R02stvSmtOGQt0IT7LMNXLpeGURRYRzFZ4
-7icDKi6MZ/nCHLwPISGs7rhrEl46oyZmDBB/8L4CPWqbfCNg8g6J0Ix3vE9u1vsi
-HxkblO9Hi/52sM7D+GYGtUJG27QGFYf42yFD/U2tHgFJJmgQlwi8VQg2UJVmkEXJ
-V5GsRCxiXtphb5qPzH1xCpQ3I1KaImuMmWNNMa9vP7teqvz5YAw=
-=w4i6
+klDxRQ//c5uP9NEV4A8kjC9aZU1YcWeYaYcec/xhxzbfYw4wMymH9SGDkNtt9x7F
+HrHywZOhrpPwuOAPggSsrmMzmHrm87CB8omvYuJN8HJcYPIGBOn5BpqxRilQtbud
+KUK5PQeYl1tS7VsFMJ4VrpeyZKUp7wfBoTr7U3Tvtm+z/zxQPQUOmTDguNLzIuTL
+oHk6wD05+Xu2Hbaq16qS9u2d2uWQZwVgICnj6XHAbLsOrPQ2FJyuzYYnQGpZrczX
+SzE0NvLyqbBSil+8XcOQ4CDDKIO+pUqi6KmmKJYtRX0epWERDj3SDE/5V3UphS1c
+k16GQiHLh/wzL+ybuHtkriRMxuWINvFQZhnlrqt5OnWlMpfUpzJlKAZ8DhpwtAlk
+yB5kVn2G9CPAyy4pn4Fc7EUmWzdtN6C+7mkZYFEUw0LXUO+IYH2ucrxxojPsCncp
+eyXYxLuc+YAB3JFHKbaGOh46MM9aE/dBx45yIhOWHP4QWDpQ63UU1+Gx/awJHB+B
+PTos6fAfd8mzH0ifIIXMLlTBAF0FIn3f84Aum5+G7RcAI6JIsxDsS4SVq1VJVT6U
+j7nfGwhGLl4BHF8nKbuwIZbUxXPW6GxU3hN6z/4amP1ly2eXLd6NAErZzuCuHhJE
+FpWOiVQcKdRwqldcWKirwf+OTFRJpYJgyWEJk+/rBcc6KfWwBZU=
+=Q85m
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 75273542e1d5..5e2976f2b2e3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jul 2018 08:08:41 +0000
+Wed, 18 Jul 2018 13:38:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 09b0b6446ab8..57b0fb2bed9a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ae0c2a730eb2..f1b0ad0e6e82 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/reg-0.13.4 b/metadata/md5-cache/app-emulation/reg-0.13.4
deleted file mode 100644
index 539a152f16ee..000000000000
--- a/metadata/md5-cache/app-emulation/reg-0.13.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker registry v2 command line client
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/reg
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/reg/archive/v0.13.4.tar.gz -> reg-0.13.4.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c856ddbec15552c800e11f669e94def5
diff --git a/metadata/md5-cache/app-emulation/reg-0.14.1 b/metadata/md5-cache/app-emulation/reg-0.14.1
deleted file mode 100644
index 8edd7c47da81..000000000000
--- a/metadata/md5-cache/app-emulation/reg-0.14.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Docker registry v2 command line client
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/reg
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/reg/archive/v0.14.1.tar.gz -> reg-0.14.1.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=729c395250c947538062876aa7dbfb80
diff --git a/metadata/md5-cache/app-emulation/reg-0.13.3 b/metadata/md5-cache/app-emulation/reg-0.15.4-r1
similarity index 55%
rename from metadata/md5-cache/app-emulation/reg-0.13.3
rename to metadata/md5-cache/app-emulation/reg-0.15.4-r1
index b496fb0a7c7d..7eb1e28d4e33 100644
--- a/metadata/md5-cache/app-emulation/reg-0.13.3
+++ b/metadata/md5-cache/app-emulation/reg-0.15.4-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile install setup test unpack
 DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=Docker registry v2 command line client
 EAPI=6
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/genuinetools/reg/archive/v0.13.3.tar.gz -> reg-0.13.3.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=63429071712b338ade621575a5889ce9
+SRC_URI=https://github.com/genuinetools/reg/archive/v0.15.4.tar.gz -> reg-0.15.4.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1586cb2b9993b41b9b01562e820f6cb2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
similarity index 91%
rename from metadata/md5-cache/app-emulation/virtualbox-5.2.12
rename to metadata/md5-cache/app-emulation/virtualbox-5.2.16
index 5d247d13ac10..989dbb62040c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.16 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.12-patches-01.tar.xz
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	linux-info	bb73a1f0c3db9ff796439bf44bed8467	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	tmpfiles	d7dc36a24e327d58f0728badddca6448	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d3aa684935c702ac779b1eaa36eea77
+_md5_=eb7f0b11a52a931986a5a208a4af8092
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12
deleted file mode 100644
index 19a23b1076ef..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VBoxGuestAdditions_5.2.12.iso
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=378cc9e89df1e573943eb52f7caab439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16
new file mode 100644
index 000000000000..b6c2d7766f3c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VBoxGuestAdditions_5.2.16.iso
+_md5_=70aae409f8f86cd224c19e3ecd2126ea
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591
deleted file mode 100644
index 7b7cea739897..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=5
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.12 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12-122591-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12-122591-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.12/Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.12/VirtualBoxSDK-5.2.12-122591.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6040cbe2623647c024ca24a36c9701dc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
new file mode 100644
index 000000000000..811a1815a59d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.16 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16-123759-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.16/Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.16/VirtualBoxSDK-5.2.16-123759.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42d5dd5d7511d69dda21fc60b81c5eaf
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591
deleted file mode 100644
index 2a3bef8529e3..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-5.2.12
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=53ce8063968f6913ed36edc5034ac601
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759
new file mode 100644
index 000000000000..36d30e2aeb69
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.2.16
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=af08d1c9280ee23cfbea5662b65d7675
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
similarity index 88%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
index 08a8eca55dd6..960cf376d97b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.16/VirtualBox-5.2.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	bb73a1f0c3db9ff796439bf44bed8467	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eba0892a4e461a1cefc70d496c4b7adc
+_md5_=0990e370570de520c9d4b0186900f6e5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
similarity index 93%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12
rename to metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
index 4785afb99fb0..446e0059bf32 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.12.tar.xz
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.16.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	linux-info	bb73a1f0c3db9ff796439bf44bed8467	linux-mod	8ce5c5f548ed010d6499eb792ac1a638	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=957f9194e88099ba8c30324c39cdb075
+_md5_=bccf9dfb12387664d9fd8ca9af9f9601
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fb872276dc93..dae8562f88d8 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/PyGithub-1.40_alpha4 b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
index e8256dc3ff17..cc615e3a58c4 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
+++ b/metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyjwt[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.14.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/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(-)]
+DEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library to access the Github API v3
 EAPI=6
 HOMEPAGE=https://github.com/PyGithub/PyGithub/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3+
-RDEPEND=dev-python/pyjwt[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.14.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-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 )
+RDEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.40a4.tar.gz -> PyGithub-1.40a4.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=080160b112f2589a059d64a232f77be1
+_md5_=9753aed2d1deb6348b75ca740ddda97a
diff --git a/metadata/md5-cache/dev-python/gevent-1.3.5 b/metadata/md5-cache/dev-python/gevent-1.3.5
new file mode 100644
index 000000000000..cfe468a96334
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gevent-1.3.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.13 virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Coroutine-based network library
+EAPI=6
+HOMEPAGE=http://gevent.org/ https://pypi.org/project/gevent/
+IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libev-4.23 >=net-dns/c-ares-1.12 >=dev-python/greenlet-0.4.13 virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/g/gevent/gevent-1.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a90cc1dfff9d9811ae853a393caf4ce
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.13 b/metadata/md5-cache/dev-python/greenlet-0.4.13
index f0b8b89b1f0e..5e9dab2a9c0e 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.13
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=6
 HOMEPAGE=https://pypi.org/project/greenlet/
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-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 )
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.13.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bf2443bed6e5e6666a936ed185755bc
+_md5_=ae66db2d7d4f9f39d022dc9011705bfa
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.5.3 b/metadata/md5-cache/dev-python/pyjwt-1.5.3
index 68743ff9ee75..df6526b8d4f2 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.5.3
+++ b/metadata/md5-cache/dev-python/pyjwt-1.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/cryptography-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/cryptography-1.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=JSON Web Token implementation in Python
 EAPI=6
 HOMEPAGE=https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-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_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.5.3.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c3facf2d186ae18b568c44d8caf4983
+_md5_=ec6ac5e6411d4a6254f0c0a6506509fd
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 611e876534ef..5141b14c97c5 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/tornado-1.4 b/metadata/md5-cache/games-strategy/tornado-1.4
deleted file mode 100644
index aa7c91b156d6..000000000000
--- a/metadata/md5-cache/games-strategy/tornado-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Clone of a C64 game - destroy the opponent's house
-EAPI=5
-HOMEPAGE=http://kiza.kcore.de/software/tornado/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=http://kiza.kcore.de/software/tornado/download/tornado-1.4.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78a9a07d12aeda81de2f91f2a4fe8771
diff --git a/metadata/md5-cache/games-strategy/tornado-1.4-r2 b/metadata/md5-cache/games-strategy/tornado-1.4-r2
new file mode 100644
index 000000000000..06fc7456faf3
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/tornado-1.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=nls? ( sys-devel/gettext )
+DESCRIPTION=Clone of a C64 game - destroy the opponent's house
+EAPI=6
+HOMEPAGE=https://github.com/kouya/tornado
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://github.com/kouya/tornado/archive/v1.4.tar.gz -> tornado-1.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=950a11d505cd7fc07f04673516e39505
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5144847044d7..65b8437fbd00 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/fwupd-1.1.0 b/metadata/md5-cache/sys-apps/fwupd-1.1.0-r1
similarity index 91%
rename from metadata/md5-cache/sys-apps/fwupd-1.1.0
rename to metadata/md5-cache/sys-apps/fwupd-1.1.0-r1
index e78c82752961..356688f5f249 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.1.0
+++ b/metadata/md5-cache/sys-apps/fwupd-1.1.0-r1
@@ -1,14 +1,15 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive >=dev-util/meson-0.41.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] )
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=6
 HOMEPAGE=https://fwupd.org
 IUSE=colorhug dell doc gpg +man pkcs7 redfish systemd test uefi 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
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype >=sys-libs/efivar-33 x11-libs/cairo )
+PDEPEND=sys-apps/dbus
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.0.tar.gz -> fwupd-1.1.0.tar.gz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b161de940a4832e728ec5f61389c147
+_md5_=a3467259752ecf9bfedf218deb5e2dbb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 23fa72dcc20c..fb87f99289c4 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.11.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.1
similarity index 83%
rename from metadata/md5-cache/sys-cluster/kube-apiserver-1.11.0
rename to metadata/md5-cache/sys-cluster/kube-apiserver-1.11.1
index 17bff0828775..bbc282c349a9 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.1
similarity index 83%
rename from metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.0
rename to metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.1
index 79824eef9898..5f7506aa2793 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.11.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.1
similarity index 82%
rename from metadata/md5-cache/sys-cluster/kube-proxy-1.11.0
rename to metadata/md5-cache/sys-cluster/kube-proxy-1.11.1
index 4d2a17ecb268..920d7afee965 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.1
similarity index 83%
rename from metadata/md5-cache/sys-cluster/kube-scheduler-1.11.0
rename to metadata/md5-cache/sys-cluster/kube-scheduler-1.11.1
index 5cc243cdc54e..17fe346e2c82 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.11.0 b/metadata/md5-cache/sys-cluster/kubectl-1.11.1
similarity index 86%
rename from metadata/md5-cache/sys-cluster/kubectl-1.11.0
rename to metadata/md5-cache/sys-cluster/kubectl-1.11.1
index 4516c603d070..8aec7a8ed836 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.11.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.11.0 b/metadata/md5-cache/sys-cluster/kubelet-1.11.1
similarity index 82%
rename from metadata/md5-cache/sys-cluster/kubelet-1.11.0
rename to metadata/md5-cache/sys-cluster/kubelet-1.11.1
index 2082cdd46a28..854894f926ca 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.11.0
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.11.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.0.tar.gz -> kubernetes-1.11.0.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.11.1.tar.gz -> kubernetes-1.11.1.tar.gz
 _eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
 _md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1a50f80d68c8..5701354dd525 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.17.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8
new file mode 100644
index 000000000000..82012a29ab24
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8
@@ -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.17 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.17.8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/genpatches-4.17-9.base.tar.xz mirror://gentoo/genpatches-4.17-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.17-9.experimental.tar.xz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	kernel-2	9c959482618084f1edf862d4783a73b4	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=543d660fdd06d635ae8d29e99fd093ad
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index dad2b7b33a0b..c64ccd9f5734 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/python-greenlet-1.0 b/metadata/md5-cache/virtual/python-greenlet-1.0
index cca1ad9f5202..a9e70e4e6420 100644
--- a/metadata/md5-cache/virtual/python-greenlet-1.0
+++ b/metadata/md5-cache/virtual/python-greenlet-1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python greenlet module
 EAPI=6
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 -hppa ~mips ppc ppc64 x86
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) 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_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_python2_7? ( dev-python/greenlet[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/greenlet[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/greenlet[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/greenlet[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(-)] )
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/greenlet[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/greenlet[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/greenlet[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/greenlet[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/greenlet[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_7(-)?,-python_single_target_python3_7(-)] )
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d49e625efc45459a7a6716db47699acb
+_md5_=92879f918ff549cb6f398e09a3235a6c
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c81742deca29..5525dc06d67c 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/uwsgi-2.0.17.1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
new file mode 100644
index 000000000000..19edcf589e03
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=6
+HOMEPAGE=http://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
+SLOT=0
+SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.17.1.tar.gz -> uwsgi-2.0.17.1.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	d0e5375d47f4c809f406eb892e531513	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b43d08fe0771faf2f5e7be19c2789d33	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	a43d6cd7f05b4d013e7e40104ddfd3c7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5f501b8102ab0066873f5439d5e08b60
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ad320a10b7c6..25b77045023d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19946 BLAKE2B 37c8e8da6d0a8ec1afb0d8130e6a0691b2337c561a7530993bc0d97dd6269ffedba2f21a2a2c3768d5c1ca61b5951708c71d2be3e169f99b0ebf7184cc931c64 SHA512 0bb16aaac12c9d78f051f6bdbcd26e1f27fbda2b373993607a770cb50b1617d861c7d394ada14a3620375b712f2fc4a8e199c1b94b59062b18e2d1cf6d090de1
-TIMESTAMP 2018-07-18T08:08:45Z
+TIMESTAMP 2018-07-18T13:38:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltO9Y1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltPQuRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB0nQ//ViHXR5MrTTeqSJBO0U5fZ1QL8so0dTi+ErFgBo20lpAxWBMONg0sTwvs
-mX95VvR4iNZAOcT88gsS5698d0nqZTxVFWtGqVesV9vX2shQKndCzTOopbPOULKw
-/TLuWJjQWEiqLKWzUCiws/pgd8pRIFbZc8bVw6LMfGFrEpBlnapwXEG7X8d22t6e
-ydjwq2FOsXdIb3wzY+MGoTjLiJra9CAucgvw1o2eku6lmPdI1gf00xYxPgJMdBYw
-0nBYoHMXehxw/sb5SSnAG6LnS+fpUj4DzGxIEg0u5EUkGVkMvFzqdOQI0S3k9/k9
-UzAvMqFP6Rpp2j2vhVgbMk1WfaGaEIzwqFI1qaQCbmKA/GdrOCM5BDR/0zu8tTUh
-gKJeEVGU6bRaBzcYw4n5J0RICvTwE/XtaIBjE2TpyrVrGSLdxQc0BGCfO3vVaifC
-xu1VtvfMawRXO1+DctafwBePQFa29v0FBYBFo3hecPgT+C08VsDI3YkCcNmMQNh7
-f6k/DO2BTe+YA3ehvtRc9V1ZG3TuvmXjNIv4GQ5Ju80eA0T0DgOT4OGHrfH5GeRN
-gzJBZci2/MMFQ42g8WzGQnGccgrx3BT0RcuqWxnEt+NTjMxHj79OP4j9Hsk4YZ7b
-6J782NPpxN7T/Sn856Hf5C5P42Sm0WBX0JJFFt9CR4eP1qwIupo=
-=q/PV
+klC2CA//W+WYxYzGVZXnrWmTA0Z4OhveK+Pj8vzXUcitXRraxDGg9VNeXGx2J0nr
+eDnSFMS4vEHsx4n2NQeln7JeOpfONtOUseHBZWKKWjb7WsLEBbhozYzBHLN4wGqR
+82e287iA+Kxg/PeT7rtVlWuTRxsCHxqiBopIMbpWtRs7/31t70/bWXx6XSXArnrk
+ZwRIyVkuN1U2tklw8YjwDfjULduKKH69j/UGRtBrAMEJIcz8sRP4xAYGpbPcL5jS
+v9F0VSaM/E8dNVbqVk2s2H6AeQQwF/SODsRnTihrQR3h76b3l+8URi7rQCNcUzWP
+z/m/yLfkEUW84R2znVlW6WYB9nCF3Zm0+bIwjgChJJfvrfv/rnbpviVOOUuJa2wc
+6o4jHazgSx5S7Z7t1TFy7pwhHOkVtsRPY6cbXsVDgrUmAK1GJF3LodUXlSygsgbF
+OEkOft1qj9sofJhY3Di4k7FlUe7KUYaJmvIci6HvkVQs2dSjKc4EAcOam0pET3ic
+MoVkAD5eBKkoxJUNjIUe7PHQJG8/6B/zRqXB5DpEjFyQuf7D+wxZwYc+H6ZvjRg2
+WVpJ1fghuLWf3rl5wMtyI9+STbwWj2fjO3fy3DiOfDvOSN5p4b+Kn5h0aMrl45oP
+yKFv7JIis7NTa4oPgd+ddkcf4AMEA9f1PF/ST9ssWM3dNw8c0Wc=
+=hWS4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 75273542e1d5..5e2976f2b2e3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jul 2018 08:08:41 +0000
+Wed, 18 Jul 2018 13:38:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 02565b4b3506..980589ee7139 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 18 08:08:41 UTC 2018
+Wed Jul 18 13:38:40 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 50fd7d4f95c5..1a7806d681a4 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -4518,7 +4518,7 @@
 1801231609 ./virtual/libiconv/libiconv-0-r1.ebuild
 1801231609 ./virtual/libiconv/libiconv-0-r2.ebuild
 1702282250 ./virtual/cdrtools/cdrtools-0.ebuild
-1705041940 ./virtual/python-greenlet/python-greenlet-1.0.ebuild
+1807181309 ./virtual/python-greenlet/python-greenlet-1.0.ebuild
 1703291854 ./virtual/libusb/libusb-0-r2.ebuild
 1703291854 ./virtual/libusb/libusb-1-r1.ebuild
 1805070338 ./virtual/libusb/libusb-1-r2.ebuild
@@ -9307,6 +9307,7 @@
 1806162339 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.50.ebuild
 1806141939 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.137.ebuild
 1801080209 ./sys-kernel/gentoo-sources/gentoo-sources-4.1.48.ebuild
+1807181509 ./sys-kernel/gentoo-sources/gentoo-sources-4.17.8.ebuild
 1807031939 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.111.ebuild
 1807101939 ./sys-kernel/gentoo-sources/gentoo-sources-4.17.5.ebuild
 1806040208 ./sys-kernel/gentoo-sources/gentoo-sources-4.17.0.ebuild
@@ -11026,7 +11027,7 @@
 1801140209 ./games-strategy/colobot-data/colobot-data-9999.ebuild
 1801140209 ./games-strategy/colobot-data/colobot-data-0.1.11.ebuild
 1711182327 ./games-strategy/netpanzer/netpanzer-0.8.2.ebuild
-1711182327 ./games-strategy/tornado/tornado-1.4.ebuild
+1807181609 ./games-strategy/tornado/tornado-1.4-r2.ebuild
 1807010309 ./games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
 1805120008 ./games-mud/powwow/powwow-1.2.16-r1.ebuild
 1702282250 ./games-mud/kildclient/kildclient-3.0.1-r1.ebuild
@@ -12102,7 +12103,7 @@
 1804192239 ./dev-python/pgmagick/pgmagick-0.6.7.ebuild
 1806281539 ./dev-python/GridDataFormats/GridDataFormats-0.4.0.ebuild
 1804192239 ./dev-python/greenlet/greenlet-0.4.12.ebuild
-1807010739 ./dev-python/greenlet/greenlet-0.4.13.ebuild
+1807181309 ./dev-python/greenlet/greenlet-0.4.13.ebuild
 1709251644 ./dev-python/django-haystack/django-haystack-2.4.1.ebuild
 1804262239 ./dev-python/fudge/fudge-1.1.0.ebuild
 1804262239 ./dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -12133,6 +12134,7 @@
 1806280139 ./dev-python/gevent/gevent-1.2.1.ebuild
 1807011709 ./dev-python/gevent/gevent-1.2.2.ebuild
 1804192239 ./dev-python/gevent/gevent-1.0.1.ebuild
+1807181309 ./dev-python/gevent/gevent-1.3.5.ebuild
 1803170038 ./dev-python/flup/flup-1.0.2-r1.ebuild
 1705301334 ./dev-python/cligj/cligj-0.4.0.ebuild
 1707081719 ./dev-python/shiboken/shiboken-1.2.2.ebuild
@@ -13583,7 +13585,7 @@
 1804192239 ./dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
 1806281909 ./dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
 1704241231 ./dev-python/PyGithub/PyGithub-1.28.ebuild
-1807141239 ./dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
+1807181609 ./dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
 1806030209 ./dev-python/PyGithub/PyGithub-1.39.ebuild
 1708120743 ./dev-python/PyGithub/PyGithub-1.35.ebuild
 1804262239 ./dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
@@ -13705,7 +13707,7 @@
 1702282250 ./dev-python/dask/dask-0.10.2.ebuild
 1709300229 ./dev-python/voluptuous/voluptuous-0.10.5.ebuild
 1804290638 ./dev-python/voluptuous/voluptuous-0.11.1.ebuild
-1804192239 ./dev-python/pyjwt/pyjwt-1.5.3.ebuild
+1807181609 ./dev-python/pyjwt/pyjwt-1.5.3.ebuild
 1804262239 ./dev-python/statistics/statistics-3.4.0_beta3.ebuild
 1804262239 ./dev-python/statistics/statistics-1.0.3.5.ebuild
 1707121740 ./dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -26691,8 +26693,8 @@
 1702282250 ./sys-cluster/mvapich2/mvapich2-1.6.ebuild
 1806061539 ./sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild
 1806272339 ./sys-cluster/kube-scheduler/kube-scheduler-1.10.5.ebuild
+1807181439 ./sys-cluster/kube-scheduler/kube-scheduler-1.11.1.ebuild
 1807021809 ./sys-cluster/kube-scheduler/kube-scheduler-1.9.9.ebuild
-1807091809 ./sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
 1805231139 ./sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild
 1805261438 ./sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
 1805260039 ./sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
@@ -26705,11 +26707,11 @@
 1806010108 ./sys-cluster/heat/heat-9.0.4.ebuild
 1806270009 ./sys-cluster/heat/heat-2018.1.9999.ebuild
 1806061539 ./sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild
+1807181439 ./sys-cluster/kube-apiserver/kube-apiserver-1.11.1.ebuild
 1807021809 ./sys-cluster/kube-apiserver/kube-apiserver-1.9.9.ebuild
 1805231139 ./sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild
-1807021809 ./sys-cluster/kube-apiserver/kube-apiserver-1.11.0.ebuild
 1806272339 ./sys-cluster/kube-apiserver/kube-apiserver-1.10.5.ebuild
-1807101539 ./sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
+1807181439 ./sys-cluster/kube-proxy/kube-proxy-1.11.1.ebuild
 1806061539 ./sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild
 1805231139 ./sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild
 1806272339 ./sys-cluster/kube-proxy/kube-proxy-1.10.5.ebuild
@@ -26722,15 +26724,15 @@
 1710310241 ./sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
 1711040011 ./sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
 1806061539 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild
-1807111809 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
 1806272339 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.10.5.ebuild
 1807021809 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.9.9.ebuild
+1807181439 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.11.1.ebuild
 1805231139 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild
 1704301236 ./sys-cluster/libqb/libqb-0.17.2.ebuild
 1704221722 ./sys-cluster/libqb/libqb-0.17.1.ebuild
 1706191933 ./sys-cluster/libqb/libqb-1.0.1.ebuild
 1801231609 ./sys-cluster/vzctl/vzctl-4.9.4.ebuild
-1807021809 ./sys-cluster/kubectl/kubectl-1.11.0.ebuild
+1807181439 ./sys-cluster/kubectl/kubectl-1.11.1.ebuild
 1806272339 ./sys-cluster/kubectl/kubectl-1.10.5.ebuild
 1805231139 ./sys-cluster/kubectl/kubectl-1.9.8.ebuild
 1807021809 ./sys-cluster/kubectl/kubectl-1.9.9.ebuild
@@ -26758,7 +26760,7 @@
 1806061539 ./sys-cluster/kubelet/kubelet-1.10.4.ebuild
 1806272339 ./sys-cluster/kubelet/kubelet-1.10.5.ebuild
 1805231139 ./sys-cluster/kubelet/kubelet-1.9.8.ebuild
-1807091809 ./sys-cluster/kubelet/kubelet-1.11.0.ebuild
+1807181439 ./sys-cluster/kubelet/kubelet-1.11.1.ebuild
 1708310107 ./sys-cluster/openstack-meta/openstack-meta-2017.2.9999.ebuild
 1802241038 ./sys-cluster/openstack-meta/openstack-meta-2018.1.9999.ebuild
 1806111409 ./sys-cluster/mpich/mpich-3.1.3.ebuild
@@ -31603,7 +31605,7 @@
 1807111139 ./sys-apps/onerng/onerng-3.6.ebuild
 1702282250 ./sys-apps/hotplug2stdout/hotplug2stdout-1.2.1.ebuild
 1807101539 ./sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
-1807131639 ./sys-apps/fwupd/fwupd-1.1.0.ebuild
+1807181609 ./sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
 1708311839 ./sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
 1806042239 ./sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
 1801060809 ./sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
@@ -31888,6 +31890,7 @@
 1804182146 ./sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
 1711130928 ./www-servers/civetweb/civetweb-1.10.ebuild
 1703181053 ./www-servers/bozohttpd/bozohttpd-20170201.ebuild
+1807181309 ./www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
 1803291839 ./www-servers/uwsgi/uwsgi-2.0.17.ebuild
 1702282250 ./www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
 1702282250 ./www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r1.ebuild
@@ -35058,7 +35061,7 @@
 1805220338 ./app-emulation/skopeo/skopeo-0.1.30.ebuild
 1707301135 ./app-emulation/skopeo/skopeo-0.1.22.ebuild
 1709030700 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
-1805102208 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild
+1807181309 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild
 1805102208 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.38.ebuild
 1807031139 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.14.ebuild
 1805081838 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
@@ -35185,13 +35188,11 @@
 1804222138 ./app-emulation/diskimage-builder/diskimage-builder-2.14.1.ebuild
 1805102208 ./app-emulation/virtualbox-bin/virtualbox-bin-5.1.38.122592.ebuild
 1805081838 ./app-emulation/virtualbox-bin/virtualbox-bin-5.1.36.122089.ebuild
+1807181309 ./app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild
 1807031139 ./app-emulation/virtualbox-bin/virtualbox-bin-5.2.14.123301.ebuild
-1805102208 ./app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild
 1805012209 ./app-emulation/vov/vov-2.0.0.ebuild
-1806121509 ./app-emulation/reg/reg-0.13.3.ebuild
-1806151739 ./app-emulation/reg/reg-0.13.4.ebuild
 1807171939 ./app-emulation/reg/reg-0.15.4.ebuild
-1806181739 ./app-emulation/reg/reg-0.14.1.ebuild
+1807181439 ./app-emulation/reg/reg-0.15.4-r1.ebuild
 1702282250 ./app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
 1802280138 ./app-emulation/cadvisor/cadvisor-0.29.1.ebuild
 1801252208 ./app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild
@@ -35232,13 +35233,13 @@
 1807151909 ./app-emulation/wine-staging/wine-staging-3.12.ebuild
 1806040438 ./app-emulation/dlx/dlx-1.0.0.ebuild
 1807170309 ./app-emulation/virtualbox/virtualbox-5.1.36.ebuild
-1807170309 ./app-emulation/virtualbox/virtualbox-5.2.12.ebuild
 1807170309 ./app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
 1807170309 ./app-emulation/virtualbox/virtualbox-5.1.38.ebuild
+1807181309 ./app-emulation/virtualbox/virtualbox-5.2.16.ebuild
 1804131308 ./app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
 1805121908 ./app-emulation/fuse/fuse-1.5.3.ebuild
 1807071609 ./app-emulation/fuse/fuse-1.5.5.ebuild
-1805102208 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild
+1807181309 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild
 1807031139 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.14.ebuild
 1805102208 ./app-emulation/virtualbox-modules/virtualbox-modules-5.1.36.ebuild
 1805102208 ./app-emulation/virtualbox-modules/virtualbox-modules-5.1.38.ebuild
@@ -35248,13 +35249,13 @@
 1804152209 ./app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
 1804150208 ./app-emulation/virt-manager/virt-manager-9999.ebuild
 1805081838 ./app-emulation/virtualbox-additions/virtualbox-additions-5.1.36-r1.ebuild
-1805102208 ./app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild
 1807031139 ./app-emulation/virtualbox-additions/virtualbox-additions-5.2.14.ebuild
 1805102208 ./app-emulation/virtualbox-additions/virtualbox-additions-5.1.38.ebuild
+1807181309 ./app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild
 1702282250 ./app-emulation/softgun/softgun-0.21.ebuild
 1702282250 ./app-emulation/softgun/softgun-0.22.ebuild
-1805102208 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild
 1807031139 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.14.123301.ebuild
+1807181309 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild
 1805102208 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.38.122592.ebuild
 1805081838 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.36.122089.ebuild
 1804270438 ./app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
@@ -40043,7 +40044,7 @@
 1702282334 metadata/md5-cache/virtual/emacs-flim-0
 1805270804 metadata/md5-cache/virtual/glu-9.0-r2
 1805282038 metadata/md5-cache/virtual/emacs-25
-1807170030 metadata/md5-cache/virtual/Manifest.gz
+1807181309 metadata/md5-cache/virtual/Manifest.gz
 1801231609 metadata/md5-cache/virtual/httpd-basic-0-r2
 1706261608 metadata/md5-cache/virtual/lapack-3.7
 1807101039 metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1
@@ -40097,7 +40098,7 @@
 1702282334 metadata/md5-cache/virtual/cdrtools-0
 1804232138 metadata/md5-cache/virtual/perl-CPAN-2.110.100_rc-r6
 1702282334 metadata/md5-cache/virtual/emacs-24
-1807081716 metadata/md5-cache/virtual/python-greenlet-1.0
+1807181309 metadata/md5-cache/virtual/python-greenlet-1.0
 1803201012 metadata/md5-cache/virtual/perl-I18N-LangTags-0.420.0
 1801231609 metadata/md5-cache/virtual/httpd-fastcgi-0-r1
 1807101039 metadata/md5-cache/virtual/perl-Thread-Queue-3.120.0-r1
@@ -44744,6 +44745,7 @@
 1807170030 metadata/md5-cache/sys-kernel/ck-sources-4.9.107
 1807170030 metadata/md5-cache/sys-kernel/kergen-0.1.3
 1807170030 metadata/md5-cache/sys-kernel/vanilla-sources-3.2.102
+1807181509 metadata/md5-cache/sys-kernel/gentoo-sources-4.17.8
 1807170030 metadata/md5-cache/sys-kernel/rt-sources-4.14.40_p30
 1807170030 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111-r1
 1805212239 metadata/md5-cache/sys-kernel/linux-firmware-20180518
@@ -44809,7 +44811,7 @@
 1807170030 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.53
 1807170030 metadata/md5-cache/sys-kernel/aufs-sources-4.14.47
 1807170030 metadata/md5-cache/sys-kernel/gentoo-sources-4.17.3
-1807180109 metadata/md5-cache/sys-kernel/Manifest.gz
+1807181509 metadata/md5-cache/sys-kernel/Manifest.gz
 1807170030 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1806131110 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1806131202 metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
@@ -46530,7 +46532,7 @@
 1807170030 metadata/md5-cache/games-strategy/colobot-0.1.11
 1801271808 metadata/md5-cache/games-strategy/wargus-data-0-r1
 1807170030 metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
-1807170030 metadata/md5-cache/games-strategy/Manifest.gz
+1807181609 metadata/md5-cache/games-strategy/Manifest.gz
 1805241809 metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
 1807170030 metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
 1807170030 metadata/md5-cache/games-strategy/seven-kingdoms-2.14.7
@@ -46561,9 +46563,9 @@
 1807170030 metadata/md5-cache/games-strategy/freesynd-0.7.1-r1
 1807170030 metadata/md5-cache/games-strategy/freeciv-2.5.11
 1807170030 metadata/md5-cache/games-strategy/wesnoth-1.14.3
+1807181609 metadata/md5-cache/games-strategy/tornado-1.4-r2
 1807170030 metadata/md5-cache/games-strategy/netpanzer-0.8.2
 1807170030 metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
-1807170030 metadata/md5-cache/games-strategy/tornado-1.4
 1807170030 metadata/md5-cache/games-strategy/freeorion-9999
 1807152209 metadata/md5-cache/games-strategy/uqm-0.7.0.1
 1707090139 metadata/md5-cache/games-mud/mudix-4.3-r2
@@ -48434,6 +48436,7 @@
 1807170030 metadata/md5-cache/dev-python/enable-4.4.1
 1807170030 metadata/md5-cache/dev-python/libcloud-1.5.0
 1807170030 metadata/md5-cache/dev-python/elib-intl-0_pre20110711
+1807181309 metadata/md5-cache/dev-python/gevent-1.3.5
 1807081716 metadata/md5-cache/dev-python/pytest-flake8-0.8.1
 1807081716 metadata/md5-cache/dev-python/httmock-1.2.4
 1807081716 metadata/md5-cache/dev-python/sortedcontainers-1.5.7
@@ -48505,7 +48508,7 @@
 1807081716 metadata/md5-cache/dev-python/aiodns-1.1.1
 1807081716 metadata/md5-cache/dev-python/jaraco-logging-1.5.2
 1807081716 metadata/md5-cache/dev-python/oslo-versionedobjects-1.31.3
-1807170030 metadata/md5-cache/dev-python/greenlet-0.4.13
+1807181309 metadata/md5-cache/dev-python/greenlet-0.4.13
 1807170030 metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
 1807170030 metadata/md5-cache/dev-python/tweepy-3.5.0
 1807170030 metadata/md5-cache/dev-python/tweepy-2.3
@@ -48829,7 +48832,7 @@
 1807170030 metadata/md5-cache/dev-python/watchdog-0.8.3-r1
 1807081716 metadata/md5-cache/dev-python/theano-0.9.0
 1807081716 metadata/md5-cache/dev-python/python-magic-0.4.15
-1807180209 metadata/md5-cache/dev-python/Manifest.gz
+1807181609 metadata/md5-cache/dev-python/Manifest.gz
 1807170030 metadata/md5-cache/dev-python/mamba-0.8.6
 1807170030 metadata/md5-cache/dev-python/spyder-3.2.4
 1807081716 metadata/md5-cache/dev-python/logfury-0.1.2
@@ -49766,7 +49769,7 @@
 1807170030 metadata/md5-cache/dev-python/testscenarios-0.5.0
 1807081716 metadata/md5-cache/dev-python/pyperclip-1.5.27
 1807170030 metadata/md5-cache/dev-python/jupyter-1.0.0
-1807141239 metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
+1807181609 metadata/md5-cache/dev-python/PyGithub-1.40_alpha4
 1807170030 metadata/md5-cache/dev-python/pythong-2.1.5-r2
 1807170030 metadata/md5-cache/dev-python/automaton-0.8.0
 1807162309 metadata/md5-cache/dev-python/mimeparse-1.6.0
@@ -50277,7 +50280,7 @@
 1807170030 metadata/md5-cache/dev-python/rply-0.7.4
 1807170030 metadata/md5-cache/dev-python/objgraph-1.7.2
 1807081716 metadata/md5-cache/dev-python/toolz-0.9.0
-1807170030 metadata/md5-cache/dev-python/pyjwt-1.5.3
+1807181609 metadata/md5-cache/dev-python/pyjwt-1.5.3
 1807170030 metadata/md5-cache/dev-python/gdata-2.0.18
 1807170030 metadata/md5-cache/dev-python/netaddr-0.7.12
 1807170030 metadata/md5-cache/dev-python/ldappool-1.0
@@ -54725,7 +54728,7 @@
 1807170030 metadata/md5-cache/sys-freebsd/freebsd-pf-11.1
 1807170030 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1807170030 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
-1807181109 metadata/md5-cache/Manifest.gz
+1807181609 metadata/md5-cache/Manifest.gz
 1805270804 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1807170030 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1807170030 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -62184,6 +62187,7 @@
 1807081716 metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
 1807170030 metadata/md5-cache/sys-cluster/charm-6.6.0-r1
 1807170030 metadata/md5-cache/sys-cluster/corosync-1.3.5
+1807181439 metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.1
 1807180040 metadata/md5-cache/sys-cluster/swift-2.16.0
 1807170030 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
 1806232209 metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
@@ -62198,6 +62202,7 @@
 1807170030 metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
 1807180040 metadata/md5-cache/sys-cluster/cinder-2017.2.9999
 1807180040 metadata/md5-cache/sys-cluster/torque-6.0.3
+1807181439 metadata/md5-cache/sys-cluster/kube-apiserver-1.11.1
 1807180040 metadata/md5-cache/sys-cluster/cinder-12.0.3
 1807090039 metadata/md5-cache/sys-cluster/keepalived-1.4.3
 1807170030 metadata/md5-cache/sys-cluster/legion-18.05.0
@@ -62217,6 +62222,7 @@
 1807170030 metadata/md5-cache/sys-cluster/legion-9999
 1807170030 metadata/md5-cache/sys-cluster/corosync-2.3.3
 1807170030 metadata/md5-cache/sys-cluster/ceph-12.2.1
+1807181439 metadata/md5-cache/sys-cluster/kubelet-1.11.1
 1806061539 metadata/md5-cache/sys-cluster/kube-apiserver-1.10.4
 1807170030 metadata/md5-cache/sys-cluster/openmpi-2.1.3
 1807170030 metadata/md5-cache/sys-cluster/legion-17.02.0
@@ -62230,12 +62236,12 @@
 1807021809 metadata/md5-cache/sys-cluster/kubectl-1.9.9
 1807180040 metadata/md5-cache/sys-cluster/torque-2.5.13-r1
 1805140108 metadata/md5-cache/sys-cluster/charliecloud-0.2.4
-1807021809 metadata/md5-cache/sys-cluster/kubectl-1.11.0
 1807170030 metadata/md5-cache/sys-cluster/csync2-2.0
 1807180040 metadata/md5-cache/sys-cluster/libccs-perl-3.1.5
 1807170030 metadata/md5-cache/sys-cluster/legion-17.08.0
 1807170030 metadata/md5-cache/sys-cluster/maui-3.3.1-r3
 1807180040 metadata/md5-cache/sys-cluster/heat-9.0.4
+1807181439 metadata/md5-cache/sys-cluster/kube-scheduler-1.11.1
 1807180040 metadata/md5-cache/sys-cluster/neutron-2018.1.9999
 1807180040 metadata/md5-cache/sys-cluster/sanlock-3.4.0-r1
 1807170030 metadata/md5-cache/sys-cluster/charm-6.5.1-r1
@@ -62260,7 +62266,6 @@
 1807170030 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 1806272339 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.5
 1807180009 metadata/md5-cache/sys-cluster/ceph-12.2.7
-1807091809 metadata/md5-cache/sys-cluster/kube-scheduler-1.11.0
 1807170030 metadata/md5-cache/sys-cluster/charm-6.8.2
 1807170030 metadata/md5-cache/sys-cluster/legion-17.10.0
 1805012209 metadata/md5-cache/sys-cluster/lspbs-1.1-r1
@@ -62292,8 +62297,7 @@
 1807180040 metadata/md5-cache/sys-cluster/cman-3.1.5-r1
 1807170030 metadata/md5-cache/sys-cluster/singularity-2.4.2
 1807170030 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
-1807101539 metadata/md5-cache/sys-cluster/kube-proxy-1.11.0
-1807180040 metadata/md5-cache/sys-cluster/Manifest.gz
+1807181439 metadata/md5-cache/sys-cluster/Manifest.gz
 1807180040 metadata/md5-cache/sys-cluster/nova-16.1.4
 1807170030 metadata/md5-cache/sys-cluster/cman-lib-2.03.09-r1
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
@@ -62353,7 +62357,6 @@
 1807170030 metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
 1807081716 metadata/md5-cache/sys-cluster/minikube-0.28.0-r1
 1807170030 metadata/md5-cache/sys-cluster/libquo-1.2.4-r1
-1807021809 metadata/md5-cache/sys-cluster/kube-apiserver-1.11.0
 1807170030 metadata/md5-cache/sys-cluster/rgmanager-3.1.5
 1806272339 metadata/md5-cache/sys-cluster/kubelet-1.10.5
 1807180040 metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
@@ -62378,7 +62381,6 @@
 1712020039 metadata/md5-cache/sys-cluster/charliecloud-0.2.3_pre20171121
 1805270804 metadata/md5-cache/sys-cluster/gasnet-1.28.0
 1807170030 metadata/md5-cache/sys-cluster/teleport-2.4.2
-1807111809 metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.0
 1807021809 metadata/md5-cache/sys-cluster/kube-proxy-1.9.9
 1807021809 metadata/md5-cache/sys-cluster/kube-apiserver-1.9.9
 1807170030 metadata/md5-cache/sys-cluster/util-vserver-0.30.216_pre3120
@@ -62406,9 +62408,10 @@
 1805270804 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
 1807170030 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.12
 1807180040 metadata/md5-cache/sys-cluster/cman-3.1.5
-1807091809 metadata/md5-cache/sys-cluster/kubelet-1.11.0
+1807181439 metadata/md5-cache/sys-cluster/kube-proxy-1.11.1
 1807180040 metadata/md5-cache/sys-cluster/torque-4.1.7-r1
 1805270804 metadata/md5-cache/sys-cluster/libdlm-3.2.0
+1807181439 metadata/md5-cache/sys-cluster/kubectl-1.11.1
 1806272339 metadata/md5-cache/sys-cluster/kube-proxy-1.10.5
 1805270804 metadata/md5-cache/sys-cluster/corosync-2.3.5
 1807170030 metadata/md5-cache/x11-apps/mkfontscale-1.1.3
@@ -67175,6 +67178,7 @@
 1807170030 metadata/md5-cache/sys-apps/usbmon-6-r1
 1807170030 metadata/md5-cache/sys-apps/lmctfy-0.3.1
 1803190338 metadata/md5-cache/sys-apps/cciss_vol_status-1.12
+1807181609 metadata/md5-cache/sys-apps/fwupd-1.1.0-r1
 1804140239 metadata/md5-cache/sys-apps/inxi-2.3.56
 1807170030 metadata/md5-cache/sys-apps/kbd-2.0.4
 1807170030 metadata/md5-cache/sys-apps/sg3_utils-1.43
@@ -67192,7 +67196,6 @@
 1807170030 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.12
 1807170030 metadata/md5-cache/sys-apps/paludis-3.0.0_pre20180214
 1805270804 metadata/md5-cache/sys-apps/man-db-2.8.3
-1807170030 metadata/md5-cache/sys-apps/fwupd-1.1.0
 1807170030 metadata/md5-cache/sys-apps/openrc-0.35.5
 1807170030 metadata/md5-cache/sys-apps/paxctl-0.9
 1702282332 metadata/md5-cache/sys-apps/hprofile-3.2.2
@@ -67229,7 +67232,7 @@
 1807170030 metadata/md5-cache/sys-apps/uam-0.3.2
 1807170030 metadata/md5-cache/sys-apps/iproute2-9999
 1807170030 metadata/md5-cache/sys-apps/toybox-9999
-1807180040 metadata/md5-cache/sys-apps/Manifest.gz
+1807181609 metadata/md5-cache/sys-apps/Manifest.gz
 1806131202 metadata/md5-cache/sys-apps/hwids-20170328
 1806131110 metadata/md5-cache/sys-apps/restorecond-9999
 1807081716 metadata/md5-cache/sys-apps/portage-mgorny-2.3.36.1
@@ -67521,6 +67524,7 @@
 1807170030 metadata/md5-cache/www-servers/adsf-1.3.1
 1702282335 metadata/md5-cache/www-servers/spawn-fcgi-1.6.3-r1
 1807170030 metadata/md5-cache/www-servers/tomcat-7.0.85
+1807181309 metadata/md5-cache/www-servers/uwsgi-2.0.17.1
 1807171709 metadata/md5-cache/www-servers/h2o-2.2.5
 1807170030 metadata/md5-cache/www-servers/ocsigenserver-2.8
 1807081716 metadata/md5-cache/www-servers/tornado-4.4.2-r1
@@ -67555,7 +67559,7 @@
 1807170030 metadata/md5-cache/www-servers/thttpd-2.27.1
 1702282335 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
 1807171039 metadata/md5-cache/www-servers/apache-2.4.33-r1
-1807172039 metadata/md5-cache/www-servers/Manifest.gz
+1807181309 metadata/md5-cache/www-servers/Manifest.gz
 1807170030 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
 1807172039 metadata/md5-cache/www-servers/nginx-unit-1.3
 1807081716 metadata/md5-cache/www-servers/tornado-4.5.1
@@ -70701,6 +70705,7 @@
 1803031308 metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
 1807081716 metadata/md5-cache/app-eselect/eselect-repository-3
 1807071609 metadata/md5-cache/app-emulation/libspectrum-1.4.4
+1807181309 metadata/md5-cache/app-emulation/virtualbox-5.2.16
 1807170030 metadata/md5-cache/app-emulation/softgun-0.21
 1807180039 metadata/md5-cache/app-emulation/qemu-2.12.0-r3
 1807170030 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.1.38.122592
@@ -70724,6 +70729,7 @@
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-15.0.1
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-15.0.0
+1807181309 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.16
 1807170030 metadata/md5-cache/app-emulation/libcacard-0.1.2
 1807170030 metadata/md5-cache/app-emulation/wine-any-3.11
 1807170030 metadata/md5-cache/app-emulation/phpvirtualbox-5.0.3
@@ -70744,7 +70750,6 @@
 1807170030 metadata/md5-cache/app-emulation/vov-2.0.0
 1807170030 metadata/md5-cache/app-emulation/wine-d3d9-3.10
 1807180039 metadata/md5-cache/app-emulation/qemu-2.11.1-r2
-1807180039 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.12
 1806042238 metadata/md5-cache/app-emulation/containerd-1.0.3_p20180223
 1807170030 metadata/md5-cache/app-emulation/genymotion-bin-2.11.0
 1805121908 metadata/md5-cache/app-emulation/libspectrum-1.4.2
@@ -70752,12 +70757,12 @@
 1807180039 metadata/md5-cache/app-emulation/libvirt-4.4.0-r1
 1807170030 metadata/md5-cache/app-emulation/hercules-3.12
 1807170030 metadata/md5-cache/app-emulation/rkt-1.29.0
-1807170030 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.12.122591
 1807170030 metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
 1805091208 metadata/md5-cache/app-emulation/libdsk-1.5.8
 1804290939 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1807170030 metadata/md5-cache/app-emulation/wine-d3d9-3.12
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
+1807181309 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.16
 1807180039 metadata/md5-cache/app-emulation/nemu-2.0.0
 1807170030 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.14.123301
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -70791,7 +70796,6 @@
 1704102038 metadata/md5-cache/app-emulation/wine-mono-4.7.0
 1801191240 metadata/md5-cache/app-emulation/libguestfs-appliance-1.28.1-r1
 1807081716 metadata/md5-cache/app-emulation/sen-0.6.0
-1806151739 metadata/md5-cache/app-emulation/reg-0.13.4
 1711280210 metadata/md5-cache/app-emulation/virtio-win-0.1.141
 1711182038 metadata/md5-cache/app-emulation/virt-what-1.18
 1807170030 metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
@@ -70817,7 +70821,6 @@
 1807170030 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
 1805270804 metadata/md5-cache/app-emulation/containerd-1.0.3
 1805270804 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.16
-1807180039 metadata/md5-cache/app-emulation/virtualbox-5.2.12
 1807170030 metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
 1807170030 metadata/md5-cache/app-emulation/xen-4.9.1-r1
 1807171439 metadata/md5-cache/app-emulation/xen-tools-4.10.1
@@ -70829,7 +70832,6 @@
 1807170030 metadata/md5-cache/app-emulation/vagrant-2.1.2-r1
 1807180039 metadata/md5-cache/app-emulation/nemu-1.4.1
 1807170030 metadata/md5-cache/app-emulation/docker-proxy-9999
-1807170030 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.12.122591
 1710122038 metadata/md5-cache/app-emulation/docker-bench-security-1.3.3
 1807031139 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.14
 1807170030 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.2-r2
@@ -70856,8 +70858,7 @@
 1806151739 metadata/md5-cache/app-emulation/img-0.4.6
 1807170030 metadata/md5-cache/app-emulation/nemu-1.2.0
 1806042238 metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
-1807180039 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.12
-1807180039 metadata/md5-cache/app-emulation/Manifest.gz
+1807181439 metadata/md5-cache/app-emulation/Manifest.gz
 1807170030 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1807170030 metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.1
 1806131110 metadata/md5-cache/app-emulation/docker-gc-9999
@@ -70876,7 +70877,6 @@
 1807170030 metadata/md5-cache/app-emulation/containerd-9999
 1805270804 metadata/md5-cache/app-emulation/dinero-4.7-r1
 1807170030 metadata/md5-cache/app-emulation/virt-manager-1.5.1-r1
-1806181739 metadata/md5-cache/app-emulation/reg-0.14.1
 1804290939 metadata/md5-cache/app-emulation/umoci-0.2.1
 1807170030 metadata/md5-cache/app-emulation/wine-staging-9999
 1807081716 metadata/md5-cache/app-emulation/spice-0.14.0-r1
@@ -70885,12 +70885,11 @@
 1807180039 metadata/md5-cache/app-emulation/libvirt-9999
 1807180039 metadata/md5-cache/app-emulation/lxd-3.2
 1807170030 metadata/md5-cache/app-emulation/xtrs-4.9d-r4
-1807170030 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.12
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-15.3.1
-1806121509 metadata/md5-cache/app-emulation/reg-0.13.3
 1807170030 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.3
 1804290939 metadata/md5-cache/app-emulation/docker-machine-kvm-0.10.0
 1806131110 metadata/md5-cache/app-emulation/spice-protocol-9999
+1807181309 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.16
 1804290939 metadata/md5-cache/app-emulation/go-secbench-0.1.0
 1805121908 metadata/md5-cache/app-emulation/fuse-utils-1.4.1
 1804290939 metadata/md5-cache/app-emulation/docker-swarm-1.2.0
@@ -70966,18 +70965,21 @@
 1807170030 metadata/md5-cache/app-emulation/cloud-init-0.7.6_p1212
 1804290939 metadata/md5-cache/app-emulation/cadvisor-0.29.1
 1807170030 metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
+1807181439 metadata/md5-cache/app-emulation/reg-0.15.4-r1
 1805151438 metadata/md5-cache/app-emulation/kompose-1.13.0
 1807170030 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.11
 1807170030 metadata/md5-cache/app-emulation/qt-virt-manager-9999
 1807170030 metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
 1807170030 metadata/md5-cache/app-emulation/winetricks-20170823
 1807170030 metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
+1807181309 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.16.123759
 1807170030 metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
 1807180039 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.14
 1807170030 metadata/md5-cache/app-emulation/virtualbox-bin-5.1.36.122089
 1807180039 metadata/md5-cache/app-emulation/docker-18.03.1
 1807170030 metadata/md5-cache/app-emulation/xen-4.9.1-r2
 1807081716 metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
+1807181309 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.16.123759
 1807170030 metadata/md5-cache/app-emulation/free42-2.0.20
 1807170030 metadata/md5-cache/app-emulation/wine-any-2.0-r1
 1807081716 metadata/md5-cache/app-emulation/glean-1.10.3
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5fd447b2d867..02b5500df1d2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jul 2018 08:30:01 +0000
+Wed, 18 Jul 2018 14:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 53fa1f1bfbd5..0aa515726713 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c1a3ef6a658fa181236f7915ed33412cce40ffb3 1531900661 2018-07-18T07:57:41+00:00
+5228ac9c7306784766466e5866e8e3426233db42 1531918475 2018-07-18T12:54:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f2721df7ccca..64e0aa695f0f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1531901101 Wed 18 Jul 2018 08:05:01 AM UTC
+1531920901 Wed 18 Jul 2018 01:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 75273542e1d5..5e2976f2b2e3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jul 2018 08:08:41 +0000
+Wed, 18 Jul 2018 13:38:40 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 36dee0bfca92..c8c6382e3127 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 447ab0755aae..da2695cdab3e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
 AUX 4.2/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d
 AUX 4.2/samba4.initd-r1 1103 BLAKE2B cf8a53aff9ec49a745168593e737c35d61ccc138ed304d27977a420f71440b4a7a0e241110180278684d26c5f848810c9b1bfc32af54a22f039119513765bccc SHA512 8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5
-AUX 4.4/samba4.confd 2036 BLAKE2B afc872734ee4b5d4332e1550e29dca6fdfe5e70a77018621df731aed5c69471294c5c9766050b1109bf978c785690930d8e6aa0429d60ae4d0b37487b4c2c8bf SHA512 122fa1eb8bcf43b0cab64be604c4cae82553f4fbff58ba831afdd2dd5e032618a875154bd50578aeba880a28c45027aa1fba66a76d1c3c28d5850fc098d9812c
+AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
 AUX 4.4/samba4.initd-r1 1125 BLAKE2B 204a639069495cfd711bd1c9dcd78a480e07bca7b760efdec49061f093d7e41dc6ce16b9264cc4762094bb7a796dc96d71003668416d40948036bd6fcc944a2e SHA512 982771fd7e1d260d8d4305eb18a3c15871f535b700d2b9554af24df62286e59ce6c5c76ef4ffee7a751fc01040eefaaabad71b2f67e3749ba1ee97a368b14d5a
 AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75b8b616e039e235f2202e4c5275421ec018911e92680da923d9403f7bfc65e1995216f4c157fef SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d
 AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd898f2a942afb284e72a3a50454ffa63c201a3ad1b061d966107c749450cefe260e40090327f0144e1086e9bba4607c3811500 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536
diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd
index 2604981f2141..629a605021a2 100644
--- a/net-fs/samba/files/4.4/samba4.confd
+++ b/net-fs/samba/files/4.4/samba4.confd
@@ -32,7 +32,7 @@ nmbd_reload="killall -HUP nmbd"
 
 samba4_start_options=""
 samba4_command="/usr/sbin/samba"
-samba4_pidfile="${piddir}/samba4.pid"
+samba4_pidfile="${piddir}/samba.pid"
 samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}"
 samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}"
 samba4_reload="killall -HUP samba"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index aebc59f0b5d9..3bc1e1540de5 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 80601532ae21..ddbed5909982 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -15,9 +15,9 @@ kernel_linux
 # coreutils on darwin.
 acl
 
-# Prefix removed python3_4 from PYTHON_TARGETS and PYTHON_SINGLE_TARGET
-python_targets_python3_4
-python_single_target_python3_4
+# Prefix removed python3_5 from PYTHON_TARGETS and PYTHON_SINGLE_TARGET
+python_targets_python3_5
+python_single_target_python3_5
 
 # Similar for Ruby 2.3
 ruby_targets_ruby23
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bda8a8c0cc65..320e69d85a8b 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index a44c1926b1ff..5fab30b1dbca 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,6 @@
+AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
 DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
 DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae
 EBUILD fwupd-1.0.8-r1.ebuild 2571 BLAKE2B 319b1a34fdd87aadffcd39e73713b09b1cdf5191582c71bd2192fe07a4db3494a4108f92fa331c7cb5ab12725ece340df8dad94cd4544cf10cf0b3af3b8015c8 SHA512 4a42e8c3d1b860b7936b320b78d2e453f4412312d412176dc53f3dce0f8ce28311d2ec79dc2eedc381f46ddfe332c35e97e49775bdea9f1f07c600fd5ae866cc
-EBUILD fwupd-1.1.0.ebuild 2583 BLAKE2B 30a1ffe9ec7a4f6ae154c24478568c2b12c841e3fc16d1ee390edcc09379982c99aeddec75d7ae56e9e95db5776a579111a6cf9686ee20b3802605a7f8e93acc SHA512 447ce527e8aa2ee6bf629f9840dbbaa10826c1697503866928e0f58ebd2db0ce89de931cbbdb36af4ff52e8b31b2acf1fb89f56cde3093c5190875f8596dfee2
+EBUILD fwupd-1.1.0-r1.ebuild 3031 BLAKE2B 04e01f707797f72f4854e6ce49dd40146a0f63445900bcd812f049ebcb35b75e3e735fe03595ae58500cef05ad3295a34cb2ffd83f116183e0eb558c19e3bc61 SHA512 d99e8963cc883fe3f631c15b52f5b0fe7f731e197565c3786c597ddfa607091b05861aa55c0a6395824396ba1d3d5a116c65e442c6261fd5b2999999e3b2353e
 MISC metadata.xml 889 BLAKE2B d567f74fb461b0740d21bbc1e2b37692928aa2dbab77250743b898b6aaab8579bea218d4aa1fe379f45422d7ca4b9b81fbcd6bb2c8c41b586b27c0b30f71715a SHA512 80c84c24df419837825e4dc4453dc360c32f4e3eef3d117fe51a8675717ebd6f64bae27df6221895d86d9f099092c3c7e9e5b7650851722ccfc927a874bec001
diff --git a/sys-apps/fwupd/files/fwupd b/sys-apps/fwupd/files/fwupd
new file mode 100644
index 000000000000..b235bf82c6fa
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Firmware update daemon"
+pidfile="/var/run/fwupd.pid"
+command="/usr/libexec/fwupd/fwupd"
+command_background="true"
+
+depend() {
+	need dbus
+	before xdm
+}
diff --git a/sys-apps/fwupd/fwupd-1.1.0.ebuild b/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
similarity index 85%
rename from sys-apps/fwupd/fwupd-1.1.0.ebuild
rename to sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
index 431667267fac..0b779394a532 100644
--- a/sys-apps/fwupd/fwupd-1.1.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
+		sys-boot/gnu-efi
 		>=sys-libs/efivar-33
 		x11-libs/cairo
 	)
@@ -74,6 +75,10 @@ DEPEND="
 	test? ( net-libs/gnutls[tools] )
 "
 
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
 src_prepare() {
 	default
 	sed -e "s/'--create'/'--absolute-name', '--create'/" \
@@ -102,3 +107,15 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	doinitd "${FILESDIR}"/${PN}
+}
+
+pkg_postinst() {
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3456eb299f61..335aa442b656 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index c4234fd02a5e..a45ae5362822 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -3,12 +3,12 @@ AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c73
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-apiserver-1.10.4.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.10.5.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.11.0.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.11.1.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.8.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.9.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.11.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kube-apiserver/kube-apiserver-1.11.0.ebuild
rename to sys-cluster/kube-apiserver/kube-apiserver-1.11.1.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index e72c6c72e99f..21466db5920b 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,12 +3,12 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-controller-manager-1.10.4.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.10.5.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.11.0.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.11.1.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.9.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kube-controller-manager/kube-controller-manager-1.11.0.ebuild
rename to sys-cluster/kube-controller-manager/kube-controller-manager-1.11.1.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a3252ac8c331..21939746e0c8 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,12 +3,12 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.10.5.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.11.0.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.11.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.9.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kube-proxy/kube-proxy-1.11.0.ebuild
rename to sys-cluster/kube-proxy/kube-proxy-1.11.1.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index d3885553cac4..740cdc4f8616 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,12 +3,12 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kube-scheduler-1.10.4.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.10.5.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.11.0.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
+EBUILD kube-scheduler-1.11.1.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 EBUILD kube-scheduler-1.9.9.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kube-scheduler/kube-scheduler-1.11.0.ebuild
rename to sys-cluster/kube-scheduler/kube-scheduler-1.11.1.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 47f6f80e48ac..962b27412fc5 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,9 @@
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kubectl-1.10.5.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.11.0.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.11.1.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.8.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.9.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.11.0.ebuild b/sys-cluster/kubectl/kubectl-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kubectl/kubectl-1.11.0.ebuild
rename to sys-cluster/kubectl/kubectl-1.11.1.ebuild
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 77e9037e0487..7ad4a48d8091 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,12 +3,12 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 DIST kubernetes-1.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
 DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.11.0.tar.gz 24433264 BLAKE2B 7a848fcd8c25c45fb34a78f0e253724bbfe24190ed6b3d49447a431e45bacbc726c7f6992db1d1eb976e6b183b811b5b3d5ef7b6d58d68a824b9d5c18b9d99e5 SHA512 8152b47e1972f26a239166cea7ccb6449e212b8f51144e85576cfcfea85699a902be39aaa600f9400cd7673c2a169f5f18c9898b297b46df3e6268e4044d025a
+DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
 DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
 EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.10.5.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.11.0.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.11.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.9.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.11.0.ebuild b/sys-cluster/kubelet/kubelet-1.11.1.ebuild
similarity index 100%
rename from sys-cluster/kubelet/kubelet-1.11.0.ebuild
rename to sys-cluster/kubelet/kubelet-1.11.1.ebuild
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a7270600802c..9cc83004184b 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 82f2b328645b..38983dc7bb96 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -64,6 +64,9 @@ DIST genpatches-4.17-7.extras.tar.xz 17480 BLAKE2B ba9706cc7fd251ce586062354be3a
 DIST genpatches-4.17-8.base.tar.xz 170084 BLAKE2B dc747c215803b06da66f94956589daed3d0767f7dfb3f4e10d4e1ebae5f714a5fb3e8d6b0b2e69fb349e15c859cf19c821dfa57438bbe0b0c308fa97c973bb8d SHA512 96b088f7e8afbf9a6e1d6dafd49e4cc6b4079e36a16ce7e819c653e4852aaec7e7834806fd520edf84a6a92f9c19934b8c322d743df4de6a8e7a9075a3c18aa1
 DIST genpatches-4.17-8.experimental.tar.xz 5220 BLAKE2B 2003d75504ae365714815a04947ac28aece44da7ec82772871b73fe15556015ffaadff44544cd5bff7379232df88d28dc545d808434a4430046a69a81a7b9ee0 SHA512 b527c3085e6bdf7fb9f6a4c44cf6a2810f1182f43ad533db9b8666e72a47a58b74d760985753cbbfec22337ec630cbb73d8262be0689d3eb78c4daba62bdcaa8
 DIST genpatches-4.17-8.extras.tar.xz 17488 BLAKE2B 8965450e31b593640355e758334bdcb84cf57bcb5313261e734f31ac72a082c97e5f27e723f36383063bfad4842162bf86c8c382bbcd33e4282e15dec8f871b8 SHA512 2452bf5d442ec542a048402a48744e299275e5a42067e0ae007ed0d3934792b5698c05c485361ee890b66cefe2b4f7c4b9f84e9cc24820271f8592fa6b17e852
+DIST genpatches-4.17-9.base.tar.xz 170416 BLAKE2B 4d8316d2b81dc5b08e5517fc36df7c782e88f725e48472adbdb11246a51b26cebbec0ce5a383b9dc244060ec92213883938585b6d1ecd1116a6e674a6dfee0a8 SHA512 55aaec70d1be0a0e56aa0b6ab505a554fd2271e4bf1e21a7db640c89286be945001e773110dd0255760dff9301fc407204cb0f7d0e35841934ee088ef8b873a1
+DIST genpatches-4.17-9.experimental.tar.xz 5220 BLAKE2B 7b133e03a35f7f0ffa58b9a7a2e7465bbb186b4cde1f9d1ce57f0792edded4462ef69b1ce19fac97ac6fe5abf8ac1f14b5cf516eac2649e540bddd107358bafa SHA512 b6dfb48d6140bfa252d06e9b8ca4510e9c77c76ff61e1bce6f26a28e115306ab17525d6838f84bb804056f41c95a73cfc4dd536f7101176635be65ad3bf781bb
+DIST genpatches-4.17-9.extras.tar.xz 17500 BLAKE2B 6d3fe7e54d1acb6072d627d2d7e2de5884d7512b4b02c9d2d7c5d2588d5c2d8147a2c22d62ee3f10dc574ed2ad87b81c1cd5bc3e9b635454f137858830a338fd SHA512 dd64f073f0dc99218b48a90fcbc4997ac3140672fdeb332341ab6d4bccbebfd2060c91e9f0197f9537a313c698deb106bb57a5d8334fd72e37c40767257e3b2c
 DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
 DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
 DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
@@ -161,6 +164,7 @@ EBUILD gentoo-sources-4.17.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f9403
 EBUILD gentoo-sources-4.17.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
 EBUILD gentoo-sources-4.17.6.ebuild 741 BLAKE2B df58106245c600e0bf9dd35a7eb2f4d25469e29769d81e314e552dd32b95e592acbb90af0413ae1559939a302d289005043ff729ca43c2fff520b133ac38a2d5 SHA512 4e94b88e040b686d34e8083e6cf9ae23a4d1b5bdddd456150b1b8f85203b645de42182c3043339600bb24c9ebe4b5e4893ce633f13fdbfaab9815809169a8f64
 EBUILD gentoo-sources-4.17.7.ebuild 741 BLAKE2B 3d0593031462ff30611e20d66f3b9b5b4da8b8763754f0af7fca209c8b9d7659e910ed401e44006c78469c2f5f19c01767c29a5497b8d32fe8894a5493707463 SHA512 f024a492df3732d1c5253bf32ede8119f0f3c89da099875c14c9511b676b40b934918134ed85f098236505080a781eb0d096158e799bc905e6659208b96649d7
+EBUILD gentoo-sources-4.17.8.ebuild 741 BLAKE2B c600b8af8fb7af879c95edeb1f4c1d7412991bd42450e8659c13f60fd8ccd19a41da0cef5ffaf97e62faac994928d03a778adf104a3a368b530b00bbf5e49d22 SHA512 913997637d2bef7ea097e0a060674c1932bde149d6f32baa32f355420dab9fbe4e91af7c1d8e41992bca36b0b53eefea3a08c1a1c2b10300e0893544f844098c
 EBUILD gentoo-sources-4.4.111-r1.ebuild 738 BLAKE2B 2052014422e63b1e20f01d48f63a8eff2ae594e15ff9c873cc9d062db10c238c61084ff3c4e61bd3576af1b2744776a137972f6766e2752283b05835e40f50a8 SHA512 589b508bafdfa91c3b1f9faf390dc56795cfd5d43e8e55cde64b75ff7595f13e614d06f59a83ae1a30c2be816cabca08cdd5578c19bb459e8beab6cbc2945a07
 EBUILD gentoo-sources-4.4.128.ebuild 739 BLAKE2B addd997d6cd91e4b777dcdb847bd5c3444b4c995025a8fd1202597082bfe87ba9e46817d5db2902737d7f73ab733db4b14c6688108da061fb229f234b5c19358 SHA512 8ec27f6b753c3d839a7741da8aab3e0fe4b3095a1535ca018605b31fb9dca8ebcbcf2fee47c2da99be42e8036fce6733e0b7bfda5c2d7a5d20a50b94b42ebcc7
 EBUILD gentoo-sources-4.4.136.ebuild 743 BLAKE2B b0fd4a8b5501581a53820c0276119222184abe01bbd0c831f56b97015c4f1b39a8e5dbe47e6e647e82f322d9012c280e5fd91e04c1b464a111bb54362cc4079c SHA512 0139337d5e991cc8d318be840ee9fd2a927d058bbc869bfc1bd6d3d8b6e18a3f4e78a376a4b662c5e56afc4e90e44d2596af94dcb290dc0a744a2afb35924dbc
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.17.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.17.8.ebuild
new file mode 100644
index 000000000000..c73638f7769a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.17.8.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="9"
+
+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/virtual/Manifest.gz b/virtual/Manifest.gz
index 17e2f6d32e09..33f2fec5915d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index 6d2092a83305..bf75df8b20cd 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0.ebuild 443 BLAKE2B 14e227c5f7c1639c5d5250670387010296aa170d5f436ff3a0c0edaec8a565a09f2bc79e0e7e31e980dce2ffa8b456e841bfef8493cb5c026152a0579c8c5eaa SHA512 753c53dcfc79938084ad41a55ecd7112bf33c7b66f66cc76173e468e9128c5761a53a8fde73e0bc61eebfa7bfffbd3ea59a58bbd22fc072359566963a211b17f
+EBUILD python-greenlet-1.0.ebuild 445 BLAKE2B f854c06cd56aea5a5767cc20ed0b1719d42dd9b7dbdec63e661a37ad455d21786c71c211d57b9791926b12c654b10ab40a20fa71b01c18afcea09390e1258265 SHA512 9fa5fa45f1284ba4607f992bd26a7e14e79c346f88fa116f40a4f6e9ac6cefafc6a6e782fc2b0937a8f030b987ab2feb54ceb73477d3f6a7165c754135821ae5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-greenlet/python-greenlet-1.0.ebuild b/virtual/python-greenlet/python-greenlet-1.0.ebuild
index 4f2384226a7b..13bded7e61d0 100644
--- a/virtual/python-greenlet/python-greenlet-1.0.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit python-r1
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 02564cd6ba7a..c925fdf7e644 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 99908371b6b9..c6f7be608e25 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,6 +3,8 @@ AUX 42_mod_uwsgi-r2.conf 254 BLAKE2B 27e8a1814eb6a3a2cf265d5364971cb2aa4ff97a428
 AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3530be9d177bff755779251ea880d98addacf5476e3aae20145c95fad4d7baf594e58b9ebcaf2b0dde SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
+DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
+EBUILD uwsgi-2.0.17.1.ebuild 12786 BLAKE2B 0ec5625970bd579005e552862aeca312793b6b91c40ac0064adb9c4bdea75b97cfa13a69f92d17912655c00e4556f4f06486d1289b97127e88bd5a712506423f SHA512 0b987ba9c350f647ccd8aa8fda1e11b82ab989b5cc92abe00bc36a1a3fb860c99693e1e50494f369cf08afba3645826dbd806466e2bb493d933826686b55bf14
 EBUILD uwsgi-2.0.17.ebuild 12846 BLAKE2B 90fcbf6300de611aa3d7c930dd94c4a55c175656e2bbcdcc606e1b77df1b2e481fb31beedbb20b33db0bc3c4b0e8338661fd471ae7a088a5eaa386b66c4b9b39 SHA512 7940ac487b2ab57bca5790836c40e604fe5129449aac5d6de474f31a4fb1357ce0b724647e73639e2b3f062f0a9243106d352d2413424408f30c44ec9c3e59b4
 MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
new file mode 100644
index 000000000000..623312528d19
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby22 ruby23 ruby24"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	uwsgi_plugins_router_xmldir? ( xml !expat )
+	pypy? ( python_targets_python2_7 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent )
+	python_gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	json? ( !yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl ) )
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	xml? ( !expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat ) )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( dev-lang/go:=[gccgo] )
+	lua? ( dev-lang/lua:= )
+	mono? ( =dev-lang/mono-4* )
+	perl? ( dev-lang/perl:= )
+	php? (
+		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
+		php_targets_php7-0? ( dev-lang/php:7.0[embed] )
+		php_targets_php7-1? ( dev-lang/php:7.1[embed] )
+		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
+	)
+	pypy? ( virtual/pypy )
+	python? ( ${PYTHON_DEPS} )
+	python_gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
+
+src_unpack() {
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use ruby && ruby-ng_pkg_setup
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	if [[ ${EPYTHON} == pypy* ]]; then
+		einfo "skipping because pypy is not meant to build plugins on its own"
+		return
+	fi
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python_asyncio ; then
+		if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python_gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use pypy ; then
+		if [[ "${PYV}" == "27" ]] ; then
+			# TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+			# QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+			append-ldflags -Wl,-z,noexecstack
+			${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+		fi
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since we don't have
+		# slotted lua
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+
+	if use apache2 ; then
+		for m in proxy_uwsgi Ruwsgi uwsgi ; do
+			APXS2_ARGS="-c mod_${m}.c"
+			apache-module_src_compile
+		done
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	if use apache2; then
+		for m in proxy_uwsgi Ruwsgi uwsgi ; do
+			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+			apache-module_src_install
+		done
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+		elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+		elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+		elog "Therefore you can enable only one of them at a time."
+		elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+		elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		if [[ ${EPYTHON} == pypy* ]] ; then
+			elog "  '--plugins pypy' for pypy"
+			return
+		fi
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python_asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python_gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $USE_RUBY; do
+			if use ruby_targets_${ruby} ; then
+				elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+				elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+				elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+			fi
+		done
+	fi
+}